Randomize chain source selection in tests

benches/payments.rs

@@ -8,7 +8,7 @@ use bitcoin::hex::DisplayHex;
 use bitcoin::Amount;
 use common::{
 	expect_channel_ready_event, generate_blocks_and_wait, premine_and_distribute_funds,
-setup_bitcoind_and_electrsd, setup_two_nodes_with_store, TestChainSource,
+random_chain_source, setup_bitcoind_and_electrsd, setup_two_nodes_with_store,
 };
 use criterion::{criterion_group, criterion_main, Criterion};
 use ldk_node::{Event, Node};
@@ -119,7 +119,7 @@ async fn send_payments(node_a: Arc<Node>, node_b: Arc<Node>) -> std::time::Durat
 fn payment_benchmark(c: &mut Criterion) {
 	// Set up two nodes. Because this is slow, we reuse the same nodes for each sample.
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = random_chain_source(&bitcoind, &electrsd);
 
 	let (node_a, node_b) = setup_two_nodes_with_store(
  &chain_source,

bindings/ldk_node.udl

@@ -129,6 +129,7 @@ interface Builder {
 	void set_node_alias(string node_alias);
 	[Throws=BuildError]
 	void set_async_payments_role(AsyncPaymentsRole? role);
+	void set_wallet_recovery_mode();
 	[Throws=BuildError]
 	Node build(NodeEntropy node_entropy);
 	[Throws=BuildError]

src/builder.rs

@@ -244,6 +244,7 @@ pub struct NodeBuilder {
 	async_payments_role: Option<AsyncPaymentsRole>,
 	runtime_handle: Option<tokio::runtime::Handle>,
 	pathfinding_scores_sync_config: Option<PathfindingScoresSyncConfig>,
+	recovery_mode: bool,
 }
 
 impl NodeBuilder {
@@ -261,6 +262,7 @@ impl NodeBuilder {
  let log_writer_config = None;
  let runtime_handle = None;
  let pathfinding_scores_sync_config = None;
+ let recovery_mode = false;
  Self {
  config,
  chain_data_source_config,
@@ -270,6 +272,7 @@ impl NodeBuilder {
  runtime_handle,
  async_payments_role: None,
  pathfinding_scores_sync_config,
+ recovery_mode,
  }
 	}
 
@@ -544,6 +547,16 @@ impl NodeBuilder {
  Ok(self)
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&mut self) -> &mut Self {
+ self.recovery_mode = true;
+ self
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: NodeEntropy) -> Result<Node, BuildError> {
@@ -679,6 +692,7 @@ impl NodeBuilder {
  self.liquidity_source_config.as_ref(),
  self.pathfinding_scores_sync_config.as_ref(),
  self.async_payments_role,
+ self.recovery_mode,
  seed_bytes,
  runtime,
  logger,
@@ -919,6 +933,15 @@ impl ArcedNodeBuilder {
  self.inner.write().unwrap().set_async_payments_role(role).map(|_| ())
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&self) {
+ self.inner.write().unwrap().set_wallet_recovery_mode();
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: Arc<NodeEntropy>) -> Result<Arc<Node>, BuildError> {
@@ -1033,8 +1056,8 @@ fn build_with_store_internal(
 	gossip_source_config: Option<&GossipSourceConfig>,
 	liquidity_source_config: Option<&LiquiditySourceConfig>,
 	pathfinding_scores_sync_config: Option<&PathfindingScoresSyncConfig>,
-	async_payments_role: Option<AsyncPaymentsRole>, seed_bytes: [u8; 64], runtime: Arc<Runtime>,
-	logger: Arc<Logger>, kv_store: Arc<DynStore>,
+	async_payments_role: Option<AsyncPaymentsRole>, recovery_mode: bool, seed_bytes: [u8; 64],
+runtime: Arc<Runtime>, logger: Arc<Logger>, kv_store: Arc<DynStore>,
 ) -> Result<Node, BuildError> {
 	optionally_install_rustls_cryptoprovider();
 
@@ -1230,19 +1253,23 @@ fn build_with_store_internal(
  BuildError::WalletSetupFailed
  })?;
 
- if let Some(best_block) = chain_tip_opt {
- // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
- // TODO: Use a proper wallet birthday once BDK supports it.
- let mut latest_checkpoint = wallet.latest_checkpoint();
- let block_id =
- bdk_chain::BlockId { height: best_block.height, hash: best_block.block_hash };
- latest_checkpoint = latest_checkpoint.insert(block_id);
- let update =
- bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
- wallet.apply_update(update).map_err(|e| {
- log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
- BuildError::WalletSetupFailed
- })?;
+ if !recovery_mode {
+ if let Some(best_block) = chain_tip_opt {
+ // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
+ // TODO: Use a proper wallet birthday once BDK supports it.
+ let mut latest_checkpoint = wallet.latest_checkpoint();
+ let block_id = bdk_chain::BlockId {
+ height: best_block.height,
+ hash: best_block.block_hash,
+ };
+ latest_checkpoint = latest_checkpoint.insert(block_id);
+ let update =
+ bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
+ wallet.apply_update(update).map_err(|e| {
+ log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
+ BuildError::WalletSetupFailed
+ })?;
+ }
  }
  wallet
  },
@@ -1267,6 +1294,7 @@ fn build_with_store_internal(
  wallet_persister,
  Arc::clone(&tx_broadcaster),
  Arc::clone(&fee_estimator),
+ Arc::clone(&chain_source),
  Arc::clone(&payment_store),
  Arc::clone(&config),
  Arc::clone(&logger),

src/chain/mod.rs

@@ -10,7 +10,7 @@ mod electrum;
 mod esplora;
 
 use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 
 use bitcoin::{Script, Txid};
@@ -84,6 +84,7 @@ impl WalletSyncStatus {
 
 pub(crate) struct ChainSource {
 	kind: ChainSourceKind,
+	registered_txids: Mutex<Vec<Txid>>,
 	tx_broadcaster: Arc<Broadcaster>,
 	logger: Arc<Logger>,
 }
@@ -112,7 +113,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Esplora(esplora_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) fn new_electrum(
@@ -131,7 +133,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Electrum(electrum_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) async fn new_bitcoind_rpc(
@@ -153,7 +156,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) async fn new_bitcoind_rest(
@@ -176,7 +180,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) fn start(&self, runtime: Arc<Runtime>) -> Result<(), Error> {
@@ -209,6 +214,10 @@ impl ChainSource {
  }
 	}
 
+	pub(crate) fn registered_txids(&self) -> Vec<Txid> {
+ self.registered_txids.lock().unwrap().clone()
+	}
+
 	pub(crate) fn is_transaction_based(&self) -> bool {
  match &self.kind {
  ChainSourceKind::Esplora(_) => true,
@@ -463,6 +472,7 @@ impl ChainSource {
 
 impl Filter for ChainSource {
 	fn register_tx(&self, txid: &Txid, script_pubkey: &Script) {
+ self.registered_txids.lock().unwrap().push(*txid);
  match &self.kind {
  ChainSourceKind::Esplora(esplora_chain_source) => {
  esplora_chain_source.register_tx(txid, script_pubkey)

src/lib.rs

@@ -1329,10 +1329,6 @@ impl Node {
  Error::ChannelSplicingFailed
  })?;
 
- // insert channel's funding utxo into the wallet so we can later calculate fees
- // correctly when viewing this splice-in.
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  let change_address = self.wallet.get_new_internal_address()?;
 
  let contribution = SpliceContribution::splice_in(
@@ -1426,18 +1422,6 @@ impl Node {
  },
  };
 
- let funding_txo = channel_details.funding_txo.ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready",);
- Error::ChannelSplicingFailed
- })?;
-
- let funding_output = channel_details.get_funding_output().ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready");
- Error::ChannelSplicingFailed
- })?;
-
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  self.channel_manager
  .splice_channel(
  &channel_details.channel_id,

benches/payments.rs

@@ -8,7 +8,7 @@ use bitcoin::hex::DisplayHex;
 use bitcoin::Amount;
 use common::{
 	expect_channel_ready_event, generate_blocks_and_wait, premine_and_distribute_funds,
-setup_bitcoind_and_electrsd, setup_two_nodes_with_store, TestChainSource,
+random_chain_source, setup_bitcoind_and_electrsd, setup_two_nodes_with_store,
 };
 use criterion::{criterion_group, criterion_main, Criterion};
 use ldk_node::{Event, Node};
@@ -119,7 +119,7 @@ async fn send_payments(node_a: Arc<Node>, node_b: Arc<Node>) -> std::time::Durat
 fn payment_benchmark(c: &mut Criterion) {
 	// Set up two nodes. Because this is slow, we reuse the same nodes for each sample.
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = random_chain_source(&bitcoind, &electrsd);
 
 	let (node_a, node_b) = setup_two_nodes_with_store(
  &chain_source,

bindings/ldk_node.udl

@@ -129,6 +129,7 @@ interface Builder {
 	void set_node_alias(string node_alias);
 	[Throws=BuildError]
 	void set_async_payments_role(AsyncPaymentsRole? role);
+	void set_wallet_recovery_mode();
 	[Throws=BuildError]
 	Node build(NodeEntropy node_entropy);
 	[Throws=BuildError]

src/builder.rs

@@ -244,6 +244,7 @@ pub struct NodeBuilder {
 	async_payments_role: Option<AsyncPaymentsRole>,
 	runtime_handle: Option<tokio::runtime::Handle>,
 	pathfinding_scores_sync_config: Option<PathfindingScoresSyncConfig>,
+	recovery_mode: bool,
 }
 
 impl NodeBuilder {
@@ -261,6 +262,7 @@ impl NodeBuilder {
  let log_writer_config = None;
  let runtime_handle = None;
  let pathfinding_scores_sync_config = None;
+ let recovery_mode = false;
  Self {
  config,
  chain_data_source_config,
@@ -270,6 +272,7 @@ impl NodeBuilder {
  runtime_handle,
  async_payments_role: None,
  pathfinding_scores_sync_config,
+ recovery_mode,
  }
 	}
 
@@ -544,6 +547,16 @@ impl NodeBuilder {
  Ok(self)
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&mut self) -> &mut Self {
+ self.recovery_mode = true;
+ self
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: NodeEntropy) -> Result<Node, BuildError> {
@@ -679,6 +692,7 @@ impl NodeBuilder {
  self.liquidity_source_config.as_ref(),
  self.pathfinding_scores_sync_config.as_ref(),
  self.async_payments_role,
+ self.recovery_mode,
  seed_bytes,
  runtime,
  logger,
@@ -919,6 +933,15 @@ impl ArcedNodeBuilder {
  self.inner.write().unwrap().set_async_payments_role(role).map(|_| ())
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&self) {
+ self.inner.write().unwrap().set_wallet_recovery_mode();
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: Arc<NodeEntropy>) -> Result<Arc<Node>, BuildError> {
@@ -1033,8 +1056,8 @@ fn build_with_store_internal(
 	gossip_source_config: Option<&GossipSourceConfig>,
 	liquidity_source_config: Option<&LiquiditySourceConfig>,
 	pathfinding_scores_sync_config: Option<&PathfindingScoresSyncConfig>,
-	async_payments_role: Option<AsyncPaymentsRole>, seed_bytes: [u8; 64], runtime: Arc<Runtime>,
-	logger: Arc<Logger>, kv_store: Arc<DynStore>,
+	async_payments_role: Option<AsyncPaymentsRole>, recovery_mode: bool, seed_bytes: [u8; 64],
+runtime: Arc<Runtime>, logger: Arc<Logger>, kv_store: Arc<DynStore>,
 ) -> Result<Node, BuildError> {
 	optionally_install_rustls_cryptoprovider();
 
@@ -1230,19 +1253,23 @@ fn build_with_store_internal(
  BuildError::WalletSetupFailed
  })?;
 
- if let Some(best_block) = chain_tip_opt {
- // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
- // TODO: Use a proper wallet birthday once BDK supports it.
- let mut latest_checkpoint = wallet.latest_checkpoint();
- let block_id =
- bdk_chain::BlockId { height: best_block.height, hash: best_block.block_hash };
- latest_checkpoint = latest_checkpoint.insert(block_id);
- let update =
- bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
- wallet.apply_update(update).map_err(|e| {
- log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
- BuildError::WalletSetupFailed
- })?;
+ if !recovery_mode {
+ if let Some(best_block) = chain_tip_opt {
+ // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
+ // TODO: Use a proper wallet birthday once BDK supports it.
+ let mut latest_checkpoint = wallet.latest_checkpoint();
+ let block_id = bdk_chain::BlockId {
+ height: best_block.height,
+ hash: best_block.block_hash,
+ };
+ latest_checkpoint = latest_checkpoint.insert(block_id);
+ let update =
+ bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
+ wallet.apply_update(update).map_err(|e| {
+ log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
+ BuildError::WalletSetupFailed
+ })?;
+ }
  }
  wallet
  },
@@ -1267,6 +1294,7 @@ fn build_with_store_internal(
  wallet_persister,
  Arc::clone(&tx_broadcaster),
  Arc::clone(&fee_estimator),
+ Arc::clone(&chain_source),
  Arc::clone(&payment_store),
  Arc::clone(&config),
  Arc::clone(&logger),

src/chain/mod.rs

@@ -10,7 +10,7 @@ mod electrum;
 mod esplora;
 
 use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 
 use bitcoin::{Script, Txid};
@@ -84,6 +84,7 @@ impl WalletSyncStatus {
 
 pub(crate) struct ChainSource {
 	kind: ChainSourceKind,
+	registered_txids: Mutex<Vec<Txid>>,
 	tx_broadcaster: Arc<Broadcaster>,
 	logger: Arc<Logger>,
 }
@@ -112,7 +113,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Esplora(esplora_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) fn new_electrum(
@@ -131,7 +133,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Electrum(electrum_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) async fn new_bitcoind_rpc(
@@ -153,7 +156,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) async fn new_bitcoind_rest(
@@ -176,7 +180,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) fn start(&self, runtime: Arc<Runtime>) -> Result<(), Error> {
@@ -209,6 +214,10 @@ impl ChainSource {
  }
 	}
 
+	pub(crate) fn registered_txids(&self) -> Vec<Txid> {
+ self.registered_txids.lock().unwrap().clone()
+	}
+
 	pub(crate) fn is_transaction_based(&self) -> bool {
  match &self.kind {
  ChainSourceKind::Esplora(_) => true,
@@ -463,6 +472,7 @@ impl ChainSource {
 
 impl Filter for ChainSource {
 	fn register_tx(&self, txid: &Txid, script_pubkey: &Script) {
+ self.registered_txids.lock().unwrap().push(*txid);
  match &self.kind {
  ChainSourceKind::Esplora(esplora_chain_source) => {
  esplora_chain_source.register_tx(txid, script_pubkey)

src/lib.rs

@@ -1329,10 +1329,6 @@ impl Node {
  Error::ChannelSplicingFailed
  })?;
 
- // insert channel's funding utxo into the wallet so we can later calculate fees
- // correctly when viewing this splice-in.
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  let change_address = self.wallet.get_new_internal_address()?;
 
  let contribution = SpliceContribution::splice_in(
@@ -1426,18 +1422,6 @@ impl Node {
  },
  };
 
- let funding_txo = channel_details.funding_txo.ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready",);
- Error::ChannelSplicingFailed
- })?;
-
- let funding_output = channel_details.get_funding_output().ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready");
- Error::ChannelSplicingFailed
- })?;
-
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  self.channel_manager
  .splice_channel(
  &channel_details.channel_id,

benches/payments.rs

@@ -8,7 +8,7 @@ use bitcoin::hex::DisplayHex;
 use bitcoin::Amount;
 use common::{
 	expect_channel_ready_event, generate_blocks_and_wait, premine_and_distribute_funds,
-setup_bitcoind_and_electrsd, setup_two_nodes_with_store, TestChainSource,
+random_chain_source, setup_bitcoind_and_electrsd, setup_two_nodes_with_store,
 };
 use criterion::{criterion_group, criterion_main, Criterion};
 use ldk_node::{Event, Node};
@@ -119,7 +119,7 @@ async fn send_payments(node_a: Arc<Node>, node_b: Arc<Node>) -> std::time::Durat
 fn payment_benchmark(c: &mut Criterion) {
 	// Set up two nodes. Because this is slow, we reuse the same nodes for each sample.
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = random_chain_source(&bitcoind, &electrsd);
 
 	let (node_a, node_b) = setup_two_nodes_with_store(
  &chain_source,

bindings/ldk_node.udl

@@ -129,6 +129,7 @@ interface Builder {
 	void set_node_alias(string node_alias);
 	[Throws=BuildError]
 	void set_async_payments_role(AsyncPaymentsRole? role);
+	void set_wallet_recovery_mode();
 	[Throws=BuildError]
 	Node build(NodeEntropy node_entropy);
 	[Throws=BuildError]

src/builder.rs

@@ -244,6 +244,7 @@ pub struct NodeBuilder {
 	async_payments_role: Option<AsyncPaymentsRole>,
 	runtime_handle: Option<tokio::runtime::Handle>,
 	pathfinding_scores_sync_config: Option<PathfindingScoresSyncConfig>,
+	recovery_mode: bool,
 }
 
 impl NodeBuilder {
@@ -261,6 +262,7 @@ impl NodeBuilder {
  let log_writer_config = None;
  let runtime_handle = None;
  let pathfinding_scores_sync_config = None;
+ let recovery_mode = false;
  Self {
  config,
  chain_data_source_config,
@@ -270,6 +272,7 @@ impl NodeBuilder {
  runtime_handle,
  async_payments_role: None,
  pathfinding_scores_sync_config,
+ recovery_mode,
  }
 	}
 
@@ -544,6 +547,16 @@ impl NodeBuilder {
  Ok(self)
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&mut self) -> &mut Self {
+ self.recovery_mode = true;
+ self
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: NodeEntropy) -> Result<Node, BuildError> {
@@ -679,6 +692,7 @@ impl NodeBuilder {
  self.liquidity_source_config.as_ref(),
  self.pathfinding_scores_sync_config.as_ref(),
  self.async_payments_role,
+ self.recovery_mode,
  seed_bytes,
  runtime,
  logger,
@@ -919,6 +933,15 @@ impl ArcedNodeBuilder {
  self.inner.write().unwrap().set_async_payments_role(role).map(|_| ())
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&self) {
+ self.inner.write().unwrap().set_wallet_recovery_mode();
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: Arc<NodeEntropy>) -> Result<Arc<Node>, BuildError> {
@@ -1033,8 +1056,8 @@ fn build_with_store_internal(
 	gossip_source_config: Option<&GossipSourceConfig>,
 	liquidity_source_config: Option<&LiquiditySourceConfig>,
 	pathfinding_scores_sync_config: Option<&PathfindingScoresSyncConfig>,
-	async_payments_role: Option<AsyncPaymentsRole>, seed_bytes: [u8; 64], runtime: Arc<Runtime>,
-	logger: Arc<Logger>, kv_store: Arc<DynStore>,
+	async_payments_role: Option<AsyncPaymentsRole>, recovery_mode: bool, seed_bytes: [u8; 64],
+runtime: Arc<Runtime>, logger: Arc<Logger>, kv_store: Arc<DynStore>,
 ) -> Result<Node, BuildError> {
 	optionally_install_rustls_cryptoprovider();
 
@@ -1230,19 +1253,23 @@ fn build_with_store_internal(
  BuildError::WalletSetupFailed
  })?;
 
- if let Some(best_block) = chain_tip_opt {
- // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
- // TODO: Use a proper wallet birthday once BDK supports it.
- let mut latest_checkpoint = wallet.latest_checkpoint();
- let block_id =
- bdk_chain::BlockId { height: best_block.height, hash: best_block.block_hash };
- latest_checkpoint = latest_checkpoint.insert(block_id);
- let update =
- bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
- wallet.apply_update(update).map_err(|e| {
- log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
- BuildError::WalletSetupFailed
- })?;
+ if !recovery_mode {
+ if let Some(best_block) = chain_tip_opt {
+ // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
+ // TODO: Use a proper wallet birthday once BDK supports it.
+ let mut latest_checkpoint = wallet.latest_checkpoint();
+ let block_id = bdk_chain::BlockId {
+ height: best_block.height,
+ hash: best_block.block_hash,
+ };
+ latest_checkpoint = latest_checkpoint.insert(block_id);
+ let update =
+ bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
+ wallet.apply_update(update).map_err(|e| {
+ log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
+ BuildError::WalletSetupFailed
+ })?;
+ }
  }
  wallet
  },
@@ -1267,6 +1294,7 @@ fn build_with_store_internal(
  wallet_persister,
  Arc::clone(&tx_broadcaster),
  Arc::clone(&fee_estimator),
+ Arc::clone(&chain_source),
  Arc::clone(&payment_store),
  Arc::clone(&config),
  Arc::clone(&logger),

src/chain/mod.rs

@@ -10,7 +10,7 @@ mod electrum;
 mod esplora;
 
 use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 
 use bitcoin::{Script, Txid};
@@ -84,6 +84,7 @@ impl WalletSyncStatus {
 
 pub(crate) struct ChainSource {
 	kind: ChainSourceKind,
+	registered_txids: Mutex<Vec<Txid>>,
 	tx_broadcaster: Arc<Broadcaster>,
 	logger: Arc<Logger>,
 }
@@ -112,7 +113,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Esplora(esplora_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) fn new_electrum(
@@ -131,7 +133,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Electrum(electrum_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) async fn new_bitcoind_rpc(
@@ -153,7 +156,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) async fn new_bitcoind_rest(
@@ -176,7 +180,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) fn start(&self, runtime: Arc<Runtime>) -> Result<(), Error> {
@@ -209,6 +214,10 @@ impl ChainSource {
  }
 	}
 
+	pub(crate) fn registered_txids(&self) -> Vec<Txid> {
+ self.registered_txids.lock().unwrap().clone()
+	}
+
 	pub(crate) fn is_transaction_based(&self) -> bool {
  match &self.kind {
  ChainSourceKind::Esplora(_) => true,
@@ -463,6 +472,7 @@ impl ChainSource {
 
 impl Filter for ChainSource {
 	fn register_tx(&self, txid: &Txid, script_pubkey: &Script) {
+ self.registered_txids.lock().unwrap().push(*txid);
  match &self.kind {
  ChainSourceKind::Esplora(esplora_chain_source) => {
  esplora_chain_source.register_tx(txid, script_pubkey)

src/lib.rs

@@ -1329,10 +1329,6 @@ impl Node {
  Error::ChannelSplicingFailed
  })?;
 
- // insert channel's funding utxo into the wallet so we can later calculate fees
- // correctly when viewing this splice-in.
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  let change_address = self.wallet.get_new_internal_address()?;
 
  let contribution = SpliceContribution::splice_in(
@@ -1426,18 +1422,6 @@ impl Node {
  },
  };
 
- let funding_txo = channel_details.funding_txo.ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready",);
- Error::ChannelSplicingFailed
- })?;
-
- let funding_output = channel_details.get_funding_output().ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready");
- Error::ChannelSplicingFailed
- })?;
-
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  self.channel_manager
  .splice_channel(
  &channel_details.channel_id,

benches/payments.rs

@@ -8,7 +8,7 @@ use bitcoin::hex::DisplayHex;
 use bitcoin::Amount;
 use common::{
 	expect_channel_ready_event, generate_blocks_and_wait, premine_and_distribute_funds,
-setup_bitcoind_and_electrsd, setup_two_nodes_with_store, TestChainSource,
+random_chain_source, setup_bitcoind_and_electrsd, setup_two_nodes_with_store,
 };
 use criterion::{criterion_group, criterion_main, Criterion};
 use ldk_node::{Event, Node};
@@ -119,7 +119,7 @@ async fn send_payments(node_a: Arc<Node>, node_b: Arc<Node>) -> std::time::Durat
 fn payment_benchmark(c: &mut Criterion) {
 	// Set up two nodes. Because this is slow, we reuse the same nodes for each sample.
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = random_chain_source(&bitcoind, &electrsd);
 
 	let (node_a, node_b) = setup_two_nodes_with_store(
  &chain_source,

bindings/ldk_node.udl

@@ -129,6 +129,7 @@ interface Builder {
 	void set_node_alias(string node_alias);
 	[Throws=BuildError]
 	void set_async_payments_role(AsyncPaymentsRole? role);
+	void set_wallet_recovery_mode();
 	[Throws=BuildError]
 	Node build(NodeEntropy node_entropy);
 	[Throws=BuildError]

src/builder.rs

@@ -244,6 +244,7 @@ pub struct NodeBuilder {
 	async_payments_role: Option<AsyncPaymentsRole>,
 	runtime_handle: Option<tokio::runtime::Handle>,
 	pathfinding_scores_sync_config: Option<PathfindingScoresSyncConfig>,
+	recovery_mode: bool,
 }
 
 impl NodeBuilder {
@@ -261,6 +262,7 @@ impl NodeBuilder {
  let log_writer_config = None;
  let runtime_handle = None;
  let pathfinding_scores_sync_config = None;
+ let recovery_mode = false;
  Self {
  config,
  chain_data_source_config,
@@ -270,6 +272,7 @@ impl NodeBuilder {
  runtime_handle,
  async_payments_role: None,
  pathfinding_scores_sync_config,
+ recovery_mode,
  }
 	}
 
@@ -544,6 +547,16 @@ impl NodeBuilder {
  Ok(self)
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&mut self) -> &mut Self {
+ self.recovery_mode = true;
+ self
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: NodeEntropy) -> Result<Node, BuildError> {
@@ -679,6 +692,7 @@ impl NodeBuilder {
  self.liquidity_source_config.as_ref(),
  self.pathfinding_scores_sync_config.as_ref(),
  self.async_payments_role,
+ self.recovery_mode,
  seed_bytes,
  runtime,
  logger,
@@ -919,6 +933,15 @@ impl ArcedNodeBuilder {
  self.inner.write().unwrap().set_async_payments_role(role).map(|_| ())
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&self) {
+ self.inner.write().unwrap().set_wallet_recovery_mode();
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: Arc<NodeEntropy>) -> Result<Arc<Node>, BuildError> {
@@ -1033,8 +1056,8 @@ fn build_with_store_internal(
 	gossip_source_config: Option<&GossipSourceConfig>,
 	liquidity_source_config: Option<&LiquiditySourceConfig>,
 	pathfinding_scores_sync_config: Option<&PathfindingScoresSyncConfig>,
-	async_payments_role: Option<AsyncPaymentsRole>, seed_bytes: [u8; 64], runtime: Arc<Runtime>,
-	logger: Arc<Logger>, kv_store: Arc<DynStore>,
+	async_payments_role: Option<AsyncPaymentsRole>, recovery_mode: bool, seed_bytes: [u8; 64],
+runtime: Arc<Runtime>, logger: Arc<Logger>, kv_store: Arc<DynStore>,
 ) -> Result<Node, BuildError> {
 	optionally_install_rustls_cryptoprovider();
 
@@ -1230,19 +1253,23 @@ fn build_with_store_internal(
  BuildError::WalletSetupFailed
  })?;
 
- if let Some(best_block) = chain_tip_opt {
- // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
- // TODO: Use a proper wallet birthday once BDK supports it.
- let mut latest_checkpoint = wallet.latest_checkpoint();
- let block_id =
- bdk_chain::BlockId { height: best_block.height, hash: best_block.block_hash };
- latest_checkpoint = latest_checkpoint.insert(block_id);
- let update =
- bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
- wallet.apply_update(update).map_err(|e| {
- log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
- BuildError::WalletSetupFailed
- })?;
+ if !recovery_mode {
+ if let Some(best_block) = chain_tip_opt {
+ // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
+ // TODO: Use a proper wallet birthday once BDK supports it.
+ let mut latest_checkpoint = wallet.latest_checkpoint();
+ let block_id = bdk_chain::BlockId {
+ height: best_block.height,
+ hash: best_block.block_hash,
+ };
+ latest_checkpoint = latest_checkpoint.insert(block_id);
+ let update =
+ bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
+ wallet.apply_update(update).map_err(|e| {
+ log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
+ BuildError::WalletSetupFailed
+ })?;
+ }
  }
  wallet
  },
@@ -1267,6 +1294,7 @@ fn build_with_store_internal(
  wallet_persister,
  Arc::clone(&tx_broadcaster),
  Arc::clone(&fee_estimator),
+ Arc::clone(&chain_source),
  Arc::clone(&payment_store),
  Arc::clone(&config),
  Arc::clone(&logger),

src/chain/mod.rs

@@ -10,7 +10,7 @@ mod electrum;
 mod esplora;
 
 use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 
 use bitcoin::{Script, Txid};
@@ -84,6 +84,7 @@ impl WalletSyncStatus {
 
 pub(crate) struct ChainSource {
 	kind: ChainSourceKind,
+	registered_txids: Mutex<Vec<Txid>>,
 	tx_broadcaster: Arc<Broadcaster>,
 	logger: Arc<Logger>,
 }
@@ -112,7 +113,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Esplora(esplora_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) fn new_electrum(
@@ -131,7 +133,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Electrum(electrum_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) async fn new_bitcoind_rpc(
@@ -153,7 +156,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) async fn new_bitcoind_rest(
@@ -176,7 +180,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) fn start(&self, runtime: Arc<Runtime>) -> Result<(), Error> {
@@ -209,6 +214,10 @@ impl ChainSource {
  }
 	}
 
+	pub(crate) fn registered_txids(&self) -> Vec<Txid> {
+ self.registered_txids.lock().unwrap().clone()
+	}
+
 	pub(crate) fn is_transaction_based(&self) -> bool {
  match &self.kind {
  ChainSourceKind::Esplora(_) => true,
@@ -463,6 +472,7 @@ impl ChainSource {
 
 impl Filter for ChainSource {
 	fn register_tx(&self, txid: &Txid, script_pubkey: &Script) {
+ self.registered_txids.lock().unwrap().push(*txid);
  match &self.kind {
  ChainSourceKind::Esplora(esplora_chain_source) => {
  esplora_chain_source.register_tx(txid, script_pubkey)

src/lib.rs

@@ -1329,10 +1329,6 @@ impl Node {
  Error::ChannelSplicingFailed
  })?;
 
- // insert channel's funding utxo into the wallet so we can later calculate fees
- // correctly when viewing this splice-in.
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  let change_address = self.wallet.get_new_internal_address()?;
 
  let contribution = SpliceContribution::splice_in(
@@ -1426,18 +1422,6 @@ impl Node {
  },
  };
 
- let funding_txo = channel_details.funding_txo.ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready",);
- Error::ChannelSplicingFailed
- })?;
-
- let funding_output = channel_details.get_funding_output().ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready");
- Error::ChannelSplicingFailed
- })?;
-
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  self.channel_manager
  .splice_channel(
  &channel_details.channel_id,

benches/payments.rs

@@ -8,7 +8,7 @@ use bitcoin::hex::DisplayHex;
 use bitcoin::Amount;
 use common::{
 	expect_channel_ready_event, generate_blocks_and_wait, premine_and_distribute_funds,
-setup_bitcoind_and_electrsd, setup_two_nodes_with_store, TestChainSource,
+random_chain_source, setup_bitcoind_and_electrsd, setup_two_nodes_with_store,
 };
 use criterion::{criterion_group, criterion_main, Criterion};
 use ldk_node::{Event, Node};
@@ -119,7 +119,7 @@ async fn send_payments(node_a: Arc<Node>, node_b: Arc<Node>) -> std::time::Durat
 fn payment_benchmark(c: &mut Criterion) {
 	// Set up two nodes. Because this is slow, we reuse the same nodes for each sample.
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = random_chain_source(&bitcoind, &electrsd);
 
 	let (node_a, node_b) = setup_two_nodes_with_store(
  &chain_source,

bindings/ldk_node.udl

@@ -129,6 +129,7 @@ interface Builder {
 	void set_node_alias(string node_alias);
 	[Throws=BuildError]
 	void set_async_payments_role(AsyncPaymentsRole? role);
+	void set_wallet_recovery_mode();
 	[Throws=BuildError]
 	Node build(NodeEntropy node_entropy);
 	[Throws=BuildError]

src/builder.rs

@@ -244,6 +244,7 @@ pub struct NodeBuilder {
 	async_payments_role: Option<AsyncPaymentsRole>,
 	runtime_handle: Option<tokio::runtime::Handle>,
 	pathfinding_scores_sync_config: Option<PathfindingScoresSyncConfig>,
+	recovery_mode: bool,
 }
 
 impl NodeBuilder {
@@ -261,6 +262,7 @@ impl NodeBuilder {
  let log_writer_config = None;
  let runtime_handle = None;
  let pathfinding_scores_sync_config = None;
+ let recovery_mode = false;
  Self {
  config,
  chain_data_source_config,
@@ -270,6 +272,7 @@ impl NodeBuilder {
  runtime_handle,
  async_payments_role: None,
  pathfinding_scores_sync_config,
+ recovery_mode,
  }
 	}
 
@@ -544,6 +547,16 @@ impl NodeBuilder {
  Ok(self)
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&mut self) -> &mut Self {
+ self.recovery_mode = true;
+ self
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: NodeEntropy) -> Result<Node, BuildError> {
@@ -679,6 +692,7 @@ impl NodeBuilder {
  self.liquidity_source_config.as_ref(),
  self.pathfinding_scores_sync_config.as_ref(),
  self.async_payments_role,
+ self.recovery_mode,
  seed_bytes,
  runtime,
  logger,
@@ -919,6 +933,15 @@ impl ArcedNodeBuilder {
  self.inner.write().unwrap().set_async_payments_role(role).map(|_| ())
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&self) {
+ self.inner.write().unwrap().set_wallet_recovery_mode();
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: Arc<NodeEntropy>) -> Result<Arc<Node>, BuildError> {
@@ -1033,8 +1056,8 @@ fn build_with_store_internal(
 	gossip_source_config: Option<&GossipSourceConfig>,
 	liquidity_source_config: Option<&LiquiditySourceConfig>,
 	pathfinding_scores_sync_config: Option<&PathfindingScoresSyncConfig>,
-	async_payments_role: Option<AsyncPaymentsRole>, seed_bytes: [u8; 64], runtime: Arc<Runtime>,
-	logger: Arc<Logger>, kv_store: Arc<DynStore>,
+	async_payments_role: Option<AsyncPaymentsRole>, recovery_mode: bool, seed_bytes: [u8; 64],
+runtime: Arc<Runtime>, logger: Arc<Logger>, kv_store: Arc<DynStore>,
 ) -> Result<Node, BuildError> {
 	optionally_install_rustls_cryptoprovider();
 
@@ -1230,19 +1253,23 @@ fn build_with_store_internal(
  BuildError::WalletSetupFailed
  })?;
 
- if let Some(best_block) = chain_tip_opt {
- // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
- // TODO: Use a proper wallet birthday once BDK supports it.
- let mut latest_checkpoint = wallet.latest_checkpoint();
- let block_id =
- bdk_chain::BlockId { height: best_block.height, hash: best_block.block_hash };
- latest_checkpoint = latest_checkpoint.insert(block_id);
- let update =
- bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
- wallet.apply_update(update).map_err(|e| {
- log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
- BuildError::WalletSetupFailed
- })?;
+ if !recovery_mode {
+ if let Some(best_block) = chain_tip_opt {
+ // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
+ // TODO: Use a proper wallet birthday once BDK supports it.
+ let mut latest_checkpoint = wallet.latest_checkpoint();
+ let block_id = bdk_chain::BlockId {
+ height: best_block.height,
+ hash: best_block.block_hash,
+ };
+ latest_checkpoint = latest_checkpoint.insert(block_id);
+ let update =
+ bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
+ wallet.apply_update(update).map_err(|e| {
+ log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
+ BuildError::WalletSetupFailed
+ })?;
+ }
  }
  wallet
  },
@@ -1267,6 +1294,7 @@ fn build_with_store_internal(
  wallet_persister,
  Arc::clone(&tx_broadcaster),
  Arc::clone(&fee_estimator),
+ Arc::clone(&chain_source),
  Arc::clone(&payment_store),
  Arc::clone(&config),
  Arc::clone(&logger),

src/chain/mod.rs

@@ -10,7 +10,7 @@ mod electrum;
 mod esplora;
 
 use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 
 use bitcoin::{Script, Txid};
@@ -84,6 +84,7 @@ impl WalletSyncStatus {
 
 pub(crate) struct ChainSource {
 	kind: ChainSourceKind,
+	registered_txids: Mutex<Vec<Txid>>,
 	tx_broadcaster: Arc<Broadcaster>,
 	logger: Arc<Logger>,
 }
@@ -112,7 +113,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Esplora(esplora_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) fn new_electrum(
@@ -131,7 +133,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Electrum(electrum_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) async fn new_bitcoind_rpc(
@@ -153,7 +156,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) async fn new_bitcoind_rest(
@@ -176,7 +180,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) fn start(&self, runtime: Arc<Runtime>) -> Result<(), Error> {
@@ -209,6 +214,10 @@ impl ChainSource {
  }
 	}
 
+	pub(crate) fn registered_txids(&self) -> Vec<Txid> {
+ self.registered_txids.lock().unwrap().clone()
+	}
+
 	pub(crate) fn is_transaction_based(&self) -> bool {
  match &self.kind {
  ChainSourceKind::Esplora(_) => true,
@@ -463,6 +472,7 @@ impl ChainSource {
 
 impl Filter for ChainSource {
 	fn register_tx(&self, txid: &Txid, script_pubkey: &Script) {
+ self.registered_txids.lock().unwrap().push(*txid);
  match &self.kind {
  ChainSourceKind::Esplora(esplora_chain_source) => {
  esplora_chain_source.register_tx(txid, script_pubkey)

src/lib.rs

@@ -1329,10 +1329,6 @@ impl Node {
  Error::ChannelSplicingFailed
  })?;
 
- // insert channel's funding utxo into the wallet so we can later calculate fees
- // correctly when viewing this splice-in.
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  let change_address = self.wallet.get_new_internal_address()?;
 
  let contribution = SpliceContribution::splice_in(
@@ -1426,18 +1422,6 @@ impl Node {
  },
  };
 
- let funding_txo = channel_details.funding_txo.ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready",);
- Error::ChannelSplicingFailed
- })?;
-
- let funding_output = channel_details.get_funding_output().ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready");
- Error::ChannelSplicingFailed
- })?;
-
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  self.channel_manager
  .splice_channel(
  &channel_details.channel_id,

benches/payments.rs

@@ -8,7 +8,7 @@ use bitcoin::hex::DisplayHex;
 use bitcoin::Amount;
 use common::{
 	expect_channel_ready_event, generate_blocks_and_wait, premine_and_distribute_funds,
-setup_bitcoind_and_electrsd, setup_two_nodes_with_store, TestChainSource,
+random_chain_source, setup_bitcoind_and_electrsd, setup_two_nodes_with_store,
 };
 use criterion::{criterion_group, criterion_main, Criterion};
 use ldk_node::{Event, Node};
@@ -119,7 +119,7 @@ async fn send_payments(node_a: Arc<Node>, node_b: Arc<Node>) -> std::time::Durat
 fn payment_benchmark(c: &mut Criterion) {
 	// Set up two nodes. Because this is slow, we reuse the same nodes for each sample.
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = random_chain_source(&bitcoind, &electrsd);
 
 	let (node_a, node_b) = setup_two_nodes_with_store(
  &chain_source,

bindings/ldk_node.udl

@@ -129,6 +129,7 @@ interface Builder {
 	void set_node_alias(string node_alias);
 	[Throws=BuildError]
 	void set_async_payments_role(AsyncPaymentsRole? role);
+	void set_wallet_recovery_mode();
 	[Throws=BuildError]
 	Node build(NodeEntropy node_entropy);
 	[Throws=BuildError]

src/builder.rs

@@ -244,6 +244,7 @@ pub struct NodeBuilder {
 	async_payments_role: Option<AsyncPaymentsRole>,
 	runtime_handle: Option<tokio::runtime::Handle>,
 	pathfinding_scores_sync_config: Option<PathfindingScoresSyncConfig>,
+	recovery_mode: bool,
 }
 
 impl NodeBuilder {
@@ -261,6 +262,7 @@ impl NodeBuilder {
  let log_writer_config = None;
  let runtime_handle = None;
  let pathfinding_scores_sync_config = None;
+ let recovery_mode = false;
  Self {
  config,
  chain_data_source_config,
@@ -270,6 +272,7 @@ impl NodeBuilder {
  runtime_handle,
  async_payments_role: None,
  pathfinding_scores_sync_config,
+ recovery_mode,
  }
 	}
 
@@ -544,6 +547,16 @@ impl NodeBuilder {
  Ok(self)
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&mut self) -> &mut Self {
+ self.recovery_mode = true;
+ self
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: NodeEntropy) -> Result<Node, BuildError> {
@@ -679,6 +692,7 @@ impl NodeBuilder {
  self.liquidity_source_config.as_ref(),
  self.pathfinding_scores_sync_config.as_ref(),
  self.async_payments_role,
+ self.recovery_mode,
  seed_bytes,
  runtime,
  logger,
@@ -919,6 +933,15 @@ impl ArcedNodeBuilder {
  self.inner.write().unwrap().set_async_payments_role(role).map(|_| ())
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&self) {
+ self.inner.write().unwrap().set_wallet_recovery_mode();
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: Arc<NodeEntropy>) -> Result<Arc<Node>, BuildError> {
@@ -1033,8 +1056,8 @@ fn build_with_store_internal(
 	gossip_source_config: Option<&GossipSourceConfig>,
 	liquidity_source_config: Option<&LiquiditySourceConfig>,
 	pathfinding_scores_sync_config: Option<&PathfindingScoresSyncConfig>,
-	async_payments_role: Option<AsyncPaymentsRole>, seed_bytes: [u8; 64], runtime: Arc<Runtime>,
-	logger: Arc<Logger>, kv_store: Arc<DynStore>,
+	async_payments_role: Option<AsyncPaymentsRole>, recovery_mode: bool, seed_bytes: [u8; 64],
+runtime: Arc<Runtime>, logger: Arc<Logger>, kv_store: Arc<DynStore>,
 ) -> Result<Node, BuildError> {
 	optionally_install_rustls_cryptoprovider();
 
@@ -1230,19 +1253,23 @@ fn build_with_store_internal(
  BuildError::WalletSetupFailed
  })?;
 
- if let Some(best_block) = chain_tip_opt {
- // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
- // TODO: Use a proper wallet birthday once BDK supports it.
- let mut latest_checkpoint = wallet.latest_checkpoint();
- let block_id =
- bdk_chain::BlockId { height: best_block.height, hash: best_block.block_hash };
- latest_checkpoint = latest_checkpoint.insert(block_id);
- let update =
- bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
- wallet.apply_update(update).map_err(|e| {
- log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
- BuildError::WalletSetupFailed
- })?;
+ if !recovery_mode {
+ if let Some(best_block) = chain_tip_opt {
+ // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
+ // TODO: Use a proper wallet birthday once BDK supports it.
+ let mut latest_checkpoint = wallet.latest_checkpoint();
+ let block_id = bdk_chain::BlockId {
+ height: best_block.height,
+ hash: best_block.block_hash,
+ };
+ latest_checkpoint = latest_checkpoint.insert(block_id);
+ let update =
+ bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
+ wallet.apply_update(update).map_err(|e| {
+ log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
+ BuildError::WalletSetupFailed
+ })?;
+ }
  }
  wallet
  },
@@ -1267,6 +1294,7 @@ fn build_with_store_internal(
  wallet_persister,
  Arc::clone(&tx_broadcaster),
  Arc::clone(&fee_estimator),
+ Arc::clone(&chain_source),
  Arc::clone(&payment_store),
  Arc::clone(&config),
  Arc::clone(&logger),

src/chain/mod.rs

@@ -10,7 +10,7 @@ mod electrum;
 mod esplora;
 
 use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 
 use bitcoin::{Script, Txid};
@@ -84,6 +84,7 @@ impl WalletSyncStatus {
 
 pub(crate) struct ChainSource {
 	kind: ChainSourceKind,
+	registered_txids: Mutex<Vec<Txid>>,
 	tx_broadcaster: Arc<Broadcaster>,
 	logger: Arc<Logger>,
 }
@@ -112,7 +113,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Esplora(esplora_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) fn new_electrum(
@@ -131,7 +133,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Electrum(electrum_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) async fn new_bitcoind_rpc(
@@ -153,7 +156,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) async fn new_bitcoind_rest(
@@ -176,7 +180,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) fn start(&self, runtime: Arc<Runtime>) -> Result<(), Error> {
@@ -209,6 +214,10 @@ impl ChainSource {
  }
 	}
 
+	pub(crate) fn registered_txids(&self) -> Vec<Txid> {
+ self.registered_txids.lock().unwrap().clone()
+	}
+
 	pub(crate) fn is_transaction_based(&self) -> bool {
  match &self.kind {
  ChainSourceKind::Esplora(_) => true,
@@ -463,6 +472,7 @@ impl ChainSource {
 
 impl Filter for ChainSource {
 	fn register_tx(&self, txid: &Txid, script_pubkey: &Script) {
+ self.registered_txids.lock().unwrap().push(*txid);
  match &self.kind {
  ChainSourceKind::Esplora(esplora_chain_source) => {
  esplora_chain_source.register_tx(txid, script_pubkey)

src/lib.rs

@@ -1329,10 +1329,6 @@ impl Node {
  Error::ChannelSplicingFailed
  })?;
 
- // insert channel's funding utxo into the wallet so we can later calculate fees
- // correctly when viewing this splice-in.
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  let change_address = self.wallet.get_new_internal_address()?;
 
  let contribution = SpliceContribution::splice_in(
@@ -1426,18 +1422,6 @@ impl Node {
  },
  };
 
- let funding_txo = channel_details.funding_txo.ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready",);
- Error::ChannelSplicingFailed
- })?;
-
- let funding_output = channel_details.get_funding_output().ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready");
- Error::ChannelSplicingFailed
- })?;
-
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  self.channel_manager
  .splice_channel(
  &channel_details.channel_id,

benches/payments.rs

@@ -8,7 +8,7 @@ use bitcoin::hex::DisplayHex;
 use bitcoin::Amount;
 use common::{
 	expect_channel_ready_event, generate_blocks_and_wait, premine_and_distribute_funds,
-setup_bitcoind_and_electrsd, setup_two_nodes_with_store, TestChainSource,
+random_chain_source, setup_bitcoind_and_electrsd, setup_two_nodes_with_store,
 };
 use criterion::{criterion_group, criterion_main, Criterion};
 use ldk_node::{Event, Node};
@@ -119,7 +119,7 @@ async fn send_payments(node_a: Arc<Node>, node_b: Arc<Node>) -> std::time::Durat
 fn payment_benchmark(c: &mut Criterion) {
 	// Set up two nodes. Because this is slow, we reuse the same nodes for each sample.
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = random_chain_source(&bitcoind, &electrsd);
 
 	let (node_a, node_b) = setup_two_nodes_with_store(
  &chain_source,

bindings/ldk_node.udl

@@ -129,6 +129,7 @@ interface Builder {
 	void set_node_alias(string node_alias);
 	[Throws=BuildError]
 	void set_async_payments_role(AsyncPaymentsRole? role);
+	void set_wallet_recovery_mode();
 	[Throws=BuildError]
 	Node build(NodeEntropy node_entropy);
 	[Throws=BuildError]

src/builder.rs

@@ -244,6 +244,7 @@ pub struct NodeBuilder {
 	async_payments_role: Option<AsyncPaymentsRole>,
 	runtime_handle: Option<tokio::runtime::Handle>,
 	pathfinding_scores_sync_config: Option<PathfindingScoresSyncConfig>,
+	recovery_mode: bool,
 }
 
 impl NodeBuilder {
@@ -261,6 +262,7 @@ impl NodeBuilder {
  let log_writer_config = None;
  let runtime_handle = None;
  let pathfinding_scores_sync_config = None;
+ let recovery_mode = false;
  Self {
  config,
  chain_data_source_config,
@@ -270,6 +272,7 @@ impl NodeBuilder {
  runtime_handle,
  async_payments_role: None,
  pathfinding_scores_sync_config,
+ recovery_mode,
  }
 	}
 
@@ -544,6 +547,16 @@ impl NodeBuilder {
  Ok(self)
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&mut self) -> &mut Self {
+ self.recovery_mode = true;
+ self
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: NodeEntropy) -> Result<Node, BuildError> {
@@ -679,6 +692,7 @@ impl NodeBuilder {
  self.liquidity_source_config.as_ref(),
  self.pathfinding_scores_sync_config.as_ref(),
  self.async_payments_role,
+ self.recovery_mode,
  seed_bytes,
  runtime,
  logger,
@@ -919,6 +933,15 @@ impl ArcedNodeBuilder {
  self.inner.write().unwrap().set_async_payments_role(role).map(|_| ())
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&self) {
+ self.inner.write().unwrap().set_wallet_recovery_mode();
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: Arc<NodeEntropy>) -> Result<Arc<Node>, BuildError> {
@@ -1033,8 +1056,8 @@ fn build_with_store_internal(
 	gossip_source_config: Option<&GossipSourceConfig>,
 	liquidity_source_config: Option<&LiquiditySourceConfig>,
 	pathfinding_scores_sync_config: Option<&PathfindingScoresSyncConfig>,
-	async_payments_role: Option<AsyncPaymentsRole>, seed_bytes: [u8; 64], runtime: Arc<Runtime>,
-	logger: Arc<Logger>, kv_store: Arc<DynStore>,
+	async_payments_role: Option<AsyncPaymentsRole>, recovery_mode: bool, seed_bytes: [u8; 64],
+runtime: Arc<Runtime>, logger: Arc<Logger>, kv_store: Arc<DynStore>,
 ) -> Result<Node, BuildError> {
 	optionally_install_rustls_cryptoprovider();
 
@@ -1230,19 +1253,23 @@ fn build_with_store_internal(
  BuildError::WalletSetupFailed
  })?;
 
- if let Some(best_block) = chain_tip_opt {
- // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
- // TODO: Use a proper wallet birthday once BDK supports it.
- let mut latest_checkpoint = wallet.latest_checkpoint();
- let block_id =
- bdk_chain::BlockId { height: best_block.height, hash: best_block.block_hash };
- latest_checkpoint = latest_checkpoint.insert(block_id);
- let update =
- bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
- wallet.apply_update(update).map_err(|e| {
- log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
- BuildError::WalletSetupFailed
- })?;
+ if !recovery_mode {
+ if let Some(best_block) = chain_tip_opt {
+ // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
+ // TODO: Use a proper wallet birthday once BDK supports it.
+ let mut latest_checkpoint = wallet.latest_checkpoint();
+ let block_id = bdk_chain::BlockId {
+ height: best_block.height,
+ hash: best_block.block_hash,
+ };
+ latest_checkpoint = latest_checkpoint.insert(block_id);
+ let update =
+ bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
+ wallet.apply_update(update).map_err(|e| {
+ log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
+ BuildError::WalletSetupFailed
+ })?;
+ }
  }
  wallet
  },
@@ -1267,6 +1294,7 @@ fn build_with_store_internal(
  wallet_persister,
  Arc::clone(&tx_broadcaster),
  Arc::clone(&fee_estimator),
+ Arc::clone(&chain_source),
  Arc::clone(&payment_store),
  Arc::clone(&config),
  Arc::clone(&logger),

src/chain/mod.rs

@@ -10,7 +10,7 @@ mod electrum;
 mod esplora;
 
 use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 
 use bitcoin::{Script, Txid};
@@ -84,6 +84,7 @@ impl WalletSyncStatus {
 
 pub(crate) struct ChainSource {
 	kind: ChainSourceKind,
+	registered_txids: Mutex<Vec<Txid>>,
 	tx_broadcaster: Arc<Broadcaster>,
 	logger: Arc<Logger>,
 }
@@ -112,7 +113,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Esplora(esplora_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) fn new_electrum(
@@ -131,7 +133,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Electrum(electrum_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) async fn new_bitcoind_rpc(
@@ -153,7 +156,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) async fn new_bitcoind_rest(
@@ -176,7 +180,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) fn start(&self, runtime: Arc<Runtime>) -> Result<(), Error> {
@@ -209,6 +214,10 @@ impl ChainSource {
  }
 	}
 
+	pub(crate) fn registered_txids(&self) -> Vec<Txid> {
+ self.registered_txids.lock().unwrap().clone()
+	}
+
 	pub(crate) fn is_transaction_based(&self) -> bool {
  match &self.kind {
  ChainSourceKind::Esplora(_) => true,
@@ -463,6 +472,7 @@ impl ChainSource {
 
 impl Filter for ChainSource {
 	fn register_tx(&self, txid: &Txid, script_pubkey: &Script) {
+ self.registered_txids.lock().unwrap().push(*txid);
  match &self.kind {
  ChainSourceKind::Esplora(esplora_chain_source) => {
  esplora_chain_source.register_tx(txid, script_pubkey)

src/lib.rs

@@ -1329,10 +1329,6 @@ impl Node {
  Error::ChannelSplicingFailed
  })?;
 
- // insert channel's funding utxo into the wallet so we can later calculate fees
- // correctly when viewing this splice-in.
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  let change_address = self.wallet.get_new_internal_address()?;
 
  let contribution = SpliceContribution::splice_in(
@@ -1426,18 +1422,6 @@ impl Node {
  },
  };
 
- let funding_txo = channel_details.funding_txo.ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready",);
- Error::ChannelSplicingFailed
- })?;
-
- let funding_output = channel_details.get_funding_output().ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready");
- Error::ChannelSplicingFailed
- })?;
-
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  self.channel_manager
  .splice_channel(
  &channel_details.channel_id,

benches/payments.rs

@@ -8,7 +8,7 @@ use bitcoin::hex::DisplayHex;
 use bitcoin::Amount;
 use common::{
 	expect_channel_ready_event, generate_blocks_and_wait, premine_and_distribute_funds,
-setup_bitcoind_and_electrsd, setup_two_nodes_with_store, TestChainSource,
+random_chain_source, setup_bitcoind_and_electrsd, setup_two_nodes_with_store,
 };
 use criterion::{criterion_group, criterion_main, Criterion};
 use ldk_node::{Event, Node};
@@ -119,7 +119,7 @@ async fn send_payments(node_a: Arc<Node>, node_b: Arc<Node>) -> std::time::Durat
 fn payment_benchmark(c: &mut Criterion) {
 	// Set up two nodes. Because this is slow, we reuse the same nodes for each sample.
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	let chain_source = TestChainSource::Esplora(&electrsd);
+	let chain_source = random_chain_source(&bitcoind, &electrsd);
 
 	let (node_a, node_b) = setup_two_nodes_with_store(
  &chain_source,

bindings/ldk_node.udl

@@ -129,6 +129,7 @@ interface Builder {
 	void set_node_alias(string node_alias);
 	[Throws=BuildError]
 	void set_async_payments_role(AsyncPaymentsRole? role);
+	void set_wallet_recovery_mode();
 	[Throws=BuildError]
 	Node build(NodeEntropy node_entropy);
 	[Throws=BuildError]

src/builder.rs

@@ -244,6 +244,7 @@ pub struct NodeBuilder {
 	async_payments_role: Option<AsyncPaymentsRole>,
 	runtime_handle: Option<tokio::runtime::Handle>,
 	pathfinding_scores_sync_config: Option<PathfindingScoresSyncConfig>,
+	recovery_mode: bool,
 }
 
 impl NodeBuilder {
@@ -261,6 +262,7 @@ impl NodeBuilder {
  let log_writer_config = None;
  let runtime_handle = None;
  let pathfinding_scores_sync_config = None;
+ let recovery_mode = false;
  Self {
  config,
  chain_data_source_config,
@@ -270,6 +272,7 @@ impl NodeBuilder {
  runtime_handle,
  async_payments_role: None,
  pathfinding_scores_sync_config,
+ recovery_mode,
  }
 	}
 
@@ -544,6 +547,16 @@ impl NodeBuilder {
  Ok(self)
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&mut self) -> &mut Self {
+ self.recovery_mode = true;
+ self
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: NodeEntropy) -> Result<Node, BuildError> {
@@ -679,6 +692,7 @@ impl NodeBuilder {
  self.liquidity_source_config.as_ref(),
  self.pathfinding_scores_sync_config.as_ref(),
  self.async_payments_role,
+ self.recovery_mode,
  seed_bytes,
  runtime,
  logger,
@@ -919,6 +933,15 @@ impl ArcedNodeBuilder {
  self.inner.write().unwrap().set_async_payments_role(role).map(|_| ())
 	}
 
+	/// Configures the [`Node`] to resync chain data from genesis on first startup, recovering any
+	/// historical wallet funds.
+	///
+	/// This should only be set on first startup when importing an older wallet from a previously
+	/// used [`NodeEntropy`].
+	pub fn set_wallet_recovery_mode(&self) {
+ self.inner.write().unwrap().set_wallet_recovery_mode();
+	}
+
 	/// Builds a [`Node`] instance with a [`SqliteStore`] backend and according to the options
 	/// previously configured.
 	pub fn build(&self, node_entropy: Arc<NodeEntropy>) -> Result<Arc<Node>, BuildError> {
@@ -1033,8 +1056,8 @@ fn build_with_store_internal(
 	gossip_source_config: Option<&GossipSourceConfig>,
 	liquidity_source_config: Option<&LiquiditySourceConfig>,
 	pathfinding_scores_sync_config: Option<&PathfindingScoresSyncConfig>,
-	async_payments_role: Option<AsyncPaymentsRole>, seed_bytes: [u8; 64], runtime: Arc<Runtime>,
-	logger: Arc<Logger>, kv_store: Arc<DynStore>,
+	async_payments_role: Option<AsyncPaymentsRole>, recovery_mode: bool, seed_bytes: [u8; 64],
+runtime: Arc<Runtime>, logger: Arc<Logger>, kv_store: Arc<DynStore>,
 ) -> Result<Node, BuildError> {
 	optionally_install_rustls_cryptoprovider();
 
@@ -1230,19 +1253,23 @@ fn build_with_store_internal(
  BuildError::WalletSetupFailed
  })?;
 
- if let Some(best_block) = chain_tip_opt {
- // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
- // TODO: Use a proper wallet birthday once BDK supports it.
- let mut latest_checkpoint = wallet.latest_checkpoint();
- let block_id =
- bdk_chain::BlockId { height: best_block.height, hash: best_block.block_hash };
- latest_checkpoint = latest_checkpoint.insert(block_id);
- let update =
- bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
- wallet.apply_update(update).map_err(|e| {
- log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
- BuildError::WalletSetupFailed
- })?;
+ if !recovery_mode {
+ if let Some(best_block) = chain_tip_opt {
+ // Insert the first checkpoint if we have it, to avoid resyncing from genesis.
+ // TODO: Use a proper wallet birthday once BDK supports it.
+ let mut latest_checkpoint = wallet.latest_checkpoint();
+ let block_id = bdk_chain::BlockId {
+ height: best_block.height,
+ hash: best_block.block_hash,
+ };
+ latest_checkpoint = latest_checkpoint.insert(block_id);
+ let update =
+ bdk_wallet::Update { chain: Some(latest_checkpoint), ..Default::default() };
+ wallet.apply_update(update).map_err(|e| {
+ log_error!(logger, "Failed to apply checkpoint during wallet setup: {}", e);
+ BuildError::WalletSetupFailed
+ })?;
+ }
  }
  wallet
  },
@@ -1267,6 +1294,7 @@ fn build_with_store_internal(
  wallet_persister,
  Arc::clone(&tx_broadcaster),
  Arc::clone(&fee_estimator),
+ Arc::clone(&chain_source),
  Arc::clone(&payment_store),
  Arc::clone(&config),
  Arc::clone(&logger),

src/chain/mod.rs

@@ -10,7 +10,7 @@ mod electrum;
 mod esplora;
 
 use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 
 use bitcoin::{Script, Txid};
@@ -84,6 +84,7 @@ impl WalletSyncStatus {
 
 pub(crate) struct ChainSource {
 	kind: ChainSourceKind,
+	registered_txids: Mutex<Vec<Txid>>,
 	tx_broadcaster: Arc<Broadcaster>,
 	logger: Arc<Logger>,
 }
@@ -112,7 +113,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Esplora(esplora_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) fn new_electrum(
@@ -131,7 +133,8 @@ impl ChainSource {
  node_metrics,
  );
  let kind = ChainSourceKind::Electrum(electrum_chain_source);
- (Self { kind, tx_broadcaster, logger }, None)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, None)
 	}
 
 	pub(crate) async fn new_bitcoind_rpc(
@@ -153,7 +156,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) async fn new_bitcoind_rest(
@@ -176,7 +180,8 @@ impl ChainSource {
  );
  let best_block = bitcoind_chain_source.poll_best_block().await.ok();
  let kind = ChainSourceKind::Bitcoind(bitcoind_chain_source);
- (Self { kind, tx_broadcaster, logger }, best_block)
+ let registered_txids = Mutex::new(Vec::new());
+ (Self { kind, registered_txids, tx_broadcaster, logger }, best_block)
 	}
 
 	pub(crate) fn start(&self, runtime: Arc<Runtime>) -> Result<(), Error> {
@@ -209,6 +214,10 @@ impl ChainSource {
  }
 	}
 
+	pub(crate) fn registered_txids(&self) -> Vec<Txid> {
+ self.registered_txids.lock().unwrap().clone()
+	}
+
 	pub(crate) fn is_transaction_based(&self) -> bool {
  match &self.kind {
  ChainSourceKind::Esplora(_) => true,
@@ -463,6 +472,7 @@ impl ChainSource {
 
 impl Filter for ChainSource {
 	fn register_tx(&self, txid: &Txid, script_pubkey: &Script) {
+ self.registered_txids.lock().unwrap().push(*txid);
  match &self.kind {
  ChainSourceKind::Esplora(esplora_chain_source) => {
  esplora_chain_source.register_tx(txid, script_pubkey)

src/lib.rs

@@ -1329,10 +1329,6 @@ impl Node {
  Error::ChannelSplicingFailed
  })?;
 
- // insert channel's funding utxo into the wallet so we can later calculate fees
- // correctly when viewing this splice-in.
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  let change_address = self.wallet.get_new_internal_address()?;
 
  let contribution = SpliceContribution::splice_in(
@@ -1426,18 +1422,6 @@ impl Node {
  },
  };
 
- let funding_txo = channel_details.funding_txo.ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready",);
- Error::ChannelSplicingFailed
- })?;
-
- let funding_output = channel_details.get_funding_output().ok_or_else(|| {
- log_error!(self.logger, "Failed to splice channel: channel not yet ready");
- Error::ChannelSplicingFailed
- })?;
-
- self.wallet.insert_txo(funding_txo.into_bitcoin_outpoint(), funding_output)?;
-
  self.channel_manager
  .splice_channel(
  &channel_details.channel_id,