Split splice initiation into two phases#4290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 7 commits into from
Feb 17, 2026
Merged

Split splice initiation into two phases #4290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c80afe9
Move FundingTxInput::sequence to Utxo
jkczyz Jan 13, 2026
fc3fa7c
Use FundingTxInput instead of Utxo in CoinSelection
jkczyz Jan 14, 2026
4cae129
Make ClaimId optional in coin selection
jkczyz Jan 28, 2026
df777e8
Run rustfmt on fuzz
jkczyz Feb 2, 2026
2fd3351
Split splice initiation into two phases
jkczyz Dec 18, 2025
96b9e6a
Use CoinSelection::change_output when splicing
jkczyz Jan 20, 2026
20916b7
Consistently log in propose_quiescence
jkczyz Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
441 changes: 230 additions & 211 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop

Large diffs are not rendered by default.

112 changes: 67 additions & 45 deletions fuzz/src/full_stack.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ use bitcoin::opcodes;
use bitcoin::script::{Builder, ScriptBuf};
use bitcoin::transaction::Version;
use bitcoin::transaction::{Transaction, TxIn, TxOut};
use bitcoin::FeeRate;

use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::sha256::Hash as Sha256;
Expand All@@ -30,18 +31,16 @@ use bitcoin::hashes::Hash as _;
use bitcoin::hex::FromHex;
use bitcoin::WPubkeyHash;

use lightning::ln::funding::{FundingTxInput, SpliceContribution};

use lightning::blinded_path::message::{BlindedMessagePath, MessageContext, MessageForwardNode};
use lightning::blinded_path::payment::{BlindedPaymentPath, ReceiveTlvs};
use lightning::chain;
use lightning::chain::chaininterface::{
TransactionType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
BroadcasterInterface, ConfirmationTarget, FeeEstimator, TransactionType,
};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::bump_transaction::sync::{WalletSourceSync, WalletSync};
use lightning::events::Event;
use lightning::ln::channel_state::ChannelDetails;
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, InterceptId, PaymentId};
Expand All@@ -65,6 +64,7 @@ use lightning::sign::{
SignerProvider,
};
use lightning::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::util::async_poll::{MaybeSend, MaybeSync};
use lightning::util::config::{ChannelConfig, UserConfig};
use lightning::util::hash_tables::*;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -227,7 +227,7 @@ type ChannelMan<'a> = ChannelManager<
Arc<dyn chain::Filter>,
Arc<TestBroadcaster>,
Arc<FuzzEstimator>,
Arc<dyn Logger>,
Arc<dyn Logger + MaybeSend + MaybeSync>,
Arc<TestPersister>,
Arc<KeyProvider>,
>,
Expand All@@ -239,14 +239,20 @@ type ChannelMan<'a> = ChannelManager<
Arc<FuzzEstimator>,
&'a FuzzRouter,
&'a FuzzRouter,
Arc<dyn Logger>,
Arc<dyn Logger + MaybeSend + MaybeSync>,
>;
type PeerMan<'a> = PeerManager<
Peer<'a>,
Arc<ChannelMan<'a>>,
Arc<P2PGossipSync<Arc<NetworkGraph<Arc<dyn Logger>>>, Arc<dyn UtxoLookup>, Arc<dyn Logger>>>,
Arc<
P2PGossipSync<
Arc<NetworkGraph<Arc<dyn Logger + MaybeSend + MaybeSync>>>,
Arc<dyn UtxoLookup>,
Arc<dyn Logger + MaybeSend + MaybeSync>,
>,
>,
IgnoringMessageHandler,
Arc<dyn Logger>,
Arc<dyn Logger + MaybeSend + MaybeSync>,
IgnoringMessageHandler,
Arc<KeyProvider>,
IgnoringMessageHandler,
Expand All@@ -260,7 +266,7 @@ struct MoneyLossDetector<'a> {
Arc<dyn chain::Filter>,
Arc<TestBroadcaster>,
Arc<FuzzEstimator>,
Arc<dyn Logger>,
Arc<dyn Logger + MaybeSend + MaybeSync>,
Arc<TestPersister>,
Arc<KeyProvider>,
>,
Expand All@@ -285,7 +291,7 @@ impl<'a> MoneyLossDetector<'a> {
Arc<dyn chain::Filter>,
Arc<TestBroadcaster>,
Arc<FuzzEstimator>,
Arc<dyn Logger>,
Arc<dyn Logger + MaybeSend + MaybeSync>,
Arc<TestPersister>,
Arc<KeyProvider>,
>,
Expand DownExpand Up@@ -520,7 +526,7 @@ impl SignerProvider for KeyProvider {
}

#[inline]
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>) {
if data.len() < 32 {
return;
}
Expand DownExpand Up@@ -668,9 +674,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
script_pubkey: wallet.get_change_script().unwrap(),
}],
};
let coinbase_txid = coinbase_tx.compute_txid();
wallet
.add_utxo(bitcoin::OutPoint { txid: coinbase_txid, vout: 0 }, Amount::from_sat(1_000_000));
wallet.add_utxo(coinbase_tx.clone(), 0);

loop {
match get_slice!(1)[0] {
Expand DownExpand Up@@ -1026,20 +1030,24 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
if splice_in_sats == 0 {
continue;
}
// Create a funding input from the coinbase transaction
if let Ok(input) = FundingTxInput::new_p2wpkh(coinbase_tx.clone(), 0) {
let contribution = SpliceContribution::splice_in(
Amount::from_sat(splice_in_sats.min(900_000)), // Cap at available funds minus fees
vec![input],
Some(wallet.get_change_script().unwrap()),
);
let _ = channelmanager.splice_channel(
&chan.channel_id,
&chan.counterparty.node_id,
contribution,
253, // funding_feerate_per_kw
None,
);
let chan_id = chan.channel_id;
let counterparty = chan.counterparty.node_id;
if let Ok(funding_template) = channelmanager.splice_channel(
&chan_id,
&counterparty,
FeeRate::from_sat_per_kwu(253),
) {
let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
if let Ok(contribution) = funding_template
.splice_in_sync(Amount::from_sat(splice_in_sats.min(900_000)), &wallet_sync)
{
let _ = channelmanager.funding_contributed(
&chan_id,
&counterparty,
contribution,
None,
);
}
}
},
// Splice-out: remove funds from a channel
Expand All@@ -1062,17 +1070,29 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
// Cap splice-out at a reasonable portion of channel capacity
let max_splice_out = chan.channel_value_satoshis / 4;
let splice_out_sats = splice_out_sats.min(max_splice_out).max(546); // At least dust limit
let contribution = SpliceContribution::splice_out(vec![TxOut {
value: Amount::from_sat(splice_out_sats),
script_pubkey: wallet.get_change_script().unwrap(),
}]);
let _ = channelmanager.splice_channel(
&chan.channel_id,
&chan.counterparty.node_id,
contribution,
253, // funding_feerate_per_kw
None,
);
let chan_id = chan.channel_id;
let counterparty = chan.counterparty.node_id;
if let Ok(funding_template) = channelmanager.splice_channel(
&chan_id,
&counterparty,
FeeRate::from_sat_per_kwu(253),
) {
let outputs = vec![TxOut {
value: Amount::from_sat(splice_out_sats),
script_pubkey: wallet.get_change_script().unwrap(),
}];
let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
if let Ok(contribution) =
funding_template.splice_out_sync(outputs, &wallet_sync)
{
let _ = channelmanager.funding_contributed(
&chan_id,
&counterparty,
contribution,
None,
);
}
}
},
_ => return,
}
Expand DownExpand Up@@ -1139,14 +1159,15 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
}
}

pub fn full_stack_test<Out: test_logger::Output>(data: &[u8], out: Out) {
let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
pub fn full_stack_test<Out: test_logger::Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
Arc::new(test_logger::TestLogger::new("".to_owned(), out));
do_test(data, &logger);
}

