final fixups

Author: benthecarman

orange-sdk/Cargo.toml

@@ -25,7 +25,7 @@ graduated-rebalancer = { path = "../graduated-rebalancer", version = "0.1.0" }
 
 ldk-node = { version = "0.7.0" }
 lightning-macros = "0.2.0"
-bitcoin-payment-instructions = { workspace = true }
+bitcoin-payment-instructions = { workspace = true, features = ["http"] }
 chrono = { version = "0.4", default-features = false }
 rand = { version = "0.8.5", optional = true }
 breez-sdk-spark = { git = "https://github.com/breez/spark-sdk.git", rev = "1f2e9995230cd582d6b4aa7d06d76b99defb635e", default-features = false, features = ["rustls-tls"], optional = true }
@@ -36,8 +36,8 @@ serde_json = { version = "1.0", optional = true }
 async-trait = "0.1"
 log = "0.4.28"
 
-corepc-node = { version = "0.10.1", features = ["27_2", "download"], optional = true }
-electrsd = { version = "0.36.1", default-features = false, features = ["esplora_a33e97e1", "corepc-node_27_2"], optional = true }
+corepc-node = { version = "0.10.1", features = ["29_0", "download"], optional = true }
+electrsd = { version = "0.36.1", default-features = false, features = ["esplora_a33e97e1", "corepc-node_29_0"], 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 }

orange-sdk/src/lib.rs

@@ -1277,13 +1277,13 @@ impl Wallet {
 		Ok(())
 	}
 
-	/// 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> {
-		// todo wait for merge, self.inner.ln_wallet.inner.ldk_node.lnurl_auth(lnurl)?;
-		Ok(())
-	}
+	// 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> {
+	// 	// todo wait for merge, self.inner.ln_wallet.inner.ldk_node.lnurl_auth(lnurl)?;
+	// 	Ok(())
+	// }
 
 	/// Returns the wallet's configured tunables.
 	pub fn get_tunables(&self) -> Tunables {

orange-sdk/src/lightning_wallet.rs

@@ -393,15 +393,12 @@ impl LightningWallet {
 		let channels = self.inner.ldk_node.list_channels();
 		let channel = channels.iter().find(|c| c.counterparty_node_id == self.inner.lsp_node_id);
 
-		// todo fix this, for now leave some onchain balance for fees
-		let amt = amount.saturating_sub(Amount::from_sats(10_000).unwrap());
-
 		match channel {
 			Some(chan) => {
 				self.inner.ldk_node.splice_in(
 					&chan.user_channel_id,
 					chan.counterparty_node_id,
-					amt.sats_rounding_up(),
+					amount.sats_rounding_up(),
 				)?;
 				Ok(chan.user_channel_id)
 			},
@@ -561,6 +558,18 @@ impl graduated_rebalancer::LightningWallet for LightningWallet {
 	fn splice_to_lsp_channel(
 		&self, amt: Amount,
 	) -> Pin<Box<dyn Future<Output = Result<u128, Self::Error>> + Send + '_>> {
+		let bal = self.inner.ldk_node.list_balances();
+		// if we don't have enough onchain balance, return error
+		// if we are within 1,000 sats of the amount, reduce the amount to account for fees
+		if bal.spendable_onchain_balance_sats < amt.sats_rounding_up() {
+			return Box::pin(async move { Err(NodeError::InsufficientFunds) });
+		} else if bal.spendable_onchain_balance_sats < amt.sats_rounding_up() + 1_000 {
+			let reduced_amt = amt.saturating_sub(Amount::from_sats(1_000).expect("valid amount"));
+			return Box::pin(async move {
+				self.splice_balance_into_channel(reduced_amt).await.map(|c| c.0)
+			});
+		}
+
 		Box::pin(async move { self.splice_balance_into_channel(amt).await.map(|c| c.0) })
 	}
 

orange-sdk/src/trusted_wallet/spark/spark_store.rs

@@ -3,14 +3,14 @@
 use std::sync::Arc;
 
 use crate::io;
-use ldk_node::DynStore;
-use ldk_node::lightning::util::persist::KVStore;
 
 use breez_sdk_spark::{
 	DepositInfo, ListPaymentsRequest, Payment, PaymentDetails, PaymentMetadata, StorageError,
 	UpdateDepositPayload,
 };
+use ldk_node::DynStore;
 use ldk_node::lightning::util::persist::KVSTORE_NAMESPACE_KEY_MAX_LEN;
+use ldk_node::lightning::util::persist::KVStore;
 
 const SPARK_PRIMARY_NAMESPACE: &str = "spark";
 const SPARK_CACHE_NAMESPACE: &str = "cache";

orange-sdk/tests/test_utils.rs

@@ -235,7 +235,8 @@ fn create_third_party(uuid: Uuid, bitcoind: &Bitcoind) -> Arc<Node> {
 
 async fn fund_node(node: &Node, bitcoind: &Bitcoind, electrsd: &ElectrsD) {
 	let addr = node.onchain_payment().new_address().unwrap();
-	bitcoind.client.send_to_address(&addr, bitcoin::Amount::from_btc(1.0).unwrap()).unwrap();
+	let res = bitcoind.client.send_to_address(&addr, bitcoin::Amount::from_btc(1.0).unwrap()).unwrap();
+	wait_for_tx(&electrsd.client, res.txid().unwrap()).await;
 	generate_blocks(bitcoind, electrsd, 6).await;
 }
 
@@ -333,7 +334,7 @@ async fn build_test_nodes() -> TestParams {
 
 		// take esplora url and just get the port, as we know it's running on localhost
 		let base_url = electrsd.esplora_url.as_ref().unwrap();
-		let port = base_url.split(':').last().unwrap();
+		let port = base_url.split(':').next_back().unwrap();
 		let esplora_url = format!("http://localhost:{port}");
 
 		let wallet_config = WalletConfig {
@@ -468,7 +469,11 @@ async fn build_test_nodes() -> TestParams {
 			mint
 		};
 
-		let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
+		// take esplora url and just get the port, as we know it's running on localhost
+		let base_url = electrsd.esplora_url.as_ref().unwrap();
+		let port = base_url.split(':').next_back().unwrap();
+		let esplora_url = format!("http://localhost:{port}");
+
 		let tmp = temp_dir().join(format!("orange-test-{test_id}/wallet"));
 		let wallet_config = WalletConfig {
 			storage_config: StorageConfig::LocalSQLite(tmp.to_str().unwrap().to_string()),