Merge pull request #1046 from tnull/2026-08-fix-splice-ready-race

Wait for splice broadcasts before mining

Author: tnull

tests/common/mod.rs

@@ -1539,7 +1539,8 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
 	assert!(splice_out_sat > 500_000);
 	node_b.splice_out(&user_channel_id_b, node_a.node_id(), &addr_a, splice_out_sat).unwrap();
 
-	expect_splice_negotiated_event!(node_b, node_a.node_id());
+	let splice_out_txo = expect_splice_negotiated_event!(node_b, node_a.node_id());
+	wait_for_tx(electrsd, splice_out_txo.txid).await;
 
 	generate_blocks_and_wait(&bitcoind, electrsd, 6).await;
 	node_a.sync_wallets().unwrap();
@@ -1560,7 +1561,8 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
 	let splice_in_sat = splice_out_sat;
 	node_a.splice_in(&user_channel_id_a, node_b.node_id(), splice_in_sat).unwrap();
 
-	expect_splice_negotiated_event!(node_a, node_b.node_id());
+	let splice_in_txo = expect_splice_negotiated_event!(node_a, node_b.node_id());
+	wait_for_tx(electrsd, splice_in_txo.txid).await;
 
 	generate_blocks_and_wait(&bitcoind, electrsd, 6).await;
 	node_a.sync_wallets().unwrap();

tests/common/scenarios/mod.rs

@@ -23,7 +23,7 @@ use electrsd::electrum_client::ElectrumApi;
 use ldk_node::{Event, Node};
 
 use super::external_node::ExternalNode;
-use super::{generate_blocks_and_wait, premine_and_distribute_funds};
+use super::{generate_blocks_and_wait, premine_and_distribute_funds, wait_for_tx};
 
 #[derive(Debug, Clone, Copy)]
 pub(crate) enum Side {
@@ -240,7 +240,8 @@ pub(crate) async fn splice_in_scenario<E: ElectrumApi>(
 	.await;
 	let ext_node_id = peer.get_node_id().await.unwrap();
 	node.splice_in(&user_ch, ext_node_id, 500_000).unwrap();
-	expect_splice_negotiated_event!(node, ext_node_id);
+	let splice_txo = expect_splice_negotiated_event!(node, ext_node_id);
+	wait_for_tx(electrs, splice_txo.txid).await;
 	generate_blocks_and_wait(bitcoind, electrs, 6).await;
 	sync_wallets_with_retry(node).await;
 	expect_channel_ready_event!(node, ext_node_id);

tests/integration_tests_rust.rs

@@ -2043,6 +2043,7 @@ async fn splice_channel() {
 	// Node B contributed to this splice, so wait for its funding broadcast to be classified before
 	// syncing — otherwise a sync racing the broadcaster's queue records a generic on-chain payment.
 	wait_for_classified_funding_payment(&node_b, txo.txid).await;
+	wait_for_tx(&electrsd.client, txo.txid).await;
 
 	generate_blocks_and_wait(&bitcoind.client, &electrsd.client, 6).await;
 
@@ -2102,6 +2103,7 @@ async fn splice_channel() {
 	// Node A contributed to this splice, so wait for its funding broadcast to be classified before
 	// syncing — otherwise a sync racing the broadcaster's queue records a generic on-chain payment.
 	wait_for_classified_funding_payment(&node_a, txo.txid).await;
+	wait_for_tx(&electrsd.client, txo.txid).await;
 
 	generate_blocks_and_wait(&bitcoind.client, &electrsd.client, 6).await;