#[no_mangle]
pub extern "C" fn full_stack_run(data: *const u8, datalen: usize) {
let logger: Arc<dyn Logger> =
let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
Arc::new(test_logger::TestLogger::new("".to_owned(), test_logger::DevNull {}));
do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, &logger);
}
Expand DownExpand Up@@ -1932,6 +1953,7 @@ pub fn write_fst_seeds(path: &str) {

#[cfg(test)]
mod tests {
use lightning::util::async_poll::{MaybeSend, MaybeSync};
use lightning::util::logger::{Logger, Record};
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
Expand DownExpand Up@@ -1963,7 +1985,7 @@ mod tests {
let test = super::two_peer_forwarding_seed();

let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

let log_entries = logger.lines.lock().unwrap();
// 1
Expand DownExpand Up@@ -1998,7 +2020,7 @@ mod tests {
let test = super::gossip_exchange_seed();

let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

let log_entries = logger.lines.lock().unwrap();
assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)) or the announced channel's counterparties: ChannelAnnouncement { node_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, node_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, bitcoin_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, bitcoin_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, contents: UnsignedChannelAnnouncement { features: [], chain_hash: 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000, short_channel_id: 42, node_id_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), node_id_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), bitcoin_key_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), bitcoin_key_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), excess_data: [] } }".to_string())), Some(&1));
Expand All@@ -2011,7 +2033,7 @@ mod tests {
let test = super::splice_seed();

let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

let log_entries = logger.lines.lock().unwrap();

Expand Down
25 changes: 14 additions & 11 deletions fuzz/src/lsps_message.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,17 +77,20 @@ pub fn do_test(data: &[u8]) {
genesis_block.header.time,
));

let liquidity_manager = Arc::new(LiquidityManagerSync::new(
Arc::clone(&keys_manager),
Arc::clone(&keys_manager),
Arc::clone(&manager),
None::<Arc<dyn Filter + Send + Sync>>,
None,
kv_store,
Arc::clone(&tx_broadcaster),
None,
None,
).unwrap());
let liquidity_manager = Arc::new(
LiquidityManagerSync::new(
Arc::clone(&keys_manager),
Arc::clone(&keys_manager),
Arc::clone(&manager),
None::<Arc<dyn Filter + Send + Sync>>,
None,
kv_store,
Arc::clone(&tx_broadcaster),
None,
None,
)
.unwrap(),
);
let mut reader = data;
if let Ok(Some(msg)) = liquidity_manager.read(LSPS_MESSAGE_TYPE_ID, &mut reader) {
let secp = Secp256k1::signing_only();
Expand Down
9 changes: 5 additions & 4 deletions lightning-tests/src/upgrade_downgrade_tests.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,6 @@ use lightning::chain::channelmonitor::{ANTI_REORG_DELAY, HTLC_FAIL_BACK_BUFFER};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::{ClosureReason, Event, HTLCHandlingFailureType};
use lightning::ln::functional_test_utils::*;
use lightning::ln::funding::SpliceContribution;
use lightning::ln::msgs::BaseMessageHandler as _;
use lightning::ln::msgs::ChannelMessageHandler as _;
use lightning::ln::msgs::MessageSendEvent;
Expand DownExpand Up@@ -453,11 +452,13 @@ fn do_test_0_1_htlc_forward_after_splice(fail_htlc: bool) {
reconnect_b_c_args.send_announcement_sigs = (true, true);
reconnect_nodes(reconnect_b_c_args);

let contribution = SpliceContribution::splice_out(vec![TxOut {
let outputs = vec![TxOut {
value: Amount::from_sat(1_000),
script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
}]);
let splice_tx = splice_channel(&nodes[0], &nodes[1], ChannelId(chan_id_bytes_a), contribution);
}];
let channel_id = ChannelId(chan_id_bytes_a);
let funding_contribution = initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs);
let (splice_tx, _) = splice_channel(&nodes[0], &nodes[1], channel_id, funding_contribution);
for node in nodes.iter() {
mine_transaction(node, &splice_tx);
connect_blocks(node, ANTI_REORG_DELAY - 1);
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Split splice initiation into two phases#4290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 7 commits into

from

Feb 17, 2026
 Merged


Split splice initiation into two phases
#4290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c80afe9

Move FundingTxInput::sequence to Utxo


jkczyz Jan 13, 2026
fc3fa7c

Use FundingTxInput instead of Utxo in CoinSelection


jkczyz Jan 14, 2026
4cae129

Make ClaimId optional in coin selection


jkczyz Jan 28, 2026
df777e8

Run rustfmt on fuzz


jkczyz Feb 2, 2026
2fd3351

Split splice initiation into two phases


jkczyz Dec 18, 2025
96b9e6a

Use CoinSelection::change_output when splicing


jkczyz Jan 20, 2026
20916b7

Consistently log in propose_quiescence


jkczyz Feb 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


441 changes: 230 additions & 211 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop


Large diffs are not rendered by default.


112 changes: 67 additions & 45 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ use bitcoin::opcodes;
use bitcoin::script::{Builder, ScriptBuf};
use bitcoin::transaction::Version;
use bitcoin::transaction::{Transaction, TxIn, TxOut};
use bitcoin::FeeRate;

use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::sha256::Hash as Sha256;
Expand All@@ -30,18 +31,16 @@ use bitcoin::hashes::Hash as _;
use bitcoin::hex::FromHex;
use bitcoin::WPubkeyHash;

use lightning::ln::funding::{FundingTxInput, SpliceContribution};

use lightning::blinded_path::message::{BlindedMessagePath, MessageContext, MessageForwardNode};
use lightning::blinded_path::payment::{BlindedPaymentPath, ReceiveTlvs};
use lightning::chain;
use lightning::chain::chaininterface::{
TransactionType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
	BroadcasterInterface, ConfirmationTarget, FeeEstimator, TransactionType,
};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::bump_transaction::sync::{WalletSourceSync, WalletSync};
use lightning::events::Event;
use lightning::ln::channel_state::ChannelDetails;
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, InterceptId, PaymentId};
Expand All@@ -65,6 +64,7 @@ use lightning::sign::{
	SignerProvider,
};
use lightning::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::util::async_poll::{MaybeSend, MaybeSync};
use lightning::util::config::{ChannelConfig, UserConfig};
use lightning::util::hash_tables::*;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -227,7 +227,7 @@ type ChannelMan<'a> = ChannelManager<
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -239,14 +239,20 @@ type ChannelMan<'a> = ChannelManager<
	Arc<FuzzEstimator>,
	&'a FuzzRouter,
	&'a FuzzRouter,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
>;
type PeerMan<'a> = PeerManager<
	Peer<'a>,
	Arc<ChannelMan<'a>>,
	Arc<P2PGossipSync<Arc<NetworkGraph<Arc<dyn Logger>>>, Arc<dyn UtxoLookup>, Arc<dyn Logger>>>,
	Arc<
 P2PGossipSync<
 Arc<NetworkGraph<Arc<dyn Logger + MaybeSend + MaybeSync>>>,
 Arc<dyn UtxoLookup>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 >,
	>,
	IgnoringMessageHandler,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
	IgnoringMessageHandler,
	Arc<KeyProvider>,
	IgnoringMessageHandler,
Expand All@@ -260,7 +266,7 @@ struct MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -285,7 +291,7 @@ impl<'a> MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand DownExpand Up@@ -520,7 +526,7 @@ impl SignerProvider for KeyProvider {
}

#[inline]
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>) {
	if data.len() < 32 {
 return;
	}
Expand DownExpand Up@@ -668,9 +674,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 script_pubkey: wallet.get_change_script().unwrap(),
 }],
	};
	let coinbase_txid = coinbase_tx.compute_txid();
	wallet
 .add_utxo(bitcoin::OutPoint { txid: coinbase_txid, vout: 0 }, Amount::from_sat(1_000_000));
	wallet.add_utxo(coinbase_tx.clone(), 0);

	loop {
 match get_slice!(1)[0] {
Expand DownExpand Up@@ -1026,20 +1030,24 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 if splice_in_sats == 0 {
 continue;
 }
 // Create a funding input from the coinbase transaction
 if let Ok(input) = FundingTxInput::new_p2wpkh(coinbase_tx.clone(), 0) {
 let contribution = SpliceContribution::splice_in(
 Amount::from_sat(splice_in_sats.min(900_000)), // Cap at available funds minus fees
 vec![input],
 Some(wallet.get_change_script().unwrap()),
 );
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) = funding_template
 .splice_in_sync(Amount::from_sat(splice_in_sats.min(900_000)), &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 // Splice-out: remove funds from a channel
Expand All@@ -1062,17 +1070,29 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 // Cap splice-out at a reasonable portion of channel capacity
 let max_splice_out = chan.channel_value_satoshis / 4;
 let splice_out_sats = splice_out_sats.min(max_splice_out).max(546); // At least dust limit
 let contribution = SpliceContribution::splice_out(vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }]);
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let outputs = vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }];
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) =
 funding_template.splice_out_sync(outputs, &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 _ => return,
 }
Expand DownExpand Up@@ -1139,14 +1159,15 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
	}
}

pub fn full_stack_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
pub fn full_stack_test<Out: test_logger::Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), out));
	do_test(data, &logger);
}

