Skip to content

Refactor ConstructedTransaction to contain Transaction#4097

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
wpaulino merged 10 commits into from
Sep 24, 2025
Merged

Refactor ConstructedTransaction to contain Transaction#4097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
91845e4
Use FundingTxInput in InteractiveTxConstructorArgs
jkczyz Sep 19, 2025
1e510cc
Track satisfaction_weight in InteractiveTxInput
jkczyz Sep 19, 2025
0a1d445
Remove NegotiatedTxInput::weight
jkczyz Sep 19, 2025
e262326
Compute ConstructedTransaction weight from Transaction
jkczyz Sep 19, 2025
d01df5a
Rename NegotiatedTxInput to TxInMetadata
jkczyz Sep 22, 2025
0cab3c3
Remove duplicate TxOut persistence
jkczyz Sep 19, 2025
a8d7646
Remove unused fields from ConstructedTransaction
jkczyz Sep 22, 2025
105c686
Remove input value fields from ConstructedTransaction
jkczyz Sep 23, 2025
f20a477
Persist witnesses in InteractiveTxSigningSession
jkczyz Sep 22, 2025
86ed012
Reduce visibility of ConstructedTransaction methods
jkczyz Sep 23, 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
26 changes: 6 additions & 20 deletions lightning/src/ln/channel.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6108,8 +6108,8 @@ where
{
let mut output_index = None;
let expected_spk = funding.get_funding_redeemscript().to_p2wsh();
for (idx, outp) in signing_session.unsigned_tx().outputs().enumerate() {
if outp.script_pubkey() == &expected_spk && outp.value() == funding.get_value_satoshis() {
for (idx, outp) in signing_session.unsigned_tx().tx().output.iter().enumerate() {
if outp.script_pubkey == expected_spk && outp.value.to_sat() == funding.get_value_satoshis() {
if output_index.is_some() {
return Err(AbortReason::DuplicateFundingOutput);
}
Expand DownExpand Up@@ -6617,14 +6617,6 @@ impl FundingNegotiationContext {
}
}

let funding_inputs = self
.our_funding_inputs
.into_iter()
.map(|FundingTxInput { utxo, sequence, prevtx }| {
(TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
})
.collect();

let constructor_args = InteractiveTxConstructorArgs {
entropy_source,
holder_node_id,
Expand All@@ -6633,7 +6625,7 @@ impl FundingNegotiationContext {
feerate_sat_per_kw: self.funding_feerate_sat_per_1000_weight,
is_initiator: self.is_initiator,
funding_tx_locktime: self.funding_tx_locktime,
inputs_to_contribute: funding_inputs,
inputs_to_contribute: self.our_funding_inputs,
shared_funding_input: self.shared_funding_input,
shared_funding_output: SharedOwnedOutput::new(
shared_funding_output,
Expand DownExpand Up@@ -8623,7 +8615,7 @@ where
return Err(APIError::APIMisuseError { err });
};

let tx = signing_session.unsigned_tx().build_unsigned_tx();
let tx = signing_session.unsigned_tx().tx();
if funding_txid_signed != tx.compute_txid() {
return Err(APIError::APIMisuseError {
err: "Transaction was malleated prior to signing".to_owned(),
Expand All@@ -8635,7 +8627,7 @@ where
let sig = match &self.context.holder_signer {
ChannelSignerType::Ecdsa(signer) => signer.sign_splice_shared_input(
&self.funding.channel_transaction_parameters,
&tx,
tx,
splice_input_index as usize,
&self.context.secp_ctx,
),
Expand DownExpand Up@@ -13669,12 +13661,6 @@ where
value: Amount::from_sat(funding.get_value_satoshis()),
script_pubkey: funding.get_funding_redeemscript().to_p2wsh(),
};
let inputs_to_contribute = our_funding_inputs
.into_iter()
.map(|FundingTxInput { utxo, sequence, prevtx }| {
(TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
})
.collect();

let interactive_tx_constructor = Some(InteractiveTxConstructor::new(
InteractiveTxConstructorArgs {
Expand All@@ -13685,7 +13671,7 @@ where
feerate_sat_per_kw: funding_negotiation_context.funding_feerate_sat_per_1000_weight,
funding_tx_locktime: funding_negotiation_context.funding_tx_locktime,
is_initiator: false,
inputs_to_contribute,
inputs_to_contribute: our_funding_inputs,
shared_funding_input: None,
shared_funding_output: SharedOwnedOutput::new(shared_funding_output, our_funding_contribution_sats),
outputs_to_contribute: funding_negotiation_context.our_funding_outputs.clone(),
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9137,7 +9137,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
{
if signing_session.has_local_contribution() {
let mut pending_events = self.pending_events.lock().unwrap();
let unsigned_transaction = signing_session.unsigned_tx().build_unsigned_tx();
let unsigned_transaction = signing_session.unsigned_tx().tx().clone();
let event_action = (
Event::FundingTransactionReadyForSigning {
unsigned_transaction,
Expand Down
5 changes: 5 additions & 0 deletions lightning/src/ln/funding.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,11 @@ impl FundingTxInput {
FundingTxInput::new(prevtx, vout, witness_weight, Script::is_p2tr)
}

#[cfg(test)]
pub(crate) fn new_p2pkh(prevtx: Transaction, vout: u32) -> Result<Self, ()> {
Comment thread
wpaulino marked this conversation as resolved.
FundingTxInput::new(prevtx, vout, Weight::ZERO, Script::is_p2pkh)
}

/// The sequence number to use in the [`TxIn`].
///
/// [`TxIn`]: bitcoin::TxIn
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Refactor `ConstructedTransaction` to contain `Transaction` by jkczyz · Pull Request #4097 · lightningdevkit/rust-lightning · GitHub
Skip to content
Refactor ConstructedTransaction to contain Transaction#4097

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

wpaulino
merged 10 commits into

from

Sep 24, 2025
 Merged


Refactor ConstructedTransaction to contain Transaction#4097
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
91845e4

Use FundingTxInput in InteractiveTxConstructorArgs


jkczyz Sep 19, 2025
1e510cc

Track satisfaction_weight in InteractiveTxInput


jkczyz Sep 19, 2025
0a1d445

Remove NegotiatedTxInput::weight


jkczyz Sep 19, 2025
e262326

Compute ConstructedTransaction weight from Transaction


jkczyz Sep 19, 2025
d01df5a

Rename NegotiatedTxInput to TxInMetadata


jkczyz Sep 22, 2025
0cab3c3

Remove duplicate TxOut persistence


jkczyz Sep 19, 2025
a8d7646

Remove unused fields from ConstructedTransaction


jkczyz Sep 22, 2025
105c686

Remove input value fields from ConstructedTransaction


jkczyz Sep 23, 2025
f20a477

Persist witnesses in InteractiveTxSigningSession


jkczyz Sep 22, 2025
86ed012

Reduce visibility of ConstructedTransaction methods


jkczyz Sep 23, 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


26 changes: 6 additions & 20 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6108,8 +6108,8 @@ where
	{
 let mut output_index = None;
 let expected_spk = funding.get_funding_redeemscript().to_p2wsh();
 for (idx, outp) in signing_session.unsigned_tx().outputs().enumerate() {
 if outp.script_pubkey() == &expected_spk && outp.value() == funding.get_value_satoshis() {
 for (idx, outp) in signing_session.unsigned_tx().tx().output.iter().enumerate() {
 if outp.script_pubkey == expected_spk && outp.value.to_sat() == funding.get_value_satoshis() {
 if output_index.is_some() {
 return Err(AbortReason::DuplicateFundingOutput);
 }
Expand DownExpand Up@@ -6617,14 +6617,6 @@ impl FundingNegotiationContext {
 }
 }

 let funding_inputs = self
 .our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let constructor_args = InteractiveTxConstructorArgs {
 entropy_source,
 holder_node_id,
Expand All@@ -6633,7 +6625,7 @@ impl FundingNegotiationContext {
 feerate_sat_per_kw: self.funding_feerate_sat_per_1000_weight,
 is_initiator: self.is_initiator,
 funding_tx_locktime: self.funding_tx_locktime,
 inputs_to_contribute: funding_inputs,
 inputs_to_contribute: self.our_funding_inputs,
 shared_funding_input: self.shared_funding_input,
 shared_funding_output: SharedOwnedOutput::new(
 shared_funding_output,
Expand DownExpand Up@@ -8623,7 +8615,7 @@ where
 return Err(APIError::APIMisuseError { err });
 };

 let tx = signing_session.unsigned_tx().build_unsigned_tx();
 let tx = signing_session.unsigned_tx().tx();
 if funding_txid_signed != tx.compute_txid() {
 return Err(APIError::APIMisuseError {
 err: "Transaction was malleated prior to signing".to_owned(),
Expand All@@ -8635,7 +8627,7 @@ where
 let sig = match &self.context.holder_signer {
 ChannelSignerType::Ecdsa(signer) => signer.sign_splice_shared_input(
 &self.funding.channel_transaction_parameters,
&tx,
 tx,
 splice_input_index as usize,
 &self.context.secp_ctx,
 ),
Expand DownExpand Up@@ -13669,12 +13661,6 @@ where
 value: Amount::from_sat(funding.get_value_satoshis()),
 script_pubkey: funding.get_funding_redeemscript().to_p2wsh(),
 };
 let inputs_to_contribute = our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let interactive_tx_constructor = Some(InteractiveTxConstructor::new(
 InteractiveTxConstructorArgs {
Expand All@@ -13685,7 +13671,7 @@ where
 feerate_sat_per_kw: funding_negotiation_context.funding_feerate_sat_per_1000_weight,
 funding_tx_locktime: funding_negotiation_context.funding_tx_locktime,
 is_initiator: false,
 inputs_to_contribute,
 inputs_to_contribute: our_funding_inputs,
 shared_funding_input: None,
 shared_funding_output: SharedOwnedOutput::new(shared_funding_output, our_funding_contribution_sats),
 outputs_to_contribute: funding_negotiation_context.our_funding_outputs.clone(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9137,7 +9137,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 {
 if signing_session.has_local_contribution() {
 let mut pending_events = self.pending_events.lock().unwrap();
 let unsigned_transaction = signing_session.unsigned_tx().build_unsigned_tx();
 let unsigned_transaction = signing_session.unsigned_tx().tx().clone();
 let event_action = (
 Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,11 @@ impl FundingTxInput {
 FundingTxInput::new(prevtx, vout, witness_weight, Script::is_p2tr)
	}

	#[cfg(test)]
	pub(crate) fn new_p2pkh(prevtx: Transaction, vout: u32) -> Result<Self, ()> {
Comment thread
wpaulino marked this conversation as resolved.

 FundingTxInput::new(prevtx, vout, Weight::ZERO, Script::is_p2pkh)
	}

	/// The sequence number to use in the [`TxIn`].
	///
	/// [`TxIn`]: bitcoin::TxIn
Expand Down
Loading
Loading

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

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

wpaulino
merged 10 commits into

from

Sep 24, 2025
 Merged


Refactor ConstructedTransaction to contain Transaction#4097
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
91845e4

Use FundingTxInput in InteractiveTxConstructorArgs


jkczyz Sep 19, 2025
1e510cc

Track satisfaction_weight in InteractiveTxInput


jkczyz Sep 19, 2025
0a1d445

Remove NegotiatedTxInput::weight


jkczyz Sep 19, 2025
e262326

Compute ConstructedTransaction weight from Transaction


jkczyz Sep 19, 2025
d01df5a

Rename NegotiatedTxInput to TxInMetadata


jkczyz Sep 22, 2025
0cab3c3

Remove duplicate TxOut persistence


jkczyz Sep 19, 2025
a8d7646

Remove unused fields from ConstructedTransaction


jkczyz Sep 22, 2025
105c686

Remove input value fields from ConstructedTransaction


jkczyz Sep 23, 2025
f20a477

Persist witnesses in InteractiveTxSigningSession


jkczyz Sep 22, 2025
86ed012

Reduce visibility of ConstructedTransaction methods


jkczyz Sep 23, 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


26 changes: 6 additions & 20 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6108,8 +6108,8 @@ where
	{
 let mut output_index = None;
 let expected_spk = funding.get_funding_redeemscript().to_p2wsh();
 for (idx, outp) in signing_session.unsigned_tx().outputs().enumerate() {
 if outp.script_pubkey() == &expected_spk && outp.value() == funding.get_value_satoshis() {
 for (idx, outp) in signing_session.unsigned_tx().tx().output.iter().enumerate() {
 if outp.script_pubkey == expected_spk && outp.value.to_sat() == funding.get_value_satoshis() {
 if output_index.is_some() {
 return Err(AbortReason::DuplicateFundingOutput);
 }
Expand DownExpand Up@@ -6617,14 +6617,6 @@ impl FundingNegotiationContext {
 }
 }

 let funding_inputs = self
 .our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let constructor_args = InteractiveTxConstructorArgs {
 entropy_source,
 holder_node_id,
Expand All@@ -6633,7 +6625,7 @@ impl FundingNegotiationContext {
 feerate_sat_per_kw: self.funding_feerate_sat_per_1000_weight,
 is_initiator: self.is_initiator,
 funding_tx_locktime: self.funding_tx_locktime,
 inputs_to_contribute: funding_inputs,
 inputs_to_contribute: self.our_funding_inputs,
 shared_funding_input: self.shared_funding_input,
 shared_funding_output: SharedOwnedOutput::new(
 shared_funding_output,
Expand DownExpand Up@@ -8623,7 +8615,7 @@ where
 return Err(APIError::APIMisuseError { err });
 };

 let tx = signing_session.unsigned_tx().build_unsigned_tx();
 let tx = signing_session.unsigned_tx().tx();
 if funding_txid_signed != tx.compute_txid() {
 return Err(APIError::APIMisuseError {
 err: "Transaction was malleated prior to signing".to_owned(),
Expand All@@ -8635,7 +8627,7 @@ where
 let sig = match &self.context.holder_signer {
 ChannelSignerType::Ecdsa(signer) => signer.sign_splice_shared_input(
 &self.funding.channel_transaction_parameters,
&tx,
 tx,
 splice_input_index as usize,
 &self.context.secp_ctx,
 ),
Expand DownExpand Up@@ -13669,12 +13661,6 @@ where
 value: Amount::from_sat(funding.get_value_satoshis()),
 script_pubkey: funding.get_funding_redeemscript().to_p2wsh(),
 };
 let inputs_to_contribute = our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let interactive_tx_constructor = Some(InteractiveTxConstructor::new(
 InteractiveTxConstructorArgs {
Expand All@@ -13685,7 +13671,7 @@ where
 feerate_sat_per_kw: funding_negotiation_context.funding_feerate_sat_per_1000_weight,
 funding_tx_locktime: funding_negotiation_context.funding_tx_locktime,
 is_initiator: false,
 inputs_to_contribute,
 inputs_to_contribute: our_funding_inputs,
 shared_funding_input: None,
 shared_funding_output: SharedOwnedOutput::new(shared_funding_output, our_funding_contribution_sats),
 outputs_to_contribute: funding_negotiation_context.our_funding_outputs.clone(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9137,7 +9137,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 {
 if signing_session.has_local_contribution() {
 let mut pending_events = self.pending_events.lock().unwrap();
 let unsigned_transaction = signing_session.unsigned_tx().build_unsigned_tx();
 let unsigned_transaction = signing_session.unsigned_tx().tx().clone();
 let event_action = (
 Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,11 @@ impl FundingTxInput {
 FundingTxInput::new(prevtx, vout, witness_weight, Script::is_p2tr)
	}

	#[cfg(test)]
	pub(crate) fn new_p2pkh(prevtx: Transaction, vout: u32) -> Result<Self, ()> {
Comment thread
wpaulino marked this conversation as resolved.

 FundingTxInput::new(prevtx, vout, Weight::ZERO, Script::is_p2pkh)
	}

	/// The sequence number to use in the [`TxIn`].
	///
	/// [`TxIn`]: bitcoin::TxIn
Expand Down
Loading
Loading

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

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

wpaulino
merged 10 commits into

from

Sep 24, 2025
 Merged


Refactor ConstructedTransaction to contain Transaction#4097
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
91845e4

Use FundingTxInput in InteractiveTxConstructorArgs


jkczyz Sep 19, 2025
1e510cc

Track satisfaction_weight in InteractiveTxInput


jkczyz Sep 19, 2025
0a1d445

Remove NegotiatedTxInput::weight


jkczyz Sep 19, 2025
e262326

Compute ConstructedTransaction weight from Transaction


jkczyz Sep 19, 2025
d01df5a

Rename NegotiatedTxInput to TxInMetadata


jkczyz Sep 22, 2025
0cab3c3

Remove duplicate TxOut persistence


jkczyz Sep 19, 2025
a8d7646

Remove unused fields from ConstructedTransaction


jkczyz Sep 22, 2025
105c686

Remove input value fields from ConstructedTransaction


jkczyz Sep 23, 2025
f20a477

Persist witnesses in InteractiveTxSigningSession


jkczyz Sep 22, 2025
86ed012

Reduce visibility of ConstructedTransaction methods


jkczyz Sep 23, 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


26 changes: 6 additions & 20 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6108,8 +6108,8 @@ where
	{
 let mut output_index = None;
 let expected_spk = funding.get_funding_redeemscript().to_p2wsh();
 for (idx, outp) in signing_session.unsigned_tx().outputs().enumerate() {
 if outp.script_pubkey() == &expected_spk && outp.value() == funding.get_value_satoshis() {
 for (idx, outp) in signing_session.unsigned_tx().tx().output.iter().enumerate() {
 if outp.script_pubkey == expected_spk && outp.value.to_sat() == funding.get_value_satoshis() {
 if output_index.is_some() {
 return Err(AbortReason::DuplicateFundingOutput);
 }
Expand DownExpand Up@@ -6617,14 +6617,6 @@ impl FundingNegotiationContext {
 }
 }

 let funding_inputs = self
 .our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let constructor_args = InteractiveTxConstructorArgs {
 entropy_source,
 holder_node_id,
Expand All@@ -6633,7 +6625,7 @@ impl FundingNegotiationContext {
 feerate_sat_per_kw: self.funding_feerate_sat_per_1000_weight,
 is_initiator: self.is_initiator,
 funding_tx_locktime: self.funding_tx_locktime,
 inputs_to_contribute: funding_inputs,
 inputs_to_contribute: self.our_funding_inputs,
 shared_funding_input: self.shared_funding_input,
 shared_funding_output: SharedOwnedOutput::new(
 shared_funding_output,
Expand DownExpand Up@@ -8623,7 +8615,7 @@ where
 return Err(APIError::APIMisuseError { err });
 };

 let tx = signing_session.unsigned_tx().build_unsigned_tx();
 let tx = signing_session.unsigned_tx().tx();
 if funding_txid_signed != tx.compute_txid() {
 return Err(APIError::APIMisuseError {
 err: "Transaction was malleated prior to signing".to_owned(),
Expand All@@ -8635,7 +8627,7 @@ where
 let sig = match &self.context.holder_signer {
 ChannelSignerType::Ecdsa(signer) => signer.sign_splice_shared_input(
 &self.funding.channel_transaction_parameters,
&tx,
 tx,
 splice_input_index as usize,
 &self.context.secp_ctx,
 ),
Expand DownExpand Up@@ -13669,12 +13661,6 @@ where
 value: Amount::from_sat(funding.get_value_satoshis()),
 script_pubkey: funding.get_funding_redeemscript().to_p2wsh(),
 };
 let inputs_to_contribute = our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let interactive_tx_constructor = Some(InteractiveTxConstructor::new(
 InteractiveTxConstructorArgs {
Expand All@@ -13685,7 +13671,7 @@ where
 feerate_sat_per_kw: funding_negotiation_context.funding_feerate_sat_per_1000_weight,
 funding_tx_locktime: funding_negotiation_context.funding_tx_locktime,
 is_initiator: false,
 inputs_to_contribute,
 inputs_to_contribute: our_funding_inputs,
 shared_funding_input: None,
 shared_funding_output: SharedOwnedOutput::new(shared_funding_output, our_funding_contribution_sats),
 outputs_to_contribute: funding_negotiation_context.our_funding_outputs.clone(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9137,7 +9137,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 {
 if signing_session.has_local_contribution() {
 let mut pending_events = self.pending_events.lock().unwrap();
 let unsigned_transaction = signing_session.unsigned_tx().build_unsigned_tx();
 let unsigned_transaction = signing_session.unsigned_tx().tx().clone();
 let event_action = (
 Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,11 @@ impl FundingTxInput {
 FundingTxInput::new(prevtx, vout, witness_weight, Script::is_p2tr)
	}

	#[cfg(test)]
	pub(crate) fn new_p2pkh(prevtx: Transaction, vout: u32) -> Result<Self, ()> {
Comment thread
wpaulino marked this conversation as resolved.

 FundingTxInput::new(prevtx, vout, Weight::ZERO, Script::is_p2pkh)
	}

	/// The sequence number to use in the [`TxIn`].
	///
	/// [`TxIn`]: bitcoin::TxIn
Expand Down
Loading
Loading

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

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

wpaulino
merged 10 commits into

from

Sep 24, 2025
 Merged


Refactor ConstructedTransaction to contain Transaction#4097
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
91845e4

Use FundingTxInput in InteractiveTxConstructorArgs


jkczyz Sep 19, 2025
1e510cc

Track satisfaction_weight in InteractiveTxInput


jkczyz Sep 19, 2025
0a1d445

Remove NegotiatedTxInput::weight


jkczyz Sep 19, 2025
e262326

Compute ConstructedTransaction weight from Transaction


jkczyz Sep 19, 2025
d01df5a

Rename NegotiatedTxInput to TxInMetadata


jkczyz Sep 22, 2025
0cab3c3

Remove duplicate TxOut persistence


jkczyz Sep 19, 2025
a8d7646

Remove unused fields from ConstructedTransaction


jkczyz Sep 22, 2025
105c686

Remove input value fields from ConstructedTransaction


jkczyz Sep 23, 2025
f20a477

Persist witnesses in InteractiveTxSigningSession


jkczyz Sep 22, 2025
86ed012

Reduce visibility of ConstructedTransaction methods


jkczyz Sep 23, 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


26 changes: 6 additions & 20 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6108,8 +6108,8 @@ where
	{
 let mut output_index = None;
 let expected_spk = funding.get_funding_redeemscript().to_p2wsh();
 for (idx, outp) in signing_session.unsigned_tx().outputs().enumerate() {
 if outp.script_pubkey() == &expected_spk && outp.value() == funding.get_value_satoshis() {
 for (idx, outp) in signing_session.unsigned_tx().tx().output.iter().enumerate() {
 if outp.script_pubkey == expected_spk && outp.value.to_sat() == funding.get_value_satoshis() {
 if output_index.is_some() {
 return Err(AbortReason::DuplicateFundingOutput);
 }
Expand DownExpand Up@@ -6617,14 +6617,6 @@ impl FundingNegotiationContext {
 }
 }

 let funding_inputs = self
 .our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let constructor_args = InteractiveTxConstructorArgs {
 entropy_source,
 holder_node_id,
Expand All@@ -6633,7 +6625,7 @@ impl FundingNegotiationContext {
 feerate_sat_per_kw: self.funding_feerate_sat_per_1000_weight,
 is_initiator: self.is_initiator,
 funding_tx_locktime: self.funding_tx_locktime,
 inputs_to_contribute: funding_inputs,
 inputs_to_contribute: self.our_funding_inputs,
 shared_funding_input: self.shared_funding_input,
 shared_funding_output: SharedOwnedOutput::new(
 shared_funding_output,
Expand DownExpand Up@@ -8623,7 +8615,7 @@ where
 return Err(APIError::APIMisuseError { err });
 };

 let tx = signing_session.unsigned_tx().build_unsigned_tx();
 let tx = signing_session.unsigned_tx().tx();
 if funding_txid_signed != tx.compute_txid() {
 return Err(APIError::APIMisuseError {
 err: "Transaction was malleated prior to signing".to_owned(),
Expand All@@ -8635,7 +8627,7 @@ where
 let sig = match &self.context.holder_signer {
 ChannelSignerType::Ecdsa(signer) => signer.sign_splice_shared_input(
 &self.funding.channel_transaction_parameters,
&tx,
 tx,
 splice_input_index as usize,
 &self.context.secp_ctx,
 ),
Expand DownExpand Up@@ -13669,12 +13661,6 @@ where
 value: Amount::from_sat(funding.get_value_satoshis()),
 script_pubkey: funding.get_funding_redeemscript().to_p2wsh(),
 };
 let inputs_to_contribute = our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let interactive_tx_constructor = Some(InteractiveTxConstructor::new(
 InteractiveTxConstructorArgs {
Expand All@@ -13685,7 +13671,7 @@ where
 feerate_sat_per_kw: funding_negotiation_context.funding_feerate_sat_per_1000_weight,
 funding_tx_locktime: funding_negotiation_context.funding_tx_locktime,
 is_initiator: false,
 inputs_to_contribute,
 inputs_to_contribute: our_funding_inputs,
 shared_funding_input: None,
 shared_funding_output: SharedOwnedOutput::new(shared_funding_output, our_funding_contribution_sats),
 outputs_to_contribute: funding_negotiation_context.our_funding_outputs.clone(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9137,7 +9137,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 {
 if signing_session.has_local_contribution() {
 let mut pending_events = self.pending_events.lock().unwrap();
 let unsigned_transaction = signing_session.unsigned_tx().build_unsigned_tx();
 let unsigned_transaction = signing_session.unsigned_tx().tx().clone();
 let event_action = (
 Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,11 @@ impl FundingTxInput {
 FundingTxInput::new(prevtx, vout, witness_weight, Script::is_p2tr)
	}

	#[cfg(test)]
	pub(crate) fn new_p2pkh(prevtx: Transaction, vout: u32) -> Result<Self, ()> {
Comment thread
wpaulino marked this conversation as resolved.

 FundingTxInput::new(prevtx, vout, Weight::ZERO, Script::is_p2pkh)
	}

	/// The sequence number to use in the [`TxIn`].
	///
	/// [`TxIn`]: bitcoin::TxIn
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Refactor `ConstructedTransaction` to contain `Transaction` by jkczyz · Pull Request #4097 · lightningdevkit/rust-lightning · GitHub
Skip to content
Refactor ConstructedTransaction to contain Transaction#4097

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

wpaulino
merged 10 commits into

from

Sep 24, 2025
 Merged


Refactor ConstructedTransaction to contain Transaction#4097
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
91845e4

Use FundingTxInput in InteractiveTxConstructorArgs


jkczyz Sep 19, 2025
1e510cc

Track satisfaction_weight in InteractiveTxInput


jkczyz Sep 19, 2025
0a1d445

Remove NegotiatedTxInput::weight


jkczyz Sep 19, 2025
e262326

Compute ConstructedTransaction weight from Transaction


jkczyz Sep 19, 2025
d01df5a

Rename NegotiatedTxInput to TxInMetadata


jkczyz Sep 22, 2025
0cab3c3

Remove duplicate TxOut persistence


jkczyz Sep 19, 2025
a8d7646

Remove unused fields from ConstructedTransaction


jkczyz Sep 22, 2025
105c686

Remove input value fields from ConstructedTransaction


jkczyz Sep 23, 2025
f20a477

Persist witnesses in InteractiveTxSigningSession


jkczyz Sep 22, 2025
86ed012

Reduce visibility of ConstructedTransaction methods


jkczyz Sep 23, 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


26 changes: 6 additions & 20 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6108,8 +6108,8 @@ where
	{
 let mut output_index = None;
 let expected_spk = funding.get_funding_redeemscript().to_p2wsh();
 for (idx, outp) in signing_session.unsigned_tx().outputs().enumerate() {
 if outp.script_pubkey() == &expected_spk && outp.value() == funding.get_value_satoshis() {
 for (idx, outp) in signing_session.unsigned_tx().tx().output.iter().enumerate() {
 if outp.script_pubkey == expected_spk && outp.value.to_sat() == funding.get_value_satoshis() {
 if output_index.is_some() {
 return Err(AbortReason::DuplicateFundingOutput);
 }
Expand DownExpand Up@@ -6617,14 +6617,6 @@ impl FundingNegotiationContext {
 }
 }

 let funding_inputs = self
 .our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let constructor_args = InteractiveTxConstructorArgs {
 entropy_source,
 holder_node_id,
Expand All@@ -6633,7 +6625,7 @@ impl FundingNegotiationContext {
 feerate_sat_per_kw: self.funding_feerate_sat_per_1000_weight,
 is_initiator: self.is_initiator,
 funding_tx_locktime: self.funding_tx_locktime,
 inputs_to_contribute: funding_inputs,
 inputs_to_contribute: self.our_funding_inputs,
 shared_funding_input: self.shared_funding_input,
 shared_funding_output: SharedOwnedOutput::new(
 shared_funding_output,
Expand DownExpand Up@@ -8623,7 +8615,7 @@ where
 return Err(APIError::APIMisuseError { err });
 };

 let tx = signing_session.unsigned_tx().build_unsigned_tx();
 let tx = signing_session.unsigned_tx().tx();
 if funding_txid_signed != tx.compute_txid() {
 return Err(APIError::APIMisuseError {
 err: "Transaction was malleated prior to signing".to_owned(),
Expand All@@ -8635,7 +8627,7 @@ where
 let sig = match &self.context.holder_signer {
 ChannelSignerType::Ecdsa(signer) => signer.sign_splice_shared_input(
 &self.funding.channel_transaction_parameters,
&tx,
 tx,
 splice_input_index as usize,
 &self.context.secp_ctx,
 ),
Expand DownExpand Up@@ -13669,12 +13661,6 @@ where
 value: Amount::from_sat(funding.get_value_satoshis()),
 script_pubkey: funding.get_funding_redeemscript().to_p2wsh(),
 };
 let inputs_to_contribute = our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let interactive_tx_constructor = Some(InteractiveTxConstructor::new(
 InteractiveTxConstructorArgs {
Expand All@@ -13685,7 +13671,7 @@ where
 feerate_sat_per_kw: funding_negotiation_context.funding_feerate_sat_per_1000_weight,
 funding_tx_locktime: funding_negotiation_context.funding_tx_locktime,
 is_initiator: false,
 inputs_to_contribute,
 inputs_to_contribute: our_funding_inputs,
 shared_funding_input: None,
 shared_funding_output: SharedOwnedOutput::new(shared_funding_output, our_funding_contribution_sats),
 outputs_to_contribute: funding_negotiation_context.our_funding_outputs.clone(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9137,7 +9137,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 {
 if signing_session.has_local_contribution() {
 let mut pending_events = self.pending_events.lock().unwrap();
 let unsigned_transaction = signing_session.unsigned_tx().build_unsigned_tx();
 let unsigned_transaction = signing_session.unsigned_tx().tx().clone();
 let event_action = (
 Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,11 @@ impl FundingTxInput {
 FundingTxInput::new(prevtx, vout, witness_weight, Script::is_p2tr)
	}

	#[cfg(test)]
	pub(crate) fn new_p2pkh(prevtx: Transaction, vout: u32) -> Result<Self, ()> {
Comment thread
wpaulino marked this conversation as resolved.

 FundingTxInput::new(prevtx, vout, Weight::ZERO, Script::is_p2pkh)
	}

	/// The sequence number to use in the [`TxIn`].
	///
	/// [`TxIn`]: bitcoin::TxIn
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Refactor `ConstructedTransaction` to contain `Transaction` by jkczyz · Pull Request #4097 · lightningdevkit/rust-lightning · GitHub
Skip to content
Refactor ConstructedTransaction to contain Transaction#4097

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

wpaulino
merged 10 commits into

from

Sep 24, 2025
 Merged


Refactor ConstructedTransaction to contain Transaction#4097
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
91845e4

Use FundingTxInput in InteractiveTxConstructorArgs


jkczyz Sep 19, 2025
1e510cc

Track satisfaction_weight in InteractiveTxInput


jkczyz Sep 19, 2025
0a1d445

Remove NegotiatedTxInput::weight


jkczyz Sep 19, 2025
e262326

Compute ConstructedTransaction weight from Transaction


jkczyz Sep 19, 2025
d01df5a

Rename NegotiatedTxInput to TxInMetadata


jkczyz Sep 22, 2025
0cab3c3

Remove duplicate TxOut persistence


jkczyz Sep 19, 2025
a8d7646

Remove unused fields from ConstructedTransaction


jkczyz Sep 22, 2025
105c686

Remove input value fields from ConstructedTransaction


jkczyz Sep 23, 2025
f20a477

Persist witnesses in InteractiveTxSigningSession


jkczyz Sep 22, 2025
86ed012

Reduce visibility of ConstructedTransaction methods


jkczyz Sep 23, 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


26 changes: 6 additions & 20 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6108,8 +6108,8 @@ where
	{
 let mut output_index = None;
 let expected_spk = funding.get_funding_redeemscript().to_p2wsh();
 for (idx, outp) in signing_session.unsigned_tx().outputs().enumerate() {
 if outp.script_pubkey() == &expected_spk && outp.value() == funding.get_value_satoshis() {
 for (idx, outp) in signing_session.unsigned_tx().tx().output.iter().enumerate() {
 if outp.script_pubkey == expected_spk && outp.value.to_sat() == funding.get_value_satoshis() {
 if output_index.is_some() {
 return Err(AbortReason::DuplicateFundingOutput);
 }
Expand DownExpand Up@@ -6617,14 +6617,6 @@ impl FundingNegotiationContext {
 }
 }

 let funding_inputs = self
 .our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let constructor_args = InteractiveTxConstructorArgs {
 entropy_source,
 holder_node_id,
Expand All@@ -6633,7 +6625,7 @@ impl FundingNegotiationContext {
 feerate_sat_per_kw: self.funding_feerate_sat_per_1000_weight,
 is_initiator: self.is_initiator,
 funding_tx_locktime: self.funding_tx_locktime,
 inputs_to_contribute: funding_inputs,
 inputs_to_contribute: self.our_funding_inputs,
 shared_funding_input: self.shared_funding_input,
 shared_funding_output: SharedOwnedOutput::new(
 shared_funding_output,
Expand DownExpand Up@@ -8623,7 +8615,7 @@ where
 return Err(APIError::APIMisuseError { err });
 };

 let tx = signing_session.unsigned_tx().build_unsigned_tx();
 let tx = signing_session.unsigned_tx().tx();
 if funding_txid_signed != tx.compute_txid() {
 return Err(APIError::APIMisuseError {
 err: "Transaction was malleated prior to signing".to_owned(),
Expand All@@ -8635,7 +8627,7 @@ where
 let sig = match &self.context.holder_signer {
 ChannelSignerType::Ecdsa(signer) => signer.sign_splice_shared_input(
 &self.funding.channel_transaction_parameters,
&tx,
 tx,
 splice_input_index as usize,
 &self.context.secp_ctx,
 ),
Expand DownExpand Up@@ -13669,12 +13661,6 @@ where
 value: Amount::from_sat(funding.get_value_satoshis()),
 script_pubkey: funding.get_funding_redeemscript().to_p2wsh(),
 };
 let inputs_to_contribute = our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let interactive_tx_constructor = Some(InteractiveTxConstructor::new(
 InteractiveTxConstructorArgs {
Expand All@@ -13685,7 +13671,7 @@ where
 feerate_sat_per_kw: funding_negotiation_context.funding_feerate_sat_per_1000_weight,
 funding_tx_locktime: funding_negotiation_context.funding_tx_locktime,
 is_initiator: false,
 inputs_to_contribute,
 inputs_to_contribute: our_funding_inputs,
 shared_funding_input: None,
 shared_funding_output: SharedOwnedOutput::new(shared_funding_output, our_funding_contribution_sats),
 outputs_to_contribute: funding_negotiation_context.our_funding_outputs.clone(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9137,7 +9137,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 {
 if signing_session.has_local_contribution() {
 let mut pending_events = self.pending_events.lock().unwrap();
 let unsigned_transaction = signing_session.unsigned_tx().build_unsigned_tx();
 let unsigned_transaction = signing_session.unsigned_tx().tx().clone();
 let event_action = (
 Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,11 @@ impl FundingTxInput {
 FundingTxInput::new(prevtx, vout, witness_weight, Script::is_p2tr)
	}

	#[cfg(test)]
	pub(crate) fn new_p2pkh(prevtx: Transaction, vout: u32) -> Result<Self, ()> {
Comment thread
wpaulino marked this conversation as resolved.

 FundingTxInput::new(prevtx, vout, Weight::ZERO, Script::is_p2pkh)
	}

	/// The sequence number to use in the [`TxIn`].
	///
	/// [`TxIn`]: bitcoin::TxIn
Expand Down
Loading
Loading

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

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

wpaulino
merged 10 commits into

from

Sep 24, 2025
 Merged


Refactor ConstructedTransaction to contain Transaction#4097
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
91845e4

Use FundingTxInput in InteractiveTxConstructorArgs


jkczyz Sep 19, 2025
1e510cc

Track satisfaction_weight in InteractiveTxInput


jkczyz Sep 19, 2025
0a1d445

Remove NegotiatedTxInput::weight


jkczyz Sep 19, 2025
e262326

Compute ConstructedTransaction weight from Transaction


jkczyz Sep 19, 2025
d01df5a

Rename NegotiatedTxInput to TxInMetadata


jkczyz Sep 22, 2025
0cab3c3

Remove duplicate TxOut persistence


jkczyz Sep 19, 2025
a8d7646

Remove unused fields from ConstructedTransaction


jkczyz Sep 22, 2025
105c686

Remove input value fields from ConstructedTransaction


jkczyz Sep 23, 2025
f20a477

Persist witnesses in InteractiveTxSigningSession


jkczyz Sep 22, 2025
86ed012

Reduce visibility of ConstructedTransaction methods


jkczyz Sep 23, 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


26 changes: 6 additions & 20 deletions
lightning/src/ln/channel.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6108,8 +6108,8 @@ where
	{
 let mut output_index = None;
 let expected_spk = funding.get_funding_redeemscript().to_p2wsh();
 for (idx, outp) in signing_session.unsigned_tx().outputs().enumerate() {
 if outp.script_pubkey() == &expected_spk && outp.value() == funding.get_value_satoshis() {
 for (idx, outp) in signing_session.unsigned_tx().tx().output.iter().enumerate() {
 if outp.script_pubkey == expected_spk && outp.value.to_sat() == funding.get_value_satoshis() {
 if output_index.is_some() {
 return Err(AbortReason::DuplicateFundingOutput);
 }
Expand DownExpand Up@@ -6617,14 +6617,6 @@ impl FundingNegotiationContext {
 }
 }

 let funding_inputs = self
 .our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let constructor_args = InteractiveTxConstructorArgs {
 entropy_source,
 holder_node_id,
Expand All@@ -6633,7 +6625,7 @@ impl FundingNegotiationContext {
 feerate_sat_per_kw: self.funding_feerate_sat_per_1000_weight,
 is_initiator: self.is_initiator,
 funding_tx_locktime: self.funding_tx_locktime,
 inputs_to_contribute: funding_inputs,
 inputs_to_contribute: self.our_funding_inputs,
 shared_funding_input: self.shared_funding_input,
 shared_funding_output: SharedOwnedOutput::new(
 shared_funding_output,
Expand DownExpand Up@@ -8623,7 +8615,7 @@ where
 return Err(APIError::APIMisuseError { err });
 };

 let tx = signing_session.unsigned_tx().build_unsigned_tx();
 let tx = signing_session.unsigned_tx().tx();
 if funding_txid_signed != tx.compute_txid() {
 return Err(APIError::APIMisuseError {
 err: "Transaction was malleated prior to signing".to_owned(),
Expand All@@ -8635,7 +8627,7 @@ where
 let sig = match &self.context.holder_signer {
 ChannelSignerType::Ecdsa(signer) => signer.sign_splice_shared_input(
 &self.funding.channel_transaction_parameters,
&tx,
 tx,
 splice_input_index as usize,
 &self.context.secp_ctx,
 ),
Expand DownExpand Up@@ -13669,12 +13661,6 @@ where
 value: Amount::from_sat(funding.get_value_satoshis()),
 script_pubkey: funding.get_funding_redeemscript().to_p2wsh(),
 };
 let inputs_to_contribute = our_funding_inputs
 .into_iter()
 .map(|FundingTxInput { utxo, sequence, prevtx }| {
 (TxIn { previous_output: utxo.outpoint, sequence, ..Default::default() }, prevtx)
 })
 .collect();

 let interactive_tx_constructor = Some(InteractiveTxConstructor::new(
 InteractiveTxConstructorArgs {
Expand All@@ -13685,7 +13671,7 @@ where
 feerate_sat_per_kw: funding_negotiation_context.funding_feerate_sat_per_1000_weight,
 funding_tx_locktime: funding_negotiation_context.funding_tx_locktime,
 is_initiator: false,
 inputs_to_contribute,
 inputs_to_contribute: our_funding_inputs,
 shared_funding_input: None,
 shared_funding_output: SharedOwnedOutput::new(shared_funding_output, our_funding_contribution_sats),
 outputs_to_contribute: funding_negotiation_context.our_funding_outputs.clone(),
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/ln/channelmanager.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9137,7 +9137,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 {
 if signing_session.has_local_contribution() {
 let mut pending_events = self.pending_events.lock().unwrap();
 let unsigned_transaction = signing_session.unsigned_tx().build_unsigned_tx();
 let unsigned_transaction = signing_session.unsigned_tx().tx().clone();
 let event_action = (
 Event::FundingTransactionReadyForSigning {
 unsigned_transaction,
Expand Down

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -198,6 +198,11 @@ impl FundingTxInput {
 FundingTxInput::new(prevtx, vout, witness_weight, Script::is_p2tr)
	}

	#[cfg(test)]
	pub(crate) fn new_p2pkh(prevtx: Transaction, vout: u32) -> Result<Self, ()> {
Comment thread
wpaulino marked this conversation as resolved.

 FundingTxInput::new(prevtx, vout, Weight::ZERO, Script::is_p2pkh)
	}

	/// The sequence number to use in the [`TxIn`].
	///
	/// [`TxIn`]: bitcoin::TxIn
Expand Down
Loading
Loading