Skip to content

Fix Invalid Pending Payments and Strengthen RBF Tests#647

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

Closed
moisesPompilio wants to merge 3 commits into from
Closed

Fix Invalid Pending Payments and Strengthen RBF Tests #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c72a39c
nit: introduce setup_node and rename setup_node to setup_node_from_co…
moisesPompilio Sep 9, 2025
e584b42
Add manual block generation and direct transaction insertion for RBF …
moisesPompilio Sep 22, 2025
c893290
Add property-based reorg test for RBF transactions
moisesPompilio Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 137 additions & 12 deletions tests/common/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,26 @@ use std::boxed::Box;
use std::collections::{HashMap, HashSet};
use std::env;
use std::future::Future;
use std::iter;
use std::path::PathBuf;
use std::pin::Pin;
use std::str::FromStr;
use std::sync::{Arc, RwLock};
use std::time::Duration;
use std::time::{Duration, UNIX_EPOCH};

use bitcoin::hashes::hex::FromHex;
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::Hash;
use bitcoin::absolute::LockTime;
use bitcoin::block::{Header, Version as BlockVersion};
use bitcoin::hashes::{hex::FromHex, sha256::Hash as Sha256, sha256d::Hash as Sha256d, Hash};
use bitcoin::merkle_tree::calculate_root;
use bitcoin::script::Builder as BuilderScriptBitcoin;
use bitcoin::{
Address, Amount, Network, OutPoint, ScriptBuf, Sequence, Transaction, Txid, Witness,
opcodes::all::OP_RETURN, transaction::Version, Address, Amount, Block, BlockHash,
CompactTarget, Network, OutPoint, ScriptBuf, Sequence, Transaction, TxMerkleNode, Txid,
Witness, Wtxid,
};
use electrsd::corepc_node::{
Client as BitcoindClient, Node as BitcoinD, TemplateRequest, TemplateRules,
};
use electrsd::corepc_node::{Client as BitcoindClient, Node as BitcoinD};
use electrsd::{corepc_node, ElectrsD};
use electrum_client::ElectrumApi;
use ldk_node::config::{AsyncPaymentsRole, Config, ElectrumSyncConfig, EsploraSyncConfig};
Expand DownExpand Up@@ -285,7 +293,7 @@ pub(crate) fn setup_two_nodes(
) -> (TestNode, TestNode) {
println!("== Node A ==");
let config_a = random_config(anchor_channels);
let node_a = setup_node(chain_source, config_a, None);
let node_a = setup_node_from_config(chain_source, config_a, None);

println!("\n== Node B ==");
let mut config_b = random_config(anchor_channels);
Expand All@@ -301,11 +309,16 @@ pub(crate) fn setup_two_nodes(
.trusted_peers_no_reserve
.push(node_a.node_id());
}
let node_b = setup_node(chain_source, config_b, None);
let node_b = setup_node_from_config(chain_source, config_b, None);
(node_a, node_b)
}

