WIP: Upgrade to ldk-node 0.7

Author: benthecarman

Cargo.toml

@@ -16,9 +16,9 @@ codegen-units = 1   # Reduce number of codegen units to increase optimizations.
 panic = 'abort'     # Abort on panic
 
 [workspace.dependencies]
-bitcoin-payment-instructions = { git = "https://github.com/benthecarman/bitcoin-payment-instructions.git", branch = "orange-fork", features = ["http"] }
-lightning = { git = "https://github.com/tnull/rust-lightning", branch = "2025-08-bump-electrum-client-0.1" }
-lightning-invoice = { git = "https://github.com/tnull/rust-lightning", branch = "2025-08-bump-electrum-client-0.1" }
+bitcoin-payment-instructions = { git = "https://github.com/benthecarman/bitcoin-payment-instructions.git", branch = "orange-fork2", features = ["http"] }
+lightning = { version = "0.2.0-beta1" }
+lightning-invoice = { version = "0.34.0-beta1" }
 
 [profile.release]
 panic = "abort"

orange-sdk/Cargo.toml

@@ -18,23 +18,24 @@ _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", branch = "esplora-auth" }
+ldk-node = { git = "https://github.com/lightningdevkit/ldk-node.git", rev = "dd519080318ba099280b4353fb6335c587a67cbd" }
+lightning-macros = "0.2.0-beta1"
 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 = "1c3dd78a40ae50a88d743110a79fa4a95d93d932", 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 = "39c1206a4a1dda2adc1f3e23628136ef645f6c6b", default-features = false, features = ["wallet"], optional = true }
+cdk = { git = "https://github.com/benthecarman/cdk.git", rev = "0d7c1b2b9b73964e497763c4a315133db83d1c53", 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 = "39c1206a4a1dda2adc1f3e23628136ef645f6c6b", optional = true }
-cdk-sqlite = { git = "https://github.com/benthecarman/cdk.git", rev = "39c1206a4a1dda2adc1f3e23628136ef645f6c6b", optional = true }
-cdk-axum = { git = "https://github.com/benthecarman/cdk.git", rev = "39c1206a4a1dda2adc1f3e23628136ef645f6c6b", optional = true }
+cdk-ldk-node = { git = "https://github.com/benthecarman/cdk.git", rev = "0d7c1b2b9b73964e497763c4a315133db83d1c53", optional = true }
+cdk-sqlite = { git = "https://github.com/benthecarman/cdk.git", rev = "0d7c1b2b9b73964e497763c4a315133db83d1c53", optional = true }
+cdk-axum = { git = "https://github.com/benthecarman/cdk.git", rev = "0d7c1b2b9b73964e497763c4a315133db83d1c53", optional = true }
 axum = { version = "0.8.1", optional = true }
 
 uniffi = { version = "0.29", features = ["cli", "tokio"], optional = true }

orange-sdk/src/event.rs

@@ -6,12 +6,12 @@ use ldk_node::bitcoin::{OutPoint, Txid};
 use ldk_node::lightning::events::{ClosureReason, PaymentFailureReason};
 use ldk_node::lightning::ln::types::ChannelId;
 use ldk_node::lightning::util::logger::Logger as _;
-use ldk_node::lightning::util::persist::KVStore;
+use ldk_node::lightning::util::persist::KVStoreSync;
 use ldk_node::lightning::util::ser::{Writeable, Writer};
 use ldk_node::lightning::{impl_writeable_tlv_based_enum, log_debug, log_error, log_warn};
 use ldk_node::lightning_types::payment::{PaymentHash, PaymentPreimage};
 use ldk_node::payment::{ConfirmationStatus, PaymentKind};
-use ldk_node::{CustomTlvRecord, UserChannelId};
+use ldk_node::{CustomTlvRecord, DynStore, UserChannelId};
 
 use std::collections::VecDeque;
 use std::sync::{Arc, Condvar, Mutex};
