Use official releases

Author: benthecarman

orange-sdk/Cargo.toml

@@ -23,24 +23,23 @@ _cashu-tests = ["_test-utils", "cdk-ldk-node", "cdk/mint", "cdk-sqlite", "cdk-ax
 [dependencies]
 graduated-rebalancer = { path = "../graduated-rebalancer", version = "0.1.0" }
 
-ldk-node = { git = "https://github.com/benthecarman/ldk-node.git", rev = "3ed1d13451239c54616e9f3fe75fa1f748807b15" }
-lightning-macros = "0.2.0-beta1"
+ldk-node = { version = "0.7.0" }
+lightning-macros = "0.2.0"
 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"] }
 breez-sdk-spark = { git = "https://github.com/breez/spark-sdk.git", rev = "1f2e9995230cd582d6b4aa7d06d76b99defb635e", 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 = "f95a3cfc3b48913e399ea6b080d99b5566437d0a", default-features = false, features = ["wallet"], optional = true }
+cdk = { version = "0.14.2", default-features = false, features = ["wallet"], optional = true }
 serde_json = { version = "1.0", optional = true }
 async-trait = "0.1"
 log = "0.4.28"
 
 corepc-node = { version = "0.8.0", features = ["29_0", "download"], optional = true }
-cdk-ldk-node = { git = "https://github.com/benthecarman/cdk.git", rev = "f95a3cfc3b48913e399ea6b080d99b5566437d0a", optional = true }
-cdk-sqlite = { git = "https://github.com/benthecarman/cdk.git", rev = "f95a3cfc3b48913e399ea6b080d99b5566437d0a", optional = true }
-cdk-axum = { git = "https://github.com/benthecarman/cdk.git", rev = "f95a3cfc3b48913e399ea6b080d99b5566437d0a", optional = true }
+cdk-ldk-node = { version = "0.14.2", optional = true }
+cdk-sqlite = { version = "0.14.2", optional = true }
+cdk-axum = { version = "0.14.2", optional = true }
 axum = { version = "0.8.1", optional = true }
 
 uniffi = { version = "0.29", features = ["cli", "tokio"], optional = true }

orange-sdk/src/lightning_wallet.rs

@@ -13,16 +13,16 @@ use ldk_node::bitcoin::base64::Engine;
 use ldk_node::bitcoin::base64::prelude::BASE64_STANDARD;
 use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_node::bitcoin::{Address, Network};
+use ldk_node::config::{AsyncPaymentsRole, BackgroundSyncConfig};
 use ldk_node::lightning::ln::channelmanager::PaymentId;
 use ldk_node::lightning::ln::msgs::SocketAddress;
 use ldk_node::lightning::util::logger::Logger as _;
-use ldk_node::lightning::util::persist::KVStore;
 use ldk_node::lightning::{log_debug, log_error, log_info};
 use ldk_node::lightning_invoice::{Bolt11Invoice, Bolt11InvoiceDescription, Description};
 use ldk_node::payment::{
 	ConfirmationStatus, PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus,
 };
-use ldk_node::{DynStore, NodeError, UserChannelId, lightning};
+use ldk_node::{DynStore, NodeError, UserChannelId};
 
 use graduated_rebalancer::{LightningBalance, ReceivedLightningPayment};
 
@@ -133,37 +133,14 @@ impl LightningWallet {
 			},
 		};
 
+		builder.set_async_payments_role(Some(AsyncPaymentsRole::Client))?;
+
 		builder.set_custom_logger(Arc::clone(&logger) as Arc<dyn ldk_node::logger::LogWriter>);
 
 		builder.set_runtime(runtime.get_handle());
 
-		// download scorer and write to storage
-		// todo switch to https://github.com/lightningdevkit/ldk-node/pull/449 once available
 		if let Some(url) = config.scorer_url {
-			let fetch = tokio::time::timeout(std::time::Duration::from_secs(10), reqwest::get(url));
-			let res = fetch.await.map_err(|e| {
-				log_error!(logger, "Timed out downloading scorer: {e}");
-				InitFailure::LdkNodeStartFailure(NodeError::InvalidUri)
-			})?;
-
-			let req = res.map_err(|e| {
-				log_error!(logger, "Failed to download scorer: {e}");
-				InitFailure::LdkNodeStartFailure(NodeError::InvalidUri)
-			})?;
-
-			let bytes = req.bytes().await.map_err(|e| {
-				log_debug!(logger, "Failed to read scorer bytes: {e}");
-				InitFailure::LdkNodeStartFailure(NodeError::InvalidUri)
-			})?;
-
-			KVStore::write(
-				store.as_ref(),
-				lightning::util::persist::SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
-				lightning::util::persist::SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
-				lightning::util::persist::SCORER_PERSISTENCE_KEY,
-				bytes.to_vec(),
-			)
-			.await?;
+			builder.set_pathfinding_scores_source(url);
 		}
 
 		let ldk_node = Arc::new(builder.build_with_store(Arc::clone(&store))?);

orange-sdk/src/trusted_wallet/cashu/cashu_store.rs

@@ -765,6 +765,13 @@ impl WalletDatabase for CashuKvDatabase {
 		Ok(filtered_proofs)
 	}
 
+	async fn get_balance(
+		&self, mint_url: Option<MintUrl>, unit: Option<CurrencyUnit>, state: Option<Vec<State>>,
+	) -> Result<u64, Self::Err> {
+		let proofs = self.get_proofs(mint_url, unit, state, None).await?;
+		Ok(proofs.iter().map(|p| u64::from(p.proof.amount)).sum())
+	}
+
 	async fn update_proofs_state(&self, ys: Vec<PublicKey>, state: State) -> Result<(), Self::Err> {
 		// Update proofs in storage and cache
 		for y in &ys {

orange-sdk/tests/test_utils.rs

@@ -427,8 +427,15 @@ async fn build_test_nodes() -> TestParams {
 			})
 			.await;
 
+			let lsp_listen = lsp_listen_clone.to_string();
 			cdk.node()
-				.open_channel(lsp_node_id, lsp_listen_clone, 10_000_000, Some(5_000_000_000), None)
+				.open_channel(
+					lsp_node_id,
+					lsp_listen.parse().unwrap(),
+					10_000_000,
+					Some(5_000_000_000),
+					None,
+				)
 				.unwrap();
 			wait_for_tx_broadcast(&bitcoind_clone);
 			generate_blocks(&bitcoind_clone, 6);