#[no_mangle]
pub extern "C" fn full_stack_run(data: *const u8, datalen: usize) {
	let logger: Arc<dyn Logger> =
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), test_logger::DevNull {}));
	do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, &logger);
}
Expand DownExpand Up@@ -1932,6 +1953,7 @@ pub fn write_fst_seeds(path: &str) {

#[cfg(test)]
mod tests {
	use lightning::util::async_poll::{MaybeSend, MaybeSync};
	use lightning::util::logger::{Logger, Record};
	use std::collections::HashMap;
	use std::sync::{Arc, Mutex};
Expand DownExpand Up@@ -1963,7 +1985,7 @@ mod tests {
 let test = super::two_peer_forwarding_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 // 1
Expand DownExpand Up@@ -1998,7 +2020,7 @@ mod tests {
 let test = super::gossip_exchange_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)) or the announced channel's counterparties: ChannelAnnouncement { node_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, node_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, bitcoin_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, bitcoin_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, contents: UnsignedChannelAnnouncement { features: [], chain_hash: 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000, short_channel_id: 42, node_id_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), node_id_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), bitcoin_key_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), bitcoin_key_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), excess_data: [] } }".to_string())), Some(&1));
Expand All@@ -2011,7 +2033,7 @@ mod tests {
 let test = super::splice_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();

Expand Down

25 changes: 14 additions & 11 deletions
fuzz/src/lsps_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,17 +77,20 @@ pub fn do_test(data: &[u8]) {
 genesis_block.header.time,
	));

	let liquidity_manager = Arc::new(LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
	).unwrap());
	let liquidity_manager = Arc::new(
 LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
 )
 .unwrap(),
	);
	let mut reader = data;
	if let Ok(Some(msg)) = liquidity_manager.read(LSPS_MESSAGE_TYPE_ID, &mut reader) {
 let secp = Secp256k1::signing_only();
Expand Down

9 changes: 5 additions & 4 deletions
lightning-tests/src/upgrade_downgrade_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,6 @@ use lightning::chain::channelmonitor::{ANTI_REORG_DELAY, HTLC_FAIL_BACK_BUFFER};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::{ClosureReason, Event, HTLCHandlingFailureType};
use lightning::ln::functional_test_utils::*;
use lightning::ln::funding::SpliceContribution;
use lightning::ln::msgs::BaseMessageHandler as _;
use lightning::ln::msgs::ChannelMessageHandler as _;
use lightning::ln::msgs::MessageSendEvent;
Expand DownExpand Up@@ -453,11 +452,13 @@ fn do_test_0_1_htlc_forward_after_splice(fail_htlc: bool) {
	reconnect_b_c_args.send_announcement_sigs = (true, true);
	reconnect_nodes(reconnect_b_c_args);

	let contribution = SpliceContribution::splice_out(vec![TxOut {
	let outputs = vec![TxOut {
 value: Amount::from_sat(1_000),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}]);
	let splice_tx = splice_channel(&nodes[0], &nodes[1], ChannelId(chan_id_bytes_a), contribution);
	}];
	let channel_id = ChannelId(chan_id_bytes_a);
	let funding_contribution = initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs);
	let (splice_tx, _) = splice_channel(&nodes[0], &nodes[1], channel_id, funding_contribution);
	for node in nodes.iter() {
 mine_transaction(node, &splice_tx);
 connect_blocks(node, ANTI_REORG_DELAY - 1);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Split splice initiation into two phases#4290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 7 commits into

from

Feb 17, 2026
 Merged


Split splice initiation into two phases
#4290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c80afe9

Move FundingTxInput::sequence to Utxo


jkczyz Jan 13, 2026
fc3fa7c

Use FundingTxInput instead of Utxo in CoinSelection


jkczyz Jan 14, 2026
4cae129

Make ClaimId optional in coin selection


jkczyz Jan 28, 2026
df777e8

Run rustfmt on fuzz


jkczyz Feb 2, 2026
2fd3351

Split splice initiation into two phases


jkczyz Dec 18, 2025
96b9e6a

Use CoinSelection::change_output when splicing


jkczyz Jan 20, 2026
20916b7

Consistently log in propose_quiescence


jkczyz Feb 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


441 changes: 230 additions & 211 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop


Large diffs are not rendered by default.


112 changes: 67 additions & 45 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ use bitcoin::opcodes;
use bitcoin::script::{Builder, ScriptBuf};
use bitcoin::transaction::Version;
use bitcoin::transaction::{Transaction, TxIn, TxOut};
use bitcoin::FeeRate;

use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::sha256::Hash as Sha256;
Expand All@@ -30,18 +31,16 @@ use bitcoin::hashes::Hash as _;
use bitcoin::hex::FromHex;
use bitcoin::WPubkeyHash;

use lightning::ln::funding::{FundingTxInput, SpliceContribution};

use lightning::blinded_path::message::{BlindedMessagePath, MessageContext, MessageForwardNode};
use lightning::blinded_path::payment::{BlindedPaymentPath, ReceiveTlvs};
use lightning::chain;
use lightning::chain::chaininterface::{
TransactionType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
	BroadcasterInterface, ConfirmationTarget, FeeEstimator, TransactionType,
};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::bump_transaction::sync::{WalletSourceSync, WalletSync};
use lightning::events::Event;
use lightning::ln::channel_state::ChannelDetails;
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, InterceptId, PaymentId};
Expand All@@ -65,6 +64,7 @@ use lightning::sign::{
	SignerProvider,
};
use lightning::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::util::async_poll::{MaybeSend, MaybeSync};
use lightning::util::config::{ChannelConfig, UserConfig};
use lightning::util::hash_tables::*;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -227,7 +227,7 @@ type ChannelMan<'a> = ChannelManager<
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -239,14 +239,20 @@ type ChannelMan<'a> = ChannelManager<
	Arc<FuzzEstimator>,
	&'a FuzzRouter,
	&'a FuzzRouter,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
>;
type PeerMan<'a> = PeerManager<
	Peer<'a>,
	Arc<ChannelMan<'a>>,
	Arc<P2PGossipSync<Arc<NetworkGraph<Arc<dyn Logger>>>, Arc<dyn UtxoLookup>, Arc<dyn Logger>>>,
	Arc<
 P2PGossipSync<
 Arc<NetworkGraph<Arc<dyn Logger + MaybeSend + MaybeSync>>>,
 Arc<dyn UtxoLookup>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 >,
	>,
	IgnoringMessageHandler,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
	IgnoringMessageHandler,
	Arc<KeyProvider>,
	IgnoringMessageHandler,
Expand All@@ -260,7 +266,7 @@ struct MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -285,7 +291,7 @@ impl<'a> MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand DownExpand Up@@ -520,7 +526,7 @@ impl SignerProvider for KeyProvider {
}

#[inline]
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>) {
	if data.len() < 32 {
 return;
	}
Expand DownExpand Up@@ -668,9 +674,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 script_pubkey: wallet.get_change_script().unwrap(),
 }],
	};
	let coinbase_txid = coinbase_tx.compute_txid();
	wallet
 .add_utxo(bitcoin::OutPoint { txid: coinbase_txid, vout: 0 }, Amount::from_sat(1_000_000));
	wallet.add_utxo(coinbase_tx.clone(), 0);

	loop {
 match get_slice!(1)[0] {
Expand DownExpand Up@@ -1026,20 +1030,24 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 if splice_in_sats == 0 {
 continue;
 }
 // Create a funding input from the coinbase transaction
 if let Ok(input) = FundingTxInput::new_p2wpkh(coinbase_tx.clone(), 0) {
 let contribution = SpliceContribution::splice_in(
 Amount::from_sat(splice_in_sats.min(900_000)), // Cap at available funds minus fees
 vec![input],
 Some(wallet.get_change_script().unwrap()),
 );
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) = funding_template
 .splice_in_sync(Amount::from_sat(splice_in_sats.min(900_000)), &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 // Splice-out: remove funds from a channel
Expand All@@ -1062,17 +1070,29 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 // Cap splice-out at a reasonable portion of channel capacity
 let max_splice_out = chan.channel_value_satoshis / 4;
 let splice_out_sats = splice_out_sats.min(max_splice_out).max(546); // At least dust limit
 let contribution = SpliceContribution::splice_out(vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }]);
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let outputs = vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }];
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) =
 funding_template.splice_out_sync(outputs, &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 _ => return,
 }
Expand DownExpand Up@@ -1139,14 +1159,15 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
	}
}

pub fn full_stack_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
pub fn full_stack_test<Out: test_logger::Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), out));
	do_test(data, &logger);
}