@@ -191,12 +191,12 @@ pub struct EventQueue {
 	queue: Arc<Mutex<VecDeque<Event>>>,
 	waker: Arc<Mutex<Option<Waker>>>,
 	notifier: Condvar,
-	kv_store: Arc<dyn KVStore + Send + Sync>,
+	kv_store: Arc<DynStore>,
 	logger: Arc<Logger>,
 }
 
 impl EventQueue {
-	pub(crate) fn new(kv_store: Arc<dyn KVStore + Send + Sync>, logger: Arc<Logger>) -> Self {
+	pub(crate) fn new(kv_store: Arc<DynStore>, logger: Arc<Logger>) -> Self {
 		let queue = Arc::new(Mutex::new(VecDeque::new()));
 		let waker = Arc::new(Mutex::new(None));
 		let notifier = Condvar::new();
@@ -251,24 +251,24 @@ impl EventQueue {
 		&self, locked_queue: &VecDeque<Event>,
 	) -> Result<(), ldk_node::lightning::io::Error> {
 		let data = EventQueueSerWrapper(locked_queue).encode();
-		self.kv_store
-			.write(
+		KVStoreSync::write(
+			self.kv_store.as_ref(),
+			EVENT_QUEUE_PERSISTENCE_PRIMARY_NAMESPACE,
+			EVENT_QUEUE_PERSISTENCE_SECONDARY_NAMESPACE,
+			EVENT_QUEUE_PERSISTENCE_KEY,
+			data,
+		)
+		.map_err(|e| {
+			log_error!(
+				self.logger.as_ref(),
+				"Write for key {}/{}/{} failed due to: {}",
 				EVENT_QUEUE_PERSISTENCE_PRIMARY_NAMESPACE,
 				EVENT_QUEUE_PERSISTENCE_SECONDARY_NAMESPACE,
 				EVENT_QUEUE_PERSISTENCE_KEY,
-				&data,
-			)
-			.map_err(|e| {
-				log_error!(
-					self.logger.as_ref(),
-					"Write for key {}/{}/{} failed due to: {}",
-					EVENT_QUEUE_PERSISTENCE_PRIMARY_NAMESPACE,
-					EVENT_QUEUE_PERSISTENCE_SECONDARY_NAMESPACE,
-					EVENT_QUEUE_PERSISTENCE_KEY,
-					e
-				);
 				e
-			})?;
+			);
+			e
+		})?;
 		Ok(())
 	}
 }
@@ -316,7 +316,7 @@ pub(crate) struct LdkEventHandler {
 }
 
 impl LdkEventHandler {
-	pub(crate) fn handle_ldk_node_event(&self, event: ldk_node::Event) {
+	pub(crate) async fn handle_ldk_node_event(&self, event: ldk_node::Event) {
 		match event {
 			ldk_node::Event::PaymentSuccessful {
 				payment_id,

orange-sdk/src/lib.rs

@@ -36,11 +36,10 @@ use ldk_node::bitcoin::secp256k1::PublicKey;
 use ldk_node::io::sqlite_store::SqliteStore;
 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, log_trace, log_warn};
 use ldk_node::lightning_invoice::Bolt11Invoice;
 use ldk_node::payment::PaymentKind;
-use ldk_node::{BuildError, ChannelDetails, NodeError};
+use ldk_node::{BuildError, ChannelDetails, DynStore, NodeError};
 
 use tokio::runtime::Runtime;
 
@@ -125,7 +124,7 @@ struct WalletImpl {
 	/// Metadata store for tracking transactions.
 	tx_metadata: TxMetadataStore,
 	/// Key-value store for persistent storage.
-	store: Arc<dyn KVStore + Send + Sync>,
+	store: Arc<DynStore>,
 	/// Logger for logging wallet operations.
 	logger: Arc<Logger>,
 	/// The Tokio runtime for asynchronous operations.
@@ -532,15 +531,15 @@ impl Wallet {
 
 		log_info!(logger, "Initializing orange on network: {network}");
 
-		let store: Arc<dyn KVStore + Send + Sync> = match &config.storage_config {
+		let store: Arc<DynStore> = match &config.storage_config {
 			StorageConfig::LocalSQLite(path) => {
 				Arc::new(SqliteStore::new(path.into(), Some("orange.sqlite".to_owned()), None)?)
 			},
 		};
 
 		let event_queue = Arc::new(EventQueue::new(Arc::clone(&store), Arc::clone(&logger)));
 
-		let tx_metadata = TxMetadataStore::new(Arc::clone(&store));
+		let tx_metadata = TxMetadataStore::new(Arc::clone(&store)).await;
 
 		let trusted: Arc<Box<DynTrustedWalletInterface>> = match &config.extra_config {
 			#[cfg(feature = "spark")]
@@ -650,7 +649,7 @@ impl Wallet {
 
 	/// Sets whether the wallet should automatically rebalance from trusted/onchain to lightning.
 	pub fn set_rebalance_enabled(&self, value: bool) {
-		store::set_rebalance_enabled(self.inner.store.as_ref(), value);
+		store::set_rebalance_enabled(self.inner.store.as_ref(), value)
 	}
 
 	/// Whether the wallet should automatically rebalance from trusted/onchain to lightning.
@@ -1027,7 +1026,8 @@ impl Wallet {
 	pub async fn parse_payment_instructions(
 		&self, instructions: &str,
 	) -> Result<PaymentInstructions, instructions::ParseError> {
-		PaymentInstructions::parse(instructions, self.inner.network, &HTTPHrnResolver, true).await
+		PaymentInstructions::parse(instructions, self.inner.network, &HTTPHrnResolver::new(), true)
+			.await
 	}
 
 	/*/// Verifies instructions which allow us to claim funds given as:
@@ -1156,7 +1156,8 @@ impl Wallet {
 
 		let methods = match &instructions.instructions {
 			PaymentInstructions::ConfigurableAmount(conf) => {
-				let res = conf.clone().set_amount(instructions.amount, &HTTPHrnResolver).await;
+				let res =
+					conf.clone().set_amount(instructions.amount, &HTTPHrnResolver::new()).await;
 				let fixed_instr = res.map_err(|e| {
 					log_error!(
 						self.inner.logger,
@@ -1270,8 +1271,8 @@ impl Wallet {
 	/// Authenticates the user via [LNURL-auth] for the given LNURL string.
 	///
 	/// [LNURL-auth]: https://github.com/lnurl/luds/blob/luds/04.md
-	pub fn lnurl_auth(&self, lnurl: &str) -> Result<(), WalletError> {
-		self.inner.ln_wallet.inner.ldk_node.lnurl_auth(lnurl)?;
+	pub fn lnurl_auth(&self, _lnurl: &str) -> Result<(), WalletError> {
+		// todo wait for merge, self.inner.ln_wallet.inner.ldk_node.lnurl_auth(lnurl)?;
 		Ok(())
 	}
 

orange-sdk/src/lightning_wallet.rs

@@ -10,15 +10,15 @@ use bitcoin_payment_instructions::amount::Amount;
 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, Script};
+use ldk_node::bitcoin::{Address, Network};
 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::{PaymentDetails, PaymentDirection, PaymentKind, PaymentStatus};
-use ldk_node::{NodeError, UserChannelId, lightning};
+use ldk_node::{DynStore, NodeError, UserChannelId, lightning};
 
 use graduated_rebalancer::{LightningBalance, ReceivedLightningPayment};
 
@@ -52,7 +52,7 @@ const DEFAULT_INVOICE_EXPIRY_SECS: u32 = 86_400; // 24 hours
 
 impl LightningWallet {
 	pub(super) async fn init(
-		runtime: Arc<Runtime>, config: WalletConfig, store: Arc<dyn KVStore + Sync + Send>,
+		runtime: Arc<Runtime>, config: WalletConfig, store: Arc<DynStore>,
 		event_queue: Arc<EventQueue>, tx_metadata: TxMetadataStore, logger: Arc<Logger>,
 	) -> Result<Self, InitFailure> {
 		log_info!(logger, "Creating LDK node...");
@@ -148,12 +148,14 @@ impl LightningWallet {
 				InitFailure::LdkNodeStartFailure(NodeError::InvalidUri)
 			})?;
 
-			store.write(
+			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.as_ref(),
-			)?;
+				bytes.to_vec(),
+			)
+			.await?;
 		}
 
 		let ldk_node = Arc::new(builder.build_with_store(Arc::clone(&store))?);
@@ -175,13 +177,13 @@ impl LightningWallet {
 			lsp_socket_addr,
 		});
 
-		inner.ldk_node.start_with_runtime(Arc::clone(&runtime))?;
+		inner.ldk_node.start()?;
 
 		runtime.spawn(async move {
 			loop {
 				let event = ev_handler.ldk_node.next_event_async().await;
 				log_debug!(ev_handler.logger, "Got ldk-node event {:?}", event);
-				ev_handler.handle_ldk_node_event(event);
+				ev_handler.handle_ldk_node_event(event).await;
 			}
 		});
 
@@ -295,18 +297,20 @@ impl LightningWallet {
 		let bal = self.inner.ldk_node.list_balances().spendable_onchain_balance_sats;
 
 		// need a dummy p2wsh address to estimate the fee, p2wsh is used for LN channels
-		let fake_addr = Address::p2wsh(Script::new(), self.inner.ldk_node.config().network);
-
-		let fee = self
-			.inner
-			.ldk_node
-			.onchain_payment()
-			.estimate_send_all_to_address(&fake_addr, true, None)?;
+		// let fake_addr = Address::p2wsh(Script::new(), self.inner.ldk_node.config().network);
+		//
+		// let fee = self
+		// 	.inner
+		// 	.ldk_node
+		// 	.onchain_payment()
+		// 	.estimate_send_all_to_address(&fake_addr, true, None)?;
+		// todo get real fee
+		let fee = 1000;
 
 		let id = self.inner.ldk_node.open_channel(
 			self.inner.lsp_node_id,
 			self.inner.lsp_socket_addr.clone(),
-			bal - fee.to_sat(),
+			bal - fee,
 			None,
 			None,
 		)?;

orange-sdk/src/rebalancer.rs

@@ -8,8 +8,8 @@ use crate::trusted_wallet::DynTrustedWalletInterface;
 use crate::{Event, EventQueue, PaymentType, Tunables, store};
 use bitcoin_payment_instructions::amount::Amount;
 use graduated_rebalancer::{RebalanceTrigger, RebalancerEvent, TriggerParams};
+use ldk_node::DynStore;
 use ldk_node::lightning::util::logger::Logger as _;
-use ldk_node::lightning::util::persist::KVStore;
 use ldk_node::lightning::{log_error, log_info, log_warn};
 use ldk_node::payment::{ConfirmationStatus, PaymentDirection, PaymentKind, PaymentStatus};
 use std::cmp;
@@ -29,7 +29,7 @@ pub(crate) struct OrangeTrigger {
 	/// The event handler for processing wallet events.
 	event_queue: Arc<EventQueue>,
 	/// Key-value store for persistent storage.
-	store: Arc<dyn KVStore + Send + Sync>,
+	store: Arc<DynStore>,
 	/// Time of the last on-chain sync, used to determine when to trigger rebalances.
 	onchain_sync_time: AtomicU64,
 	/// Logger for logging events and errors.
@@ -41,7 +41,7 @@ impl OrangeTrigger {
 	pub(crate) fn new(
 		ln_wallet: Arc<LightningWallet>, trusted: Arc<Box<DynTrustedWalletInterface>>,
 		tunables: Tunables, tx_metadata: TxMetadataStore, event_queue: Arc<EventQueue>,
-		store: Arc<dyn KVStore + Send + Sync>, logger: Arc<Logger>,
+		store: Arc<DynStore>, logger: Arc<Logger>,
 	) -> Self {
 		let start =
 			ln_wallet.inner.ldk_node.status().latest_onchain_wallet_sync_timestamp.unwrap_or(0);