Skip to content

RBF splice funding transactions #4427

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

Open
jkczyz wants to merge 11 commits into
base: main
Choose a base branch
from
Open

RBF splice funding transactions #4427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e93d43c
Emit SpliceFailed for acceptor contributions
jkczyz Mar 11, 2026
55196db
Accept tx_init_rbf for pending splice transactions
jkczyz Feb 18, 2026
51fa46e
Allow multiple RBF splice candidates in channel monitor
jkczyz Feb 19, 2026
5b6ba43
Add rbf_channel API for initiating splice RBF
jkczyz Feb 19, 2026
5873660
Send tx_init_rbf instead of splice_init when a splice is pending
jkczyz Feb 19, 2026
b07bfff
Handle tx_ack_rbf on the initiator side
jkczyz Feb 19, 2026
d808155
Allow acceptor contribution to RBF splice via tx_init_rbf
jkczyz Feb 19, 2026
99390f0
Preserve our funding contribution across counterparty RBF attempts
jkczyz Feb 23, 2026
7ad073d
Consider prior contributions when filtering unique inputs/outputs
jkczyz Feb 24, 2026
c327ef9
Filter prior contributions from SpliceFundingFailed events
jkczyz Feb 25, 2026
5e521ac
Handle FeeRateAdjustmentError variants in splice acceptor path
jkczyz Feb 25, 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
2 changes: 1 addition & 1 deletion lightning-tests/src/upgrade_downgrade_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ fn do_test_0_1_htlc_forward_after_splice(fail_htlc: bool) {
}

let splice_locked = get_event_msg!(nodes[0], MessageSendEvent::SendSpliceLocked, node_b_id);
lock_splice(&nodes[0], &nodes[1], &splice_locked, false);
lock_splice(&nodes[0], &nodes[1], &splice_locked, false, &[]);

for node in nodes.iter() {
connect_blocks(node, EXTRA_BLOCKS_BEFORE_FAIL - ANTI_REORG_DELAY);
Expand Down
13 changes: 10 additions & 3 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4039,9 +4039,16 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
}

if let Some(parent_funding_txid) = channel_parameters.splice_parent_funding_txid.as_ref() {
// Only one splice can be negotiated at a time after we've exchanged `channel_ready`
// (implying our funding is confirmed) that spends our currently locked funding.
if !self.pending_funding.is_empty() {
// Multiple RBF candidates for the same splice are allowed (they share the same
// parent funding txid). A new splice with a different parent while one is pending
// is not allowed. This also ensures a dual-funded channel has exchanged
// `channel_ready` (implying funding is confirmed) before allowing a splice,
// since unconfirmed initial funding has no splice parent.
let has_different_parent = self.pending_funding.iter().any(|funding| {
funding.channel_parameters.splice_parent_funding_txid.as_ref()
!= Some(parent_funding_txid)
});
if has_different_parent {
log_error!(
logger,
"Negotiated splice while channel is pending channel_ready/splice_locked"
Expand Down
Loading
Loading