#[no_mangle]
pub extern "C" fn full_stack_run(data: *const u8, datalen: usize) {
	let logger: Arc<dyn Logger> =
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), test_logger::DevNull {}));
	do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, &logger);
}
Expand DownExpand Up@@ -1932,6 +1953,7 @@ pub fn write_fst_seeds(path: &str) {

#[cfg(test)]
mod tests {
	use lightning::util::async_poll::{MaybeSend, MaybeSync};
	use lightning::util::logger::{Logger, Record};
	use std::collections::HashMap;
	use std::sync::{Arc, Mutex};
Expand DownExpand Up@@ -1963,7 +1985,7 @@ mod tests {
 let test = super::two_peer_forwarding_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 // 1
Expand DownExpand Up@@ -1998,7 +2020,7 @@ mod tests {
 let test = super::gossip_exchange_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)) or the announced channel's counterparties: ChannelAnnouncement { node_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, node_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, bitcoin_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, bitcoin_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, contents: UnsignedChannelAnnouncement { features: [], chain_hash: 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000, short_channel_id: 42, node_id_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), node_id_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), bitcoin_key_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), bitcoin_key_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), excess_data: [] } }".to_string())), Some(&1));
Expand All@@ -2011,7 +2033,7 @@ mod tests {
 let test = super::splice_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();

Expand Down

25 changes: 14 additions & 11 deletions
fuzz/src/lsps_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,17 +77,20 @@ pub fn do_test(data: &[u8]) {
 genesis_block.header.time,
	));

	let liquidity_manager = Arc::new(LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
	).unwrap());
	let liquidity_manager = Arc::new(
 LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
 )
 .unwrap(),
	);
	let mut reader = data;
	if let Ok(Some(msg)) = liquidity_manager.read(LSPS_MESSAGE_TYPE_ID, &mut reader) {
 let secp = Secp256k1::signing_only();
Expand Down

9 changes: 5 additions & 4 deletions
lightning-tests/src/upgrade_downgrade_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,6 @@ use lightning::chain::channelmonitor::{ANTI_REORG_DELAY, HTLC_FAIL_BACK_BUFFER};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::{ClosureReason, Event, HTLCHandlingFailureType};
use lightning::ln::functional_test_utils::*;
use lightning::ln::funding::SpliceContribution;
use lightning::ln::msgs::BaseMessageHandler as _;
use lightning::ln::msgs::ChannelMessageHandler as _;
use lightning::ln::msgs::MessageSendEvent;
Expand DownExpand Up@@ -453,11 +452,13 @@ fn do_test_0_1_htlc_forward_after_splice(fail_htlc: bool) {
	reconnect_b_c_args.send_announcement_sigs = (true, true);
	reconnect_nodes(reconnect_b_c_args);

	let contribution = SpliceContribution::splice_out(vec![TxOut {
	let outputs = vec![TxOut {
 value: Amount::from_sat(1_000),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}]);
	let splice_tx = splice_channel(&nodes[0], &nodes[1], ChannelId(chan_id_bytes_a), contribution);
	}];
	let channel_id = ChannelId(chan_id_bytes_a);
	let funding_contribution = initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs);
	let (splice_tx, _) = splice_channel(&nodes[0], &nodes[1], channel_id, funding_contribution);
	for node in nodes.iter() {
 mine_transaction(node, &splice_tx);
 connect_blocks(node, ANTI_REORG_DELAY - 1);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Split splice initiation into two phases#4290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 7 commits into

from

Feb 17, 2026
 Merged


Split splice initiation into two phases
#4290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c80afe9

Move FundingTxInput::sequence to Utxo


jkczyz Jan 13, 2026
fc3fa7c

Use FundingTxInput instead of Utxo in CoinSelection


jkczyz Jan 14, 2026
4cae129

Make ClaimId optional in coin selection


jkczyz Jan 28, 2026
df777e8

Run rustfmt on fuzz


jkczyz Feb 2, 2026
2fd3351

Split splice initiation into two phases


jkczyz Dec 18, 2025
96b9e6a

Use CoinSelection::change_output when splicing


jkczyz Jan 20, 2026
20916b7

Consistently log in propose_quiescence


jkczyz Feb 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


441 changes: 230 additions & 211 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop


Large diffs are not rendered by default.


112 changes: 67 additions & 45 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ use bitcoin::opcodes;
use bitcoin::script::{Builder, ScriptBuf};
use bitcoin::transaction::Version;
use bitcoin::transaction::{Transaction, TxIn, TxOut};
use bitcoin::FeeRate;

use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::sha256::Hash as Sha256;
Expand All@@ -30,18 +31,16 @@ use bitcoin::hashes::Hash as _;
use bitcoin::hex::FromHex;
use bitcoin::WPubkeyHash;

use lightning::ln::funding::{FundingTxInput, SpliceContribution};

use lightning::blinded_path::message::{BlindedMessagePath, MessageContext, MessageForwardNode};
use lightning::blinded_path::payment::{BlindedPaymentPath, ReceiveTlvs};
use lightning::chain;
use lightning::chain::chaininterface::{
TransactionType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
	BroadcasterInterface, ConfirmationTarget, FeeEstimator, TransactionType,
};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::bump_transaction::sync::{WalletSourceSync, WalletSync};
use lightning::events::Event;
use lightning::ln::channel_state::ChannelDetails;
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, InterceptId, PaymentId};
Expand All@@ -65,6 +64,7 @@ use lightning::sign::{
	SignerProvider,
};
use lightning::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::util::async_poll::{MaybeSend, MaybeSync};
use lightning::util::config::{ChannelConfig, UserConfig};
use lightning::util::hash_tables::*;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -227,7 +227,7 @@ type ChannelMan<'a> = ChannelManager<
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -239,14 +239,20 @@ type ChannelMan<'a> = ChannelManager<
	Arc<FuzzEstimator>,
	&'a FuzzRouter,
	&'a FuzzRouter,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
>;
type PeerMan<'a> = PeerManager<
	Peer<'a>,
	Arc<ChannelMan<'a>>,
	Arc<P2PGossipSync<Arc<NetworkGraph<Arc<dyn Logger>>>, Arc<dyn UtxoLookup>, Arc<dyn Logger>>>,
	Arc<
 P2PGossipSync<
 Arc<NetworkGraph<Arc<dyn Logger + MaybeSend + MaybeSync>>>,
 Arc<dyn UtxoLookup>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 >,
	>,
	IgnoringMessageHandler,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
	IgnoringMessageHandler,
	Arc<KeyProvider>,
	IgnoringMessageHandler,
Expand All@@ -260,7 +266,7 @@ struct MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -285,7 +291,7 @@ impl<'a> MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand DownExpand Up@@ -520,7 +526,7 @@ impl SignerProvider for KeyProvider {
}

#[inline]
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>) {
	if data.len() < 32 {
 return;
	}
Expand DownExpand Up@@ -668,9 +674,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 script_pubkey: wallet.get_change_script().unwrap(),
 }],
	};
	let coinbase_txid = coinbase_tx.compute_txid();
	wallet
 .add_utxo(bitcoin::OutPoint { txid: coinbase_txid, vout: 0 }, Amount::from_sat(1_000_000));
	wallet.add_utxo(coinbase_tx.clone(), 0);

	loop {
 match get_slice!(1)[0] {
Expand DownExpand Up@@ -1026,20 +1030,24 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 if splice_in_sats == 0 {
 continue;
 }
 // Create a funding input from the coinbase transaction
 if let Ok(input) = FundingTxInput::new_p2wpkh(coinbase_tx.clone(), 0) {
 let contribution = SpliceContribution::splice_in(
 Amount::from_sat(splice_in_sats.min(900_000)), // Cap at available funds minus fees
 vec![input],
 Some(wallet.get_change_script().unwrap()),
 );
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) = funding_template
 .splice_in_sync(Amount::from_sat(splice_in_sats.min(900_000)), &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 // Splice-out: remove funds from a channel
Expand All@@ -1062,17 +1070,29 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 // Cap splice-out at a reasonable portion of channel capacity
 let max_splice_out = chan.channel_value_satoshis / 4;
 let splice_out_sats = splice_out_sats.min(max_splice_out).max(546); // At least dust limit
 let contribution = SpliceContribution::splice_out(vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }]);
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let outputs = vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }];
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) =
 funding_template.splice_out_sync(outputs, &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 _ => return,
 }
Expand DownExpand Up@@ -1139,14 +1159,15 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
	}
}

pub fn full_stack_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
pub fn full_stack_test<Out: test_logger::Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), out));
	do_test(data, &logger);
}

#[no_mangle]
pub extern "C" fn full_stack_run(data: *const u8, datalen: usize) {
	let logger: Arc<dyn Logger> =
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), test_logger::DevNull {}));
	do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, &logger);
}
Expand DownExpand Up@@ -1932,6 +1953,7 @@ pub fn write_fst_seeds(path: &str) {

#[cfg(test)]
mod tests {
	use lightning::util::async_poll::{MaybeSend, MaybeSync};
	use lightning::util::logger::{Logger, Record};
	use std::collections::HashMap;
	use std::sync::{Arc, Mutex};
Expand DownExpand Up@@ -1963,7 +1985,7 @@ mod tests {
 let test = super::two_peer_forwarding_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 // 1
Expand DownExpand Up@@ -1998,7 +2020,7 @@ mod tests {
 let test = super::gossip_exchange_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)) or the announced channel's counterparties: ChannelAnnouncement { node_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, node_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, bitcoin_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, bitcoin_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, contents: UnsignedChannelAnnouncement { features: [], chain_hash: 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000, short_channel_id: 42, node_id_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), node_id_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), bitcoin_key_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), bitcoin_key_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), excess_data: [] } }".to_string())), Some(&1));
Expand All@@ -2011,7 +2033,7 @@ mod tests {
 let test = super::splice_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();

Expand Down

25 changes: 14 additions & 11 deletions
fuzz/src/lsps_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,17 +77,20 @@ pub fn do_test(data: &[u8]) {
 genesis_block.header.time,
	));

	let liquidity_manager = Arc::new(LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
	).unwrap());
	let liquidity_manager = Arc::new(
 LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
 )
 .unwrap(),
	);
	let mut reader = data;
	if let Ok(Some(msg)) = liquidity_manager.read(LSPS_MESSAGE_TYPE_ID, &mut reader) {
 let secp = Secp256k1::signing_only();
Expand Down

9 changes: 5 additions & 4 deletions
lightning-tests/src/upgrade_downgrade_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,6 @@ use lightning::chain::channelmonitor::{ANTI_REORG_DELAY, HTLC_FAIL_BACK_BUFFER};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::{ClosureReason, Event, HTLCHandlingFailureType};
use lightning::ln::functional_test_utils::*;
use lightning::ln::funding::SpliceContribution;
use lightning::ln::msgs::BaseMessageHandler as _;
use lightning::ln::msgs::ChannelMessageHandler as _;
use lightning::ln::msgs::MessageSendEvent;
Expand DownExpand Up@@ -453,11 +452,13 @@ fn do_test_0_1_htlc_forward_after_splice(fail_htlc: bool) {
	reconnect_b_c_args.send_announcement_sigs = (true, true);
	reconnect_nodes(reconnect_b_c_args);

	let contribution = SpliceContribution::splice_out(vec![TxOut {
	let outputs = vec![TxOut {
 value: Amount::from_sat(1_000),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}]);
	let splice_tx = splice_channel(&nodes[0], &nodes[1], ChannelId(chan_id_bytes_a), contribution);
	}];
	let channel_id = ChannelId(chan_id_bytes_a);
	let funding_contribution = initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs);
	let (splice_tx, _) = splice_channel(&nodes[0], &nodes[1], channel_id, funding_contribution);
	for node in nodes.iter() {
 mine_transaction(node, &splice_tx);
 connect_blocks(node, ANTI_REORG_DELAY - 1);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Split splice initiation into two phases#4290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 7 commits into

from

Feb 17, 2026
 Merged


Split splice initiation into two phases
#4290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c80afe9

Move FundingTxInput::sequence to Utxo


jkczyz Jan 13, 2026
fc3fa7c

Use FundingTxInput instead of Utxo in CoinSelection


jkczyz Jan 14, 2026
4cae129

Make ClaimId optional in coin selection


jkczyz Jan 28, 2026
df777e8

Run rustfmt on fuzz


jkczyz Feb 2, 2026
2fd3351

Split splice initiation into two phases


jkczyz Dec 18, 2025
96b9e6a

Use CoinSelection::change_output when splicing


jkczyz Jan 20, 2026
20916b7

Consistently log in propose_quiescence


jkczyz Feb 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


441 changes: 230 additions & 211 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop


Large diffs are not rendered by default.


112 changes: 67 additions & 45 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ use bitcoin::opcodes;
use bitcoin::script::{Builder, ScriptBuf};
use bitcoin::transaction::Version;
use bitcoin::transaction::{Transaction, TxIn, TxOut};
use bitcoin::FeeRate;

use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::sha256::Hash as Sha256;
Expand All@@ -30,18 +31,16 @@ use bitcoin::hashes::Hash as _;
use bitcoin::hex::FromHex;
use bitcoin::WPubkeyHash;

use lightning::ln::funding::{FundingTxInput, SpliceContribution};

use lightning::blinded_path::message::{BlindedMessagePath, MessageContext, MessageForwardNode};
use lightning::blinded_path::payment::{BlindedPaymentPath, ReceiveTlvs};
use lightning::chain;
use lightning::chain::chaininterface::{
TransactionType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
	BroadcasterInterface, ConfirmationTarget, FeeEstimator, TransactionType,
};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::bump_transaction::sync::{WalletSourceSync, WalletSync};
use lightning::events::Event;
use lightning::ln::channel_state::ChannelDetails;
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, InterceptId, PaymentId};
Expand All@@ -65,6 +64,7 @@ use lightning::sign::{
	SignerProvider,
};
use lightning::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::util::async_poll::{MaybeSend, MaybeSync};
use lightning::util::config::{ChannelConfig, UserConfig};
use lightning::util::hash_tables::*;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -227,7 +227,7 @@ type ChannelMan<'a> = ChannelManager<
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -239,14 +239,20 @@ type ChannelMan<'a> = ChannelManager<
	Arc<FuzzEstimator>,
	&'a FuzzRouter,
	&'a FuzzRouter,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
>;
type PeerMan<'a> = PeerManager<
	Peer<'a>,
	Arc<ChannelMan<'a>>,
	Arc<P2PGossipSync<Arc<NetworkGraph<Arc<dyn Logger>>>, Arc<dyn UtxoLookup>, Arc<dyn Logger>>>,
	Arc<
 P2PGossipSync<
 Arc<NetworkGraph<Arc<dyn Logger + MaybeSend + MaybeSync>>>,
 Arc<dyn UtxoLookup>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 >,
	>,
	IgnoringMessageHandler,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
	IgnoringMessageHandler,
	Arc<KeyProvider>,
	IgnoringMessageHandler,
Expand All@@ -260,7 +266,7 @@ struct MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -285,7 +291,7 @@ impl<'a> MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand DownExpand Up@@ -520,7 +526,7 @@ impl SignerProvider for KeyProvider {
}

