WIP: change from spark-wallet to breez-sdk-spark

Author: benthecarman

examples/cli/src/main.rs

@@ -6,8 +6,8 @@ use rustyline::error::ReadlineError;
 
 use orange_sdk::bitcoin_payment_instructions::amount::Amount;
 use orange_sdk::{
-	ChainSource, Event, ExtraConfig, Mnemonic, PaymentInfo, Seed, SparkWalletConfig, StorageConfig,
-	Tunables, Wallet, WalletConfig, bitcoin::Network,
+	ChainSource, Event, ExtraConfig, Mnemonic, PaymentInfo, Seed, SparkNetwork, SparkWalletConfig,
+	StorageConfig, Tunables, Wallet, WalletConfig, bitcoin::Network,
 };
 use rand::RngCore;
 use std::fs;
@@ -89,9 +89,14 @@ fn get_config(network: Network) -> Result<WalletConfig> {
 				network,
 				seed,
 				tunables: Tunables::default(),
-				extra_config: ExtraConfig::Spark(SparkWalletConfig::default_config(
-					network.try_into().expect("valid network"),
-				)),
+				extra_config: ExtraConfig::Spark(SparkWalletConfig {
+					api_key: None,
+					network: SparkNetwork::Regtest,
+					sync_interval_secs: 60,
+					max_deposit_claim_fee: None,
+					lnurl_domain: None,
+					prefer_spark_over_lightning: false,
+				}),
 			})
 		},
 		Network::Bitcoin => {
@@ -118,9 +123,14 @@ fn get_config(network: Network) -> Result<WalletConfig> {
 				network,
 				seed,
 				tunables: Tunables::default(),
-				extra_config: ExtraConfig::Spark(SparkWalletConfig::default_config(
-					network.try_into().expect("valid network"),
-				)),
+				extra_config: ExtraConfig::Spark(SparkWalletConfig {
+					api_key: None,
+					network: SparkNetwork::Mainnet,
+					sync_interval_secs: 60,
+					max_deposit_claim_fee: None,
+					lnurl_domain: None,
+					prefer_spark_over_lightning: false,
+				}),
 			})
 		},
 		_ => Err(anyhow::anyhow!("Unsupported network: {network:?}")),

orange-sdk/Cargo.toml

@@ -10,7 +10,7 @@ name = "orange_sdk"
 [features]
 default = ["spark"]
 uniffi = ["dep:uniffi", "spark", "cashu"]
-spark = ["spark-wallet", "uuid"]
+spark = ["breez-sdk-spark", "uuid", "serde_json"]
 cashu = ["cdk", "serde_json"]
 _test-utils = ["corepc-node", "cashu", "uuid/v7", "rand"]
 _cashu-tests = ["_test-utils", "cdk-ldk-node", "cdk/mint", "cdk-sqlite", "cdk-axum", "axum"]
@@ -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 = "6e12f98be3f100fca0411e3209a610decfa32279", default-features = false, features = ["rustls-tls"], optional = true }
+breez-sdk-spark = { git = "https://github.com/breez/spark-sdk.git", rev = "6994785e98c13191e6dc26146be6ce87c5c8d987", 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", rev = "7d25e9ae5ed7f47f9ae7e87d8a9ee16797fee8cd", default-features = false, features = ["wallet"], optional = true }

orange-sdk/src/lib.rs

@@ -66,14 +66,14 @@ use trusted_wallet::TrustedError;
 #[cfg(feature = "cashu")]
 pub use crate::trusted_wallet::cashu::CashuConfig;
 pub use bitcoin_payment_instructions;
+#[cfg(feature = "spark")]
+pub use breez_sdk_spark::{Config as SparkWalletConfig, Fee, Network as SparkNetwork};
 #[cfg(feature = "cashu")]
 pub use cdk::nuts::nut00::CurrencyUnit;
 pub use event::{Event, EventQueue};
 pub use ldk_node::bip39::Mnemonic;
 pub use ldk_node::bitcoin;
 pub use ldk_node::payment::ConfirmationStatus;
-#[cfg(feature = "spark")]
-pub use spark_wallet::{OperatorPoolConfig, ServiceProviderConfig, SparkWalletConfig};
 pub use store::{PaymentId, PaymentType, Transaction, TxStatus};
 pub use trusted_wallet::ExtraConfig;
 

orange-sdk/src/trusted_wallet/mod.rs

@@ -125,7 +125,7 @@ impl<T: ?Sized + TrustedWalletInterface> graduated_rebalancer::TrustedWallet for
 pub enum ExtraConfig {
 	/// Configuration for Spark wallet.
 	#[cfg(feature = "spark")]
-	Spark(crate::SparkWalletConfig),
+	Spark(crate::SparkWalletConfig), // todo make my own reduced version
 	/// Configuration for Cashu wallet.
 	#[cfg(feature = "cashu")]
 	Cashu(cashu::CashuConfig),