Backport 4234 to 0.2#4239

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 2 commits into from
Dec 2, 2025
Merged

Backport 4234 to 0.2 #4239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
656e89e
Add funding redeem script to `ChannelDetails` and `ChannelPending` event
benthecarman Nov 19, 2025
0075d5a
Add funding redeem script to `SplicePending' event
benthecarman Nov 19, 2025
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
1 change: 1 addition & 0 deletions fuzz/src/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
index: 0,
}),
funding_redeem_script: None,
channel_type: None,
short_channel_id: Some(scid),
inbound_scid_alias: None,
Expand Down
15 changes: 15 additions & 0 deletions lightning/src/events/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1413,6 +1413,10 @@ pub enum Event {
///
/// Will be `None` for channels created prior to LDK version 0.0.122.
channel_type: Option<ChannelTypeFeatures>,
/// The witness script that is used to lock the channel's funding output to commitment transactions.
///
/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
funding_redeem_script: Option<ScriptBuf>,
},
/// Used to indicate that a channel with the given `channel_id` is ready to be used. This event
/// is emitted when
Expand DownExpand Up@@ -1532,6 +1536,8 @@ pub enum Event {
/// The features that this channel will operate with. Currently, these will be the same
/// features that the channel was opened with, but in the future splices may change them.
channel_type: ChannelTypeFeatures,
/// The witness script that is used to lock the channel's funding output to commitment transactions.
new_funding_redeem_script: ScriptBuf,
},
/// Used to indicate that a splice for the given `channel_id` has failed.
///
Expand DownExpand Up@@ -2234,6 +2240,7 @@ impl Writeable for Event {
ref counterparty_node_id,
ref funding_txo,
ref channel_type,
ref funding_redeem_script,
} => {
31u8.write(writer)?;
write_tlv_fields!(writer, {
Expand All@@ -2243,6 +2250,7 @@ impl Writeable for Event {
(4, former_temporary_channel_id, required),
(6, counterparty_node_id, required),
(8, funding_txo, required),
(9, funding_redeem_script, option),
});
},
&Event::ConnectionNeeded { .. } => {
Expand DownExpand Up@@ -2307,6 +2315,7 @@ impl Writeable for Event {
ref counterparty_node_id,
ref new_funding_txo,
ref channel_type,
ref new_funding_redeem_script,
} => {
50u8.write(writer)?;
write_tlv_fields!(writer, {
Expand All@@ -2315,6 +2324,7 @@ impl Writeable for Event {
(5, user_channel_id, required),
(7, counterparty_node_id, required),
(9, new_funding_txo, required),
(11, new_funding_redeem_script, required),
});
},
&Event::SpliceFailed {
Expand DownExpand Up@@ -2815,13 +2825,15 @@ impl MaybeReadable for Event {
let mut counterparty_node_id = RequiredWrapper(None);
let mut funding_txo = RequiredWrapper(None);
let mut channel_type = None;
let mut funding_redeem_script = None;
read_tlv_fields!(reader, {
(0, channel_id, required),
(1, channel_type, option),
(2, user_channel_id, required),
(4, former_temporary_channel_id, required),
(6, counterparty_node_id, required),
(8, funding_txo, required),
(9, funding_redeem_script, option),
});

Ok(Some(Event::ChannelPending {
Expand All@@ -2831,6 +2843,7 @@ impl MaybeReadable for Event {
counterparty_node_id: counterparty_node_id.0.unwrap(),
funding_txo: funding_txo.0.unwrap(),
channel_type,
funding_redeem_script,
}))
};
f()
Expand DownExpand Up@@ -2927,6 +2940,7 @@ impl MaybeReadable for Event {
(5, user_channel_id, required),
(7, counterparty_node_id, required),
(9, new_funding_txo, required),
(11, new_funding_redeem_script, required),
});

Ok(Some(Event::SplicePending {
Expand All@@ -2935,6 +2949,7 @@ impl MaybeReadable for Event {
counterparty_node_id: counterparty_node_id.0.unwrap(),
new_funding_txo: new_funding_txo.0.unwrap(),
channel_type: channel_type.0.unwrap(),
new_funding_redeem_script: new_funding_redeem_script.0.unwrap(),
}))
};
f()
Expand Down
15 changes: 10 additions & 5 deletions lightning/src/ln/chan_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1120,12 +1120,17 @@ impl ChannelTransactionParameters {
}
}

#[rustfmt::skip]
pub(crate) fn make_funding_redeemscript(&self) -> ScriptBuf {
make_funding_redeemscript(
&self.holder_pubkeys.funding_pubkey,
&self.counterparty_parameters.as_ref().unwrap().pubkeys.funding_pubkey
)
self.make_funding_redeemscript_opt().unwrap()
}

pub(crate) fn make_funding_redeemscript_opt(&self) -> Option<ScriptBuf> {
self.counterparty_parameters.as_ref().map(|p| {
make_funding_redeemscript(
&self.holder_pubkeys.funding_pubkey,
&p.pubkeys.funding_pubkey,
)
})
}

/// Returns the counterparty's pubkeys.
Expand Down
5 changes: 5 additions & 0 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6853,6 +6853,9 @@ pub struct SpliceFundingNegotiated {

/// The features that this channel will operate with.
pub channel_type: ChannelTypeFeatures,

/// The redeem script of the funding output.
pub funding_redeem_script: ScriptBuf,
}

/// Information about a splice funding negotiation that has failed.
Expand DownExpand Up@@ -8936,12 +8939,14 @@ where
let funding_txo =
funding.get_funding_txo().expect("funding outpoint should be set");
let channel_type = funding.get_channel_type().clone();
let funding_redeem_script = funding.get_funding_redeemscript();

pending_splice.negotiated_candidates.push(funding);

let splice_negotiated = SpliceFundingNegotiated {
funding_txo: funding_txo.into_bitcoin_outpoint(),
channel_type,
funding_redeem_script,
};

let splice_locked = pending_splice.check_get_splice_locked(
Expand Down
28 changes: 28 additions & 0 deletions lightning/src/ln/channel_state.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -450,6 +450,10 @@ pub struct ChannelDetails {
///
/// This field is empty for objects serialized with LDK versions prior to 0.0.122.
pub pending_outbound_htlcs: Vec<OutboundHTLCDetails>,
/// The witness script that is used to lock the channel's funding output to commitment transactions.
///
/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
pub funding_redeem_script: Option<bitcoin::ScriptBuf>,
}

impl ChannelDetails {
Expand All@@ -475,6 +479,21 @@ impl ChannelDetails {
self.short_channel_id.or(self.outbound_scid_alias)
}

/// Gets the funding output for this channel, if available.
///
/// During a splice, the funding output will change and this value will be updated
/// after the splice transaction has reached sufficient confirmations and we've
/// exchanged `splice_locked` messages.
pub fn get_funding_output(&self) -> Option<bitcoin::TxOut> {
match self.funding_redeem_script.as_ref() {
None => None,
Some(redeem_script) => Some(bitcoin::TxOut {
value: bitcoin::Amount::from_sat(self.channel_value_satoshis),
script_pubkey: redeem_script.to_p2wsh(),
}),
}
}

pub(super) fn from_channel<SP: Deref, F: Deref>(
channel: &Channel<SP>, best_block_height: u32, latest_features: InitFeatures,
fee_estimator: &LowerBoundedFeeEstimator<F>,
Expand DownExpand Up@@ -509,6 +528,9 @@ impl ChannelDetails {
outbound_htlc_maximum_msat: context.get_counterparty_htlc_maximum_msat(funding),
},
funding_txo: funding.get_funding_txo(),
funding_redeem_script: funding
.channel_transaction_parameters
.make_funding_redeemscript_opt(),
// Note that accept_channel (or open_channel) is always the first message, so
// `have_received_message` indicates that type negotiation has completed.
channel_type: if context.have_received_message() {
Expand DownExpand Up@@ -583,6 +605,7 @@ impl_writeable_tlv_based!(ChannelDetails, {
(41, channel_shutdown_state, option),
(43, pending_inbound_htlcs, optional_vec),
(45, pending_outbound_htlcs, optional_vec),
(47, funding_redeem_script, option),
(_unused, user_channel_id, (static_value,
_user_channel_id_low.unwrap_or(0) as u128 | ((_user_channel_id_high.unwrap_or(0) as u128) << 64)
)),
Expand DownExpand Up@@ -627,6 +650,7 @@ mod tests {
use crate::{
chain::transaction::OutPoint,
ln::{
chan_utils::make_funding_redeemscript,
channel_state::{
InboundHTLCDetails, InboundHTLCStateDetails, OutboundHTLCDetails,
OutboundHTLCStateDetails,
Expand DownExpand Up@@ -658,6 +682,10 @@ mod tests {
txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
index: 1,
}),
funding_redeem_script: Some(make_funding_redeemscript(
&PublicKey::from_slice(&[2; 33]).unwrap(),
&PublicKey::from_slice(&[2; 33]).unwrap(),
)),
channel_type: None,
short_channel_id: None,
outbound_scid_alias: None,
Expand Down
7 changes: 7 additions & 0 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3491,6 +3491,8 @@ macro_rules! emit_channel_pending_event {
($locked_events: expr, $channel: expr) => {
if $channel.context.should_emit_channel_pending_event() {
let funding_txo = $channel.funding.get_funding_txo().unwrap();
let funding_redeem_script =
Some($channel.funding.channel_transaction_parameters.make_funding_redeemscript());
$locked_events.push_back((
events::Event::ChannelPending {
channel_id: $channel.context.channel_id(),
Expand All@@ -3499,6 +3501,7 @@ macro_rules! emit_channel_pending_event {
user_channel_id: $channel.context.get_user_id(),
funding_txo: funding_txo.into_bitcoin_outpoint(),
channel_type: Some($channel.funding.get_channel_type().clone()),
funding_redeem_script,
},
None,
));
Expand DownExpand Up@@ -6456,6 +6459,8 @@ where
user_channel_id: chan.context.get_user_id(),
new_funding_txo: splice_negotiated.funding_txo,
channel_type: splice_negotiated.channel_type,
new_funding_redeem_script: splice_negotiated
.funding_redeem_script,
},
None,
));
Expand DownExpand Up@@ -9620,6 +9625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
user_channel_id: channel.context.get_user_id(),
new_funding_txo: splice_negotiated.funding_txo,
channel_type: splice_negotiated.channel_type,
new_funding_redeem_script: splice_negotiated.funding_redeem_script,
},
None,
));
Expand DownExpand Up@@ -10649,6 +10655,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
user_channel_id: chan.context.get_user_id(),
new_funding_txo: splice_negotiated.funding_txo,
channel_type: splice_negotiated.channel_type,
new_funding_redeem_script: splice_negotiated.funding_redeem_script,
},
None,
));
Expand Down
10 changes: 10 additions & 0 deletions lightning/src/routing/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3893,6 +3893,7 @@ mod tests {
use crate::blinded_path::BlindedHop;
use crate::chain::transaction::OutPoint;
use crate::crypto::chacha20::ChaCha20;
use crate::ln::chan_utils::make_funding_redeemscript;
use crate::ln::channel_state::{ChannelCounterparty, ChannelDetails, ChannelShutdownState};
use crate::ln::channelmanager;
use crate::ln::msgs::{UnsignedChannelUpdate, MAX_VALUE_MSAT};
Expand DownExpand Up@@ -3950,6 +3951,10 @@ mod tests {
outbound_htlc_maximum_msat: None,
},
funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
funding_redeem_script: Some(make_funding_redeemscript(
&PublicKey::from_slice(&[2; 33]).unwrap(),
&PublicKey::from_slice(&[2; 33]).unwrap(),
)),
channel_type: None,
short_channel_id,
outbound_scid_alias: None,
Expand DownExpand Up@@ -9250,6 +9255,7 @@ pub(crate) mod bench_utils {
use std::io::Read;

use crate::chain::transaction::OutPoint;
use crate::ln::chan_utils::make_funding_redeemscript;
use crate::ln::channel_state::{ChannelCounterparty, ChannelShutdownState};
use crate::ln::channelmanager;
use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -9345,6 +9351,10 @@ pub(crate) mod bench_utils {
funding_txo: Some(OutPoint {
txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0
}),
funding_redeem_script: Some(make_funding_redeemscript(
&PublicKey::from_slice(&[2; 33]).unwrap(),
&PublicKey::from_slice(&[2; 33]).unwrap(),
)),
channel_type: None,
short_channel_id: Some(1),
inbound_scid_alias: None,
Expand Down
, '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
Backport 4234 to 0.2#4239

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 2 commits into

from

Dec 2, 2025
 Merged


Backport 4234 to 0.2
#4239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
656e89e

Add funding redeem script to `ChannelDetails` and `ChannelPending` event


benthecarman Nov 19, 2025
0075d5a

Add funding redeem script to `SplicePending' event


