Remove exclusive reference and generic from CommitmentTransaction API#3689

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 1 commit into from
Apr 16, 2025
Merged

Remove exclusive reference and generic from CommitmentTransaction API #3689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 27 additions & 21 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3588,15 +3588,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
to_broadcaster_value,
to_countersignatory_value,
)| {
let htlc_outputs = vec![];
let nondust_htlcs = vec![];

let commitment_tx = self.build_counterparty_commitment_tx(
INITIAL_COMMITMENT_NUMBER,
&their_per_commitment_point,
to_broadcaster_value,
to_countersignatory_value,
feerate_per_kw,
htlc_outputs,
nondust_htlcs,
);
// Take the opportunity to populate this recently introduced field
self.initial_counterparty_commitment_tx = Some(commitment_tx.clone());
Expand All@@ -3609,11 +3609,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
fn build_counterparty_commitment_tx(
&self, commitment_number: u64, their_per_commitment_point: &PublicKey,
to_broadcaster_value: u64, to_countersignatory_value: u64, feerate_per_kw: u32,
mut nondust_htlcs: Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>
nondust_htlcs: Vec<HTLCOutputInCommitment>
) -> CommitmentTransaction {
let channel_parameters = &self.funding.channel_parameters.as_counterparty_broadcastable();
CommitmentTransaction::new_with_auxiliary_htlc_data(commitment_number, their_per_commitment_point,
to_broadcaster_value, to_countersignatory_value, feerate_per_kw, &mut nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
CommitmentTransaction::new(commitment_number, their_per_commitment_point,
to_broadcaster_value, to_countersignatory_value, feerate_per_kw, nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
}

fn counterparty_commitment_txs_from_update(&self, update: &ChannelMonitorUpdate) -> Vec<CommitmentTransaction> {
Expand All@@ -3629,7 +3629,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
to_countersignatory_value_sat: Some(to_countersignatory_value) } => {

let nondust_htlcs = htlc_outputs.iter().filter_map(|(htlc, _)| {
htlc.transaction_output_index.map(|_| (htlc.clone(), None))
htlc.transaction_output_index.map(|_| htlc).cloned()
}).collect::<Vec<_>>();

let commitment_tx = self.build_counterparty_commitment_tx(commitment_number,
Expand DownExpand Up@@ -5620,21 +5620,21 @@ mod tests {
{
let mut res = Vec::new();
for (idx, preimage) in $preimages_slice.iter().enumerate() {
res.push((HTLCOutputInCommitment {
res.push(HTLCOutputInCommitment {
offered: true,
amount_msat: 0,
cltv_expiry: 0,
payment_hash: preimage.1.clone(),
transaction_output_index: Some(idx as u32),
}, ()));
});
}
res
}
}
}
macro_rules! preimages_slice_to_htlc_outputs {
($preimages_slice: expr) => {
preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|(htlc, _)| (htlc, None)).collect()
preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|htlc| (htlc, None)).collect()
}
}
let dummy_sig = crate::crypto::utils::sign(&secp_ctx,
Expand DownExpand Up@@ -5690,15 +5690,17 @@ mod tests {
let best_block = BestBlock::from_network(Network::Testnet);
let monitor = ChannelMonitor::new(
Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
&channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
&channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
best_block, dummy_key, channel_id,
);

let mut htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
// These HTLCs now have their output indices assigned
let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();

monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"1").to_byte_array()),
preimages_slice_to_htlc_outputs!(preimages[5..15]), 281474976710655, dummy_key, &logger);
monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"2").to_byte_array()),
Expand DownExpand Up@@ -5733,21 +5735,25 @@ mod tests {

// Now update holder commitment tx info, pruning only element 18 as we still care about the
// previous commitment tx's preimages too
let mut htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
// These HTLCs now have their output indices assigned
let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
monitor.provide_secret(281474976710653, secret.clone()).unwrap();
assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 12);
test_preimages_exist!(&preimages[0..10], monitor);
test_preimages_exist!(&preimages[18..20], monitor);