#[inline]
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>) {
	if data.len() < 32 {
 return;
	}
Expand DownExpand Up@@ -668,9 +674,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 script_pubkey: wallet.get_change_script().unwrap(),
 }],
	};
	let coinbase_txid = coinbase_tx.compute_txid();
	wallet
 .add_utxo(bitcoin::OutPoint { txid: coinbase_txid, vout: 0 }, Amount::from_sat(1_000_000));
	wallet.add_utxo(coinbase_tx.clone(), 0);

	loop {
 match get_slice!(1)[0] {
Expand DownExpand Up@@ -1026,20 +1030,24 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 if splice_in_sats == 0 {
 continue;
 }
 // Create a funding input from the coinbase transaction
 if let Ok(input) = FundingTxInput::new_p2wpkh(coinbase_tx.clone(), 0) {
 let contribution = SpliceContribution::splice_in(
 Amount::from_sat(splice_in_sats.min(900_000)), // Cap at available funds minus fees
 vec![input],
 Some(wallet.get_change_script().unwrap()),
 );
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) = funding_template
 .splice_in_sync(Amount::from_sat(splice_in_sats.min(900_000)), &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 // Splice-out: remove funds from a channel
Expand All@@ -1062,17 +1070,29 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 // Cap splice-out at a reasonable portion of channel capacity
 let max_splice_out = chan.channel_value_satoshis / 4;
 let splice_out_sats = splice_out_sats.min(max_splice_out).max(546); // At least dust limit
 let contribution = SpliceContribution::splice_out(vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }]);
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let outputs = vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }];
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) =
 funding_template.splice_out_sync(outputs, &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 _ => return,
 }
Expand DownExpand Up@@ -1139,14 +1159,15 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
	}
}

pub fn full_stack_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
pub fn full_stack_test<Out: test_logger::Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), out));
	do_test(data, &logger);
}

#[no_mangle]
pub extern "C" fn full_stack_run(data: *const u8, datalen: usize) {
	let logger: Arc<dyn Logger> =
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), test_logger::DevNull {}));
	do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, &logger);
}
Expand DownExpand Up@@ -1932,6 +1953,7 @@ pub fn write_fst_seeds(path: &str) {

#[cfg(test)]
mod tests {
	use lightning::util::async_poll::{MaybeSend, MaybeSync};
	use lightning::util::logger::{Logger, Record};
	use std::collections::HashMap;
	use std::sync::{Arc, Mutex};
Expand DownExpand Up@@ -1963,7 +1985,7 @@ mod tests {
 let test = super::two_peer_forwarding_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 // 1
Expand DownExpand Up@@ -1998,7 +2020,7 @@ mod tests {
 let test = super::gossip_exchange_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)) or the announced channel's counterparties: ChannelAnnouncement { node_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, node_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, bitcoin_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, bitcoin_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, contents: UnsignedChannelAnnouncement { features: [], chain_hash: 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000, short_channel_id: 42, node_id_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), node_id_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), bitcoin_key_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), bitcoin_key_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), excess_data: [] } }".to_string())), Some(&1));
Expand All@@ -2011,7 +2033,7 @@ mod tests {
 let test = super::splice_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();

Expand Down

25 changes: 14 additions & 11 deletions
fuzz/src/lsps_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,17 +77,20 @@ pub fn do_test(data: &[u8]) {
 genesis_block.header.time,
	));

	let liquidity_manager = Arc::new(LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
	).unwrap());
	let liquidity_manager = Arc::new(
 LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
 )
 .unwrap(),
	);
	let mut reader = data;
	if let Ok(Some(msg)) = liquidity_manager.read(LSPS_MESSAGE_TYPE_ID, &mut reader) {
 let secp = Secp256k1::signing_only();
Expand Down

9 changes: 5 additions & 4 deletions
lightning-tests/src/upgrade_downgrade_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,6 @@ use lightning::chain::channelmonitor::{ANTI_REORG_DELAY, HTLC_FAIL_BACK_BUFFER};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::{ClosureReason, Event, HTLCHandlingFailureType};
use lightning::ln::functional_test_utils::*;
use lightning::ln::funding::SpliceContribution;
use lightning::ln::msgs::BaseMessageHandler as _;
use lightning::ln::msgs::ChannelMessageHandler as _;
use lightning::ln::msgs::MessageSendEvent;
Expand DownExpand Up@@ -453,11 +452,13 @@ fn do_test_0_1_htlc_forward_after_splice(fail_htlc: bool) {
	reconnect_b_c_args.send_announcement_sigs = (true, true);
	reconnect_nodes(reconnect_b_c_args);

	let contribution = SpliceContribution::splice_out(vec![TxOut {
	let outputs = vec![TxOut {
 value: Amount::from_sat(1_000),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}]);
	let splice_tx = splice_channel(&nodes[0], &nodes[1], ChannelId(chan_id_bytes_a), contribution);
	}];
	let channel_id = ChannelId(chan_id_bytes_a);
	let funding_contribution = initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs);
	let (splice_tx, _) = splice_channel(&nodes[0], &nodes[1], channel_id, funding_contribution);
	for node in nodes.iter() {
 mine_transaction(node, &splice_tx);
 connect_blocks(node, ANTI_REORG_DELAY - 1);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Split splice initiation into two phases#4290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 7 commits into

from

Feb 17, 2026
 Merged


Split splice initiation into two phases
#4290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c80afe9

Move FundingTxInput::sequence to Utxo


jkczyz Jan 13, 2026
fc3fa7c

Use FundingTxInput instead of Utxo in CoinSelection


jkczyz Jan 14, 2026
4cae129

Make ClaimId optional in coin selection


jkczyz Jan 28, 2026
df777e8

Run rustfmt on fuzz


jkczyz Feb 2, 2026
2fd3351

Split splice initiation into two phases


jkczyz Dec 18, 2025
96b9e6a

Use CoinSelection::change_output when splicing


jkczyz Jan 20, 2026
20916b7

Consistently log in propose_quiescence


jkczyz Feb 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


441 changes: 230 additions & 211 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop


Large diffs are not rendered by default.


112 changes: 67 additions & 45 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ use bitcoin::opcodes;
use bitcoin::script::{Builder, ScriptBuf};
use bitcoin::transaction::Version;
use bitcoin::transaction::{Transaction, TxIn, TxOut};
use bitcoin::FeeRate;

use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::sha256::Hash as Sha256;
Expand All@@ -30,18 +31,16 @@ use bitcoin::hashes::Hash as _;
use bitcoin::hex::FromHex;
use bitcoin::WPubkeyHash;

use lightning::ln::funding::{FundingTxInput, SpliceContribution};

use lightning::blinded_path::message::{BlindedMessagePath, MessageContext, MessageForwardNode};
use lightning::blinded_path::payment::{BlindedPaymentPath, ReceiveTlvs};
use lightning::chain;
use lightning::chain::chaininterface::{
TransactionType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
	BroadcasterInterface, ConfirmationTarget, FeeEstimator, TransactionType,
};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::bump_transaction::sync::{WalletSourceSync, WalletSync};
use lightning::events::Event;
use lightning::ln::channel_state::ChannelDetails;
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, InterceptId, PaymentId};
Expand All@@ -65,6 +64,7 @@ use lightning::sign::{
	SignerProvider,
};
use lightning::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::util::async_poll::{MaybeSend, MaybeSync};
use lightning::util::config::{ChannelConfig, UserConfig};
use lightning::util::hash_tables::*;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -227,7 +227,7 @@ type ChannelMan<'a> = ChannelManager<
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -239,14 +239,20 @@ type ChannelMan<'a> = ChannelManager<
	Arc<FuzzEstimator>,
	&'a FuzzRouter,
	&'a FuzzRouter,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
>;
type PeerMan<'a> = PeerManager<
	Peer<'a>,
	Arc<ChannelMan<'a>>,
	Arc<P2PGossipSync<Arc<NetworkGraph<Arc<dyn Logger>>>, Arc<dyn UtxoLookup>, Arc<dyn Logger>>>,
	Arc<
 P2PGossipSync<
 Arc<NetworkGraph<Arc<dyn Logger + MaybeSend + MaybeSync>>>,
 Arc<dyn UtxoLookup>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 >,
	>,
	IgnoringMessageHandler,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
	IgnoringMessageHandler,
	Arc<KeyProvider>,
	IgnoringMessageHandler,
Expand All@@ -260,7 +266,7 @@ struct MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -285,7 +291,7 @@ impl<'a> MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand DownExpand Up@@ -520,7 +526,7 @@ impl SignerProvider for KeyProvider {
}

