Update to latest spark-sdk

Author: benthecarman

orange-sdk/Cargo.toml

@@ -23,7 +23,7 @@ bitcoin-payment-instructions = { workspace = true }
 chrono = { version = "0.4", default-features = false }
 rand = { version = "0.8.5", optional = true }
 reqwest = { version = "0.12.23", default-features = false, features = ["rustls-tls"] }
-spark-wallet = { git = "https://github.com/breez/spark-sdk.git", rev = "47986e0ebaa7a1522ed21d0a82cea92b0d8342e4", default-features = false, features = ["rustls-tls"], optional = true }
+spark-wallet = { git = "https://github.com/breez/spark-sdk.git", rev = "6e12f98be3f100fca0411e3209a610decfa32279", default-features = false, features = ["rustls-tls"], optional = true }
 tokio = { version = "1.0", default-features = false, features = ["rt-multi-thread", "sync"] }
 uuid = { version = "1.0", default-features = false, optional = true }
 cdk = { git = "https://github.com/benthecarman/cdk.git", branch = "orange-fork", default-features = false, features = ["wallet"], optional = true }

orange-sdk/src/trusted_wallet/spark.rs

@@ -38,7 +38,7 @@ use uuid::Uuid;
 /// A wallet implementation using the Breez Spark SDK.
 #[derive(Clone)]
 pub(crate) struct Spark {
-	spark_wallet: Arc<SparkWallet<DefaultSigner>>,
+	spark_wallet: Arc<SparkWallet>,
 	store: Arc<dyn KVStore + Send + Sync>,
 	event_queue: Arc<EventQueue>,
 	tx_metadata: TxMetadataStore,
@@ -305,7 +305,7 @@ impl Spark {
 		log_info!(logger, "Starting Spark wallet with public key: {pk}");
 
 		let spark_wallet =
-			Arc::new(SparkWallet::connect(spark_config, signer).await.map_err(|e| {
+			Arc::new(SparkWallet::connect(spark_config, Arc::new(signer)).await.map_err(|e| {
 				log_error!(logger, "Failed to connect to Spark wallet: {e:?}");
 				InitFailure::TrustedFailure(e.into())
 			})?);
@@ -424,8 +424,7 @@ impl Spark {
 
 	/// Synchronizes payments from transfers to persistent storage
 	async fn sync_payments_to_storage(
-		spark_wallet: &SparkWallet<DefaultSigner>, store: &Arc<dyn KVStore + Send + Sync>,
-		logger: &Logger,
+		spark_wallet: &SparkWallet, store: &Arc<dyn KVStore + Send + Sync>, logger: &Logger,
 	) -> Result<(), TrustedError> {
 		// sync payments
 		const BATCH_SIZE: u64 = 50;