benthecarman Nov 19, 2025

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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 0,
 }),
 funding_redeem_script: None,
 channel_type: None,
 short_channel_id: Some(scid),
 inbound_scid_alias: None,
Expand Down

15 changes: 15 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1413,6 +1413,10 @@ pub enum Event {
 ///
 /// Will be `None` for channels created prior to LDK version 0.0.122.
 channel_type: Option<ChannelTypeFeatures>,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 ///
 /// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
 funding_redeem_script: Option<ScriptBuf>,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to be used. This event
	/// is emitted when
Expand DownExpand Up@@ -1532,6 +1536,8 @@ pub enum Event {
 /// The features that this channel will operate with. Currently, these will be the same
 /// features that the channel was opened with, but in the future splices may change them.
 channel_type: ChannelTypeFeatures,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 new_funding_redeem_script: ScriptBuf,
	},
	/// Used to indicate that a splice for the given `channel_id` has failed.
	///
Expand DownExpand Up@@ -2234,6 +2240,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref funding_txo,
 ref channel_type,
 ref funding_redeem_script,
 } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2243,6 +2250,7 @@ impl Writeable for Event {
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });
 },
 &Event::ConnectionNeeded { .. } => {
Expand DownExpand Up@@ -2307,6 +2315,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref new_funding_txo,
 ref channel_type,
 ref new_funding_redeem_script,
 } => {
 50u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2315,6 +2324,7 @@ impl Writeable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });
 },
 &Event::SpliceFailed {
Expand DownExpand Up@@ -2815,13 +2825,15 @@ impl MaybeReadable for Event {
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_txo = RequiredWrapper(None);
 let mut channel_type = None;
 let mut funding_redeem_script = None;
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (1, channel_type, option),
 (2, user_channel_id, required),
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });

 Ok(Some(Event::ChannelPending {
Expand All@@ -2831,6 +2843,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_txo: funding_txo.0.unwrap(),
 channel_type,
 funding_redeem_script,
 }))
 };
 f()
Expand DownExpand Up@@ -2927,6 +2940,7 @@ impl MaybeReadable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });

 Ok(Some(Event::SplicePending {
Expand All@@ -2935,6 +2949,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 new_funding_txo: new_funding_txo.0.unwrap(),
 channel_type: channel_type.0.unwrap(),
 new_funding_redeem_script: new_funding_redeem_script.0.unwrap(),
 }))
 };
 f()
Expand Down

15 changes: 10 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1120,12 +1120,17 @@ impl ChannelTransactionParameters {
 }
	}

	#[rustfmt::skip]
	pub(crate) fn make_funding_redeemscript(&self) -> ScriptBuf {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &self.counterparty_parameters.as_ref().unwrap().pubkeys.funding_pubkey
 )
 self.make_funding_redeemscript_opt().unwrap()
	}

	pub(crate) fn make_funding_redeemscript_opt(&self) -> Option<ScriptBuf> {
 self.counterparty_parameters.as_ref().map(|p| {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &p.pubkeys.funding_pubkey,
 )
 })
	}

	/// Returns the counterparty's pubkeys.
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6853,6 +6853,9 @@ pub struct SpliceFundingNegotiated {

	/// The features that this channel will operate with.
	pub channel_type: ChannelTypeFeatures,

	/// The redeem script of the funding output.
	pub funding_redeem_script: ScriptBuf,
}