#[inline]
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>) {
	if data.len() < 32 {
 return;
	}
Expand DownExpand Up@@ -668,9 +674,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 script_pubkey: wallet.get_change_script().unwrap(),
 }],
	};
	let coinbase_txid = coinbase_tx.compute_txid();
	wallet
 .add_utxo(bitcoin::OutPoint { txid: coinbase_txid, vout: 0 }, Amount::from_sat(1_000_000));
	wallet.add_utxo(coinbase_tx.clone(), 0);

	loop {
 match get_slice!(1)[0] {
Expand DownExpand Up@@ -1026,20 +1030,24 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 if splice_in_sats == 0 {
 continue;
 }
 // Create a funding input from the coinbase transaction
 if let Ok(input) = FundingTxInput::new_p2wpkh(coinbase_tx.clone(), 0) {
 let contribution = SpliceContribution::splice_in(
 Amount::from_sat(splice_in_sats.min(900_000)), // Cap at available funds minus fees
 vec![input],
 Some(wallet.get_change_script().unwrap()),
 );
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) = funding_template
 .splice_in_sync(Amount::from_sat(splice_in_sats.min(900_000)), &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 // Splice-out: remove funds from a channel
Expand All@@ -1062,17 +1070,29 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 // Cap splice-out at a reasonable portion of channel capacity
 let max_splice_out = chan.channel_value_satoshis / 4;
 let splice_out_sats = splice_out_sats.min(max_splice_out).max(546); // At least dust limit
 let contribution = SpliceContribution::splice_out(vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }]);
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let outputs = vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }];
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) =
 funding_template.splice_out_sync(outputs, &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 _ => return,
 }
Expand DownExpand Up@@ -1139,14 +1159,15 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
	}
}

pub fn full_stack_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
pub fn full_stack_test<Out: test_logger::Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), out));
	do_test(data, &logger);
}

#[no_mangle]
pub extern "C" fn full_stack_run(data: *const u8, datalen: usize) {
	let logger: Arc<dyn Logger> =
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), test_logger::DevNull {}));
	do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, &logger);
}
Expand DownExpand Up@@ -1932,6 +1953,7 @@ pub fn write_fst_seeds(path: &str) {

#[cfg(test)]
mod tests {
	use lightning::util::async_poll::{MaybeSend, MaybeSync};
	use lightning::util::logger::{Logger, Record};
	use std::collections::HashMap;
	use std::sync::{Arc, Mutex};
Expand DownExpand Up@@ -1963,7 +1985,7 @@ mod tests {
 let test = super::two_peer_forwarding_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 // 1
Expand DownExpand Up@@ -1998,7 +2020,7 @@ mod tests {
 let test = super::gossip_exchange_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)) or the announced channel's counterparties: ChannelAnnouncement { node_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, node_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, bitcoin_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, bitcoin_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, contents: UnsignedChannelAnnouncement { features: [], chain_hash: 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000, short_channel_id: 42, node_id_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), node_id_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), bitcoin_key_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), bitcoin_key_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), excess_data: [] } }".to_string())), Some(&1));
Expand All@@ -2011,7 +2033,7 @@ mod tests {
 let test = super::splice_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();

Expand Down

25 changes: 14 additions & 11 deletions
fuzz/src/lsps_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,17 +77,20 @@ pub fn do_test(data: &[u8]) {
 genesis_block.header.time,
	));

	let liquidity_manager = Arc::new(LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
	).unwrap());
	let liquidity_manager = Arc::new(
 LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
 )
 .unwrap(),
	);
	let mut reader = data;
	if let Ok(Some(msg)) = liquidity_manager.read(LSPS_MESSAGE_TYPE_ID, &mut reader) {
 let secp = Secp256k1::signing_only();
Expand Down

9 changes: 5 additions & 4 deletions
lightning-tests/src/upgrade_downgrade_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,6 @@ use lightning::chain::channelmonitor::{ANTI_REORG_DELAY, HTLC_FAIL_BACK_BUFFER};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::{ClosureReason, Event, HTLCHandlingFailureType};
use lightning::ln::functional_test_utils::*;
use lightning::ln::funding::SpliceContribution;
use lightning::ln::msgs::BaseMessageHandler as _;
use lightning::ln::msgs::ChannelMessageHandler as _;
use lightning::ln::msgs::MessageSendEvent;
Expand DownExpand Up@@ -453,11 +452,13 @@ fn do_test_0_1_htlc_forward_after_splice(fail_htlc: bool) {
	reconnect_b_c_args.send_announcement_sigs = (true, true);
	reconnect_nodes(reconnect_b_c_args);

	let contribution = SpliceContribution::splice_out(vec![TxOut {
	let outputs = vec![TxOut {
 value: Amount::from_sat(1_000),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}]);
	let splice_tx = splice_channel(&nodes[0], &nodes[1], ChannelId(chan_id_bytes_a), contribution);
	}];
	let channel_id = ChannelId(chan_id_bytes_a);
	let funding_contribution = initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs);
	let (splice_tx, _) = splice_channel(&nodes[0], &nodes[1], channel_id, funding_contribution);
	for node in nodes.iter() {
 mine_transaction(node, &splice_tx);
 connect_blocks(node, ANTI_REORG_DELAY - 1);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Split splice initiation into two phases#4290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 7 commits into

from

Feb 17, 2026
 Merged


Split splice initiation into two phases
#4290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c80afe9

Move FundingTxInput::sequence to Utxo


jkczyz Jan 13, 2026
fc3fa7c

Use FundingTxInput instead of Utxo in CoinSelection


jkczyz Jan 14, 2026
4cae129

Make ClaimId optional in coin selection


jkczyz Jan 28, 2026
df777e8

Run rustfmt on fuzz


jkczyz Feb 2, 2026
2fd3351

Split splice initiation into two phases


jkczyz Dec 18, 2025
96b9e6a

Use CoinSelection::change_output when splicing


jkczyz Jan 20, 2026
20916b7

Consistently log in propose_quiescence


jkczyz Feb 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


441 changes: 230 additions & 211 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop


Large diffs are not rendered by default.


112 changes: 67 additions & 45 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ use bitcoin::opcodes;
use bitcoin::script::{Builder, ScriptBuf};
use bitcoin::transaction::Version;
use bitcoin::transaction::{Transaction, TxIn, TxOut};
use bitcoin::FeeRate;

use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::sha256::Hash as Sha256;
Expand All@@ -30,18 +31,16 @@ use bitcoin::hashes::Hash as _;
use bitcoin::hex::FromHex;
use bitcoin::WPubkeyHash;

use lightning::ln::funding::{FundingTxInput, SpliceContribution};

use lightning::blinded_path::message::{BlindedMessagePath, MessageContext, MessageForwardNode};
use lightning::blinded_path::payment::{BlindedPaymentPath, ReceiveTlvs};
use lightning::chain;
use lightning::chain::chaininterface::{
TransactionType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
	BroadcasterInterface, ConfirmationTarget, FeeEstimator, TransactionType,
};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::bump_transaction::sync::{WalletSourceSync, WalletSync};
use lightning::events::Event;
use lightning::ln::channel_state::ChannelDetails;
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, InterceptId, PaymentId};
Expand All@@ -65,6 +64,7 @@ use lightning::sign::{
	SignerProvider,
};
use lightning::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::util::async_poll::{MaybeSend, MaybeSync};
use lightning::util::config::{ChannelConfig, UserConfig};
use lightning::util::hash_tables::*;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -227,7 +227,7 @@ type ChannelMan<'a> = ChannelManager<
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -239,14 +239,20 @@ type ChannelMan<'a> = ChannelManager<
	Arc<FuzzEstimator>,
	&'a FuzzRouter,
	&'a FuzzRouter,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
>;
type PeerMan<'a> = PeerManager<
	Peer<'a>,
	Arc<ChannelMan<'a>>,
	Arc<P2PGossipSync<Arc<NetworkGraph<Arc<dyn Logger>>>, Arc<dyn UtxoLookup>, Arc<dyn Logger>>>,
	Arc<
 P2PGossipSync<
 Arc<NetworkGraph<Arc<dyn Logger + MaybeSend + MaybeSync>>>,
 Arc<dyn UtxoLookup>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 >,
	>,
	IgnoringMessageHandler,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
	IgnoringMessageHandler,
	Arc<KeyProvider>,
	IgnoringMessageHandler,
Expand All@@ -260,7 +266,7 @@ struct MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -285,7 +291,7 @@ impl<'a> MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand DownExpand Up@@ -520,7 +526,7 @@ impl SignerProvider for KeyProvider {
}