pub(crate) fn setup_node(
pub(crate) fn setup_node(chain_source: &TestChainSource, anchor_channels: bool) -> TestNode {
let config = random_config(anchor_channels);
setup_node_from_config(chain_source, config, None)
}

pub(crate) fn setup_node_from_config(
chain_source: &TestChainSource, config: TestConfig, seed_bytes: Option<Vec<u8>>,
) -> TestNode {
setup_node_for_async_payments(chain_source, config, seed_bytes, None)
Expand DownExpand Up@@ -389,6 +402,116 @@ pub(crate) fn setup_node_for_async_payments(
node
}

pub(crate) fn generate_block_and_insert_transactions<E: ElectrumApi>(

@tnulltnullOct 9, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it would be simpler to

  1. Put the RBF into the mempool
  2. Sync the wallet so it registers
  3. Mine a block
  4. Call Bitcoin Core's invalidateblock to discard the tip and the RBF
  5. Put the original TX into the mempool
  6. Sync the wallet again

If I'm not mistaken that would save us all of this boilerplate?

@moisesPompiliomoisesPompilioOct 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.

@tnulltnullOct 10, 2025•
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.

Interesting, I was under the impression that invalidateblock doesn't put the transactions back into the mempool but would simply discard them. It's likely not working because you use the bitcoind wallet to generate and RBF the transaction, having it track as part of the wallet (rather than 'just' in the mempool).

In any case, the block mining boilerplate is probably fine here then, even though I had hoped it could be simplified.

@moisesPompiliomoisesPompilioOct 10, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

during a reorg, Bitcoin Core doesn’t drop the transactions but tries to reinsert them into the mempool. I think invalidateblock behaves similarly. So even if a different wallet were used instead of Bitcoin Core’s, the same behavior would likely occur.

bitcoind: &BitcoindClient, electrs: &E, txs: &[Transaction],
) {
let _ = bitcoind.create_wallet("ldk_node_test");
let _ = bitcoind.load_wallet("ldk_node_test");
let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
let cur_height = blockchain_info.blocks;
let address = bitcoind.new_address().expect("failed to get new address");

let request_block_template = TemplateRequest { rules: vec![TemplateRules::Segwit] };
let bt =
bitcoind.get_block_template(&request_block_template).expect("failed to get block template");

// === BIP 141: Witness Commitment Calculation ===
let witness_root = calculate_root(
iter::once(Wtxid::all_zeros()).chain(txs.iter().map(|tx| tx.compute_wtxid())),
)
.map(|root| TxMerkleNode::from_byte_array(root.to_byte_array()))
.unwrap();

// BIP 141: Witness reserved value (32 zero bytes)
let witness_reserved_value = [0u8; 32];

// === Coinbase Transaction Construction ===
// BIP 141: Coinbase witness contains the witness reserved value
let coinbase_witness = Witness::from(vec![witness_reserved_value.to_vec()]);

// BIP 141: Calculate commitment hash = Double-SHA256(witness root || witness reserved value)
let commitment_hash =
Sha256d::hash(&[witness_root.to_byte_array(), witness_reserved_value].concat());

// Format: OP_RETURN + OP_PUSHBYTES_36 + 0xaa21a9ed + 32-byte commitment hash
let witness_commitment_script = BuilderScriptBitcoin::new()
.push_opcode(OP_RETURN)
.push_slice(&{
let mut data = [0u8; 36];
data[..4].copy_from_slice(&[0xaa, 0x21, 0xa9, 0xed]);
data[4..].copy_from_slice(&commitment_hash.to_byte_array());
data
})
.into_script();

// BIP 34: Block height in coinbase input script
let block_height = bt.height;
let height_script = BuilderScriptBitcoin::new()
.push_int(block_height as i64) // BIP 34: block height as first item
.push_int(rand::random()) // Random nonce for uniqueness
.into_script();

// Do not use the coinbase value from the block template.
// The template may include transactions not actually mined, so fees may be incorrect.
let coinbase_output_value = 1_250_000_000;

let coinbase_tx = Transaction {
version: Version::ONE,
lock_time: LockTime::from_height(0).unwrap(),
input: vec![bitcoin::TxIn {
previous_output: OutPoint::default(), // Null outpoint for coinbase
script_sig: height_script, // BIP 34: height + random data
sequence: Sequence::default(),
witness: coinbase_witness, // BIP 141: witness reserved value
}],
output: vec![
// Coinbase reward output
bitcoin::TxOut {
value: Amount::from_sat(coinbase_output_value),
script_pubkey: address.script_pubkey(),
},
// BIP 141: Witness commitment output (must be last output)
bitcoin::TxOut { value: Amount::ZERO, script_pubkey: witness_commitment_script },
],
};

// === Block Construction ===
let bits: [u8; 4] = Vec::from_hex(&bt.bits).unwrap().try_into().expect("bits must be 4 bytes");
let prev_hash_block = BlockHash::from_str(&bt.previous_block_hash).expect("invalid prev hash");

let txdata = [coinbase_tx].into_iter().chain(txs.iter().cloned()).collect::<Vec<_>>();
let mut block = Block {
header: Header {
version: BlockVersion::default(),
prev_blockhash: prev_hash_block,
merkle_root: TxMerkleNode::all_zeros(), // Will be calculated below
time: Ord::max(bt.min_time, UNIX_EPOCH.elapsed().unwrap().as_secs() as u32),
bits: CompactTarget::from_consensus(u32::from_be_bytes(bits)),
nonce: 0,
},
txdata,
};

block.header.merkle_root = block.compute_merkle_root().expect("must compute");

for nonce in 0..=u32::MAX {
block.header.nonce = nonce;
if block.header.target().is_met_by(block.block_hash()) {
break;
}
}

match bitcoind.submit_block(&block) {
Ok(_) => {},
Err(e) => panic!("Failed to submit block: {:?}", e),
}
wait_for_block(electrs, cur_height as usize + 1);

txs.iter().for_each(|tx| {
wait_for_tx(electrs, tx.compute_txid());
});
}

pub(crate) fn generate_blocks_and_wait<E: ElectrumApi>(
bitcoind: &BitcoindClient, electrs: &E, num: usize,
) {
Expand DownExpand Up@@ -570,11 +693,13 @@ pub(crate) fn bump_fee_and_broadcast<E: ElectrumApi>(
let tx_bytes = Vec::<u8>::from_hex(&signed_result.hex).unwrap();
tx = bitcoin::consensus::encode::deserialize::<Transaction>(&tx_bytes).unwrap();

if is_insert_block {
generate_block_and_insert_transactions(bitcoind, electrs, &[tx.clone()]);
return tx;
}

match bitcoind.send_raw_transaction(&tx) {
Ok(res) => {
if is_insert_block {
generate_blocks_and_wait(bitcoind, electrs, 1);
}
let new_txid: Txid = res.0.parse().unwrap();
wait_for_tx(electrs, new_txid);
return tx;
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Fix Invalid Pending Payments and Strengthen RBF Tests by moisesPompilio · Pull Request #647 · lightningdevkit/ldk-node · GitHub
Skip to content
Fix Invalid Pending Payments and Strengthen RBF Tests#647

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

 Closed

moisesPompilio
wants to merge
3
commits into

from

 Closed


Fix Invalid Pending Payments and Strengthen RBF Tests
#647
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c72a39c

nit: introduce setup_node and rename setup_node to setup_node_from_co…


moisesPompilio Sep 9, 2025
e584b42

Add manual block generation and direct transaction insertion for RBF …


moisesPompilio Sep 22, 2025
c893290

Add property-based reorg test for RBF transactions


moisesPompilio Sep 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


149 changes: 137 additions & 12 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,26 @@ use std::boxed::Box;
use std::collections::{HashMap, HashSet};
use std::env;
use std::future::Future;
use std::iter;
use std::path::PathBuf;
use std::pin::Pin;
use std::str::FromStr;
use std::sync::{Arc, RwLock};
use std::time::Duration;
use std::time::{Duration, UNIX_EPOCH};

use bitcoin::hashes::hex::FromHex;
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::Hash;
use bitcoin::absolute::LockTime;
use bitcoin::block::{Header, Version as BlockVersion};
use bitcoin::hashes::{hex::FromHex, sha256::Hash as Sha256, sha256d::Hash as Sha256d, Hash};
use bitcoin::merkle_tree::calculate_root;
use bitcoin::script::Builder as BuilderScriptBitcoin;
use bitcoin::{
	Address, Amount, Network, OutPoint, ScriptBuf, Sequence, Transaction, Txid, Witness,
	opcodes::all::OP_RETURN, transaction::Version, Address, Amount, Block, BlockHash,
	CompactTarget, Network, OutPoint, ScriptBuf, Sequence, Transaction, TxMerkleNode, Txid,
	Witness, Wtxid,
};
use electrsd::corepc_node::{
	Client as BitcoindClient, Node as BitcoinD, TemplateRequest, TemplateRules,
};
use electrsd::corepc_node::{Client as BitcoindClient, Node as BitcoinD};
use electrsd::{corepc_node, ElectrsD};
use electrum_client::ElectrumApi;
use ldk_node::config::{AsyncPaymentsRole, Config, ElectrumSyncConfig, EsploraSyncConfig};
Expand DownExpand Up@@ -285,7 +293,7 @@ pub(crate) fn setup_two_nodes(
) -> (TestNode, TestNode) {
	println!("== Node A ==");
	let config_a = random_config(anchor_channels);
	let node_a = setup_node(chain_source, config_a, None);
	let node_a = setup_node_from_config(chain_source, config_a, None);

	println!("\n== Node B ==");
	let mut config_b = random_config(anchor_channels);
Expand All@@ -301,11 +309,16 @@ pub(crate) fn setup_two_nodes(
 .trusted_peers_no_reserve
 .push(node_a.node_id());
	}
	let node_b = setup_node(chain_source, config_b, None);
	let node_b = setup_node_from_config(chain_source, config_b, None);
	(node_a, node_b)
}

pub(crate) fn setup_node(
pub(crate) fn setup_node(chain_source: &TestChainSource, anchor_channels: bool) -> TestNode {
	let config = random_config(anchor_channels);
	setup_node_from_config(chain_source, config, None)
}

pub(crate) fn setup_node_from_config(
	chain_source: &TestChainSource, config: TestConfig, seed_bytes: Option<Vec<u8>>,
) -> TestNode {
	setup_node_for_async_payments(chain_source, config, seed_bytes, None)
Expand DownExpand Up@@ -389,6 +402,116 @@ pub(crate) fn setup_node_for_async_payments(
	node
}

pub(crate) fn generate_block_and_insert_transactions<E: ElectrumApi>(
@tnulltnullOct 9, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it would be simpler to
  1. Put the RBF into the mempool
  2. Sync the wallet so it registers
  3. Mine a block
  4. Call Bitcoin Core's invalidateblock to discard the tip and the RBF
  5. Put the original TX into the mempool
  6. Sync the wallet again
If I'm not mistaken that would save us all of this boilerplate?
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
@tnulltnullOct 10, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
Interesting, I was under the impression that invalidateblock doesn't put the transactions back into the mempool but would simply discard them. It's likely not working because you use the bitcoind wallet to generate and RBF the transaction, having it track as part of the wallet (rather than 'just' in the mempool).
In any case, the block mining boilerplate is probably fine here then, even though I had hoped it could be simplified.
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

during a reorg, Bitcoin Core doesn’t drop the transactions but tries to reinsert them into the mempool. I think invalidateblock behaves similarly. So even if a different wallet were used instead of Bitcoin Core’s, the same behavior would likely occur.
	bitcoind: &BitcoindClient, electrs: &E, txs: &[Transaction],
) {
	let _ = bitcoind.create_wallet("ldk_node_test");
	let _ = bitcoind.load_wallet("ldk_node_test");
	let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
	let cur_height = blockchain_info.blocks;
	let address = bitcoind.new_address().expect("failed to get new address");

	let request_block_template = TemplateRequest { rules: vec![TemplateRules::Segwit] };
	let bt =
 bitcoind.get_block_template(&request_block_template).expect("failed to get block template");

	// === BIP 141: Witness Commitment Calculation ===
	let witness_root = calculate_root(
 iter::once(Wtxid::all_zeros()).chain(txs.iter().map(|tx| tx.compute_wtxid())),
	)
	.map(|root| TxMerkleNode::from_byte_array(root.to_byte_array()))
	.unwrap();

	// BIP 141: Witness reserved value (32 zero bytes)
	let witness_reserved_value = [0u8; 32];

	// === Coinbase Transaction Construction ===
	// BIP 141: Coinbase witness contains the witness reserved value
	let coinbase_witness = Witness::from(vec![witness_reserved_value.to_vec()]);

	// BIP 141: Calculate commitment hash = Double-SHA256(witness root || witness reserved value)
	let commitment_hash =
 Sha256d::hash(&[witness_root.to_byte_array(), witness_reserved_value].concat());

	// Format: OP_RETURN + OP_PUSHBYTES_36 + 0xaa21a9ed + 32-byte commitment hash
	let witness_commitment_script = BuilderScriptBitcoin::new()
 .push_opcode(OP_RETURN)
 .push_slice(&{
 let mut data = [0u8; 36];
 data[..4].copy_from_slice(&[0xaa, 0x21, 0xa9, 0xed]);
 data[4..].copy_from_slice(&commitment_hash.to_byte_array());
 data
 })
 .into_script();

	// BIP 34: Block height in coinbase input script
	let block_height = bt.height;
	let height_script = BuilderScriptBitcoin::new()
 .push_int(block_height as i64) // BIP 34: block height as first item
 .push_int(rand::random()) // Random nonce for uniqueness
 .into_script();

	// Do not use the coinbase value from the block template.
	// The template may include transactions not actually mined, so fees may be incorrect.
	let coinbase_output_value = 1_250_000_000;

	let coinbase_tx = Transaction {
 version: Version::ONE,
 lock_time: LockTime::from_height(0).unwrap(),
 input: vec![bitcoin::TxIn {
 previous_output: OutPoint::default(), // Null outpoint for coinbase
 script_sig: height_script, // BIP 34: height + random data
 sequence: Sequence::default(),
 witness: coinbase_witness, // BIP 141: witness reserved value
 }],
 output: vec![
 // Coinbase reward output
 bitcoin::TxOut {
 value: Amount::from_sat(coinbase_output_value),
 script_pubkey: address.script_pubkey(),
 },
 // BIP 141: Witness commitment output (must be last output)
 bitcoin::TxOut { value: Amount::ZERO, script_pubkey: witness_commitment_script },
 ],
	};

	// === Block Construction ===
	let bits: [u8; 4] = Vec::from_hex(&bt.bits).unwrap().try_into().expect("bits must be 4 bytes");
	let prev_hash_block = BlockHash::from_str(&bt.previous_block_hash).expect("invalid prev hash");

	let txdata = [coinbase_tx].into_iter().chain(txs.iter().cloned()).collect::<Vec<_>>();
	let mut block = Block {
 header: Header {
 version: BlockVersion::default(),
 prev_blockhash: prev_hash_block,
 merkle_root: TxMerkleNode::all_zeros(), // Will be calculated below
 time: Ord::max(bt.min_time, UNIX_EPOCH.elapsed().unwrap().as_secs() as u32),
 bits: CompactTarget::from_consensus(u32::from_be_bytes(bits)),
 nonce: 0,
 },
 txdata,
	};

	block.header.merkle_root = block.compute_merkle_root().expect("must compute");

	for nonce in 0..=u32::MAX {
 block.header.nonce = nonce;
 if block.header.target().is_met_by(block.block_hash()) {
 break;
 }
	}

	match bitcoind.submit_block(&block) {
 Ok(_) => {},
 Err(e) => panic!("Failed to submit block: {:?}", e),
	}
	wait_for_block(electrs, cur_height as usize + 1);

	txs.iter().for_each(|tx| {
 wait_for_tx(electrs, tx.compute_txid());
	});
}

pub(crate) fn generate_blocks_and_wait<E: ElectrumApi>(
	bitcoind: &BitcoindClient, electrs: &E, num: usize,
) {
Expand DownExpand Up@@ -570,11 +693,13 @@ pub(crate) fn bump_fee_and_broadcast<E: ElectrumApi>(
 let tx_bytes = Vec::<u8>::from_hex(&signed_result.hex).unwrap();
 tx = bitcoin::consensus::encode::deserialize::<Transaction>(&tx_bytes).unwrap();

 if is_insert_block {
 generate_block_and_insert_transactions(bitcoind, electrs, &[tx.clone()]);
 return tx;
 }

 match bitcoind.send_raw_transaction(&tx) {
 Ok(res) => {
 if is_insert_block {
 generate_blocks_and_wait(bitcoind, electrs, 1);
 }
 let new_txid: Txid = res.0.parse().unwrap();
 wait_for_tx(electrs, new_txid);
 return tx;
Expand Down
Loading
Loading

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

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

 Closed

moisesPompilio
wants to merge
3
commits into

from

 Closed


Fix Invalid Pending Payments and Strengthen RBF Tests
#647
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c72a39c

nit: introduce setup_node and rename setup_node to setup_node_from_co…


moisesPompilio Sep 9, 2025
e584b42

Add manual block generation and direct transaction insertion for RBF …


moisesPompilio Sep 22, 2025
c893290

Add property-based reorg test for RBF transactions


moisesPompilio Sep 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


149 changes: 137 additions & 12 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,26 @@ use std::boxed::Box;
use std::collections::{HashMap, HashSet};
use std::env;
use std::future::Future;
use std::iter;
use std::path::PathBuf;
use std::pin::Pin;
use std::str::FromStr;
use std::sync::{Arc, RwLock};
use std::time::Duration;
use std::time::{Duration, UNIX_EPOCH};

use bitcoin::hashes::hex::FromHex;
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::Hash;
use bitcoin::absolute::LockTime;
use bitcoin::block::{Header, Version as BlockVersion};
use bitcoin::hashes::{hex::FromHex, sha256::Hash as Sha256, sha256d::Hash as Sha256d, Hash};
use bitcoin::merkle_tree::calculate_root;
use bitcoin::script::Builder as BuilderScriptBitcoin;
use bitcoin::{
	Address, Amount, Network, OutPoint, ScriptBuf, Sequence, Transaction, Txid, Witness,
	opcodes::all::OP_RETURN, transaction::Version, Address, Amount, Block, BlockHash,
	CompactTarget, Network, OutPoint, ScriptBuf, Sequence, Transaction, TxMerkleNode, Txid,
	Witness, Wtxid,
};
use electrsd::corepc_node::{
	Client as BitcoindClient, Node as BitcoinD, TemplateRequest, TemplateRules,
};
use electrsd::corepc_node::{Client as BitcoindClient, Node as BitcoinD};
use electrsd::{corepc_node, ElectrsD};
use electrum_client::ElectrumApi;
use ldk_node::config::{AsyncPaymentsRole, Config, ElectrumSyncConfig, EsploraSyncConfig};
Expand DownExpand Up@@ -285,7 +293,7 @@ pub(crate) fn setup_two_nodes(
) -> (TestNode, TestNode) {
	println!("== Node A ==");
	let config_a = random_config(anchor_channels);
	let node_a = setup_node(chain_source, config_a, None);
	let node_a = setup_node_from_config(chain_source, config_a, None);

	println!("\n== Node B ==");
	let mut config_b = random_config(anchor_channels);
Expand All@@ -301,11 +309,16 @@ pub(crate) fn setup_two_nodes(
 .trusted_peers_no_reserve
 .push(node_a.node_id());
	}
	let node_b = setup_node(chain_source, config_b, None);
	let node_b = setup_node_from_config(chain_source, config_b, None);
	(node_a, node_b)
}

pub(crate) fn setup_node(
pub(crate) fn setup_node(chain_source: &TestChainSource, anchor_channels: bool) -> TestNode {
	let config = random_config(anchor_channels);
	setup_node_from_config(chain_source, config, None)
}

pub(crate) fn setup_node_from_config(
	chain_source: &TestChainSource, config: TestConfig, seed_bytes: Option<Vec<u8>>,
) -> TestNode {
	setup_node_for_async_payments(chain_source, config, seed_bytes, None)
Expand DownExpand Up@@ -389,6 +402,116 @@ pub(crate) fn setup_node_for_async_payments(
	node
}

pub(crate) fn generate_block_and_insert_transactions<E: ElectrumApi>(
@tnulltnullOct 9, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it would be simpler to
  1. Put the RBF into the mempool
  2. Sync the wallet so it registers
  3. Mine a block
  4. Call Bitcoin Core's invalidateblock to discard the tip and the RBF
  5. Put the original TX into the mempool
  6. Sync the wallet again
If I'm not mistaken that would save us all of this boilerplate?
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
@tnulltnullOct 10, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
Interesting, I was under the impression that invalidateblock doesn't put the transactions back into the mempool but would simply discard them. It's likely not working because you use the bitcoind wallet to generate and RBF the transaction, having it track as part of the wallet (rather than 'just' in the mempool).
In any case, the block mining boilerplate is probably fine here then, even though I had hoped it could be simplified.
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

during a reorg, Bitcoin Core doesn’t drop the transactions but tries to reinsert them into the mempool. I think invalidateblock behaves similarly. So even if a different wallet were used instead of Bitcoin Core’s, the same behavior would likely occur.
	bitcoind: &BitcoindClient, electrs: &E, txs: &[Transaction],
) {
	let _ = bitcoind.create_wallet("ldk_node_test");
	let _ = bitcoind.load_wallet("ldk_node_test");
	let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
	let cur_height = blockchain_info.blocks;
	let address = bitcoind.new_address().expect("failed to get new address");

	let request_block_template = TemplateRequest { rules: vec![TemplateRules::Segwit] };
	let bt =
 bitcoind.get_block_template(&request_block_template).expect("failed to get block template");

	// === BIP 141: Witness Commitment Calculation ===
	let witness_root = calculate_root(
 iter::once(Wtxid::all_zeros()).chain(txs.iter().map(|tx| tx.compute_wtxid())),
	)
	.map(|root| TxMerkleNode::from_byte_array(root.to_byte_array()))
	.unwrap();

	// BIP 141: Witness reserved value (32 zero bytes)
	let witness_reserved_value = [0u8; 32];

	// === Coinbase Transaction Construction ===
	// BIP 141: Coinbase witness contains the witness reserved value
	let coinbase_witness = Witness::from(vec![witness_reserved_value.to_vec()]);

	// BIP 141: Calculate commitment hash = Double-SHA256(witness root || witness reserved value)
	let commitment_hash =
 Sha256d::hash(&[witness_root.to_byte_array(), witness_reserved_value].concat());

	// Format: OP_RETURN + OP_PUSHBYTES_36 + 0xaa21a9ed + 32-byte commitment hash
	let witness_commitment_script = BuilderScriptBitcoin::new()
 .push_opcode(OP_RETURN)
 .push_slice(&{
 let mut data = [0u8; 36];
 data[..4].copy_from_slice(&[0xaa, 0x21, 0xa9, 0xed]);
 data[4..].copy_from_slice(&commitment_hash.to_byte_array());
 data
 })
 .into_script();

	// BIP 34: Block height in coinbase input script
	let block_height = bt.height;
	let height_script = BuilderScriptBitcoin::new()
 .push_int(block_height as i64) // BIP 34: block height as first item
 .push_int(rand::random()) // Random nonce for uniqueness
 .into_script();

	// Do not use the coinbase value from the block template.
	// The template may include transactions not actually mined, so fees may be incorrect.
	let coinbase_output_value = 1_250_000_000;

	let coinbase_tx = Transaction {
 version: Version::ONE,
 lock_time: LockTime::from_height(0).unwrap(),
 input: vec![bitcoin::TxIn {
 previous_output: OutPoint::default(), // Null outpoint for coinbase
 script_sig: height_script, // BIP 34: height + random data
 sequence: Sequence::default(),
 witness: coinbase_witness, // BIP 141: witness reserved value
 }],
 output: vec![
 // Coinbase reward output
 bitcoin::TxOut {
 value: Amount::from_sat(coinbase_output_value),
 script_pubkey: address.script_pubkey(),
 },
 // BIP 141: Witness commitment output (must be last output)
 bitcoin::TxOut { value: Amount::ZERO, script_pubkey: witness_commitment_script },
 ],
	};

	// === Block Construction ===
	let bits: [u8; 4] = Vec::from_hex(&bt.bits).unwrap().try_into().expect("bits must be 4 bytes");
	let prev_hash_block = BlockHash::from_str(&bt.previous_block_hash).expect("invalid prev hash");

	let txdata = [coinbase_tx].into_iter().chain(txs.iter().cloned()).collect::<Vec<_>>();
	let mut block = Block {
 header: Header {
 version: BlockVersion::default(),
 prev_blockhash: prev_hash_block,
 merkle_root: TxMerkleNode::all_zeros(), // Will be calculated below
 time: Ord::max(bt.min_time, UNIX_EPOCH.elapsed().unwrap().as_secs() as u32),
 bits: CompactTarget::from_consensus(u32::from_be_bytes(bits)),
 nonce: 0,
 },
 txdata,
	};

	block.header.merkle_root = block.compute_merkle_root().expect("must compute");

	for nonce in 0..=u32::MAX {
 block.header.nonce = nonce;
 if block.header.target().is_met_by(block.block_hash()) {
 break;
 }
	}

	match bitcoind.submit_block(&block) {
 Ok(_) => {},
 Err(e) => panic!("Failed to submit block: {:?}", e),
	}
	wait_for_block(electrs, cur_height as usize + 1);

	txs.iter().for_each(|tx| {
 wait_for_tx(electrs, tx.compute_txid());
	});
}

pub(crate) fn generate_blocks_and_wait<E: ElectrumApi>(
	bitcoind: &BitcoindClient, electrs: &E, num: usize,
) {
Expand DownExpand Up@@ -570,11 +693,13 @@ pub(crate) fn bump_fee_and_broadcast<E: ElectrumApi>(
 let tx_bytes = Vec::<u8>::from_hex(&signed_result.hex).unwrap();
 tx = bitcoin::consensus::encode::deserialize::<Transaction>(&tx_bytes).unwrap();

 if is_insert_block {
 generate_block_and_insert_transactions(bitcoind, electrs, &[tx.clone()]);
 return tx;
 }

 match bitcoind.send_raw_transaction(&tx) {
 Ok(res) => {
 if is_insert_block {
 generate_blocks_and_wait(bitcoind, electrs, 1);
 }
 let new_txid: Txid = res.0.parse().unwrap();
 wait_for_tx(electrs, new_txid);
 return tx;
Expand Down
Loading
Loading

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

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

 Closed

moisesPompilio
wants to merge
3
commits into

from

 Closed


Fix Invalid Pending Payments and Strengthen RBF Tests
#647
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c72a39c

nit: introduce setup_node and rename setup_node to setup_node_from_co…


moisesPompilio Sep 9, 2025
e584b42

Add manual block generation and direct transaction insertion for RBF …


moisesPompilio Sep 22, 2025
c893290

Add property-based reorg test for RBF transactions


moisesPompilio Sep 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


149 changes: 137 additions & 12 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,26 @@ use std::boxed::Box;
use std::collections::{HashMap, HashSet};
use std::env;
use std::future::Future;
use std::iter;
use std::path::PathBuf;
use std::pin::Pin;
use std::str::FromStr;
use std::sync::{Arc, RwLock};
use std::time::Duration;
use std::time::{Duration, UNIX_EPOCH};

use bitcoin::hashes::hex::FromHex;
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::Hash;
use bitcoin::absolute::LockTime;
use bitcoin::block::{Header, Version as BlockVersion};
use bitcoin::hashes::{hex::FromHex, sha256::Hash as Sha256, sha256d::Hash as Sha256d, Hash};
use bitcoin::merkle_tree::calculate_root;
use bitcoin::script::Builder as BuilderScriptBitcoin;
use bitcoin::{
	Address, Amount, Network, OutPoint, ScriptBuf, Sequence, Transaction, Txid, Witness,
	opcodes::all::OP_RETURN, transaction::Version, Address, Amount, Block, BlockHash,
	CompactTarget, Network, OutPoint, ScriptBuf, Sequence, Transaction, TxMerkleNode, Txid,
	Witness, Wtxid,
};
use electrsd::corepc_node::{
	Client as BitcoindClient, Node as BitcoinD, TemplateRequest, TemplateRules,
};
use electrsd::corepc_node::{Client as BitcoindClient, Node as BitcoinD};
use electrsd::{corepc_node, ElectrsD};
use electrum_client::ElectrumApi;
use ldk_node::config::{AsyncPaymentsRole, Config, ElectrumSyncConfig, EsploraSyncConfig};
Expand DownExpand Up@@ -285,7 +293,7 @@ pub(crate) fn setup_two_nodes(
) -> (TestNode, TestNode) {
	println!("== Node A ==");
	let config_a = random_config(anchor_channels);
	let node_a = setup_node(chain_source, config_a, None);
	let node_a = setup_node_from_config(chain_source, config_a, None);

	println!("\n== Node B ==");
	let mut config_b = random_config(anchor_channels);
Expand All@@ -301,11 +309,16 @@ pub(crate) fn setup_two_nodes(
 .trusted_peers_no_reserve
 .push(node_a.node_id());
	}
	let node_b = setup_node(chain_source, config_b, None);
	let node_b = setup_node_from_config(chain_source, config_b, None);
	(node_a, node_b)
}

pub(crate) fn setup_node(
pub(crate) fn setup_node(chain_source: &TestChainSource, anchor_channels: bool) -> TestNode {
	let config = random_config(anchor_channels);
	setup_node_from_config(chain_source, config, None)
}

pub(crate) fn setup_node_from_config(
	chain_source: &TestChainSource, config: TestConfig, seed_bytes: Option<Vec<u8>>,
) -> TestNode {
	setup_node_for_async_payments(chain_source, config, seed_bytes, None)
Expand DownExpand Up@@ -389,6 +402,116 @@ pub(crate) fn setup_node_for_async_payments(
	node
}

pub(crate) fn generate_block_and_insert_transactions<E: ElectrumApi>(
@tnulltnullOct 9, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it would be simpler to
  1. Put the RBF into the mempool
  2. Sync the wallet so it registers
  3. Mine a block
  4. Call Bitcoin Core's invalidateblock to discard the tip and the RBF
  5. Put the original TX into the mempool
  6. Sync the wallet again
If I'm not mistaken that would save us all of this boilerplate?
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
@tnulltnullOct 10, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
Interesting, I was under the impression that invalidateblock doesn't put the transactions back into the mempool but would simply discard them. It's likely not working because you use the bitcoind wallet to generate and RBF the transaction, having it track as part of the wallet (rather than 'just' in the mempool).
In any case, the block mining boilerplate is probably fine here then, even though I had hoped it could be simplified.
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

during a reorg, Bitcoin Core doesn’t drop the transactions but tries to reinsert them into the mempool. I think invalidateblock behaves similarly. So even if a different wallet were used instead of Bitcoin Core’s, the same behavior would likely occur.
	bitcoind: &BitcoindClient, electrs: &E, txs: &[Transaction],
) {
	let _ = bitcoind.create_wallet("ldk_node_test");
	let _ = bitcoind.load_wallet("ldk_node_test");
	let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
	let cur_height = blockchain_info.blocks;
	let address = bitcoind.new_address().expect("failed to get new address");

	let request_block_template = TemplateRequest { rules: vec![TemplateRules::Segwit] };
	let bt =
 bitcoind.get_block_template(&request_block_template).expect("failed to get block template");

	// === BIP 141: Witness Commitment Calculation ===
	let witness_root = calculate_root(
 iter::once(Wtxid::all_zeros()).chain(txs.iter().map(|tx| tx.compute_wtxid())),
	)
	.map(|root| TxMerkleNode::from_byte_array(root.to_byte_array()))
	.unwrap();

	// BIP 141: Witness reserved value (32 zero bytes)
	let witness_reserved_value = [0u8; 32];

	// === Coinbase Transaction Construction ===
	// BIP 141: Coinbase witness contains the witness reserved value
	let coinbase_witness = Witness::from(vec![witness_reserved_value.to_vec()]);

	// BIP 141: Calculate commitment hash = Double-SHA256(witness root || witness reserved value)
	let commitment_hash =
 Sha256d::hash(&[witness_root.to_byte_array(), witness_reserved_value].concat());

	// Format: OP_RETURN + OP_PUSHBYTES_36 + 0xaa21a9ed + 32-byte commitment hash
	let witness_commitment_script = BuilderScriptBitcoin::new()
 .push_opcode(OP_RETURN)
 .push_slice(&{
 let mut data = [0u8; 36];
 data[..4].copy_from_slice(&[0xaa, 0x21, 0xa9, 0xed]);
 data[4..].copy_from_slice(&commitment_hash.to_byte_array());
 data
 })
 .into_script();

	// BIP 34: Block height in coinbase input script
	let block_height = bt.height;
	let height_script = BuilderScriptBitcoin::new()
 .push_int(block_height as i64) // BIP 34: block height as first item
 .push_int(rand::random()) // Random nonce for uniqueness
 .into_script();

	// Do not use the coinbase value from the block template.
	// The template may include transactions not actually mined, so fees may be incorrect.
	let coinbase_output_value = 1_250_000_000;

	let coinbase_tx = Transaction {
 version: Version::ONE,
 lock_time: LockTime::from_height(0).unwrap(),
 input: vec![bitcoin::TxIn {
 previous_output: OutPoint::default(), // Null outpoint for coinbase
 script_sig: height_script, // BIP 34: height + random data
 sequence: Sequence::default(),
 witness: coinbase_witness, // BIP 141: witness reserved value
 }],
 output: vec![
 // Coinbase reward output
 bitcoin::TxOut {
 value: Amount::from_sat(coinbase_output_value),
 script_pubkey: address.script_pubkey(),
 },
 // BIP 141: Witness commitment output (must be last output)
 bitcoin::TxOut { value: Amount::ZERO, script_pubkey: witness_commitment_script },
 ],
	};

	// === Block Construction ===
	let bits: [u8; 4] = Vec::from_hex(&bt.bits).unwrap().try_into().expect("bits must be 4 bytes");
	let prev_hash_block = BlockHash::from_str(&bt.previous_block_hash).expect("invalid prev hash");

	let txdata = [coinbase_tx].into_iter().chain(txs.iter().cloned()).collect::<Vec<_>>();
	let mut block = Block {
 header: Header {
 version: BlockVersion::default(),
 prev_blockhash: prev_hash_block,
 merkle_root: TxMerkleNode::all_zeros(), // Will be calculated below
 time: Ord::max(bt.min_time, UNIX_EPOCH.elapsed().unwrap().as_secs() as u32),
 bits: CompactTarget::from_consensus(u32::from_be_bytes(bits)),
 nonce: 0,
 },
 txdata,
	};

	block.header.merkle_root = block.compute_merkle_root().expect("must compute");

	for nonce in 0..=u32::MAX {
 block.header.nonce = nonce;
 if block.header.target().is_met_by(block.block_hash()) {
 break;
 }
	}

	match bitcoind.submit_block(&block) {
 Ok(_) => {},
 Err(e) => panic!("Failed to submit block: {:?}", e),
	}
	wait_for_block(electrs, cur_height as usize + 1);

	txs.iter().for_each(|tx| {
 wait_for_tx(electrs, tx.compute_txid());
	});
}

pub(crate) fn generate_blocks_and_wait<E: ElectrumApi>(
	bitcoind: &BitcoindClient, electrs: &E, num: usize,
) {
Expand DownExpand Up@@ -570,11 +693,13 @@ pub(crate) fn bump_fee_and_broadcast<E: ElectrumApi>(
 let tx_bytes = Vec::<u8>::from_hex(&signed_result.hex).unwrap();
 tx = bitcoin::consensus::encode::deserialize::<Transaction>(&tx_bytes).unwrap();

 if is_insert_block {
 generate_block_and_insert_transactions(bitcoind, electrs, &[tx.clone()]);
 return tx;
 }

 match bitcoind.send_raw_transaction(&tx) {
 Ok(res) => {
 if is_insert_block {
 generate_blocks_and_wait(bitcoind, electrs, 1);
 }
 let new_txid: Txid = res.0.parse().unwrap();
 wait_for_tx(electrs, new_txid);
 return tx;
Expand Down
Loading
Loading

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

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

 Closed

moisesPompilio
wants to merge
3
commits into

from

 Closed


Fix Invalid Pending Payments and Strengthen RBF Tests
#647
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c72a39c

nit: introduce setup_node and rename setup_node to setup_node_from_co…


moisesPompilio Sep 9, 2025
e584b42

Add manual block generation and direct transaction insertion for RBF …


moisesPompilio Sep 22, 2025
c893290

Add property-based reorg test for RBF transactions


moisesPompilio Sep 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


149 changes: 137 additions & 12 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,26 @@ use std::boxed::Box;
use std::collections::{HashMap, HashSet};
use std::env;
use std::future::Future;
use std::iter;
use std::path::PathBuf;
use std::pin::Pin;
use std::str::FromStr;
use std::sync::{Arc, RwLock};
use std::time::Duration;
use std::time::{Duration, UNIX_EPOCH};

use bitcoin::hashes::hex::FromHex;
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::Hash;
use bitcoin::absolute::LockTime;
use bitcoin::block::{Header, Version as BlockVersion};
use bitcoin::hashes::{hex::FromHex, sha256::Hash as Sha256, sha256d::Hash as Sha256d, Hash};
use bitcoin::merkle_tree::calculate_root;
use bitcoin::script::Builder as BuilderScriptBitcoin;
use bitcoin::{
	Address, Amount, Network, OutPoint, ScriptBuf, Sequence, Transaction, Txid, Witness,
	opcodes::all::OP_RETURN, transaction::Version, Address, Amount, Block, BlockHash,
	CompactTarget, Network, OutPoint, ScriptBuf, Sequence, Transaction, TxMerkleNode, Txid,
	Witness, Wtxid,
};
use electrsd::corepc_node::{
	Client as BitcoindClient, Node as BitcoinD, TemplateRequest, TemplateRules,
};
use electrsd::corepc_node::{Client as BitcoindClient, Node as BitcoinD};
use electrsd::{corepc_node, ElectrsD};
use electrum_client::ElectrumApi;
use ldk_node::config::{AsyncPaymentsRole, Config, ElectrumSyncConfig, EsploraSyncConfig};
Expand DownExpand Up@@ -285,7 +293,7 @@ pub(crate) fn setup_two_nodes(
) -> (TestNode, TestNode) {
	println!("== Node A ==");
	let config_a = random_config(anchor_channels);
	let node_a = setup_node(chain_source, config_a, None);
	let node_a = setup_node_from_config(chain_source, config_a, None);

	println!("\n== Node B ==");
	let mut config_b = random_config(anchor_channels);
Expand All@@ -301,11 +309,16 @@ pub(crate) fn setup_two_nodes(
 .trusted_peers_no_reserve
 .push(node_a.node_id());
	}
	let node_b = setup_node(chain_source, config_b, None);
	let node_b = setup_node_from_config(chain_source, config_b, None);
	(node_a, node_b)
}

pub(crate) fn setup_node(
pub(crate) fn setup_node(chain_source: &TestChainSource, anchor_channels: bool) -> TestNode {
	let config = random_config(anchor_channels);
	setup_node_from_config(chain_source, config, None)
}

pub(crate) fn setup_node_from_config(
	chain_source: &TestChainSource, config: TestConfig, seed_bytes: Option<Vec<u8>>,
) -> TestNode {
	setup_node_for_async_payments(chain_source, config, seed_bytes, None)
Expand DownExpand Up@@ -389,6 +402,116 @@ pub(crate) fn setup_node_for_async_payments(
	node
}

pub(crate) fn generate_block_and_insert_transactions<E: ElectrumApi>(
@tnulltnullOct 9, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it would be simpler to
  1. Put the RBF into the mempool
  2. Sync the wallet so it registers
  3. Mine a block
  4. Call Bitcoin Core's invalidateblock to discard the tip and the RBF
  5. Put the original TX into the mempool
  6. Sync the wallet again
If I'm not mistaken that would save us all of this boilerplate?
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
@tnulltnullOct 10, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
Interesting, I was under the impression that invalidateblock doesn't put the transactions back into the mempool but would simply discard them. It's likely not working because you use the bitcoind wallet to generate and RBF the transaction, having it track as part of the wallet (rather than 'just' in the mempool).
In any case, the block mining boilerplate is probably fine here then, even though I had hoped it could be simplified.
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

during a reorg, Bitcoin Core doesn’t drop the transactions but tries to reinsert them into the mempool. I think invalidateblock behaves similarly. So even if a different wallet were used instead of Bitcoin Core’s, the same behavior would likely occur.
	bitcoind: &BitcoindClient, electrs: &E, txs: &[Transaction],
) {
	let _ = bitcoind.create_wallet("ldk_node_test");
	let _ = bitcoind.load_wallet("ldk_node_test");
	let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
	let cur_height = blockchain_info.blocks;
	let address = bitcoind.new_address().expect("failed to get new address");

	let request_block_template = TemplateRequest { rules: vec![TemplateRules::Segwit] };
	let bt =
 bitcoind.get_block_template(&request_block_template).expect("failed to get block template");

	// === BIP 141: Witness Commitment Calculation ===
	let witness_root = calculate_root(
 iter::once(Wtxid::all_zeros()).chain(txs.iter().map(|tx| tx.compute_wtxid())),
	)
	.map(|root| TxMerkleNode::from_byte_array(root.to_byte_array()))
	.unwrap();

	// BIP 141: Witness reserved value (32 zero bytes)
	let witness_reserved_value = [0u8; 32];

	// === Coinbase Transaction Construction ===
	// BIP 141: Coinbase witness contains the witness reserved value
	let coinbase_witness = Witness::from(vec![witness_reserved_value.to_vec()]);

	// BIP 141: Calculate commitment hash = Double-SHA256(witness root || witness reserved value)
	let commitment_hash =
 Sha256d::hash(&[witness_root.to_byte_array(), witness_reserved_value].concat());

	// Format: OP_RETURN + OP_PUSHBYTES_36 + 0xaa21a9ed + 32-byte commitment hash
	let witness_commitment_script = BuilderScriptBitcoin::new()
 .push_opcode(OP_RETURN)
 .push_slice(&{
 let mut data = [0u8; 36];
 data[..4].copy_from_slice(&[0xaa, 0x21, 0xa9, 0xed]);
 data[4..].copy_from_slice(&commitment_hash.to_byte_array());
 data
 })
 .into_script();

	// BIP 34: Block height in coinbase input script
	let block_height = bt.height;
	let height_script = BuilderScriptBitcoin::new()
 .push_int(block_height as i64) // BIP 34: block height as first item
 .push_int(rand::random()) // Random nonce for uniqueness
 .into_script();

	// Do not use the coinbase value from the block template.
	// The template may include transactions not actually mined, so fees may be incorrect.
	let coinbase_output_value = 1_250_000_000;

	let coinbase_tx = Transaction {
 version: Version::ONE,
 lock_time: LockTime::from_height(0).unwrap(),
 input: vec![bitcoin::TxIn {
 previous_output: OutPoint::default(), // Null outpoint for coinbase
 script_sig: height_script, // BIP 34: height + random data
 sequence: Sequence::default(),
 witness: coinbase_witness, // BIP 141: witness reserved value
 }],
 output: vec![
 // Coinbase reward output
 bitcoin::TxOut {
 value: Amount::from_sat(coinbase_output_value),
 script_pubkey: address.script_pubkey(),
 },
 // BIP 141: Witness commitment output (must be last output)
 bitcoin::TxOut { value: Amount::ZERO, script_pubkey: witness_commitment_script },
 ],
	};

	// === Block Construction ===
	let bits: [u8; 4] = Vec::from_hex(&bt.bits).unwrap().try_into().expect("bits must be 4 bytes");
	let prev_hash_block = BlockHash::from_str(&bt.previous_block_hash).expect("invalid prev hash");

	let txdata = [coinbase_tx].into_iter().chain(txs.iter().cloned()).collect::<Vec<_>>();
	let mut block = Block {
 header: Header {
 version: BlockVersion::default(),
 prev_blockhash: prev_hash_block,
 merkle_root: TxMerkleNode::all_zeros(), // Will be calculated below
 time: Ord::max(bt.min_time, UNIX_EPOCH.elapsed().unwrap().as_secs() as u32),
 bits: CompactTarget::from_consensus(u32::from_be_bytes(bits)),
 nonce: 0,
 },
 txdata,
	};

	block.header.merkle_root = block.compute_merkle_root().expect("must compute");

	for nonce in 0..=u32::MAX {
 block.header.nonce = nonce;
 if block.header.target().is_met_by(block.block_hash()) {
 break;
 }
	}

	match bitcoind.submit_block(&block) {
 Ok(_) => {},
 Err(e) => panic!("Failed to submit block: {:?}", e),
	}
	wait_for_block(electrs, cur_height as usize + 1);

	txs.iter().for_each(|tx| {
 wait_for_tx(electrs, tx.compute_txid());
	});
}

pub(crate) fn generate_blocks_and_wait<E: ElectrumApi>(
	bitcoind: &BitcoindClient, electrs: &E, num: usize,
) {
Expand DownExpand Up@@ -570,11 +693,13 @@ pub(crate) fn bump_fee_and_broadcast<E: ElectrumApi>(
 let tx_bytes = Vec::<u8>::from_hex(&signed_result.hex).unwrap();
 tx = bitcoin::consensus::encode::deserialize::<Transaction>(&tx_bytes).unwrap();

 if is_insert_block {
 generate_block_and_insert_transactions(bitcoind, electrs, &[tx.clone()]);
 return tx;
 }

 match bitcoind.send_raw_transaction(&tx) {
 Ok(res) => {
 if is_insert_block {
 generate_blocks_and_wait(bitcoind, electrs, 1);
 }
 let new_txid: Txid = res.0.parse().unwrap();
 wait_for_tx(electrs, new_txid);
 return tx;
Expand Down
Loading
Loading

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

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

 Closed

moisesPompilio
wants to merge
3
commits into

from

 Closed


Fix Invalid Pending Payments and Strengthen RBF Tests
#647
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c72a39c

nit: introduce setup_node and rename setup_node to setup_node_from_co…


moisesPompilio Sep 9, 2025
e584b42

Add manual block generation and direct transaction insertion for RBF …


moisesPompilio Sep 22, 2025
c893290

Add property-based reorg test for RBF transactions


moisesPompilio Sep 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


149 changes: 137 additions & 12 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,26 @@ use std::boxed::Box;
use std::collections::{HashMap, HashSet};
use std::env;
use std::future::Future;
use std::iter;
use std::path::PathBuf;
use std::pin::Pin;
use std::str::FromStr;
use std::sync::{Arc, RwLock};
use std::time::Duration;
use std::time::{Duration, UNIX_EPOCH};

use bitcoin::hashes::hex::FromHex;
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::Hash;
use bitcoin::absolute::LockTime;
use bitcoin::block::{Header, Version as BlockVersion};
use bitcoin::hashes::{hex::FromHex, sha256::Hash as Sha256, sha256d::Hash as Sha256d, Hash};
use bitcoin::merkle_tree::calculate_root;
use bitcoin::script::Builder as BuilderScriptBitcoin;
use bitcoin::{
	Address, Amount, Network, OutPoint, ScriptBuf, Sequence, Transaction, Txid, Witness,
	opcodes::all::OP_RETURN, transaction::Version, Address, Amount, Block, BlockHash,
	CompactTarget, Network, OutPoint, ScriptBuf, Sequence, Transaction, TxMerkleNode, Txid,
	Witness, Wtxid,
};
use electrsd::corepc_node::{
	Client as BitcoindClient, Node as BitcoinD, TemplateRequest, TemplateRules,
};
use electrsd::corepc_node::{Client as BitcoindClient, Node as BitcoinD};
use electrsd::{corepc_node, ElectrsD};
use electrum_client::ElectrumApi;
use ldk_node::config::{AsyncPaymentsRole, Config, ElectrumSyncConfig, EsploraSyncConfig};
Expand DownExpand Up@@ -285,7 +293,7 @@ pub(crate) fn setup_two_nodes(
) -> (TestNode, TestNode) {
	println!("== Node A ==");
	let config_a = random_config(anchor_channels);
	let node_a = setup_node(chain_source, config_a, None);
	let node_a = setup_node_from_config(chain_source, config_a, None);

	println!("\n== Node B ==");
	let mut config_b = random_config(anchor_channels);
Expand All@@ -301,11 +309,16 @@ pub(crate) fn setup_two_nodes(
 .trusted_peers_no_reserve
 .push(node_a.node_id());
	}
	let node_b = setup_node(chain_source, config_b, None);
	let node_b = setup_node_from_config(chain_source, config_b, None);
	(node_a, node_b)
}

pub(crate) fn setup_node(
pub(crate) fn setup_node(chain_source: &TestChainSource, anchor_channels: bool) -> TestNode {
	let config = random_config(anchor_channels);
	setup_node_from_config(chain_source, config, None)
}

pub(crate) fn setup_node_from_config(
	chain_source: &TestChainSource, config: TestConfig, seed_bytes: Option<Vec<u8>>,
) -> TestNode {
	setup_node_for_async_payments(chain_source, config, seed_bytes, None)
Expand DownExpand Up@@ -389,6 +402,116 @@ pub(crate) fn setup_node_for_async_payments(
	node
}

pub(crate) fn generate_block_and_insert_transactions<E: ElectrumApi>(
@tnulltnullOct 9, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it would be simpler to
  1. Put the RBF into the mempool
  2. Sync the wallet so it registers
  3. Mine a block
  4. Call Bitcoin Core's invalidateblock to discard the tip and the RBF
  5. Put the original TX into the mempool
  6. Sync the wallet again
If I'm not mistaken that would save us all of this boilerplate?
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
@tnulltnullOct 10, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
Interesting, I was under the impression that invalidateblock doesn't put the transactions back into the mempool but would simply discard them. It's likely not working because you use the bitcoind wallet to generate and RBF the transaction, having it track as part of the wallet (rather than 'just' in the mempool).
In any case, the block mining boilerplate is probably fine here then, even though I had hoped it could be simplified.
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

during a reorg, Bitcoin Core doesn’t drop the transactions but tries to reinsert them into the mempool. I think invalidateblock behaves similarly. So even if a different wallet were used instead of Bitcoin Core’s, the same behavior would likely occur.
	bitcoind: &BitcoindClient, electrs: &E, txs: &[Transaction],
) {
	let _ = bitcoind.create_wallet("ldk_node_test");
	let _ = bitcoind.load_wallet("ldk_node_test");
	let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
	let cur_height = blockchain_info.blocks;
	let address = bitcoind.new_address().expect("failed to get new address");

	let request_block_template = TemplateRequest { rules: vec![TemplateRules::Segwit] };
	let bt =
 bitcoind.get_block_template(&request_block_template).expect("failed to get block template");

	// === BIP 141: Witness Commitment Calculation ===
	let witness_root = calculate_root(
 iter::once(Wtxid::all_zeros()).chain(txs.iter().map(|tx| tx.compute_wtxid())),
	)
	.map(|root| TxMerkleNode::from_byte_array(root.to_byte_array()))
	.unwrap();

	// BIP 141: Witness reserved value (32 zero bytes)
	let witness_reserved_value = [0u8; 32];

	// === Coinbase Transaction Construction ===
	// BIP 141: Coinbase witness contains the witness reserved value
	let coinbase_witness = Witness::from(vec![witness_reserved_value.to_vec()]);

	// BIP 141: Calculate commitment hash = Double-SHA256(witness root || witness reserved value)
	let commitment_hash =
 Sha256d::hash(&[witness_root.to_byte_array(), witness_reserved_value].concat());

	// Format: OP_RETURN + OP_PUSHBYTES_36 + 0xaa21a9ed + 32-byte commitment hash
	let witness_commitment_script = BuilderScriptBitcoin::new()
 .push_opcode(OP_RETURN)
 .push_slice(&{
 let mut data = [0u8; 36];
 data[..4].copy_from_slice(&[0xaa, 0x21, 0xa9, 0xed]);
 data[4..].copy_from_slice(&commitment_hash.to_byte_array());
 data
 })
 .into_script();

	// BIP 34: Block height in coinbase input script
	let block_height = bt.height;
	let height_script = BuilderScriptBitcoin::new()
 .push_int(block_height as i64) // BIP 34: block height as first item
 .push_int(rand::random()) // Random nonce for uniqueness
 .into_script();

	// Do not use the coinbase value from the block template.
	// The template may include transactions not actually mined, so fees may be incorrect.
	let coinbase_output_value = 1_250_000_000;

	let coinbase_tx = Transaction {
 version: Version::ONE,
 lock_time: LockTime::from_height(0).unwrap(),
 input: vec![bitcoin::TxIn {
 previous_output: OutPoint::default(), // Null outpoint for coinbase
 script_sig: height_script, // BIP 34: height + random data
 sequence: Sequence::default(),
 witness: coinbase_witness, // BIP 141: witness reserved value
 }],
 output: vec![
 // Coinbase reward output
 bitcoin::TxOut {
 value: Amount::from_sat(coinbase_output_value),
 script_pubkey: address.script_pubkey(),
 },
 // BIP 141: Witness commitment output (must be last output)
 bitcoin::TxOut { value: Amount::ZERO, script_pubkey: witness_commitment_script },
 ],
	};

	// === Block Construction ===
	let bits: [u8; 4] = Vec::from_hex(&bt.bits).unwrap().try_into().expect("bits must be 4 bytes");
	let prev_hash_block = BlockHash::from_str(&bt.previous_block_hash).expect("invalid prev hash");

	let txdata = [coinbase_tx].into_iter().chain(txs.iter().cloned()).collect::<Vec<_>>();
	let mut block = Block {
 header: Header {
 version: BlockVersion::default(),
 prev_blockhash: prev_hash_block,
 merkle_root: TxMerkleNode::all_zeros(), // Will be calculated below
 time: Ord::max(bt.min_time, UNIX_EPOCH.elapsed().unwrap().as_secs() as u32),
 bits: CompactTarget::from_consensus(u32::from_be_bytes(bits)),
 nonce: 0,
 },
 txdata,
	};

	block.header.merkle_root = block.compute_merkle_root().expect("must compute");

	for nonce in 0..=u32::MAX {
 block.header.nonce = nonce;
 if block.header.target().is_met_by(block.block_hash()) {
 break;
 }
	}

	match bitcoind.submit_block(&block) {
 Ok(_) => {},
 Err(e) => panic!("Failed to submit block: {:?}", e),
	}
	wait_for_block(electrs, cur_height as usize + 1);

	txs.iter().for_each(|tx| {
 wait_for_tx(electrs, tx.compute_txid());
	});
}

pub(crate) fn generate_blocks_and_wait<E: ElectrumApi>(
	bitcoind: &BitcoindClient, electrs: &E, num: usize,
) {
Expand DownExpand Up@@ -570,11 +693,13 @@ pub(crate) fn bump_fee_and_broadcast<E: ElectrumApi>(
 let tx_bytes = Vec::<u8>::from_hex(&signed_result.hex).unwrap();
 tx = bitcoin::consensus::encode::deserialize::<Transaction>(&tx_bytes).unwrap();

 if is_insert_block {
 generate_block_and_insert_transactions(bitcoind, electrs, &[tx.clone()]);
 return tx;
 }

 match bitcoind.send_raw_transaction(&tx) {
 Ok(res) => {
 if is_insert_block {
 generate_blocks_and_wait(bitcoind, electrs, 1);
 }
 let new_txid: Txid = res.0.parse().unwrap();
 wait_for_tx(electrs, new_txid);
 return tx;
Expand Down
Loading
Loading

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

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

 Closed

moisesPompilio
wants to merge
3
commits into

from

 Closed


Fix Invalid Pending Payments and Strengthen RBF Tests
#647
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c72a39c

nit: introduce setup_node and rename setup_node to setup_node_from_co…


moisesPompilio Sep 9, 2025
e584b42

Add manual block generation and direct transaction insertion for RBF …


moisesPompilio Sep 22, 2025
c893290

Add property-based reorg test for RBF transactions


moisesPompilio Sep 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


149 changes: 137 additions & 12 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,26 @@ use std::boxed::Box;
use std::collections::{HashMap, HashSet};
use std::env;
use std::future::Future;
use std::iter;
use std::path::PathBuf;
use std::pin::Pin;
use std::str::FromStr;
use std::sync::{Arc, RwLock};
use std::time::Duration;
use std::time::{Duration, UNIX_EPOCH};

use bitcoin::hashes::hex::FromHex;
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::Hash;
use bitcoin::absolute::LockTime;
use bitcoin::block::{Header, Version as BlockVersion};
use bitcoin::hashes::{hex::FromHex, sha256::Hash as Sha256, sha256d::Hash as Sha256d, Hash};
use bitcoin::merkle_tree::calculate_root;
use bitcoin::script::Builder as BuilderScriptBitcoin;
use bitcoin::{
	Address, Amount, Network, OutPoint, ScriptBuf, Sequence, Transaction, Txid, Witness,
	opcodes::all::OP_RETURN, transaction::Version, Address, Amount, Block, BlockHash,
	CompactTarget, Network, OutPoint, ScriptBuf, Sequence, Transaction, TxMerkleNode, Txid,
	Witness, Wtxid,
};
use electrsd::corepc_node::{
	Client as BitcoindClient, Node as BitcoinD, TemplateRequest, TemplateRules,
};
use electrsd::corepc_node::{Client as BitcoindClient, Node as BitcoinD};
use electrsd::{corepc_node, ElectrsD};
use electrum_client::ElectrumApi;
use ldk_node::config::{AsyncPaymentsRole, Config, ElectrumSyncConfig, EsploraSyncConfig};
Expand DownExpand Up@@ -285,7 +293,7 @@ pub(crate) fn setup_two_nodes(
) -> (TestNode, TestNode) {
	println!("== Node A ==");
	let config_a = random_config(anchor_channels);
	let node_a = setup_node(chain_source, config_a, None);
	let node_a = setup_node_from_config(chain_source, config_a, None);

	println!("\n== Node B ==");
	let mut config_b = random_config(anchor_channels);
Expand All@@ -301,11 +309,16 @@ pub(crate) fn setup_two_nodes(
 .trusted_peers_no_reserve
 .push(node_a.node_id());
	}
	let node_b = setup_node(chain_source, config_b, None);
	let node_b = setup_node_from_config(chain_source, config_b, None);
	(node_a, node_b)
}

pub(crate) fn setup_node(
pub(crate) fn setup_node(chain_source: &TestChainSource, anchor_channels: bool) -> TestNode {
	let config = random_config(anchor_channels);
	setup_node_from_config(chain_source, config, None)
}

pub(crate) fn setup_node_from_config(
	chain_source: &TestChainSource, config: TestConfig, seed_bytes: Option<Vec<u8>>,
) -> TestNode {
	setup_node_for_async_payments(chain_source, config, seed_bytes, None)
Expand DownExpand Up@@ -389,6 +402,116 @@ pub(crate) fn setup_node_for_async_payments(
	node
}

pub(crate) fn generate_block_and_insert_transactions<E: ElectrumApi>(
@tnulltnullOct 9, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it would be simpler to
  1. Put the RBF into the mempool
  2. Sync the wallet so it registers
  3. Mine a block
  4. Call Bitcoin Core's invalidateblock to discard the tip and the RBF
  5. Put the original TX into the mempool
  6. Sync the wallet again
If I'm not mistaken that would save us all of this boilerplate?
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
@tnulltnullOct 10, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
Interesting, I was under the impression that invalidateblock doesn't put the transactions back into the mempool but would simply discard them. It's likely not working because you use the bitcoind wallet to generate and RBF the transaction, having it track as part of the wallet (rather than 'just' in the mempool).
In any case, the block mining boilerplate is probably fine here then, even though I had hoped it could be simplified.
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

during a reorg, Bitcoin Core doesn’t drop the transactions but tries to reinsert them into the mempool. I think invalidateblock behaves similarly. So even if a different wallet were used instead of Bitcoin Core’s, the same behavior would likely occur.
	bitcoind: &BitcoindClient, electrs: &E, txs: &[Transaction],
) {
	let _ = bitcoind.create_wallet("ldk_node_test");
	let _ = bitcoind.load_wallet("ldk_node_test");
	let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
	let cur_height = blockchain_info.blocks;
	let address = bitcoind.new_address().expect("failed to get new address");

	let request_block_template = TemplateRequest { rules: vec![TemplateRules::Segwit] };
	let bt =
 bitcoind.get_block_template(&request_block_template).expect("failed to get block template");

	// === BIP 141: Witness Commitment Calculation ===
	let witness_root = calculate_root(
 iter::once(Wtxid::all_zeros()).chain(txs.iter().map(|tx| tx.compute_wtxid())),
	)
	.map(|root| TxMerkleNode::from_byte_array(root.to_byte_array()))
	.unwrap();

	// BIP 141: Witness reserved value (32 zero bytes)
	let witness_reserved_value = [0u8; 32];

	// === Coinbase Transaction Construction ===
	// BIP 141: Coinbase witness contains the witness reserved value
	let coinbase_witness = Witness::from(vec![witness_reserved_value.to_vec()]);

	// BIP 141: Calculate commitment hash = Double-SHA256(witness root || witness reserved value)
	let commitment_hash =
 Sha256d::hash(&[witness_root.to_byte_array(), witness_reserved_value].concat());

	// Format: OP_RETURN + OP_PUSHBYTES_36 + 0xaa21a9ed + 32-byte commitment hash
	let witness_commitment_script = BuilderScriptBitcoin::new()
 .push_opcode(OP_RETURN)
 .push_slice(&{
 let mut data = [0u8; 36];
 data[..4].copy_from_slice(&[0xaa, 0x21, 0xa9, 0xed]);
 data[4..].copy_from_slice(&commitment_hash.to_byte_array());
 data
 })
 .into_script();

	// BIP 34: Block height in coinbase input script
	let block_height = bt.height;
	let height_script = BuilderScriptBitcoin::new()
 .push_int(block_height as i64) // BIP 34: block height as first item
 .push_int(rand::random()) // Random nonce for uniqueness
 .into_script();

	// Do not use the coinbase value from the block template.
	// The template may include transactions not actually mined, so fees may be incorrect.
	let coinbase_output_value = 1_250_000_000;

	let coinbase_tx = Transaction {
 version: Version::ONE,
 lock_time: LockTime::from_height(0).unwrap(),
 input: vec![bitcoin::TxIn {
 previous_output: OutPoint::default(), // Null outpoint for coinbase
 script_sig: height_script, // BIP 34: height + random data
 sequence: Sequence::default(),
 witness: coinbase_witness, // BIP 141: witness reserved value
 }],
 output: vec![
 // Coinbase reward output
 bitcoin::TxOut {
 value: Amount::from_sat(coinbase_output_value),
 script_pubkey: address.script_pubkey(),
 },
 // BIP 141: Witness commitment output (must be last output)
 bitcoin::TxOut { value: Amount::ZERO, script_pubkey: witness_commitment_script },
 ],
	};

	// === Block Construction ===
	let bits: [u8; 4] = Vec::from_hex(&bt.bits).unwrap().try_into().expect("bits must be 4 bytes");
	let prev_hash_block = BlockHash::from_str(&bt.previous_block_hash).expect("invalid prev hash");

	let txdata = [coinbase_tx].into_iter().chain(txs.iter().cloned()).collect::<Vec<_>>();
	let mut block = Block {
 header: Header {
 version: BlockVersion::default(),
 prev_blockhash: prev_hash_block,
 merkle_root: TxMerkleNode::all_zeros(), // Will be calculated below
 time: Ord::max(bt.min_time, UNIX_EPOCH.elapsed().unwrap().as_secs() as u32),
 bits: CompactTarget::from_consensus(u32::from_be_bytes(bits)),
 nonce: 0,
 },
 txdata,
	};

	block.header.merkle_root = block.compute_merkle_root().expect("must compute");

	for nonce in 0..=u32::MAX {
 block.header.nonce = nonce;
 if block.header.target().is_met_by(block.block_hash()) {
 break;
 }
	}

	match bitcoind.submit_block(&block) {
 Ok(_) => {},
 Err(e) => panic!("Failed to submit block: {:?}", e),
	}
	wait_for_block(electrs, cur_height as usize + 1);

	txs.iter().for_each(|tx| {
 wait_for_tx(electrs, tx.compute_txid());
	});
}

pub(crate) fn generate_blocks_and_wait<E: ElectrumApi>(
	bitcoind: &BitcoindClient, electrs: &E, num: usize,
) {
Expand DownExpand Up@@ -570,11 +693,13 @@ pub(crate) fn bump_fee_and_broadcast<E: ElectrumApi>(
 let tx_bytes = Vec::<u8>::from_hex(&signed_result.hex).unwrap();
 tx = bitcoin::consensus::encode::deserialize::<Transaction>(&tx_bytes).unwrap();

 if is_insert_block {
 generate_block_and_insert_transactions(bitcoind, electrs, &[tx.clone()]);
 return tx;
 }

 match bitcoind.send_raw_transaction(&tx) {
 Ok(res) => {
 if is_insert_block {
 generate_blocks_and_wait(bitcoind, electrs, 1);
 }
 let new_txid: Txid = res.0.parse().unwrap();
 wait_for_tx(electrs, new_txid);
 return tx;
Expand Down
Loading
Loading

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

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

 Closed

moisesPompilio
wants to merge
3
commits into

from

 Closed


Fix Invalid Pending Payments and Strengthen RBF Tests
#647
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
c72a39c

nit: introduce setup_node and rename setup_node to setup_node_from_co…


moisesPompilio Sep 9, 2025
e584b42

Add manual block generation and direct transaction insertion for RBF …


moisesPompilio Sep 22, 2025
c893290

Add property-based reorg test for RBF transactions


moisesPompilio Sep 22, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


149 changes: 137 additions & 12 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,18 +14,26 @@ use std::boxed::Box;
use std::collections::{HashMap, HashSet};
use std::env;
use std::future::Future;
use std::iter;
use std::path::PathBuf;
use std::pin::Pin;
use std::str::FromStr;
use std::sync::{Arc, RwLock};
use std::time::Duration;
use std::time::{Duration, UNIX_EPOCH};

use bitcoin::hashes::hex::FromHex;
use bitcoin::hashes::sha256::Hash as Sha256;
use bitcoin::hashes::Hash;
use bitcoin::absolute::LockTime;
use bitcoin::block::{Header, Version as BlockVersion};
use bitcoin::hashes::{hex::FromHex, sha256::Hash as Sha256, sha256d::Hash as Sha256d, Hash};
use bitcoin::merkle_tree::calculate_root;
use bitcoin::script::Builder as BuilderScriptBitcoin;
use bitcoin::{
	Address, Amount, Network, OutPoint, ScriptBuf, Sequence, Transaction, Txid, Witness,
	opcodes::all::OP_RETURN, transaction::Version, Address, Amount, Block, BlockHash,
	CompactTarget, Network, OutPoint, ScriptBuf, Sequence, Transaction, TxMerkleNode, Txid,
	Witness, Wtxid,
};
use electrsd::corepc_node::{
	Client as BitcoindClient, Node as BitcoinD, TemplateRequest, TemplateRules,
};
use electrsd::corepc_node::{Client as BitcoindClient, Node as BitcoinD};
use electrsd::{corepc_node, ElectrsD};
use electrum_client::ElectrumApi;
use ldk_node::config::{AsyncPaymentsRole, Config, ElectrumSyncConfig, EsploraSyncConfig};
Expand DownExpand Up@@ -285,7 +293,7 @@ pub(crate) fn setup_two_nodes(
) -> (TestNode, TestNode) {
	println!("== Node A ==");
	let config_a = random_config(anchor_channels);
	let node_a = setup_node(chain_source, config_a, None);
	let node_a = setup_node_from_config(chain_source, config_a, None);

	println!("\n== Node B ==");
	let mut config_b = random_config(anchor_channels);
Expand All@@ -301,11 +309,16 @@ pub(crate) fn setup_two_nodes(
 .trusted_peers_no_reserve
 .push(node_a.node_id());
	}
	let node_b = setup_node(chain_source, config_b, None);
	let node_b = setup_node_from_config(chain_source, config_b, None);
	(node_a, node_b)
}

pub(crate) fn setup_node(
pub(crate) fn setup_node(chain_source: &TestChainSource, anchor_channels: bool) -> TestNode {
	let config = random_config(anchor_channels);
	setup_node_from_config(chain_source, config, None)
}

pub(crate) fn setup_node_from_config(
	chain_source: &TestChainSource, config: TestConfig, seed_bytes: Option<Vec<u8>>,
) -> TestNode {
	setup_node_for_async_payments(chain_source, config, seed_bytes, None)
Expand DownExpand Up@@ -389,6 +402,116 @@ pub(crate) fn setup_node_for_async_payments(
	node
}

pub(crate) fn generate_block_and_insert_transactions<E: ElectrumApi>(
@tnulltnullOct 9, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if it would be simpler to
  1. Put the RBF into the mempool
  2. Sync the wallet so it registers
  3. Mine a block
  4. Call Bitcoin Core's invalidateblock to discard the tip and the RBF
  5. Put the original TX into the mempool
  6. Sync the wallet again
If I'm not mistaken that would save us all of this boilerplate?
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
@tnulltnullOct 10, 2025•

edited

Loading

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That approach doesn’t seem to work. After the block is mined and then invalidated, the replaced transaction isn’t discarded. I tested this flow, and when the original transaction is reintroduced, it fails because the existing transaction has a higher fee.
Interesting, I was under the impression that invalidateblock doesn't put the transactions back into the mempool but would simply discard them. It's likely not working because you use the bitcoind wallet to generate and RBF the transaction, having it track as part of the wallet (rather than 'just' in the mempool).
In any case, the block mining boilerplate is probably fine here then, even though I had hoped it could be simplified.
@moisesPompiliomoisesPompilioOct 10, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

during a reorg, Bitcoin Core doesn’t drop the transactions but tries to reinsert them into the mempool. I think invalidateblock behaves similarly. So even if a different wallet were used instead of Bitcoin Core’s, the same behavior would likely occur.
	bitcoind: &BitcoindClient, electrs: &E, txs: &[Transaction],
) {
	let _ = bitcoind.create_wallet("ldk_node_test");
	let _ = bitcoind.load_wallet("ldk_node_test");
	let blockchain_info = bitcoind.get_blockchain_info().expect("failed to get blockchain info");
	let cur_height = blockchain_info.blocks;
	let address = bitcoind.new_address().expect("failed to get new address");

	let request_block_template = TemplateRequest { rules: vec![TemplateRules::Segwit] };
	let bt =
 bitcoind.get_block_template(&request_block_template).expect("failed to get block template");

	// === BIP 141: Witness Commitment Calculation ===
	let witness_root = calculate_root(
 iter::once(Wtxid::all_zeros()).chain(txs.iter().map(|tx| tx.compute_wtxid())),
	)
	.map(|root| TxMerkleNode::from_byte_array(root.to_byte_array()))
	.unwrap();

	// BIP 141: Witness reserved value (32 zero bytes)
	let witness_reserved_value = [0u8; 32];

	// === Coinbase Transaction Construction ===
	// BIP 141: Coinbase witness contains the witness reserved value
	let coinbase_witness = Witness::from(vec![witness_reserved_value.to_vec()]);

	// BIP 141: Calculate commitment hash = Double-SHA256(witness root || witness reserved value)
	let commitment_hash =
 Sha256d::hash(&[witness_root.to_byte_array(), witness_reserved_value].concat());

	// Format: OP_RETURN + OP_PUSHBYTES_36 + 0xaa21a9ed + 32-byte commitment hash
	let witness_commitment_script = BuilderScriptBitcoin::new()
 .push_opcode(OP_RETURN)
 .push_slice(&{
 let mut data = [0u8; 36];
 data[..4].copy_from_slice(&[0xaa, 0x21, 0xa9, 0xed]);
 data[4..].copy_from_slice(&commitment_hash.to_byte_array());
 data
 })
 .into_script();

	// BIP 34: Block height in coinbase input script
	let block_height = bt.height;
	let height_script = BuilderScriptBitcoin::new()
 .push_int(block_height as i64) // BIP 34: block height as first item
 .push_int(rand::random()) // Random nonce for uniqueness
 .into_script();

	// Do not use the coinbase value from the block template.
	// The template may include transactions not actually mined, so fees may be incorrect.
	let coinbase_output_value = 1_250_000_000;

	let coinbase_tx = Transaction {
 version: Version::ONE,
 lock_time: LockTime::from_height(0).unwrap(),
 input: vec![bitcoin::TxIn {
 previous_output: OutPoint::default(), // Null outpoint for coinbase
 script_sig: height_script, // BIP 34: height + random data
 sequence: Sequence::default(),
 witness: coinbase_witness, // BIP 141: witness reserved value
 }],
 output: vec![
 // Coinbase reward output
 bitcoin::TxOut {
 value: Amount::from_sat(coinbase_output_value),
 script_pubkey: address.script_pubkey(),
 },
 // BIP 141: Witness commitment output (must be last output)
 bitcoin::TxOut { value: Amount::ZERO, script_pubkey: witness_commitment_script },
 ],
	};

	// === Block Construction ===
	let bits: [u8; 4] = Vec::from_hex(&bt.bits).unwrap().try_into().expect("bits must be 4 bytes");
	let prev_hash_block = BlockHash::from_str(&bt.previous_block_hash).expect("invalid prev hash");

	let txdata = [coinbase_tx].into_iter().chain(txs.iter().cloned()).collect::<Vec<_>>();
	let mut block = Block {
 header: Header {
 version: BlockVersion::default(),
 prev_blockhash: prev_hash_block,
 merkle_root: TxMerkleNode::all_zeros(), // Will be calculated below
 time: Ord::max(bt.min_time, UNIX_EPOCH.elapsed().unwrap().as_secs() as u32),
 bits: CompactTarget::from_consensus(u32::from_be_bytes(bits)),
 nonce: 0,
 },
 txdata,
	};

	block.header.merkle_root = block.compute_merkle_root().expect("must compute");

	for nonce in 0..=u32::MAX {
 block.header.nonce = nonce;
 if block.header.target().is_met_by(block.block_hash()) {
 break;
 }
	}

	match bitcoind.submit_block(&block) {
 Ok(_) => {},
 Err(e) => panic!("Failed to submit block: {:?}", e),
	}
	wait_for_block(electrs, cur_height as usize + 1);

	txs.iter().for_each(|tx| {
 wait_for_tx(electrs, tx.compute_txid());
	});
}

pub(crate) fn generate_blocks_and_wait<E: ElectrumApi>(
	bitcoind: &BitcoindClient, electrs: &E, num: usize,
) {
Expand DownExpand Up@@ -570,11 +693,13 @@ pub(crate) fn bump_fee_and_broadcast<E: ElectrumApi>(
 let tx_bytes = Vec::<u8>::from_hex(&signed_result.hex).unwrap();
 tx = bitcoin::consensus::encode::deserialize::<Transaction>(&tx_bytes).unwrap();

 if is_insert_block {
 generate_block_and_insert_transactions(bitcoind, electrs, &[tx.clone()]);
 return tx;
 }

 match bitcoind.send_raw_transaction(&tx) {
 Ok(res) => {
 if is_insert_block {
 generate_blocks_and_wait(bitcoind, electrs, 1);
 }
 let new_txid: Txid = res.0.parse().unwrap();
 wait_for_tx(electrs, new_txid);
 return tx;
Expand Down
Loading
Loading