// But if we do it again, we'll prune 5-10
let mut htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx,
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
// These HTLCs now have their output indices assigned
let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
monitor.provide_secret(281474976710652, secret.clone()).unwrap();
assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 5);
Expand DownExpand Up@@ -5942,7 +5948,7 @@ mod tests {
let best_block = BestBlock::from_network(Network::Testnet);
let monitor = ChannelMonitor::new(
Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
&channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
&channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
best_block, dummy_key, channel_id,
);

Expand Down
11 changes: 5 additions & 6 deletions lightning/src/chain/onchaintx.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,22 +1296,21 @@ mod tests {

// Create an OnchainTxHandler for a commitment containing HTLCs with CLTV expiries of 0, 1,
// and 2 blocks.
let mut htlcs = Vec::new();
let mut nondust_htlcs = Vec::new();
for i in 0..3 {
let preimage = PaymentPreimage([i; 32]);
let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
htlcs.push((
nondust_htlcs.push(
HTLCOutputInCommitment {
offered: true,
amount_msat: 10000,
cltv_expiry: i as u32,
payment_hash: hash,
transaction_output_index: Some(i as u32),
},
(),
));
}
);
}
let holder_commit = HolderCommitmentTransaction::dummy(1000000, &mut htlcs);
let holder_commit = HolderCommitmentTransaction::dummy(1000000, nondust_htlcs);
let destination_script = ScriptBuf::new();
let mut tx_handler = OnchainTxHandler::new(
1000000,
Expand Down
6 changes: 3 additions & 3 deletions lightning/src/chain/package.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1712,7 +1712,7 @@ mod tests {
payment_hash: PaymentHash::from(preimage),
transaction_output_index: None,
};
let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
let trusted_tx = commitment_tx.trust();
PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
HTLCDescriptor {
Expand DownExpand Up@@ -1746,7 +1746,7 @@ mod tests {
payment_hash: PaymentHash::from(PaymentPreimage([2;32])),
transaction_output_index: None,
};
let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
let trusted_tx = commitment_tx.trust();
PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
HTLCDescriptor {
Expand All@@ -1770,7 +1770,7 @@ mod tests {

macro_rules! dumb_funding_output {
() => {{
let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut Vec::new());
let commitment_tx = HolderCommitmentTransaction::dummy(0, Vec::new());
let mut channel_parameters = ChannelTransactionParameters::test_dummy(0);
channel_parameters.channel_type_features = ChannelTypeFeatures::only_static_remote_key();
PackageSolvingData::HolderFundingOutput(HolderFundingOutput::build(
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Remove exclusive reference and generic from CommitmentTransaction API#3689

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 1 commit into

from

Apr 16, 2025
 Merged


Remove exclusive reference and generic from CommitmentTransaction API
#3689
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


48 changes: 27 additions & 21 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3588,15 +3588,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_broadcaster_value,
 to_countersignatory_value,
 )| {
 let htlc_outputs = vec![];
 let nondust_htlcs = vec![];

 let commitment_tx = self.build_counterparty_commitment_tx(
 INITIAL_COMMITMENT_NUMBER,
 &their_per_commitment_point,
 to_broadcaster_value,
 to_countersignatory_value,
 feerate_per_kw,
htlc_outputs,
nondust_htlcs,
 );
 // Take the opportunity to populate this recently introduced field
 self.initial_counterparty_commitment_tx = Some(commitment_tx.clone());
Expand All@@ -3609,11 +3609,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn build_counterparty_commitment_tx(
 &self, commitment_number: u64, their_per_commitment_point: &PublicKey,
 to_broadcaster_value: u64, to_countersignatory_value: u64, feerate_per_kw: u32,
mut nondust_htlcs: Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>
 nondust_htlcs: Vec<HTLCOutputInCommitment>
	) -> CommitmentTransaction {
 let channel_parameters = &self.funding.channel_parameters.as_counterparty_broadcastable();
 CommitmentTransaction::new_with_auxiliary_htlc_data(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, &mut nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
 CommitmentTransaction::new(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
	}

	fn counterparty_commitment_txs_from_update(&self, update: &ChannelMonitorUpdate) -> Vec<CommitmentTransaction> {
Expand All@@ -3629,7 +3629,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_countersignatory_value_sat: Some(to_countersignatory_value) } => {

 let nondust_htlcs = htlc_outputs.iter().filter_map(|(htlc, _)| {
 htlc.transaction_output_index.map(|_| (htlc.clone(), None))
 htlc.transaction_output_index.map(|_| htlc).cloned()
 }).collect::<Vec<_>>();

 let commitment_tx = self.build_counterparty_commitment_tx(commitment_number,
Expand DownExpand Up@@ -5620,21 +5620,21 @@ mod tests {
 {
 let mut res = Vec::new();
 for (idx, preimage) in $preimages_slice.iter().enumerate() {
 res.push((HTLCOutputInCommitment {
 res.push(HTLCOutputInCommitment {
 offered: true,
 amount_msat: 0,
 cltv_expiry: 0,
 payment_hash: preimage.1.clone(),
 transaction_output_index: Some(idx as u32),
 }, ()));
 });
 }
 res
 }
 }
 }
 macro_rules! preimages_slice_to_htlc_outputs {
 ($preimages_slice: expr) => {
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|(htlc, _)| (htlc, None)).collect()
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|htlc| (htlc, None)).collect()
 }
 }
 let dummy_sig = crate::crypto::utils::sign(&secp_ctx,
Expand DownExpand Up@@ -5690,15 +5690,17 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();

 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"1").to_byte_array()),
 preimages_slice_to_htlc_outputs!(preimages[5..15]), 281474976710655, dummy_key, &logger);
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"2").to_byte_array()),
Expand DownExpand Up@@ -5733,21 +5735,25 @@ mod tests {

 // Now update holder commitment tx info, pruning only element 18 as we still care about the
 // previous commitment tx's preimages too
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
 monitor.provide_secret(281474976710653, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 12);
 test_preimages_exist!(&preimages[0..10], monitor);
 test_preimages_exist!(&preimages[18..20], monitor);

 // But if we do it again, we'll prune 5-10
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx,
 htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
 nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
 monitor.provide_secret(281474976710652, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 5);
Expand DownExpand Up@@ -5942,7 +5948,7 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,22 +1296,21 @@ mod tests {

 // Create an OnchainTxHandler for a commitment containing HTLCs with CLTV expiries of 0, 1,
 // and 2 blocks.
 let mut htlcs = Vec::new();
 let mut nondust_htlcs = Vec::new();
 for i in 0..3 {
 let preimage = PaymentPreimage([i; 32]);
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
htlcs.push((
nondust_htlcs.push(
 HTLCOutputInCommitment {
 offered: true,
 amount_msat: 10000,
 cltv_expiry: i as u32,
 payment_hash: hash,
 transaction_output_index: Some(i as u32),
 },
 (),
 ));
 }
 );
 }
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, &mut htlcs);
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, nondust_htlcs);
 let destination_script = ScriptBuf::new();
 let mut tx_handler = OnchainTxHandler::new(
 1000000,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1712,7 +1712,7 @@ mod tests {
 payment_hash: PaymentHash::from(preimage),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand DownExpand Up@@ -1746,7 +1746,7 @@ mod tests {
 payment_hash: PaymentHash::from(PaymentPreimage([2;32])),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand All@@ -1770,7 +1770,7 @@ mod tests {

	macro_rules! dumb_funding_output {
 () => {{
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut Vec::new());
 let commitment_tx = HolderCommitmentTransaction::dummy(0, Vec::new());
 let mut channel_parameters = ChannelTransactionParameters::test_dummy(0);
 channel_parameters.channel_type_features = ChannelTypeFeatures::only_static_remote_key();
 PackageSolvingData::HolderFundingOutput(HolderFundingOutput::build(
Expand Down
Loading

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

Skip to content
Remove exclusive reference and generic from CommitmentTransaction API#3689

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 1 commit into

from

Apr 16, 2025
 Merged


Remove exclusive reference and generic from CommitmentTransaction API
#3689
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


48 changes: 27 additions & 21 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3588,15 +3588,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_broadcaster_value,
 to_countersignatory_value,
 )| {
 let htlc_outputs = vec![];
 let nondust_htlcs = vec![];

 let commitment_tx = self.build_counterparty_commitment_tx(
 INITIAL_COMMITMENT_NUMBER,
 &their_per_commitment_point,
 to_broadcaster_value,
 to_countersignatory_value,
 feerate_per_kw,
htlc_outputs,
nondust_htlcs,
 );
 // Take the opportunity to populate this recently introduced field
 self.initial_counterparty_commitment_tx = Some(commitment_tx.clone());
Expand All@@ -3609,11 +3609,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn build_counterparty_commitment_tx(
 &self, commitment_number: u64, their_per_commitment_point: &PublicKey,
 to_broadcaster_value: u64, to_countersignatory_value: u64, feerate_per_kw: u32,
mut nondust_htlcs: Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>
 nondust_htlcs: Vec<HTLCOutputInCommitment>
	) -> CommitmentTransaction {
 let channel_parameters = &self.funding.channel_parameters.as_counterparty_broadcastable();
 CommitmentTransaction::new_with_auxiliary_htlc_data(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, &mut nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
 CommitmentTransaction::new(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
	}

	fn counterparty_commitment_txs_from_update(&self, update: &ChannelMonitorUpdate) -> Vec<CommitmentTransaction> {
Expand All@@ -3629,7 +3629,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_countersignatory_value_sat: Some(to_countersignatory_value) } => {

 let nondust_htlcs = htlc_outputs.iter().filter_map(|(htlc, _)| {
 htlc.transaction_output_index.map(|_| (htlc.clone(), None))
 htlc.transaction_output_index.map(|_| htlc).cloned()
 }).collect::<Vec<_>>();

 let commitment_tx = self.build_counterparty_commitment_tx(commitment_number,
Expand DownExpand Up@@ -5620,21 +5620,21 @@ mod tests {
 {
 let mut res = Vec::new();
 for (idx, preimage) in $preimages_slice.iter().enumerate() {
 res.push((HTLCOutputInCommitment {
 res.push(HTLCOutputInCommitment {
 offered: true,
 amount_msat: 0,
 cltv_expiry: 0,
 payment_hash: preimage.1.clone(),
 transaction_output_index: Some(idx as u32),
 }, ()));
 });
 }
 res
 }
 }
 }
 macro_rules! preimages_slice_to_htlc_outputs {
 ($preimages_slice: expr) => {
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|(htlc, _)| (htlc, None)).collect()
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|htlc| (htlc, None)).collect()
 }
 }
 let dummy_sig = crate::crypto::utils::sign(&secp_ctx,
Expand DownExpand Up@@ -5690,15 +5690,17 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();

 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"1").to_byte_array()),
 preimages_slice_to_htlc_outputs!(preimages[5..15]), 281474976710655, dummy_key, &logger);
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"2").to_byte_array()),
Expand DownExpand Up@@ -5733,21 +5735,25 @@ mod tests {

 // Now update holder commitment tx info, pruning only element 18 as we still care about the
 // previous commitment tx's preimages too
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
 monitor.provide_secret(281474976710653, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 12);
 test_preimages_exist!(&preimages[0..10], monitor);
 test_preimages_exist!(&preimages[18..20], monitor);

 // But if we do it again, we'll prune 5-10
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx,
 htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
 nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
 monitor.provide_secret(281474976710652, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 5);
Expand DownExpand Up@@ -5942,7 +5948,7 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,22 +1296,21 @@ mod tests {

 // Create an OnchainTxHandler for a commitment containing HTLCs with CLTV expiries of 0, 1,
 // and 2 blocks.
 let mut htlcs = Vec::new();
 let mut nondust_htlcs = Vec::new();
 for i in 0..3 {
 let preimage = PaymentPreimage([i; 32]);
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
htlcs.push((
nondust_htlcs.push(
 HTLCOutputInCommitment {
 offered: true,
 amount_msat: 10000,
 cltv_expiry: i as u32,
 payment_hash: hash,
 transaction_output_index: Some(i as u32),
 },
 (),
 ));
 }
 );
 }
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, &mut htlcs);
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, nondust_htlcs);
 let destination_script = ScriptBuf::new();
 let mut tx_handler = OnchainTxHandler::new(
 1000000,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1712,7 +1712,7 @@ mod tests {
 payment_hash: PaymentHash::from(preimage),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand DownExpand Up@@ -1746,7 +1746,7 @@ mod tests {
 payment_hash: PaymentHash::from(PaymentPreimage([2;32])),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand All@@ -1770,7 +1770,7 @@ mod tests {

	macro_rules! dumb_funding_output {
 () => {{
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut Vec::new());
 let commitment_tx = HolderCommitmentTransaction::dummy(0, Vec::new());
 let mut channel_parameters = ChannelTransactionParameters::test_dummy(0);
 channel_parameters.channel_type_features = ChannelTypeFeatures::only_static_remote_key();
 PackageSolvingData::HolderFundingOutput(HolderFundingOutput::build(
Expand Down
Loading

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

Skip to content
Remove exclusive reference and generic from CommitmentTransaction API#3689

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 1 commit into

from

Apr 16, 2025
 Merged


Remove exclusive reference and generic from CommitmentTransaction API
#3689
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


48 changes: 27 additions & 21 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3588,15 +3588,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_broadcaster_value,
 to_countersignatory_value,
 )| {
 let htlc_outputs = vec![];
 let nondust_htlcs = vec![];

 let commitment_tx = self.build_counterparty_commitment_tx(
 INITIAL_COMMITMENT_NUMBER,
 &their_per_commitment_point,
 to_broadcaster_value,
 to_countersignatory_value,
 feerate_per_kw,
htlc_outputs,
nondust_htlcs,
 );
 // Take the opportunity to populate this recently introduced field
 self.initial_counterparty_commitment_tx = Some(commitment_tx.clone());
Expand All@@ -3609,11 +3609,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn build_counterparty_commitment_tx(
 &self, commitment_number: u64, their_per_commitment_point: &PublicKey,
 to_broadcaster_value: u64, to_countersignatory_value: u64, feerate_per_kw: u32,
mut nondust_htlcs: Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>
 nondust_htlcs: Vec<HTLCOutputInCommitment>
	) -> CommitmentTransaction {
 let channel_parameters = &self.funding.channel_parameters.as_counterparty_broadcastable();
 CommitmentTransaction::new_with_auxiliary_htlc_data(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, &mut nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
 CommitmentTransaction::new(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
	}

	fn counterparty_commitment_txs_from_update(&self, update: &ChannelMonitorUpdate) -> Vec<CommitmentTransaction> {
Expand All@@ -3629,7 +3629,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_countersignatory_value_sat: Some(to_countersignatory_value) } => {

 let nondust_htlcs = htlc_outputs.iter().filter_map(|(htlc, _)| {
 htlc.transaction_output_index.map(|_| (htlc.clone(), None))
 htlc.transaction_output_index.map(|_| htlc).cloned()
 }).collect::<Vec<_>>();

 let commitment_tx = self.build_counterparty_commitment_tx(commitment_number,
Expand DownExpand Up@@ -5620,21 +5620,21 @@ mod tests {
 {
 let mut res = Vec::new();
 for (idx, preimage) in $preimages_slice.iter().enumerate() {
 res.push((HTLCOutputInCommitment {
 res.push(HTLCOutputInCommitment {
 offered: true,
 amount_msat: 0,
 cltv_expiry: 0,
 payment_hash: preimage.1.clone(),
 transaction_output_index: Some(idx as u32),
 }, ()));
 });
 }
 res
 }
 }
 }
 macro_rules! preimages_slice_to_htlc_outputs {
 ($preimages_slice: expr) => {
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|(htlc, _)| (htlc, None)).collect()
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|htlc| (htlc, None)).collect()
 }
 }
 let dummy_sig = crate::crypto::utils::sign(&secp_ctx,
Expand DownExpand Up@@ -5690,15 +5690,17 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();

 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"1").to_byte_array()),
 preimages_slice_to_htlc_outputs!(preimages[5..15]), 281474976710655, dummy_key, &logger);
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"2").to_byte_array()),
Expand DownExpand Up@@ -5733,21 +5735,25 @@ mod tests {

 // Now update holder commitment tx info, pruning only element 18 as we still care about the
 // previous commitment tx's preimages too
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
 monitor.provide_secret(281474976710653, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 12);
 test_preimages_exist!(&preimages[0..10], monitor);
 test_preimages_exist!(&preimages[18..20], monitor);

 // But if we do it again, we'll prune 5-10
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx,
 htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
 nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
 monitor.provide_secret(281474976710652, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 5);
Expand DownExpand Up@@ -5942,7 +5948,7 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,22 +1296,21 @@ mod tests {

 // Create an OnchainTxHandler for a commitment containing HTLCs with CLTV expiries of 0, 1,
 // and 2 blocks.
 let mut htlcs = Vec::new();
 let mut nondust_htlcs = Vec::new();
 for i in 0..3 {
 let preimage = PaymentPreimage([i; 32]);
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
htlcs.push((
nondust_htlcs.push(
 HTLCOutputInCommitment {
 offered: true,
 amount_msat: 10000,
 cltv_expiry: i as u32,
 payment_hash: hash,
 transaction_output_index: Some(i as u32),
 },
 (),
 ));
 }
 );
 }
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, &mut htlcs);
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, nondust_htlcs);
 let destination_script = ScriptBuf::new();
 let mut tx_handler = OnchainTxHandler::new(
 1000000,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1712,7 +1712,7 @@ mod tests {
 payment_hash: PaymentHash::from(preimage),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand DownExpand Up@@ -1746,7 +1746,7 @@ mod tests {
 payment_hash: PaymentHash::from(PaymentPreimage([2;32])),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand All@@ -1770,7 +1770,7 @@ mod tests {

	macro_rules! dumb_funding_output {
 () => {{
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut Vec::new());
 let commitment_tx = HolderCommitmentTransaction::dummy(0, Vec::new());
 let mut channel_parameters = ChannelTransactionParameters::test_dummy(0);
 channel_parameters.channel_type_features = ChannelTypeFeatures::only_static_remote_key();
 PackageSolvingData::HolderFundingOutput(HolderFundingOutput::build(
Expand Down
Loading

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

Skip to content
Remove exclusive reference and generic from CommitmentTransaction API#3689

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 1 commit into

from

Apr 16, 2025
 Merged


Remove exclusive reference and generic from CommitmentTransaction API
#3689
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


48 changes: 27 additions & 21 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3588,15 +3588,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_broadcaster_value,
 to_countersignatory_value,
 )| {
 let htlc_outputs = vec![];
 let nondust_htlcs = vec![];

 let commitment_tx = self.build_counterparty_commitment_tx(
 INITIAL_COMMITMENT_NUMBER,
 &their_per_commitment_point,
 to_broadcaster_value,
 to_countersignatory_value,
 feerate_per_kw,
htlc_outputs,
nondust_htlcs,
 );
 // Take the opportunity to populate this recently introduced field
 self.initial_counterparty_commitment_tx = Some(commitment_tx.clone());
Expand All@@ -3609,11 +3609,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn build_counterparty_commitment_tx(
 &self, commitment_number: u64, their_per_commitment_point: &PublicKey,
 to_broadcaster_value: u64, to_countersignatory_value: u64, feerate_per_kw: u32,
mut nondust_htlcs: Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>
 nondust_htlcs: Vec<HTLCOutputInCommitment>
	) -> CommitmentTransaction {
 let channel_parameters = &self.funding.channel_parameters.as_counterparty_broadcastable();
 CommitmentTransaction::new_with_auxiliary_htlc_data(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, &mut nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
 CommitmentTransaction::new(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
	}

	fn counterparty_commitment_txs_from_update(&self, update: &ChannelMonitorUpdate) -> Vec<CommitmentTransaction> {
Expand All@@ -3629,7 +3629,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_countersignatory_value_sat: Some(to_countersignatory_value) } => {

 let nondust_htlcs = htlc_outputs.iter().filter_map(|(htlc, _)| {
 htlc.transaction_output_index.map(|_| (htlc.clone(), None))
 htlc.transaction_output_index.map(|_| htlc).cloned()
 }).collect::<Vec<_>>();

 let commitment_tx = self.build_counterparty_commitment_tx(commitment_number,
Expand DownExpand Up@@ -5620,21 +5620,21 @@ mod tests {
 {
 let mut res = Vec::new();
 for (idx, preimage) in $preimages_slice.iter().enumerate() {
 res.push((HTLCOutputInCommitment {
 res.push(HTLCOutputInCommitment {
 offered: true,
 amount_msat: 0,
 cltv_expiry: 0,
 payment_hash: preimage.1.clone(),
 transaction_output_index: Some(idx as u32),
 }, ()));
 });
 }
 res
 }
 }
 }
 macro_rules! preimages_slice_to_htlc_outputs {
 ($preimages_slice: expr) => {
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|(htlc, _)| (htlc, None)).collect()
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|htlc| (htlc, None)).collect()
 }
 }
 let dummy_sig = crate::crypto::utils::sign(&secp_ctx,
Expand DownExpand Up@@ -5690,15 +5690,17 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();

 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"1").to_byte_array()),
 preimages_slice_to_htlc_outputs!(preimages[5..15]), 281474976710655, dummy_key, &logger);
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"2").to_byte_array()),
Expand DownExpand Up@@ -5733,21 +5735,25 @@ mod tests {

 // Now update holder commitment tx info, pruning only element 18 as we still care about the
 // previous commitment tx's preimages too
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
 monitor.provide_secret(281474976710653, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 12);
 test_preimages_exist!(&preimages[0..10], monitor);
 test_preimages_exist!(&preimages[18..20], monitor);

 // But if we do it again, we'll prune 5-10
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx,
 htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
 nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
 monitor.provide_secret(281474976710652, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 5);
Expand DownExpand Up@@ -5942,7 +5948,7 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,22 +1296,21 @@ mod tests {

 // Create an OnchainTxHandler for a commitment containing HTLCs with CLTV expiries of 0, 1,
 // and 2 blocks.
 let mut htlcs = Vec::new();
 let mut nondust_htlcs = Vec::new();
 for i in 0..3 {
 let preimage = PaymentPreimage([i; 32]);
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
htlcs.push((
nondust_htlcs.push(
 HTLCOutputInCommitment {
 offered: true,
 amount_msat: 10000,
 cltv_expiry: i as u32,
 payment_hash: hash,
 transaction_output_index: Some(i as u32),
 },
 (),
 ));
 }
 );
 }
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, &mut htlcs);
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, nondust_htlcs);
 let destination_script = ScriptBuf::new();
 let mut tx_handler = OnchainTxHandler::new(
 1000000,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1712,7 +1712,7 @@ mod tests {
 payment_hash: PaymentHash::from(preimage),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand DownExpand Up@@ -1746,7 +1746,7 @@ mod tests {
 payment_hash: PaymentHash::from(PaymentPreimage([2;32])),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand All@@ -1770,7 +1770,7 @@ mod tests {

	macro_rules! dumb_funding_output {
 () => {{
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut Vec::new());
 let commitment_tx = HolderCommitmentTransaction::dummy(0, Vec::new());
 let mut channel_parameters = ChannelTransactionParameters::test_dummy(0);
 channel_parameters.channel_type_features = ChannelTypeFeatures::only_static_remote_key();
 PackageSolvingData::HolderFundingOutput(HolderFundingOutput::build(
Expand Down
Loading

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

Skip to content
Remove exclusive reference and generic from CommitmentTransaction API#3689

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 1 commit into

from

Apr 16, 2025
 Merged


Remove exclusive reference and generic from CommitmentTransaction API
#3689
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


48 changes: 27 additions & 21 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3588,15 +3588,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_broadcaster_value,
 to_countersignatory_value,
 )| {
 let htlc_outputs = vec![];
 let nondust_htlcs = vec![];

 let commitment_tx = self.build_counterparty_commitment_tx(
 INITIAL_COMMITMENT_NUMBER,
 &their_per_commitment_point,
 to_broadcaster_value,
 to_countersignatory_value,
 feerate_per_kw,
htlc_outputs,
nondust_htlcs,
 );
 // Take the opportunity to populate this recently introduced field
 self.initial_counterparty_commitment_tx = Some(commitment_tx.clone());
Expand All@@ -3609,11 +3609,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn build_counterparty_commitment_tx(
 &self, commitment_number: u64, their_per_commitment_point: &PublicKey,
 to_broadcaster_value: u64, to_countersignatory_value: u64, feerate_per_kw: u32,
mut nondust_htlcs: Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>
 nondust_htlcs: Vec<HTLCOutputInCommitment>
	) -> CommitmentTransaction {
 let channel_parameters = &self.funding.channel_parameters.as_counterparty_broadcastable();
 CommitmentTransaction::new_with_auxiliary_htlc_data(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, &mut nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
 CommitmentTransaction::new(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
	}

	fn counterparty_commitment_txs_from_update(&self, update: &ChannelMonitorUpdate) -> Vec<CommitmentTransaction> {
Expand All@@ -3629,7 +3629,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_countersignatory_value_sat: Some(to_countersignatory_value) } => {

 let nondust_htlcs = htlc_outputs.iter().filter_map(|(htlc, _)| {
 htlc.transaction_output_index.map(|_| (htlc.clone(), None))
 htlc.transaction_output_index.map(|_| htlc).cloned()
 }).collect::<Vec<_>>();

 let commitment_tx = self.build_counterparty_commitment_tx(commitment_number,
Expand DownExpand Up@@ -5620,21 +5620,21 @@ mod tests {
 {
 let mut res = Vec::new();
 for (idx, preimage) in $preimages_slice.iter().enumerate() {
 res.push((HTLCOutputInCommitment {
 res.push(HTLCOutputInCommitment {
 offered: true,
 amount_msat: 0,
 cltv_expiry: 0,
 payment_hash: preimage.1.clone(),
 transaction_output_index: Some(idx as u32),
 }, ()));
 });
 }
 res
 }
 }
 }
 macro_rules! preimages_slice_to_htlc_outputs {
 ($preimages_slice: expr) => {
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|(htlc, _)| (htlc, None)).collect()
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|htlc| (htlc, None)).collect()
 }
 }
 let dummy_sig = crate::crypto::utils::sign(&secp_ctx,
Expand DownExpand Up@@ -5690,15 +5690,17 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();

 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"1").to_byte_array()),
 preimages_slice_to_htlc_outputs!(preimages[5..15]), 281474976710655, dummy_key, &logger);
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"2").to_byte_array()),
Expand DownExpand Up@@ -5733,21 +5735,25 @@ mod tests {

 // Now update holder commitment tx info, pruning only element 18 as we still care about the
 // previous commitment tx's preimages too
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
 monitor.provide_secret(281474976710653, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 12);
 test_preimages_exist!(&preimages[0..10], monitor);
 test_preimages_exist!(&preimages[18..20], monitor);

 // But if we do it again, we'll prune 5-10
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx,
 htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
 nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
 monitor.provide_secret(281474976710652, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 5);
Expand DownExpand Up@@ -5942,7 +5948,7 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,22 +1296,21 @@ mod tests {

 // Create an OnchainTxHandler for a commitment containing HTLCs with CLTV expiries of 0, 1,
 // and 2 blocks.
 let mut htlcs = Vec::new();
 let mut nondust_htlcs = Vec::new();
 for i in 0..3 {
 let preimage = PaymentPreimage([i; 32]);
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
htlcs.push((
nondust_htlcs.push(
 HTLCOutputInCommitment {
 offered: true,
 amount_msat: 10000,
 cltv_expiry: i as u32,
 payment_hash: hash,
 transaction_output_index: Some(i as u32),
 },
 (),
 ));
 }
 );
 }
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, &mut htlcs);
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, nondust_htlcs);
 let destination_script = ScriptBuf::new();
 let mut tx_handler = OnchainTxHandler::new(
 1000000,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1712,7 +1712,7 @@ mod tests {
 payment_hash: PaymentHash::from(preimage),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand DownExpand Up@@ -1746,7 +1746,7 @@ mod tests {
 payment_hash: PaymentHash::from(PaymentPreimage([2;32])),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand All@@ -1770,7 +1770,7 @@ mod tests {

	macro_rules! dumb_funding_output {
 () => {{
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut Vec::new());
 let commitment_tx = HolderCommitmentTransaction::dummy(0, Vec::new());
 let mut channel_parameters = ChannelTransactionParameters::test_dummy(0);
 channel_parameters.channel_type_features = ChannelTypeFeatures::only_static_remote_key();
 PackageSolvingData::HolderFundingOutput(HolderFundingOutput::build(
Expand Down
Loading

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

Skip to content
Remove exclusive reference and generic from CommitmentTransaction API#3689

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 1 commit into

from

Apr 16, 2025
 Merged


Remove exclusive reference and generic from CommitmentTransaction API
#3689
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


48 changes: 27 additions & 21 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3588,15 +3588,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_broadcaster_value,
 to_countersignatory_value,
 )| {
 let htlc_outputs = vec![];
 let nondust_htlcs = vec![];

 let commitment_tx = self.build_counterparty_commitment_tx(
 INITIAL_COMMITMENT_NUMBER,
 &their_per_commitment_point,
 to_broadcaster_value,
 to_countersignatory_value,
 feerate_per_kw,
htlc_outputs,
nondust_htlcs,
 );
 // Take the opportunity to populate this recently introduced field
 self.initial_counterparty_commitment_tx = Some(commitment_tx.clone());
Expand All@@ -3609,11 +3609,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn build_counterparty_commitment_tx(
 &self, commitment_number: u64, their_per_commitment_point: &PublicKey,
 to_broadcaster_value: u64, to_countersignatory_value: u64, feerate_per_kw: u32,
mut nondust_htlcs: Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>
 nondust_htlcs: Vec<HTLCOutputInCommitment>
	) -> CommitmentTransaction {
 let channel_parameters = &self.funding.channel_parameters.as_counterparty_broadcastable();
 CommitmentTransaction::new_with_auxiliary_htlc_data(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, &mut nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
 CommitmentTransaction::new(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
	}

	fn counterparty_commitment_txs_from_update(&self, update: &ChannelMonitorUpdate) -> Vec<CommitmentTransaction> {
Expand All@@ -3629,7 +3629,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_countersignatory_value_sat: Some(to_countersignatory_value) } => {

 let nondust_htlcs = htlc_outputs.iter().filter_map(|(htlc, _)| {
 htlc.transaction_output_index.map(|_| (htlc.clone(), None))
 htlc.transaction_output_index.map(|_| htlc).cloned()
 }).collect::<Vec<_>>();

 let commitment_tx = self.build_counterparty_commitment_tx(commitment_number,
Expand DownExpand Up@@ -5620,21 +5620,21 @@ mod tests {
 {
 let mut res = Vec::new();
 for (idx, preimage) in $preimages_slice.iter().enumerate() {
 res.push((HTLCOutputInCommitment {
 res.push(HTLCOutputInCommitment {
 offered: true,
 amount_msat: 0,
 cltv_expiry: 0,
 payment_hash: preimage.1.clone(),
 transaction_output_index: Some(idx as u32),
 }, ()));
 });
 }
 res
 }
 }
 }
 macro_rules! preimages_slice_to_htlc_outputs {
 ($preimages_slice: expr) => {
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|(htlc, _)| (htlc, None)).collect()
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|htlc| (htlc, None)).collect()
 }
 }
 let dummy_sig = crate::crypto::utils::sign(&secp_ctx,
Expand DownExpand Up@@ -5690,15 +5690,17 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();

 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"1").to_byte_array()),
 preimages_slice_to_htlc_outputs!(preimages[5..15]), 281474976710655, dummy_key, &logger);
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"2").to_byte_array()),
Expand DownExpand Up@@ -5733,21 +5735,25 @@ mod tests {

 // Now update holder commitment tx info, pruning only element 18 as we still care about the
 // previous commitment tx's preimages too
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
 monitor.provide_secret(281474976710653, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 12);
 test_preimages_exist!(&preimages[0..10], monitor);
 test_preimages_exist!(&preimages[18..20], monitor);

 // But if we do it again, we'll prune 5-10
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx,
 htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
 nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
 monitor.provide_secret(281474976710652, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 5);
Expand DownExpand Up@@ -5942,7 +5948,7 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,22 +1296,21 @@ mod tests {

 // Create an OnchainTxHandler for a commitment containing HTLCs with CLTV expiries of 0, 1,
 // and 2 blocks.
 let mut htlcs = Vec::new();
 let mut nondust_htlcs = Vec::new();
 for i in 0..3 {
 let preimage = PaymentPreimage([i; 32]);
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
htlcs.push((
nondust_htlcs.push(
 HTLCOutputInCommitment {
 offered: true,
 amount_msat: 10000,
 cltv_expiry: i as u32,
 payment_hash: hash,
 transaction_output_index: Some(i as u32),
 },
 (),
 ));
 }
 );
 }
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, &mut htlcs);
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, nondust_htlcs);
 let destination_script = ScriptBuf::new();
 let mut tx_handler = OnchainTxHandler::new(
 1000000,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1712,7 +1712,7 @@ mod tests {
 payment_hash: PaymentHash::from(preimage),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand DownExpand Up@@ -1746,7 +1746,7 @@ mod tests {
 payment_hash: PaymentHash::from(PaymentPreimage([2;32])),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand All@@ -1770,7 +1770,7 @@ mod tests {

	macro_rules! dumb_funding_output {
 () => {{
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut Vec::new());
 let commitment_tx = HolderCommitmentTransaction::dummy(0, Vec::new());
 let mut channel_parameters = ChannelTransactionParameters::test_dummy(0);
 channel_parameters.channel_type_features = ChannelTypeFeatures::only_static_remote_key();
 PackageSolvingData::HolderFundingOutput(HolderFundingOutput::build(
Expand Down
Loading

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

Skip to content
Remove exclusive reference and generic from CommitmentTransaction API#3689

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 1 commit into

from

Apr 16, 2025
 Merged


Remove exclusive reference and generic from CommitmentTransaction API
#3689
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


48 changes: 27 additions & 21 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3588,15 +3588,15 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_broadcaster_value,
 to_countersignatory_value,
 )| {
 let htlc_outputs = vec![];
 let nondust_htlcs = vec![];

 let commitment_tx = self.build_counterparty_commitment_tx(
 INITIAL_COMMITMENT_NUMBER,
 &their_per_commitment_point,
 to_broadcaster_value,
 to_countersignatory_value,
 feerate_per_kw,
htlc_outputs,
nondust_htlcs,
 );
 // Take the opportunity to populate this recently introduced field
 self.initial_counterparty_commitment_tx = Some(commitment_tx.clone());
Expand All@@ -3609,11 +3609,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
	fn build_counterparty_commitment_tx(
 &self, commitment_number: u64, their_per_commitment_point: &PublicKey,
 to_broadcaster_value: u64, to_countersignatory_value: u64, feerate_per_kw: u32,
mut nondust_htlcs: Vec<(HTLCOutputInCommitment, Option<Box<HTLCSource>>)>
 nondust_htlcs: Vec<HTLCOutputInCommitment>
	) -> CommitmentTransaction {
 let channel_parameters = &self.funding.channel_parameters.as_counterparty_broadcastable();
 CommitmentTransaction::new_with_auxiliary_htlc_data(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, &mut nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
 CommitmentTransaction::new(commitment_number, their_per_commitment_point,
 to_broadcaster_value, to_countersignatory_value, feerate_per_kw, nondust_htlcs, channel_parameters, &self.onchain_tx_handler.secp_ctx)
	}

	fn counterparty_commitment_txs_from_update(&self, update: &ChannelMonitorUpdate) -> Vec<CommitmentTransaction> {
Expand All@@ -3629,7 +3629,7 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 to_countersignatory_value_sat: Some(to_countersignatory_value) } => {

 let nondust_htlcs = htlc_outputs.iter().filter_map(|(htlc, _)| {
 htlc.transaction_output_index.map(|_| (htlc.clone(), None))
 htlc.transaction_output_index.map(|_| htlc).cloned()
 }).collect::<Vec<_>>();

 let commitment_tx = self.build_counterparty_commitment_tx(commitment_number,
Expand DownExpand Up@@ -5620,21 +5620,21 @@ mod tests {
 {
 let mut res = Vec::new();
 for (idx, preimage) in $preimages_slice.iter().enumerate() {
 res.push((HTLCOutputInCommitment {
 res.push(HTLCOutputInCommitment {
 offered: true,
 amount_msat: 0,
 cltv_expiry: 0,
 payment_hash: preimage.1.clone(),
 transaction_output_index: Some(idx as u32),
 }, ()));
 });
 }
 res
 }
 }
 }
 macro_rules! preimages_slice_to_htlc_outputs {
 ($preimages_slice: expr) => {
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|(htlc, _)| (htlc, None)).collect()
 preimages_slice_to_htlcs!($preimages_slice).into_iter().map(|htlc| (htlc, None)).collect()
 }
 }
 let dummy_sig = crate::crypto::utils::sign(&secp_ctx,
Expand DownExpand Up@@ -5690,15 +5690,17 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..10]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();

 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"1").to_byte_array()),
 preimages_slice_to_htlc_outputs!(preimages[5..15]), 281474976710655, dummy_key, &logger);
 monitor.provide_latest_counterparty_commitment_tx(Txid::from_byte_array(Sha256::hash(b"2").to_byte_array()),
Expand DownExpand Up@@ -5733,21 +5735,25 @@ mod tests {

 // Now update holder commitment tx info, pruning only element 18 as we still care about the
 // previous commitment tx's preimages too
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..5]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("2273e227a5b7449b6e70f1fb4652864038b1cbf9cd7c043a7d6456b7fc275ad8").unwrap());
 monitor.provide_secret(281474976710653, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 12);
 test_preimages_exist!(&preimages[0..10], monitor);
 test_preimages_exist!(&preimages[18..20], monitor);

 // But if we do it again, we'll prune 5-10
 let mut htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, &mut htlcs);
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx,
 htlcs.into_iter().map(|(htlc, _)| (htlc, Some(dummy_sig), Some(dummy_source.clone()))).collect());
 let nondust_htlcs = preimages_slice_to_htlcs!(preimages[0..3]);
 let dummy_commitment_tx = HolderCommitmentTransaction::dummy(0, nondust_htlcs);
 // These HTLCs now have their output indices assigned
 let nondust_htlcs = dummy_commitment_tx.nondust_htlcs();
 monitor.provide_latest_holder_commitment_tx(dummy_commitment_tx.clone(),
 nondust_htlcs.into_iter().map(|htlc| (htlc.clone(), Some(dummy_sig), Some(dummy_source.clone()))).collect());
 secret[0..32].clone_from_slice(&<Vec<u8>>::from_hex("27cddaa5624534cb6cb9d7da077cf2b22ab21e9b506fd4998a51d54502e99116").unwrap());
 monitor.provide_secret(281474976710652, secret.clone()).unwrap();
 assert_eq!(monitor.inner.lock().unwrap().payment_preimages.len(), 5);
Expand DownExpand Up@@ -5942,7 +5948,7 @@ mod tests {
 let best_block = BestBlock::from_network(Network::Testnet);
 let monitor = ChannelMonitor::new(
 Secp256k1::new(), keys, Some(shutdown_script.into_inner()), 0, &ScriptBuf::new(),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, &mut Vec::new()),
 &channel_parameters, true, 0, HolderCommitmentTransaction::dummy(0, Vec::new()),
 best_block, dummy_key, channel_id,
 );

Expand Down

11 changes: 5 additions & 6 deletions
lightning/src/chain/onchaintx.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1296,22 +1296,21 @@ mod tests {

 // Create an OnchainTxHandler for a commitment containing HTLCs with CLTV expiries of 0, 1,
 // and 2 blocks.
 let mut htlcs = Vec::new();
 let mut nondust_htlcs = Vec::new();
 for i in 0..3 {
 let preimage = PaymentPreimage([i; 32]);
 let hash = PaymentHash(Sha256::hash(&preimage.0[..]).to_byte_array());
htlcs.push((
nondust_htlcs.push(
 HTLCOutputInCommitment {
 offered: true,
 amount_msat: 10000,
 cltv_expiry: i as u32,
 payment_hash: hash,
 transaction_output_index: Some(i as u32),
 },
 (),
 ));
 }
 );
 }
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, &mut htlcs);
 let holder_commit = HolderCommitmentTransaction::dummy(1000000, nondust_htlcs);
 let destination_script = ScriptBuf::new();
 let mut tx_handler = OnchainTxHandler::new(
 1000000,
Expand Down

6 changes: 3 additions & 3 deletions
lightning/src/chain/package.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1712,7 +1712,7 @@ mod tests {
 payment_hash: PaymentHash::from(preimage),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand DownExpand Up@@ -1746,7 +1746,7 @@ mod tests {
 payment_hash: PaymentHash::from(PaymentPreimage([2;32])),
 transaction_output_index: None,
 };
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut vec![(htlc.clone(), ())]);
 let commitment_tx = HolderCommitmentTransaction::dummy(0, vec![htlc.clone()]);
 let trusted_tx = commitment_tx.trust();
 PackageSolvingData::HolderHTLCOutput(HolderHTLCOutput::build(
 HTLCDescriptor {
Expand All@@ -1770,7 +1770,7 @@ mod tests {

	macro_rules! dumb_funding_output {
 () => {{
 let commitment_tx = HolderCommitmentTransaction::dummy(0, &mut Vec::new());
 let commitment_tx = HolderCommitmentTransaction::dummy(0, Vec::new());
 let mut channel_parameters = ChannelTransactionParameters::test_dummy(0);
 channel_parameters.channel_type_features = ChannelTypeFeatures::only_static_remote_key();
 PackageSolvingData::HolderFundingOutput(HolderFundingOutput::build(
Expand Down
Loading