/// Information about a splice funding negotiation that has failed.
Expand DownExpand Up@@ -8936,12 +8939,14 @@ where
 let funding_txo =
 funding.get_funding_txo().expect("funding outpoint should be set");
 let channel_type = funding.get_channel_type().clone();
 let funding_redeem_script = funding.get_funding_redeemscript();

 pending_splice.negotiated_candidates.push(funding);

 let splice_negotiated = SpliceFundingNegotiated {
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type,
 funding_redeem_script,
 };

 let splice_locked = pending_splice.check_get_splice_locked(
Expand Down

28 changes: 28 additions & 0 deletions
lightning/src/ln/channel_state.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,6 +450,10 @@ pub struct ChannelDetails {
	///
	/// This field is empty for objects serialized with LDK versions prior to 0.0.122.
	pub pending_outbound_htlcs: Vec<OutboundHTLCDetails>,
	/// The witness script that is used to lock the channel's funding output to commitment transactions.
	///
	/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
	pub funding_redeem_script: Option<bitcoin::ScriptBuf>,
}

impl ChannelDetails {
Expand All@@ -475,6 +479,21 @@ impl ChannelDetails {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	/// Gets the funding output for this channel, if available.
	///
	/// During a splice, the funding output will change and this value will be updated
	/// after the splice transaction has reached sufficient confirmations and we've
	/// exchanged `splice_locked` messages.
	pub fn get_funding_output(&self) -> Option<bitcoin::TxOut> {
 match self.funding_redeem_script.as_ref() {
 None => None,
 Some(redeem_script) => Some(bitcoin::TxOut {
 value: bitcoin::Amount::from_sat(self.channel_value_satoshis),
 script_pubkey: redeem_script.to_p2wsh(),
 }),
 }
	}

	pub(super) fn from_channel<SP: Deref, F: Deref>(
 channel: &Channel<SP>, best_block_height: u32, latest_features: InitFeatures,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
Expand DownExpand Up@@ -509,6 +528,9 @@ impl ChannelDetails {
 outbound_htlc_maximum_msat: context.get_counterparty_htlc_maximum_msat(funding),
 },
 funding_txo: funding.get_funding_txo(),
 funding_redeem_script: funding
 .channel_transaction_parameters
 .make_funding_redeemscript_opt(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if context.have_received_message() {
Expand DownExpand Up@@ -583,6 +605,7 @@ impl_writeable_tlv_based!(ChannelDetails, {
	(41, channel_shutdown_state, option),
	(43, pending_inbound_htlcs, optional_vec),
	(45, pending_outbound_htlcs, optional_vec),
	(47, funding_redeem_script, option),
	(_unused, user_channel_id, (static_value,
 _user_channel_id_low.unwrap_or(0) as u128 | ((_user_channel_id_high.unwrap_or(0) as u128) << 64)
	)),
Expand DownExpand Up@@ -627,6 +650,7 @@ mod tests {
	use crate::{
 chain::transaction::OutPoint,
 ln::{
 chan_utils::make_funding_redeemscript,
 channel_state::{
 InboundHTLCDetails, InboundHTLCStateDetails, OutboundHTLCDetails,
 OutboundHTLCStateDetails,
Expand DownExpand Up@@ -658,6 +682,10 @@ mod tests {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 1,
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: None,
 outbound_scid_alias: None,
Expand Down

7 changes: 7 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3491,6 +3491,8 @@ macro_rules! emit_channel_pending_event {
	($locked_events: expr, $channel: expr) => {
 if $channel.context.should_emit_channel_pending_event() {
 let funding_txo = $channel.funding.get_funding_txo().unwrap();
 let funding_redeem_script =
 Some($channel.funding.channel_transaction_parameters.make_funding_redeemscript());
 $locked_events.push_back((
 events::Event::ChannelPending {
 channel_id: $channel.context.channel_id(),
Expand All@@ -3499,6 +3501,7 @@ macro_rules! emit_channel_pending_event {
 user_channel_id: $channel.context.get_user_id(),
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type: Some($channel.funding.get_channel_type().clone()),
 funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -6456,6 +6459,8 @@ where
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated
 .funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -9620,6 +9625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: channel.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -10649,6 +10655,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3893,6 +3893,7 @@ mod tests {
	use crate::blinded_path::BlindedHop;
	use crate::chain::transaction::OutPoint;
	use crate::crypto::chacha20::ChaCha20;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelDetails, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::msgs::{UnsignedChannelUpdate, MAX_VALUE_MSAT};
Expand DownExpand Up@@ -3950,6 +3951,10 @@ mod tests {
 outbound_htlc_maximum_msat: None,
 },
 funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id,
 outbound_scid_alias: None,
Expand DownExpand Up@@ -9250,6 +9255,7 @@ pub(crate) mod bench_utils {
	use std::io::Read;

	use crate::chain::transaction::OutPoint;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -9345,6 +9351,10 @@ pub(crate) mod bench_utils {
 funding_txo: Some(OutPoint {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: Some(1),
 inbound_scid_alias: None,
Expand Down

, '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
Backport 4234 to 0.2#4239

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 2 commits into

from

Dec 2, 2025
 Merged


Backport 4234 to 0.2
#4239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
656e89e

Add funding redeem script to `ChannelDetails` and `ChannelPending` event


benthecarman Nov 19, 2025
0075d5a

Add funding redeem script to `SplicePending' event


benthecarman Nov 19, 2025

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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 0,
 }),
 funding_redeem_script: None,
 channel_type: None,
 short_channel_id: Some(scid),
 inbound_scid_alias: None,
Expand Down

15 changes: 15 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1413,6 +1413,10 @@ pub enum Event {
 ///
 /// Will be `None` for channels created prior to LDK version 0.0.122.
 channel_type: Option<ChannelTypeFeatures>,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 ///
 /// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
 funding_redeem_script: Option<ScriptBuf>,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to be used. This event
	/// is emitted when
Expand DownExpand Up@@ -1532,6 +1536,8 @@ pub enum Event {
 /// The features that this channel will operate with. Currently, these will be the same
 /// features that the channel was opened with, but in the future splices may change them.
 channel_type: ChannelTypeFeatures,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 new_funding_redeem_script: ScriptBuf,
	},
	/// Used to indicate that a splice for the given `channel_id` has failed.
	///
Expand DownExpand Up@@ -2234,6 +2240,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref funding_txo,
 ref channel_type,
 ref funding_redeem_script,
 } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2243,6 +2250,7 @@ impl Writeable for Event {
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });
 },
 &Event::ConnectionNeeded { .. } => {
Expand DownExpand Up@@ -2307,6 +2315,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref new_funding_txo,
 ref channel_type,
 ref new_funding_redeem_script,
 } => {
 50u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2315,6 +2324,7 @@ impl Writeable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });
 },
 &Event::SpliceFailed {
Expand DownExpand Up@@ -2815,13 +2825,15 @@ impl MaybeReadable for Event {
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_txo = RequiredWrapper(None);
 let mut channel_type = None;
 let mut funding_redeem_script = None;
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (1, channel_type, option),
 (2, user_channel_id, required),
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });

 Ok(Some(Event::ChannelPending {
Expand All@@ -2831,6 +2843,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_txo: funding_txo.0.unwrap(),
 channel_type,
 funding_redeem_script,
 }))
 };
 f()
Expand DownExpand Up@@ -2927,6 +2940,7 @@ impl MaybeReadable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });

 Ok(Some(Event::SplicePending {
Expand All@@ -2935,6 +2949,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 new_funding_txo: new_funding_txo.0.unwrap(),
 channel_type: channel_type.0.unwrap(),
 new_funding_redeem_script: new_funding_redeem_script.0.unwrap(),
 }))
 };
 f()
Expand Down

15 changes: 10 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1120,12 +1120,17 @@ impl ChannelTransactionParameters {
 }
	}

	#[rustfmt::skip]
	pub(crate) fn make_funding_redeemscript(&self) -> ScriptBuf {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &self.counterparty_parameters.as_ref().unwrap().pubkeys.funding_pubkey
 )
 self.make_funding_redeemscript_opt().unwrap()
	}

	pub(crate) fn make_funding_redeemscript_opt(&self) -> Option<ScriptBuf> {
 self.counterparty_parameters.as_ref().map(|p| {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &p.pubkeys.funding_pubkey,
 )
 })
	}

	/// Returns the counterparty's pubkeys.
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6853,6 +6853,9 @@ pub struct SpliceFundingNegotiated {

	/// The features that this channel will operate with.
	pub channel_type: ChannelTypeFeatures,

	/// The redeem script of the funding output.
	pub funding_redeem_script: ScriptBuf,
}

/// Information about a splice funding negotiation that has failed.
Expand DownExpand Up@@ -8936,12 +8939,14 @@ where
 let funding_txo =
 funding.get_funding_txo().expect("funding outpoint should be set");
 let channel_type = funding.get_channel_type().clone();
 let funding_redeem_script = funding.get_funding_redeemscript();

 pending_splice.negotiated_candidates.push(funding);

 let splice_negotiated = SpliceFundingNegotiated {
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type,
 funding_redeem_script,
 };

 let splice_locked = pending_splice.check_get_splice_locked(
Expand Down

28 changes: 28 additions & 0 deletions
lightning/src/ln/channel_state.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,6 +450,10 @@ pub struct ChannelDetails {
	///
	/// This field is empty for objects serialized with LDK versions prior to 0.0.122.
	pub pending_outbound_htlcs: Vec<OutboundHTLCDetails>,
	/// The witness script that is used to lock the channel's funding output to commitment transactions.
	///
	/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
	pub funding_redeem_script: Option<bitcoin::ScriptBuf>,
}

impl ChannelDetails {
Expand All@@ -475,6 +479,21 @@ impl ChannelDetails {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	/// Gets the funding output for this channel, if available.
	///
	/// During a splice, the funding output will change and this value will be updated
	/// after the splice transaction has reached sufficient confirmations and we've
	/// exchanged `splice_locked` messages.
	pub fn get_funding_output(&self) -> Option<bitcoin::TxOut> {
 match self.funding_redeem_script.as_ref() {
 None => None,
 Some(redeem_script) => Some(bitcoin::TxOut {
 value: bitcoin::Amount::from_sat(self.channel_value_satoshis),
 script_pubkey: redeem_script.to_p2wsh(),
 }),
 }
	}

	pub(super) fn from_channel<SP: Deref, F: Deref>(
 channel: &Channel<SP>, best_block_height: u32, latest_features: InitFeatures,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
Expand DownExpand Up@@ -509,6 +528,9 @@ impl ChannelDetails {
 outbound_htlc_maximum_msat: context.get_counterparty_htlc_maximum_msat(funding),
 },
 funding_txo: funding.get_funding_txo(),
 funding_redeem_script: funding
 .channel_transaction_parameters
 .make_funding_redeemscript_opt(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if context.have_received_message() {
Expand DownExpand Up@@ -583,6 +605,7 @@ impl_writeable_tlv_based!(ChannelDetails, {
	(41, channel_shutdown_state, option),
	(43, pending_inbound_htlcs, optional_vec),
	(45, pending_outbound_htlcs, optional_vec),
	(47, funding_redeem_script, option),
	(_unused, user_channel_id, (static_value,
 _user_channel_id_low.unwrap_or(0) as u128 | ((_user_channel_id_high.unwrap_or(0) as u128) << 64)
	)),
Expand DownExpand Up@@ -627,6 +650,7 @@ mod tests {
	use crate::{
 chain::transaction::OutPoint,
 ln::{
 chan_utils::make_funding_redeemscript,
 channel_state::{
 InboundHTLCDetails, InboundHTLCStateDetails, OutboundHTLCDetails,
 OutboundHTLCStateDetails,
Expand DownExpand Up@@ -658,6 +682,10 @@ mod tests {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 1,
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: None,
 outbound_scid_alias: None,
Expand Down

7 changes: 7 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3491,6 +3491,8 @@ macro_rules! emit_channel_pending_event {
	($locked_events: expr, $channel: expr) => {
 if $channel.context.should_emit_channel_pending_event() {
 let funding_txo = $channel.funding.get_funding_txo().unwrap();
 let funding_redeem_script =
 Some($channel.funding.channel_transaction_parameters.make_funding_redeemscript());
 $locked_events.push_back((
 events::Event::ChannelPending {
 channel_id: $channel.context.channel_id(),
Expand All@@ -3499,6 +3501,7 @@ macro_rules! emit_channel_pending_event {
 user_channel_id: $channel.context.get_user_id(),
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type: Some($channel.funding.get_channel_type().clone()),
 funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -6456,6 +6459,8 @@ where
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated
 .funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -9620,6 +9625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: channel.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -10649,6 +10655,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3893,6 +3893,7 @@ mod tests {
	use crate::blinded_path::BlindedHop;
	use crate::chain::transaction::OutPoint;
	use crate::crypto::chacha20::ChaCha20;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelDetails, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::msgs::{UnsignedChannelUpdate, MAX_VALUE_MSAT};
Expand DownExpand Up@@ -3950,6 +3951,10 @@ mod tests {
 outbound_htlc_maximum_msat: None,
 },
 funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id,
 outbound_scid_alias: None,
Expand DownExpand Up@@ -9250,6 +9255,7 @@ pub(crate) mod bench_utils {
	use std::io::Read;

	use crate::chain::transaction::OutPoint;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -9345,6 +9351,10 @@ pub(crate) mod bench_utils {
 funding_txo: Some(OutPoint {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: Some(1),
 inbound_scid_alias: None,
Expand Down

, '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
Backport 4234 to 0.2#4239

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 2 commits into

from

Dec 2, 2025
 Merged


Backport 4234 to 0.2
#4239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
656e89e

Add funding redeem script to `ChannelDetails` and `ChannelPending` event


benthecarman Nov 19, 2025
0075d5a

Add funding redeem script to `SplicePending' event


benthecarman Nov 19, 2025

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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 0,
 }),
 funding_redeem_script: None,
 channel_type: None,
 short_channel_id: Some(scid),
 inbound_scid_alias: None,
Expand Down

15 changes: 15 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1413,6 +1413,10 @@ pub enum Event {
 ///
 /// Will be `None` for channels created prior to LDK version 0.0.122.
 channel_type: Option<ChannelTypeFeatures>,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 ///
 /// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
 funding_redeem_script: Option<ScriptBuf>,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to be used. This event
	/// is emitted when
Expand DownExpand Up@@ -1532,6 +1536,8 @@ pub enum Event {
 /// The features that this channel will operate with. Currently, these will be the same
 /// features that the channel was opened with, but in the future splices may change them.
 channel_type: ChannelTypeFeatures,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 new_funding_redeem_script: ScriptBuf,
	},
	/// Used to indicate that a splice for the given `channel_id` has failed.
	///
Expand DownExpand Up@@ -2234,6 +2240,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref funding_txo,
 ref channel_type,
 ref funding_redeem_script,
 } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2243,6 +2250,7 @@ impl Writeable for Event {
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });
 },
 &Event::ConnectionNeeded { .. } => {
Expand DownExpand Up@@ -2307,6 +2315,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref new_funding_txo,
 ref channel_type,
 ref new_funding_redeem_script,
 } => {
 50u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2315,6 +2324,7 @@ impl Writeable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });
 },
 &Event::SpliceFailed {
Expand DownExpand Up@@ -2815,13 +2825,15 @@ impl MaybeReadable for Event {
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_txo = RequiredWrapper(None);
 let mut channel_type = None;
 let mut funding_redeem_script = None;
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (1, channel_type, option),
 (2, user_channel_id, required),
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });

 Ok(Some(Event::ChannelPending {
Expand All@@ -2831,6 +2843,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_txo: funding_txo.0.unwrap(),
 channel_type,
 funding_redeem_script,
 }))
 };
 f()
Expand DownExpand Up@@ -2927,6 +2940,7 @@ impl MaybeReadable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });

 Ok(Some(Event::SplicePending {
Expand All@@ -2935,6 +2949,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 new_funding_txo: new_funding_txo.0.unwrap(),
 channel_type: channel_type.0.unwrap(),
 new_funding_redeem_script: new_funding_redeem_script.0.unwrap(),
 }))
 };
 f()
Expand Down

15 changes: 10 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1120,12 +1120,17 @@ impl ChannelTransactionParameters {
 }
	}

	#[rustfmt::skip]
	pub(crate) fn make_funding_redeemscript(&self) -> ScriptBuf {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &self.counterparty_parameters.as_ref().unwrap().pubkeys.funding_pubkey
 )
 self.make_funding_redeemscript_opt().unwrap()
	}

	pub(crate) fn make_funding_redeemscript_opt(&self) -> Option<ScriptBuf> {
 self.counterparty_parameters.as_ref().map(|p| {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &p.pubkeys.funding_pubkey,
 )
 })
	}

	/// Returns the counterparty's pubkeys.
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6853,6 +6853,9 @@ pub struct SpliceFundingNegotiated {

	/// The features that this channel will operate with.
	pub channel_type: ChannelTypeFeatures,

	/// The redeem script of the funding output.
	pub funding_redeem_script: ScriptBuf,
}

/// Information about a splice funding negotiation that has failed.
Expand DownExpand Up@@ -8936,12 +8939,14 @@ where
 let funding_txo =
 funding.get_funding_txo().expect("funding outpoint should be set");
 let channel_type = funding.get_channel_type().clone();
 let funding_redeem_script = funding.get_funding_redeemscript();

 pending_splice.negotiated_candidates.push(funding);

 let splice_negotiated = SpliceFundingNegotiated {
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type,
 funding_redeem_script,
 };

 let splice_locked = pending_splice.check_get_splice_locked(
Expand Down

28 changes: 28 additions & 0 deletions
lightning/src/ln/channel_state.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,6 +450,10 @@ pub struct ChannelDetails {
	///
	/// This field is empty for objects serialized with LDK versions prior to 0.0.122.
	pub pending_outbound_htlcs: Vec<OutboundHTLCDetails>,
	/// The witness script that is used to lock the channel's funding output to commitment transactions.
	///
	/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
	pub funding_redeem_script: Option<bitcoin::ScriptBuf>,
}

impl ChannelDetails {
Expand All@@ -475,6 +479,21 @@ impl ChannelDetails {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	/// Gets the funding output for this channel, if available.
	///
	/// During a splice, the funding output will change and this value will be updated
	/// after the splice transaction has reached sufficient confirmations and we've
	/// exchanged `splice_locked` messages.
	pub fn get_funding_output(&self) -> Option<bitcoin::TxOut> {
 match self.funding_redeem_script.as_ref() {
 None => None,
 Some(redeem_script) => Some(bitcoin::TxOut {
 value: bitcoin::Amount::from_sat(self.channel_value_satoshis),
 script_pubkey: redeem_script.to_p2wsh(),
 }),
 }
	}

	pub(super) fn from_channel<SP: Deref, F: Deref>(
 channel: &Channel<SP>, best_block_height: u32, latest_features: InitFeatures,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
Expand DownExpand Up@@ -509,6 +528,9 @@ impl ChannelDetails {
 outbound_htlc_maximum_msat: context.get_counterparty_htlc_maximum_msat(funding),
 },
 funding_txo: funding.get_funding_txo(),
 funding_redeem_script: funding
 .channel_transaction_parameters
 .make_funding_redeemscript_opt(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if context.have_received_message() {
Expand DownExpand Up@@ -583,6 +605,7 @@ impl_writeable_tlv_based!(ChannelDetails, {
	(41, channel_shutdown_state, option),
	(43, pending_inbound_htlcs, optional_vec),
	(45, pending_outbound_htlcs, optional_vec),
	(47, funding_redeem_script, option),
	(_unused, user_channel_id, (static_value,
 _user_channel_id_low.unwrap_or(0) as u128 | ((_user_channel_id_high.unwrap_or(0) as u128) << 64)
	)),
Expand DownExpand Up@@ -627,6 +650,7 @@ mod tests {
	use crate::{
 chain::transaction::OutPoint,
 ln::{
 chan_utils::make_funding_redeemscript,
 channel_state::{
 InboundHTLCDetails, InboundHTLCStateDetails, OutboundHTLCDetails,
 OutboundHTLCStateDetails,
Expand DownExpand Up@@ -658,6 +682,10 @@ mod tests {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 1,
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: None,
 outbound_scid_alias: None,
Expand Down

7 changes: 7 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3491,6 +3491,8 @@ macro_rules! emit_channel_pending_event {
	($locked_events: expr, $channel: expr) => {
 if $channel.context.should_emit_channel_pending_event() {
 let funding_txo = $channel.funding.get_funding_txo().unwrap();
 let funding_redeem_script =
 Some($channel.funding.channel_transaction_parameters.make_funding_redeemscript());
 $locked_events.push_back((
 events::Event::ChannelPending {
 channel_id: $channel.context.channel_id(),
Expand All@@ -3499,6 +3501,7 @@ macro_rules! emit_channel_pending_event {
 user_channel_id: $channel.context.get_user_id(),
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type: Some($channel.funding.get_channel_type().clone()),
 funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -6456,6 +6459,8 @@ where
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated
 .funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -9620,6 +9625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: channel.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -10649,6 +10655,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3893,6 +3893,7 @@ mod tests {
	use crate::blinded_path::BlindedHop;
	use crate::chain::transaction::OutPoint;
	use crate::crypto::chacha20::ChaCha20;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelDetails, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::msgs::{UnsignedChannelUpdate, MAX_VALUE_MSAT};
Expand DownExpand Up@@ -3950,6 +3951,10 @@ mod tests {
 outbound_htlc_maximum_msat: None,
 },
 funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id,
 outbound_scid_alias: None,
Expand DownExpand Up@@ -9250,6 +9255,7 @@ pub(crate) mod bench_utils {
	use std::io::Read;

	use crate::chain::transaction::OutPoint;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -9345,6 +9351,10 @@ pub(crate) mod bench_utils {
 funding_txo: Some(OutPoint {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: Some(1),
 inbound_scid_alias: None,
Expand Down

, '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
Backport 4234 to 0.2#4239

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 2 commits into

from

Dec 2, 2025
 Merged


Backport 4234 to 0.2
#4239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
656e89e

Add funding redeem script to `ChannelDetails` and `ChannelPending` event


benthecarman Nov 19, 2025
0075d5a

Add funding redeem script to `SplicePending' event


benthecarman Nov 19, 2025

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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 0,
 }),
 funding_redeem_script: None,
 channel_type: None,
 short_channel_id: Some(scid),
 inbound_scid_alias: None,
Expand Down

15 changes: 15 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1413,6 +1413,10 @@ pub enum Event {
 ///
 /// Will be `None` for channels created prior to LDK version 0.0.122.
 channel_type: Option<ChannelTypeFeatures>,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 ///
 /// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
 funding_redeem_script: Option<ScriptBuf>,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to be used. This event
	/// is emitted when
Expand DownExpand Up@@ -1532,6 +1536,8 @@ pub enum Event {
 /// The features that this channel will operate with. Currently, these will be the same
 /// features that the channel was opened with, but in the future splices may change them.
 channel_type: ChannelTypeFeatures,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 new_funding_redeem_script: ScriptBuf,
	},
	/// Used to indicate that a splice for the given `channel_id` has failed.
	///
Expand DownExpand Up@@ -2234,6 +2240,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref funding_txo,
 ref channel_type,
 ref funding_redeem_script,
 } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2243,6 +2250,7 @@ impl Writeable for Event {
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });
 },
 &Event::ConnectionNeeded { .. } => {
Expand DownExpand Up@@ -2307,6 +2315,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref new_funding_txo,
 ref channel_type,
 ref new_funding_redeem_script,
 } => {
 50u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2315,6 +2324,7 @@ impl Writeable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });
 },
 &Event::SpliceFailed {
Expand DownExpand Up@@ -2815,13 +2825,15 @@ impl MaybeReadable for Event {
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_txo = RequiredWrapper(None);
 let mut channel_type = None;
 let mut funding_redeem_script = None;
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (1, channel_type, option),
 (2, user_channel_id, required),
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });

 Ok(Some(Event::ChannelPending {
Expand All@@ -2831,6 +2843,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_txo: funding_txo.0.unwrap(),
 channel_type,
 funding_redeem_script,
 }))
 };
 f()
Expand DownExpand Up@@ -2927,6 +2940,7 @@ impl MaybeReadable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });

 Ok(Some(Event::SplicePending {
Expand All@@ -2935,6 +2949,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 new_funding_txo: new_funding_txo.0.unwrap(),
 channel_type: channel_type.0.unwrap(),
 new_funding_redeem_script: new_funding_redeem_script.0.unwrap(),
 }))
 };
 f()
Expand Down

15 changes: 10 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1120,12 +1120,17 @@ impl ChannelTransactionParameters {
 }
	}

	#[rustfmt::skip]
	pub(crate) fn make_funding_redeemscript(&self) -> ScriptBuf {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &self.counterparty_parameters.as_ref().unwrap().pubkeys.funding_pubkey
 )
 self.make_funding_redeemscript_opt().unwrap()
	}

	pub(crate) fn make_funding_redeemscript_opt(&self) -> Option<ScriptBuf> {
 self.counterparty_parameters.as_ref().map(|p| {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &p.pubkeys.funding_pubkey,
 )
 })
	}

	/// Returns the counterparty's pubkeys.
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6853,6 +6853,9 @@ pub struct SpliceFundingNegotiated {

	/// The features that this channel will operate with.
	pub channel_type: ChannelTypeFeatures,

	/// The redeem script of the funding output.
	pub funding_redeem_script: ScriptBuf,
}

/// Information about a splice funding negotiation that has failed.
Expand DownExpand Up@@ -8936,12 +8939,14 @@ where
 let funding_txo =
 funding.get_funding_txo().expect("funding outpoint should be set");
 let channel_type = funding.get_channel_type().clone();
 let funding_redeem_script = funding.get_funding_redeemscript();

 pending_splice.negotiated_candidates.push(funding);

 let splice_negotiated = SpliceFundingNegotiated {
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type,
 funding_redeem_script,
 };

 let splice_locked = pending_splice.check_get_splice_locked(
Expand Down

28 changes: 28 additions & 0 deletions
lightning/src/ln/channel_state.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,6 +450,10 @@ pub struct ChannelDetails {
	///
	/// This field is empty for objects serialized with LDK versions prior to 0.0.122.
	pub pending_outbound_htlcs: Vec<OutboundHTLCDetails>,
	/// The witness script that is used to lock the channel's funding output to commitment transactions.
	///
	/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
	pub funding_redeem_script: Option<bitcoin::ScriptBuf>,
}

impl ChannelDetails {
Expand All@@ -475,6 +479,21 @@ impl ChannelDetails {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	/// Gets the funding output for this channel, if available.
	///
	/// During a splice, the funding output will change and this value will be updated
	/// after the splice transaction has reached sufficient confirmations and we've
	/// exchanged `splice_locked` messages.
	pub fn get_funding_output(&self) -> Option<bitcoin::TxOut> {
 match self.funding_redeem_script.as_ref() {
 None => None,
 Some(redeem_script) => Some(bitcoin::TxOut {
 value: bitcoin::Amount::from_sat(self.channel_value_satoshis),
 script_pubkey: redeem_script.to_p2wsh(),
 }),
 }
	}

	pub(super) fn from_channel<SP: Deref, F: Deref>(
 channel: &Channel<SP>, best_block_height: u32, latest_features: InitFeatures,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
Expand DownExpand Up@@ -509,6 +528,9 @@ impl ChannelDetails {
 outbound_htlc_maximum_msat: context.get_counterparty_htlc_maximum_msat(funding),
 },
 funding_txo: funding.get_funding_txo(),
 funding_redeem_script: funding
 .channel_transaction_parameters
 .make_funding_redeemscript_opt(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if context.have_received_message() {
Expand DownExpand Up@@ -583,6 +605,7 @@ impl_writeable_tlv_based!(ChannelDetails, {
	(41, channel_shutdown_state, option),
	(43, pending_inbound_htlcs, optional_vec),
	(45, pending_outbound_htlcs, optional_vec),
	(47, funding_redeem_script, option),
	(_unused, user_channel_id, (static_value,
 _user_channel_id_low.unwrap_or(0) as u128 | ((_user_channel_id_high.unwrap_or(0) as u128) << 64)
	)),
Expand DownExpand Up@@ -627,6 +650,7 @@ mod tests {
	use crate::{
 chain::transaction::OutPoint,
 ln::{
 chan_utils::make_funding_redeemscript,
 channel_state::{
 InboundHTLCDetails, InboundHTLCStateDetails, OutboundHTLCDetails,
 OutboundHTLCStateDetails,
Expand DownExpand Up@@ -658,6 +682,10 @@ mod tests {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 1,
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: None,
 outbound_scid_alias: None,
Expand Down

7 changes: 7 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3491,6 +3491,8 @@ macro_rules! emit_channel_pending_event {
	($locked_events: expr, $channel: expr) => {
 if $channel.context.should_emit_channel_pending_event() {
 let funding_txo = $channel.funding.get_funding_txo().unwrap();
 let funding_redeem_script =
 Some($channel.funding.channel_transaction_parameters.make_funding_redeemscript());
 $locked_events.push_back((
 events::Event::ChannelPending {
 channel_id: $channel.context.channel_id(),
Expand All@@ -3499,6 +3501,7 @@ macro_rules! emit_channel_pending_event {
 user_channel_id: $channel.context.get_user_id(),
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type: Some($channel.funding.get_channel_type().clone()),
 funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -6456,6 +6459,8 @@ where
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated
 .funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -9620,6 +9625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: channel.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -10649,6 +10655,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3893,6 +3893,7 @@ mod tests {
	use crate::blinded_path::BlindedHop;
	use crate::chain::transaction::OutPoint;
	use crate::crypto::chacha20::ChaCha20;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelDetails, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::msgs::{UnsignedChannelUpdate, MAX_VALUE_MSAT};
Expand DownExpand Up@@ -3950,6 +3951,10 @@ mod tests {
 outbound_htlc_maximum_msat: None,
 },
 funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id,
 outbound_scid_alias: None,
Expand DownExpand Up@@ -9250,6 +9255,7 @@ pub(crate) mod bench_utils {
	use std::io::Read;

	use crate::chain::transaction::OutPoint;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -9345,6 +9351,10 @@ pub(crate) mod bench_utils {
 funding_txo: Some(OutPoint {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: Some(1),
 inbound_scid_alias: None,
Expand Down

, '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
Backport 4234 to 0.2#4239

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 2 commits into

from

Dec 2, 2025
 Merged


Backport 4234 to 0.2
#4239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
656e89e

Add funding redeem script to `ChannelDetails` and `ChannelPending` event


benthecarman Nov 19, 2025
0075d5a

Add funding redeem script to `SplicePending' event


benthecarman Nov 19, 2025

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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 0,
 }),
 funding_redeem_script: None,
 channel_type: None,
 short_channel_id: Some(scid),
 inbound_scid_alias: None,
Expand Down

15 changes: 15 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1413,6 +1413,10 @@ pub enum Event {
 ///
 /// Will be `None` for channels created prior to LDK version 0.0.122.
 channel_type: Option<ChannelTypeFeatures>,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 ///
 /// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
 funding_redeem_script: Option<ScriptBuf>,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to be used. This event
	/// is emitted when
Expand DownExpand Up@@ -1532,6 +1536,8 @@ pub enum Event {
 /// The features that this channel will operate with. Currently, these will be the same
 /// features that the channel was opened with, but in the future splices may change them.
 channel_type: ChannelTypeFeatures,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 new_funding_redeem_script: ScriptBuf,
	},
	/// Used to indicate that a splice for the given `channel_id` has failed.
	///
Expand DownExpand Up@@ -2234,6 +2240,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref funding_txo,
 ref channel_type,
 ref funding_redeem_script,
 } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2243,6 +2250,7 @@ impl Writeable for Event {
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });
 },
 &Event::ConnectionNeeded { .. } => {
Expand DownExpand Up@@ -2307,6 +2315,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref new_funding_txo,
 ref channel_type,
 ref new_funding_redeem_script,
 } => {
 50u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2315,6 +2324,7 @@ impl Writeable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });
 },
 &Event::SpliceFailed {
Expand DownExpand Up@@ -2815,13 +2825,15 @@ impl MaybeReadable for Event {
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_txo = RequiredWrapper(None);
 let mut channel_type = None;
 let mut funding_redeem_script = None;
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (1, channel_type, option),
 (2, user_channel_id, required),
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });

 Ok(Some(Event::ChannelPending {
Expand All@@ -2831,6 +2843,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_txo: funding_txo.0.unwrap(),
 channel_type,
 funding_redeem_script,
 }))
 };
 f()
Expand DownExpand Up@@ -2927,6 +2940,7 @@ impl MaybeReadable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });

 Ok(Some(Event::SplicePending {
Expand All@@ -2935,6 +2949,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 new_funding_txo: new_funding_txo.0.unwrap(),
 channel_type: channel_type.0.unwrap(),
 new_funding_redeem_script: new_funding_redeem_script.0.unwrap(),
 }))
 };
 f()
Expand Down

15 changes: 10 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1120,12 +1120,17 @@ impl ChannelTransactionParameters {
 }
	}

	#[rustfmt::skip]
	pub(crate) fn make_funding_redeemscript(&self) -> ScriptBuf {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &self.counterparty_parameters.as_ref().unwrap().pubkeys.funding_pubkey
 )
 self.make_funding_redeemscript_opt().unwrap()
	}

	pub(crate) fn make_funding_redeemscript_opt(&self) -> Option<ScriptBuf> {
 self.counterparty_parameters.as_ref().map(|p| {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &p.pubkeys.funding_pubkey,
 )
 })
	}

	/// Returns the counterparty's pubkeys.
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6853,6 +6853,9 @@ pub struct SpliceFundingNegotiated {

	/// The features that this channel will operate with.
	pub channel_type: ChannelTypeFeatures,

	/// The redeem script of the funding output.
	pub funding_redeem_script: ScriptBuf,
}

/// Information about a splice funding negotiation that has failed.
Expand DownExpand Up@@ -8936,12 +8939,14 @@ where
 let funding_txo =
 funding.get_funding_txo().expect("funding outpoint should be set");
 let channel_type = funding.get_channel_type().clone();
 let funding_redeem_script = funding.get_funding_redeemscript();

 pending_splice.negotiated_candidates.push(funding);

 let splice_negotiated = SpliceFundingNegotiated {
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type,
 funding_redeem_script,
 };

 let splice_locked = pending_splice.check_get_splice_locked(
Expand Down

28 changes: 28 additions & 0 deletions
lightning/src/ln/channel_state.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,6 +450,10 @@ pub struct ChannelDetails {
	///
	/// This field is empty for objects serialized with LDK versions prior to 0.0.122.
	pub pending_outbound_htlcs: Vec<OutboundHTLCDetails>,
	/// The witness script that is used to lock the channel's funding output to commitment transactions.
	///
	/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
	pub funding_redeem_script: Option<bitcoin::ScriptBuf>,
}

impl ChannelDetails {
Expand All@@ -475,6 +479,21 @@ impl ChannelDetails {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	/// Gets the funding output for this channel, if available.
	///
	/// During a splice, the funding output will change and this value will be updated
	/// after the splice transaction has reached sufficient confirmations and we've
	/// exchanged `splice_locked` messages.
	pub fn get_funding_output(&self) -> Option<bitcoin::TxOut> {
 match self.funding_redeem_script.as_ref() {
 None => None,
 Some(redeem_script) => Some(bitcoin::TxOut {
 value: bitcoin::Amount::from_sat(self.channel_value_satoshis),
 script_pubkey: redeem_script.to_p2wsh(),
 }),
 }
	}

	pub(super) fn from_channel<SP: Deref, F: Deref>(
 channel: &Channel<SP>, best_block_height: u32, latest_features: InitFeatures,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
Expand DownExpand Up@@ -509,6 +528,9 @@ impl ChannelDetails {
 outbound_htlc_maximum_msat: context.get_counterparty_htlc_maximum_msat(funding),
 },
 funding_txo: funding.get_funding_txo(),
 funding_redeem_script: funding
 .channel_transaction_parameters
 .make_funding_redeemscript_opt(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if context.have_received_message() {
Expand DownExpand Up@@ -583,6 +605,7 @@ impl_writeable_tlv_based!(ChannelDetails, {
	(41, channel_shutdown_state, option),
	(43, pending_inbound_htlcs, optional_vec),
	(45, pending_outbound_htlcs, optional_vec),
	(47, funding_redeem_script, option),
	(_unused, user_channel_id, (static_value,
 _user_channel_id_low.unwrap_or(0) as u128 | ((_user_channel_id_high.unwrap_or(0) as u128) << 64)
	)),
Expand DownExpand Up@@ -627,6 +650,7 @@ mod tests {
	use crate::{
 chain::transaction::OutPoint,
 ln::{
 chan_utils::make_funding_redeemscript,
 channel_state::{
 InboundHTLCDetails, InboundHTLCStateDetails, OutboundHTLCDetails,
 OutboundHTLCStateDetails,
Expand DownExpand Up@@ -658,6 +682,10 @@ mod tests {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 1,
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: None,
 outbound_scid_alias: None,
Expand Down

7 changes: 7 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3491,6 +3491,8 @@ macro_rules! emit_channel_pending_event {
	($locked_events: expr, $channel: expr) => {
 if $channel.context.should_emit_channel_pending_event() {
 let funding_txo = $channel.funding.get_funding_txo().unwrap();
 let funding_redeem_script =
 Some($channel.funding.channel_transaction_parameters.make_funding_redeemscript());
 $locked_events.push_back((
 events::Event::ChannelPending {
 channel_id: $channel.context.channel_id(),
Expand All@@ -3499,6 +3501,7 @@ macro_rules! emit_channel_pending_event {
 user_channel_id: $channel.context.get_user_id(),
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type: Some($channel.funding.get_channel_type().clone()),
 funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -6456,6 +6459,8 @@ where
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated
 .funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -9620,6 +9625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: channel.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -10649,6 +10655,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3893,6 +3893,7 @@ mod tests {
	use crate::blinded_path::BlindedHop;
	use crate::chain::transaction::OutPoint;
	use crate::crypto::chacha20::ChaCha20;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelDetails, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::msgs::{UnsignedChannelUpdate, MAX_VALUE_MSAT};
Expand DownExpand Up@@ -3950,6 +3951,10 @@ mod tests {
 outbound_htlc_maximum_msat: None,
 },
 funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id,
 outbound_scid_alias: None,
Expand DownExpand Up@@ -9250,6 +9255,7 @@ pub(crate) mod bench_utils {
	use std::io::Read;

	use crate::chain::transaction::OutPoint;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -9345,6 +9351,10 @@ pub(crate) mod bench_utils {
 funding_txo: Some(OutPoint {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: Some(1),
 inbound_scid_alias: None,
Expand Down

, '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
Backport 4234 to 0.2#4239

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 2 commits into

from

Dec 2, 2025
 Merged


Backport 4234 to 0.2
#4239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
656e89e

Add funding redeem script to `ChannelDetails` and `ChannelPending` event


benthecarman Nov 19, 2025
0075d5a

Add funding redeem script to `SplicePending' event


benthecarman Nov 19, 2025

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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 0,
 }),
 funding_redeem_script: None,
 channel_type: None,
 short_channel_id: Some(scid),
 inbound_scid_alias: None,
Expand Down

15 changes: 15 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1413,6 +1413,10 @@ pub enum Event {
 ///
 /// Will be `None` for channels created prior to LDK version 0.0.122.
 channel_type: Option<ChannelTypeFeatures>,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 ///
 /// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
 funding_redeem_script: Option<ScriptBuf>,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to be used. This event
	/// is emitted when
Expand DownExpand Up@@ -1532,6 +1536,8 @@ pub enum Event {
 /// The features that this channel will operate with. Currently, these will be the same
 /// features that the channel was opened with, but in the future splices may change them.
 channel_type: ChannelTypeFeatures,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 new_funding_redeem_script: ScriptBuf,
	},
	/// Used to indicate that a splice for the given `channel_id` has failed.
	///
Expand DownExpand Up@@ -2234,6 +2240,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref funding_txo,
 ref channel_type,
 ref funding_redeem_script,
 } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2243,6 +2250,7 @@ impl Writeable for Event {
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });
 },
 &Event::ConnectionNeeded { .. } => {
Expand DownExpand Up@@ -2307,6 +2315,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref new_funding_txo,
 ref channel_type,
 ref new_funding_redeem_script,
 } => {
 50u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2315,6 +2324,7 @@ impl Writeable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });
 },
 &Event::SpliceFailed {
Expand DownExpand Up@@ -2815,13 +2825,15 @@ impl MaybeReadable for Event {
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_txo = RequiredWrapper(None);
 let mut channel_type = None;
 let mut funding_redeem_script = None;
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (1, channel_type, option),
 (2, user_channel_id, required),
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });

 Ok(Some(Event::ChannelPending {
Expand All@@ -2831,6 +2843,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_txo: funding_txo.0.unwrap(),
 channel_type,
 funding_redeem_script,
 }))
 };
 f()
Expand DownExpand Up@@ -2927,6 +2940,7 @@ impl MaybeReadable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });

 Ok(Some(Event::SplicePending {
Expand All@@ -2935,6 +2949,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 new_funding_txo: new_funding_txo.0.unwrap(),
 channel_type: channel_type.0.unwrap(),
 new_funding_redeem_script: new_funding_redeem_script.0.unwrap(),
 }))
 };
 f()
Expand Down

15 changes: 10 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1120,12 +1120,17 @@ impl ChannelTransactionParameters {
 }
	}

	#[rustfmt::skip]
	pub(crate) fn make_funding_redeemscript(&self) -> ScriptBuf {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &self.counterparty_parameters.as_ref().unwrap().pubkeys.funding_pubkey
 )
 self.make_funding_redeemscript_opt().unwrap()
	}

	pub(crate) fn make_funding_redeemscript_opt(&self) -> Option<ScriptBuf> {
 self.counterparty_parameters.as_ref().map(|p| {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &p.pubkeys.funding_pubkey,
 )
 })
	}

	/// Returns the counterparty's pubkeys.
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6853,6 +6853,9 @@ pub struct SpliceFundingNegotiated {

	/// The features that this channel will operate with.
	pub channel_type: ChannelTypeFeatures,

	/// The redeem script of the funding output.
	pub funding_redeem_script: ScriptBuf,
}

/// Information about a splice funding negotiation that has failed.
Expand DownExpand Up@@ -8936,12 +8939,14 @@ where
 let funding_txo =
 funding.get_funding_txo().expect("funding outpoint should be set");
 let channel_type = funding.get_channel_type().clone();
 let funding_redeem_script = funding.get_funding_redeemscript();

 pending_splice.negotiated_candidates.push(funding);

 let splice_negotiated = SpliceFundingNegotiated {
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type,
 funding_redeem_script,
 };

 let splice_locked = pending_splice.check_get_splice_locked(
Expand Down

28 changes: 28 additions & 0 deletions
lightning/src/ln/channel_state.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,6 +450,10 @@ pub struct ChannelDetails {
	///
	/// This field is empty for objects serialized with LDK versions prior to 0.0.122.
	pub pending_outbound_htlcs: Vec<OutboundHTLCDetails>,
	/// The witness script that is used to lock the channel's funding output to commitment transactions.
	///
	/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
	pub funding_redeem_script: Option<bitcoin::ScriptBuf>,
}

impl ChannelDetails {
Expand All@@ -475,6 +479,21 @@ impl ChannelDetails {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	/// Gets the funding output for this channel, if available.
	///
	/// During a splice, the funding output will change and this value will be updated
	/// after the splice transaction has reached sufficient confirmations and we've
	/// exchanged `splice_locked` messages.
	pub fn get_funding_output(&self) -> Option<bitcoin::TxOut> {
 match self.funding_redeem_script.as_ref() {
 None => None,
 Some(redeem_script) => Some(bitcoin::TxOut {
 value: bitcoin::Amount::from_sat(self.channel_value_satoshis),
 script_pubkey: redeem_script.to_p2wsh(),
 }),
 }
	}

	pub(super) fn from_channel<SP: Deref, F: Deref>(
 channel: &Channel<SP>, best_block_height: u32, latest_features: InitFeatures,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
Expand DownExpand Up@@ -509,6 +528,9 @@ impl ChannelDetails {
 outbound_htlc_maximum_msat: context.get_counterparty_htlc_maximum_msat(funding),
 },
 funding_txo: funding.get_funding_txo(),
 funding_redeem_script: funding
 .channel_transaction_parameters
 .make_funding_redeemscript_opt(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if context.have_received_message() {
Expand DownExpand Up@@ -583,6 +605,7 @@ impl_writeable_tlv_based!(ChannelDetails, {
	(41, channel_shutdown_state, option),
	(43, pending_inbound_htlcs, optional_vec),
	(45, pending_outbound_htlcs, optional_vec),
	(47, funding_redeem_script, option),
	(_unused, user_channel_id, (static_value,
 _user_channel_id_low.unwrap_or(0) as u128 | ((_user_channel_id_high.unwrap_or(0) as u128) << 64)
	)),
Expand DownExpand Up@@ -627,6 +650,7 @@ mod tests {
	use crate::{
 chain::transaction::OutPoint,
 ln::{
 chan_utils::make_funding_redeemscript,
 channel_state::{
 InboundHTLCDetails, InboundHTLCStateDetails, OutboundHTLCDetails,
 OutboundHTLCStateDetails,
Expand DownExpand Up@@ -658,6 +682,10 @@ mod tests {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 1,
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: None,
 outbound_scid_alias: None,
Expand Down

7 changes: 7 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3491,6 +3491,8 @@ macro_rules! emit_channel_pending_event {
	($locked_events: expr, $channel: expr) => {
 if $channel.context.should_emit_channel_pending_event() {
 let funding_txo = $channel.funding.get_funding_txo().unwrap();
 let funding_redeem_script =
 Some($channel.funding.channel_transaction_parameters.make_funding_redeemscript());
 $locked_events.push_back((
 events::Event::ChannelPending {
 channel_id: $channel.context.channel_id(),
Expand All@@ -3499,6 +3501,7 @@ macro_rules! emit_channel_pending_event {
 user_channel_id: $channel.context.get_user_id(),
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type: Some($channel.funding.get_channel_type().clone()),
 funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -6456,6 +6459,8 @@ where
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated
 .funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -9620,6 +9625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: channel.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -10649,6 +10655,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3893,6 +3893,7 @@ mod tests {
	use crate::blinded_path::BlindedHop;
	use crate::chain::transaction::OutPoint;
	use crate::crypto::chacha20::ChaCha20;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelDetails, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::msgs::{UnsignedChannelUpdate, MAX_VALUE_MSAT};
Expand DownExpand Up@@ -3950,6 +3951,10 @@ mod tests {
 outbound_htlc_maximum_msat: None,
 },
 funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id,
 outbound_scid_alias: None,
Expand DownExpand Up@@ -9250,6 +9255,7 @@ pub(crate) mod bench_utils {
	use std::io::Read;

	use crate::chain::transaction::OutPoint;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -9345,6 +9351,10 @@ pub(crate) mod bench_utils {
 funding_txo: Some(OutPoint {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: Some(1),
 inbound_scid_alias: None,
Expand Down

, '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
Backport 4234 to 0.2#4239

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 2 commits into

from

Dec 2, 2025
 Merged


Backport 4234 to 0.2
#4239
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
656e89e

Add funding redeem script to `ChannelDetails` and `ChannelPending` event


benthecarman Nov 19, 2025
0075d5a

Add funding redeem script to `SplicePending' event


benthecarman Nov 19, 2025

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


1 change: 1 addition & 0 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 0,
 }),
 funding_redeem_script: None,
 channel_type: None,
 short_channel_id: Some(scid),
 inbound_scid_alias: None,
Expand Down

15 changes: 15 additions & 0 deletions
lightning/src/events/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1413,6 +1413,10 @@ pub enum Event {
 ///
 /// Will be `None` for channels created prior to LDK version 0.0.122.
 channel_type: Option<ChannelTypeFeatures>,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 ///
 /// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
 funding_redeem_script: Option<ScriptBuf>,
	},
	/// Used to indicate that a channel with the given `channel_id` is ready to be used. This event
	/// is emitted when
Expand DownExpand Up@@ -1532,6 +1536,8 @@ pub enum Event {
 /// The features that this channel will operate with. Currently, these will be the same
 /// features that the channel was opened with, but in the future splices may change them.
 channel_type: ChannelTypeFeatures,
 /// The witness script that is used to lock the channel's funding output to commitment transactions.
 new_funding_redeem_script: ScriptBuf,
	},
	/// Used to indicate that a splice for the given `channel_id` has failed.
	///
Expand DownExpand Up@@ -2234,6 +2240,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref funding_txo,
 ref channel_type,
 ref funding_redeem_script,
 } => {
 31u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2243,6 +2250,7 @@ impl Writeable for Event {
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });
 },
 &Event::ConnectionNeeded { .. } => {
Expand DownExpand Up@@ -2307,6 +2315,7 @@ impl Writeable for Event {
 ref counterparty_node_id,
 ref new_funding_txo,
 ref channel_type,
 ref new_funding_redeem_script,
 } => {
 50u8.write(writer)?;
 write_tlv_fields!(writer, {
Expand All@@ -2315,6 +2324,7 @@ impl Writeable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });
 },
 &Event::SpliceFailed {
Expand DownExpand Up@@ -2815,13 +2825,15 @@ impl MaybeReadable for Event {
 let mut counterparty_node_id = RequiredWrapper(None);
 let mut funding_txo = RequiredWrapper(None);
 let mut channel_type = None;
 let mut funding_redeem_script = None;
 read_tlv_fields!(reader, {
 (0, channel_id, required),
 (1, channel_type, option),
 (2, user_channel_id, required),
 (4, former_temporary_channel_id, required),
 (6, counterparty_node_id, required),
 (8, funding_txo, required),
 (9, funding_redeem_script, option),
 });

 Ok(Some(Event::ChannelPending {
Expand All@@ -2831,6 +2843,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 funding_txo: funding_txo.0.unwrap(),
 channel_type,
 funding_redeem_script,
 }))
 };
 f()
Expand DownExpand Up@@ -2927,6 +2940,7 @@ impl MaybeReadable for Event {
 (5, user_channel_id, required),
 (7, counterparty_node_id, required),
 (9, new_funding_txo, required),
 (11, new_funding_redeem_script, required),
 });

 Ok(Some(Event::SplicePending {
Expand All@@ -2935,6 +2949,7 @@ impl MaybeReadable for Event {
 counterparty_node_id: counterparty_node_id.0.unwrap(),
 new_funding_txo: new_funding_txo.0.unwrap(),
 channel_type: channel_type.0.unwrap(),
 new_funding_redeem_script: new_funding_redeem_script.0.unwrap(),
 }))
 };
 f()
Expand Down

15 changes: 10 additions & 5 deletions
lightning/src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1120,12 +1120,17 @@ impl ChannelTransactionParameters {
 }
	}

	#[rustfmt::skip]
	pub(crate) fn make_funding_redeemscript(&self) -> ScriptBuf {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &self.counterparty_parameters.as_ref().unwrap().pubkeys.funding_pubkey
 )
 self.make_funding_redeemscript_opt().unwrap()
	}

	pub(crate) fn make_funding_redeemscript_opt(&self) -> Option<ScriptBuf> {
 self.counterparty_parameters.as_ref().map(|p| {
 make_funding_redeemscript(
 &self.holder_pubkeys.funding_pubkey,
 &p.pubkeys.funding_pubkey,
 )
 })
	}

	/// Returns the counterparty's pubkeys.
Expand Down

5 changes: 5 additions & 0 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6853,6 +6853,9 @@ pub struct SpliceFundingNegotiated {

	/// The features that this channel will operate with.
	pub channel_type: ChannelTypeFeatures,

	/// The redeem script of the funding output.
	pub funding_redeem_script: ScriptBuf,
}

/// Information about a splice funding negotiation that has failed.
Expand DownExpand Up@@ -8936,12 +8939,14 @@ where
 let funding_txo =
 funding.get_funding_txo().expect("funding outpoint should be set");
 let channel_type = funding.get_channel_type().clone();
 let funding_redeem_script = funding.get_funding_redeemscript();

 pending_splice.negotiated_candidates.push(funding);

 let splice_negotiated = SpliceFundingNegotiated {
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type,
 funding_redeem_script,
 };

 let splice_locked = pending_splice.check_get_splice_locked(
Expand Down

28 changes: 28 additions & 0 deletions
lightning/src/ln/channel_state.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -450,6 +450,10 @@ pub struct ChannelDetails {
	///
	/// This field is empty for objects serialized with LDK versions prior to 0.0.122.
	pub pending_outbound_htlcs: Vec<OutboundHTLCDetails>,
	/// The witness script that is used to lock the channel's funding output to commitment transactions.
	///
	/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.
	pub funding_redeem_script: Option<bitcoin::ScriptBuf>,
}

impl ChannelDetails {
Expand All@@ -475,6 +479,21 @@ impl ChannelDetails {
 self.short_channel_id.or(self.outbound_scid_alias)
	}

	/// Gets the funding output for this channel, if available.
	///
	/// During a splice, the funding output will change and this value will be updated
	/// after the splice transaction has reached sufficient confirmations and we've
	/// exchanged `splice_locked` messages.
	pub fn get_funding_output(&self) -> Option<bitcoin::TxOut> {
 match self.funding_redeem_script.as_ref() {
 None => None,
 Some(redeem_script) => Some(bitcoin::TxOut {
 value: bitcoin::Amount::from_sat(self.channel_value_satoshis),
 script_pubkey: redeem_script.to_p2wsh(),
 }),
 }
	}

	pub(super) fn from_channel<SP: Deref, F: Deref>(
 channel: &Channel<SP>, best_block_height: u32, latest_features: InitFeatures,
 fee_estimator: &LowerBoundedFeeEstimator<F>,
Expand DownExpand Up@@ -509,6 +528,9 @@ impl ChannelDetails {
 outbound_htlc_maximum_msat: context.get_counterparty_htlc_maximum_msat(funding),
 },
 funding_txo: funding.get_funding_txo(),
 funding_redeem_script: funding
 .channel_transaction_parameters
 .make_funding_redeemscript_opt(),
 // Note that accept_channel (or open_channel) is always the first message, so
 // `have_received_message` indicates that type negotiation has completed.
 channel_type: if context.have_received_message() {
Expand DownExpand Up@@ -583,6 +605,7 @@ impl_writeable_tlv_based!(ChannelDetails, {
	(41, channel_shutdown_state, option),
	(43, pending_inbound_htlcs, optional_vec),
	(45, pending_outbound_htlcs, optional_vec),
	(47, funding_redeem_script, option),
	(_unused, user_channel_id, (static_value,
 _user_channel_id_low.unwrap_or(0) as u128 | ((_user_channel_id_high.unwrap_or(0) as u128) << 64)
	)),
Expand DownExpand Up@@ -627,6 +650,7 @@ mod tests {
	use crate::{
 chain::transaction::OutPoint,
 ln::{
 chan_utils::make_funding_redeemscript,
 channel_state::{
 InboundHTLCDetails, InboundHTLCStateDetails, OutboundHTLCDetails,
 OutboundHTLCStateDetails,
Expand DownExpand Up@@ -658,6 +682,10 @@ mod tests {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
 index: 1,
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: None,
 outbound_scid_alias: None,
Expand Down

7 changes: 7 additions & 0 deletions
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3491,6 +3491,8 @@ macro_rules! emit_channel_pending_event {
	($locked_events: expr, $channel: expr) => {
 if $channel.context.should_emit_channel_pending_event() {
 let funding_txo = $channel.funding.get_funding_txo().unwrap();
 let funding_redeem_script =
 Some($channel.funding.channel_transaction_parameters.make_funding_redeemscript());
 $locked_events.push_back((
 events::Event::ChannelPending {
 channel_id: $channel.context.channel_id(),
Expand All@@ -3499,6 +3501,7 @@ macro_rules! emit_channel_pending_event {
 user_channel_id: $channel.context.get_user_id(),
 funding_txo: funding_txo.into_bitcoin_outpoint(),
 channel_type: Some($channel.funding.get_channel_type().clone()),
 funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -6456,6 +6459,8 @@ where
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated
 .funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -9620,6 +9625,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: channel.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand DownExpand Up@@ -10649,6 +10655,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 user_channel_id: chan.context.get_user_id(),
 new_funding_txo: splice_negotiated.funding_txo,
 channel_type: splice_negotiated.channel_type,
 new_funding_redeem_script: splice_negotiated.funding_redeem_script,
 },
 None,
 ));
Expand Down

10 changes: 10 additions & 0 deletions
lightning/src/routing/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3893,6 +3893,7 @@ mod tests {
	use crate::blinded_path::BlindedHop;
	use crate::chain::transaction::OutPoint;
	use crate::crypto::chacha20::ChaCha20;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelDetails, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::msgs::{UnsignedChannelUpdate, MAX_VALUE_MSAT};
Expand DownExpand Up@@ -3950,6 +3951,10 @@ mod tests {
 outbound_htlc_maximum_msat: None,
 },
 funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id,
 outbound_scid_alias: None,
Expand DownExpand Up@@ -9250,6 +9255,7 @@ pub(crate) mod bench_utils {
	use std::io::Read;

	use crate::chain::transaction::OutPoint;
	use crate::ln::chan_utils::make_funding_redeemscript;
	use crate::ln::channel_state::{ChannelCounterparty, ChannelShutdownState};
	use crate::ln::channelmanager;
	use crate::ln::types::ChannelId;
Expand DownExpand Up@@ -9345,6 +9351,10 @@ pub(crate) mod bench_utils {
 funding_txo: Some(OutPoint {
 txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0
 }),
 funding_redeem_script: Some(make_funding_redeemscript(
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 &PublicKey::from_slice(&[2; 33]).unwrap(),
 )),
 channel_type: None,
 short_channel_id: Some(1),
 inbound_scid_alias: None,
Expand Down