#[inline]
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>) {
	if data.len() < 32 {
 return;
	}
Expand DownExpand Up@@ -668,9 +674,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 script_pubkey: wallet.get_change_script().unwrap(),
 }],
	};
	let coinbase_txid = coinbase_tx.compute_txid();
	wallet
 .add_utxo(bitcoin::OutPoint { txid: coinbase_txid, vout: 0 }, Amount::from_sat(1_000_000));
	wallet.add_utxo(coinbase_tx.clone(), 0);

	loop {
 match get_slice!(1)[0] {
Expand DownExpand Up@@ -1026,20 +1030,24 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 if splice_in_sats == 0 {
 continue;
 }
 // Create a funding input from the coinbase transaction
 if let Ok(input) = FundingTxInput::new_p2wpkh(coinbase_tx.clone(), 0) {
 let contribution = SpliceContribution::splice_in(
 Amount::from_sat(splice_in_sats.min(900_000)), // Cap at available funds minus fees
 vec![input],
 Some(wallet.get_change_script().unwrap()),
 );
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) = funding_template
 .splice_in_sync(Amount::from_sat(splice_in_sats.min(900_000)), &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 // Splice-out: remove funds from a channel
Expand All@@ -1062,17 +1070,29 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 // Cap splice-out at a reasonable portion of channel capacity
 let max_splice_out = chan.channel_value_satoshis / 4;
 let splice_out_sats = splice_out_sats.min(max_splice_out).max(546); // At least dust limit
 let contribution = SpliceContribution::splice_out(vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }]);
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let outputs = vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }];
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) =
 funding_template.splice_out_sync(outputs, &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 _ => return,
 }
Expand DownExpand Up@@ -1139,14 +1159,15 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
	}
}

pub fn full_stack_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
pub fn full_stack_test<Out: test_logger::Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), out));
	do_test(data, &logger);
}

#[no_mangle]
pub extern "C" fn full_stack_run(data: *const u8, datalen: usize) {
	let logger: Arc<dyn Logger> =
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), test_logger::DevNull {}));
	do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, &logger);
}
Expand DownExpand Up@@ -1932,6 +1953,7 @@ pub fn write_fst_seeds(path: &str) {

#[cfg(test)]
mod tests {
	use lightning::util::async_poll::{MaybeSend, MaybeSync};
	use lightning::util::logger::{Logger, Record};
	use std::collections::HashMap;
	use std::sync::{Arc, Mutex};
Expand DownExpand Up@@ -1963,7 +1985,7 @@ mod tests {
 let test = super::two_peer_forwarding_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 // 1
Expand DownExpand Up@@ -1998,7 +2020,7 @@ mod tests {
 let test = super::gossip_exchange_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)) or the announced channel's counterparties: ChannelAnnouncement { node_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, node_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, bitcoin_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, bitcoin_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, contents: UnsignedChannelAnnouncement { features: [], chain_hash: 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000, short_channel_id: 42, node_id_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), node_id_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), bitcoin_key_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), bitcoin_key_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), excess_data: [] } }".to_string())), Some(&1));
Expand All@@ -2011,7 +2033,7 @@ mod tests {
 let test = super::splice_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();

Expand Down

25 changes: 14 additions & 11 deletions
fuzz/src/lsps_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,17 +77,20 @@ pub fn do_test(data: &[u8]) {
 genesis_block.header.time,
	));

	let liquidity_manager = Arc::new(LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
	).unwrap());
	let liquidity_manager = Arc::new(
 LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
 )
 .unwrap(),
	);
	let mut reader = data;
	if let Ok(Some(msg)) = liquidity_manager.read(LSPS_MESSAGE_TYPE_ID, &mut reader) {
 let secp = Secp256k1::signing_only();
Expand Down

9 changes: 5 additions & 4 deletions
lightning-tests/src/upgrade_downgrade_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,6 @@ use lightning::chain::channelmonitor::{ANTI_REORG_DELAY, HTLC_FAIL_BACK_BUFFER};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::{ClosureReason, Event, HTLCHandlingFailureType};
use lightning::ln::functional_test_utils::*;
use lightning::ln::funding::SpliceContribution;
use lightning::ln::msgs::BaseMessageHandler as _;
use lightning::ln::msgs::ChannelMessageHandler as _;
use lightning::ln::msgs::MessageSendEvent;
Expand DownExpand Up@@ -453,11 +452,13 @@ fn do_test_0_1_htlc_forward_after_splice(fail_htlc: bool) {
	reconnect_b_c_args.send_announcement_sigs = (true, true);
	reconnect_nodes(reconnect_b_c_args);

	let contribution = SpliceContribution::splice_out(vec![TxOut {
	let outputs = vec![TxOut {
 value: Amount::from_sat(1_000),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}]);
	let splice_tx = splice_channel(&nodes[0], &nodes[1], ChannelId(chan_id_bytes_a), contribution);
	}];
	let channel_id = ChannelId(chan_id_bytes_a);
	let funding_contribution = initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs);
	let (splice_tx, _) = splice_channel(&nodes[0], &nodes[1], channel_id, funding_contribution);
	for node in nodes.iter() {
 mine_transaction(node, &splice_tx);
 connect_blocks(node, ANTI_REORG_DELAY - 1);
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Split splice initiation into two phases#4290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 7 commits into

from

Feb 17, 2026
 Merged


Split splice initiation into two phases
#4290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
c80afe9

Move FundingTxInput::sequence to Utxo


jkczyz Jan 13, 2026
fc3fa7c

Use FundingTxInput instead of Utxo in CoinSelection


jkczyz Jan 14, 2026
4cae129

Make ClaimId optional in coin selection


jkczyz Jan 28, 2026
df777e8

Run rustfmt on fuzz


jkczyz Feb 2, 2026
2fd3351

Split splice initiation into two phases


jkczyz Dec 18, 2025
96b9e6a

Use CoinSelection::change_output when splicing


jkczyz Jan 20, 2026
20916b7

Consistently log in propose_quiescence


jkczyz Feb 2, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


441 changes: 230 additions & 211 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop


Large diffs are not rendered by default.


112 changes: 67 additions & 45 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ use bitcoin::opcodes;
use bitcoin::script::{Builder, ScriptBuf};
use bitcoin::transaction::Version;
use bitcoin::transaction::{Transaction, TxIn, TxOut};
use bitcoin::FeeRate;

use bitcoin::hash_types::{BlockHash, Txid};
use bitcoin::hashes::sha256::Hash as Sha256;
Expand All@@ -30,18 +31,16 @@ use bitcoin::hashes::Hash as _;
use bitcoin::hex::FromHex;
use bitcoin::WPubkeyHash;

use lightning::ln::funding::{FundingTxInput, SpliceContribution};

use lightning::blinded_path::message::{BlindedMessagePath, MessageContext, MessageForwardNode};
use lightning::blinded_path::payment::{BlindedPaymentPath, ReceiveTlvs};
use lightning::chain;
use lightning::chain::chaininterface::{
TransactionType, BroadcasterInterface, ConfirmationTarget, FeeEstimator,
	BroadcasterInterface, ConfirmationTarget, FeeEstimator, TransactionType,
};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::bump_transaction::sync::{WalletSourceSync, WalletSync};
use lightning::events::Event;
use lightning::ln::channel_state::ChannelDetails;
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, InterceptId, PaymentId};
Expand All@@ -65,6 +64,7 @@ use lightning::sign::{
	SignerProvider,
};
use lightning::types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::util::async_poll::{MaybeSend, MaybeSync};
use lightning::util::config::{ChannelConfig, UserConfig};
use lightning::util::hash_tables::*;
use lightning::util::logger::Logger;
Expand DownExpand Up@@ -227,7 +227,7 @@ type ChannelMan<'a> = ChannelManager<
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -239,14 +239,20 @@ type ChannelMan<'a> = ChannelManager<
	Arc<FuzzEstimator>,
	&'a FuzzRouter,
	&'a FuzzRouter,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
>;
type PeerMan<'a> = PeerManager<
	Peer<'a>,
	Arc<ChannelMan<'a>>,
	Arc<P2PGossipSync<Arc<NetworkGraph<Arc<dyn Logger>>>, Arc<dyn UtxoLookup>, Arc<dyn Logger>>>,
	Arc<
 P2PGossipSync<
 Arc<NetworkGraph<Arc<dyn Logger + MaybeSend + MaybeSync>>>,
 Arc<dyn UtxoLookup>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 >,
	>,
	IgnoringMessageHandler,
	Arc<dyn Logger>,
	Arc<dyn Logger + MaybeSend + MaybeSync>,
	IgnoringMessageHandler,
	Arc<KeyProvider>,
	IgnoringMessageHandler,
Expand All@@ -260,7 +266,7 @@ struct MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand All@@ -285,7 +291,7 @@ impl<'a> MoneyLossDetector<'a> {
 Arc<dyn chain::Filter>,
 Arc<TestBroadcaster>,
 Arc<FuzzEstimator>,
 Arc<dyn Logger>,
 Arc<dyn Logger + MaybeSend + MaybeSync>,
 Arc<TestPersister>,
 Arc<KeyProvider>,
 >,
Expand DownExpand Up@@ -520,7 +526,7 @@ impl SignerProvider for KeyProvider {
}

#[inline]
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger + MaybeSend + MaybeSync>) {
	if data.len() < 32 {
 return;
	}
Expand DownExpand Up@@ -668,9 +674,7 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 script_pubkey: wallet.get_change_script().unwrap(),
 }],
	};
	let coinbase_txid = coinbase_tx.compute_txid();
	wallet
 .add_utxo(bitcoin::OutPoint { txid: coinbase_txid, vout: 0 }, Amount::from_sat(1_000_000));
	wallet.add_utxo(coinbase_tx.clone(), 0);

	loop {
 match get_slice!(1)[0] {
Expand DownExpand Up@@ -1026,20 +1030,24 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 if splice_in_sats == 0 {
 continue;
 }
 // Create a funding input from the coinbase transaction
 if let Ok(input) = FundingTxInput::new_p2wpkh(coinbase_tx.clone(), 0) {
 let contribution = SpliceContribution::splice_in(
 Amount::from_sat(splice_in_sats.min(900_000)), // Cap at available funds minus fees
 vec![input],
 Some(wallet.get_change_script().unwrap()),
 );
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) = funding_template
 .splice_in_sync(Amount::from_sat(splice_in_sats.min(900_000)), &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 // Splice-out: remove funds from a channel
Expand All@@ -1062,17 +1070,29 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
 // Cap splice-out at a reasonable portion of channel capacity
 let max_splice_out = chan.channel_value_satoshis / 4;
 let splice_out_sats = splice_out_sats.min(max_splice_out).max(546); // At least dust limit
 let contribution = SpliceContribution::splice_out(vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }]);
 let _ = channelmanager.splice_channel(
 &chan.channel_id,
 &chan.counterparty.node_id,
 contribution,
 253, // funding_feerate_per_kw
 None,
 );
 let chan_id = chan.channel_id;
 let counterparty = chan.counterparty.node_id;
 if let Ok(funding_template) = channelmanager.splice_channel(
 &chan_id,
 &counterparty,
 FeeRate::from_sat_per_kwu(253),
 ) {
 let outputs = vec![TxOut {
 value: Amount::from_sat(splice_out_sats),
 script_pubkey: wallet.get_change_script().unwrap(),
 }];
 let wallet_sync = WalletSync::new(&wallet, Arc::clone(&logger));
 if let Ok(contribution) =
 funding_template.splice_out_sync(outputs, &wallet_sync)
 {
 let _ = channelmanager.funding_contributed(
 &chan_id,
 &counterparty,
 contribution,
 None,
 );
 }
 }
 },
 _ => return,
 }
Expand DownExpand Up@@ -1139,14 +1159,15 @@ pub fn do_test(mut data: &[u8], logger: &Arc<dyn Logger>) {
	}
}

pub fn full_stack_test<Out: test_logger::Output>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
pub fn full_stack_test<Out: test_logger::Output + MaybeSend + MaybeSync>(data: &[u8], out: Out) {
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), out));
	do_test(data, &logger);
}

#[no_mangle]
pub extern "C" fn full_stack_run(data: *const u8, datalen: usize) {
	let logger: Arc<dyn Logger> =
	let logger: Arc<dyn Logger + MaybeSend + MaybeSync> =
 Arc::new(test_logger::TestLogger::new("".to_owned(), test_logger::DevNull {}));
	do_test(unsafe { std::slice::from_raw_parts(data, datalen) }, &logger);
}
Expand DownExpand Up@@ -1932,6 +1953,7 @@ pub fn write_fst_seeds(path: &str) {

#[cfg(test)]
mod tests {
	use lightning::util::async_poll::{MaybeSend, MaybeSync};
	use lightning::util::logger::{Logger, Record};
	use std::collections::HashMap;
	use std::sync::{Arc, Mutex};
Expand DownExpand Up@@ -1963,7 +1985,7 @@ mod tests {
 let test = super::two_peer_forwarding_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 // 1
Expand DownExpand Up@@ -1998,7 +2020,7 @@ mod tests {
 let test = super::gossip_exchange_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();
 assert_eq!(log_entries.get(&("lightning::ln::peer_handler".to_string(), "Sending message to all peers except Some(PublicKey(0000000000000000000000000000000000000000000000000000000000000002ff00000000000000000000000000000000000000000000000000000000000002)) or the announced channel's counterparties: ChannelAnnouncement { node_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, node_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, bitcoin_signature_1: 3026020200b202200303030303030303030303030303030303030303030303030303030303030303, bitcoin_signature_2: 3026020200b202200202020202020202020202020202020202020202020202020202020202020202, contents: UnsignedChannelAnnouncement { features: [], chain_hash: 6fe28c0ab6f1b372c1a6a246ae63f74f931e8365e15a089c68d6190000000000, short_channel_id: 42, node_id_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), node_id_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), bitcoin_key_1: NodeId(030303030303030303030303030303030303030303030303030303030303030303), bitcoin_key_2: NodeId(020202020202020202020202020202020202020202020202020202020202020202), excess_data: [] } }".to_string())), Some(&1));
Expand All@@ -2011,7 +2033,7 @@ mod tests {
 let test = super::splice_seed();

 let logger = Arc::new(TrackingLogger { lines: Mutex::new(HashMap::new()) });
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger>));
 super::do_test(&test, &(Arc::clone(&logger) as Arc<dyn Logger + MaybeSend + MaybeSync>));

 let log_entries = logger.lines.lock().unwrap();

Expand Down

25 changes: 14 additions & 11 deletions
fuzz/src/lsps_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,17 +77,20 @@ pub fn do_test(data: &[u8]) {
 genesis_block.header.time,
	));

	let liquidity_manager = Arc::new(LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
	).unwrap());
	let liquidity_manager = Arc::new(
 LiquidityManagerSync::new(
 Arc::clone(&keys_manager),
 Arc::clone(&keys_manager),
 Arc::clone(&manager),
 None::<Arc<dyn Filter + Send + Sync>>,
 None,
 kv_store,
 Arc::clone(&tx_broadcaster),
 None,
 None,
 )
 .unwrap(),
	);
	let mut reader = data;
	if let Ok(Some(msg)) = liquidity_manager.read(LSPS_MESSAGE_TYPE_ID, &mut reader) {
 let secp = Secp256k1::signing_only();
Expand Down

9 changes: 5 additions & 4 deletions
lightning-tests/src/upgrade_downgrade_tests.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,6 @@ use lightning::chain::channelmonitor::{ANTI_REORG_DELAY, HTLC_FAIL_BACK_BUFFER};
use lightning::events::bump_transaction::sync::WalletSourceSync;
use lightning::events::{ClosureReason, Event, HTLCHandlingFailureType};
use lightning::ln::functional_test_utils::*;
use lightning::ln::funding::SpliceContribution;
use lightning::ln::msgs::BaseMessageHandler as _;
use lightning::ln::msgs::ChannelMessageHandler as _;
use lightning::ln::msgs::MessageSendEvent;
Expand DownExpand Up@@ -453,11 +452,13 @@ fn do_test_0_1_htlc_forward_after_splice(fail_htlc: bool) {
	reconnect_b_c_args.send_announcement_sigs = (true, true);
	reconnect_nodes(reconnect_b_c_args);

	let contribution = SpliceContribution::splice_out(vec![TxOut {
	let outputs = vec![TxOut {
 value: Amount::from_sat(1_000),
 script_pubkey: nodes[0].wallet_source.get_change_script().unwrap(),
	}]);
	let splice_tx = splice_channel(&nodes[0], &nodes[1], ChannelId(chan_id_bytes_a), contribution);
	}];
	let channel_id = ChannelId(chan_id_bytes_a);
	let funding_contribution = initiate_splice_out(&nodes[0], &nodes[1], channel_id, outputs);
	let (splice_tx, _) = splice_channel(&nodes[0], &nodes[1], channel_id, funding_contribution);
	for node in nodes.iter() {
 mine_transaction(node, &splice_tx);
 connect_blocks(node, ANTI_REORG_DELAY - 1);
Expand Down
Loading
Loading