cryptogera/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-03-02 01:36:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#33616: policy: don't CheckEphemeralSpends on reorg

Browse Source 
33fbaed310a6a37d41d26af8fb34308d088d72c8 policy: don't CheckEphemeralSpends on reorg (Greg Sanders)

Pull request description:

  Similar reasoning to https://github.com/bitcoin/bitcoin/pull/33504

  During a deeper reorg it's possible that a long sequence of dust-having transactions that are connected in a linear fashion. On reorg, this could cause each subsequent "generation" to be rejected. These rejected transactions may contain a large amount of competitive fees via normal means.

  PreCheck based `PreCheckEphemeralSpends` is left in place because we wouldn't have relayed them prior to the reorg.

ACKs for top commit:
  darosior:
    re-ACK 33fbaed310a
  ismaelsadeeq:
    reACK 33fbaed310a6a37d41d26af8fb34308d088d72c8
  sedited:
    ACK 33fbaed310a6a37d41d26af8fb34308d088d72c8

Tree-SHA512: cf0a6945066e9f5f8f9a847394c2c1225facf475a8aa4bc811b436513eff79c0a720d4ad21ba6b0f1cc4dfdd61cf46acb148333ac592b2ee252953732326ad1d
This commit is contained in:
merge-script 2026-02-25 17:38:13 +01:00
commit 7c80301439
No known key found for this signature in database
GPG Key ID: 9B79B45691DB4173
3 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/policy/ephemeral_policy.h
View File

@ -41,13 +41,13 @@ class TxValidationState;
/* All the following checks are only called if standardness rules are being applied. */
/** Must be called for each transaction once transaction fees are known.
/** Called for each transaction once transaction fees are known.
* Does context-less checks about a single transaction.
* @returns false if the fee is non-zero and dust exists, populating state. True otherwise.
*/
bool PreCheckEphemeralTx(const CTransaction& tx, CFeeRate dust_relay_rate, CAmount base_fee, CAmount mod_fee, TxValidationState& state);
/** Must be called for each transaction(package) if any dust is in the package.
/** Called for each transaction(package) if any dust is in the package.
* Checks that each transaction's parents have their dust spent by the child,
* where parents are either in the mempool or in the package itself.
* Sets out_child_state and out_child_wtxid on failure.

2
src/validation.cpp
View File

@ -1367,7 +1367,7 @@ MempoolAcceptResult MemPoolAccept::AcceptSingleTransactionInternal(const CTransa
return MempoolAcceptResult::Failure(ws.m_state);
}
if (m_pool.m_opts.require_standard) {
if (!args.m_bypass_limits && m_pool.m_opts.require_standard) {
Wtxid dummy_wtxid;
if (!CheckEphemeralSpends(/*package=*/{ptx}, m_pool.m_opts.dust_relay_feerate, m_pool, ws.m_state, dummy_wtxid)) {
return MempoolAcceptResult::Failure(ws.m_state);

38
test/functional/mempool_ephemeral_dust.py
View File

@ -321,7 +321,7 @@ class EphemeralDustTest(BitcoinTestFramework):
assert_mempool_contents(self, self.nodes[0], expected=[])
def test_reorgs(self):
self.log.info("Test that reorgs breaking the truc topology doesn't cause issues")
self.log.info("Test that reorgs avoid ephemeral dust spentness checks")
assert_equal(self.nodes[0].getrawmempool(), [])
@ -329,7 +329,7 @@ class EphemeralDustTest(BitcoinTestFramework):
self.disconnect_nodes(0, 1)
# Get dusty tx mined, then check that it makes it back into mempool on reorg
# due to bypass_limits allowing 0-fee individually
# due to bypass_limits allowing 0-fee individually, and creation of single dust
# Prep for fork with empty blocks
fork_blocks = create_empty_fork(self.nodes[0])
@ -349,29 +349,33 @@ class EphemeralDustTest(BitcoinTestFramework):
# Prep for fork with empty blocks
fork_blocks = create_empty_fork(self.nodes[0])
# Mine the sweep then re-org, the sweep will not make it back in due to spend checks
# Mine the sweep then re-org, the sweep will make it back in due to lack of eph dust spend checks on reorg
self.generateblock(self.nodes[0], self.wallet.get_address(), [dusty_tx["hex"], sweep_tx["hex"]], sync_fun=self.no_op)
self.trigger_reorg(fork_blocks)
assert_mempool_contents(self, self.nodes[0], expected=[dusty_tx["tx"]], sync=False)
assert_mempool_contents(self, self.nodes[0], expected=[dusty_tx["tx"], sweep_tx["tx"]], sync=False)
# Should re-enter if dust is swept
sweep_tx_2 = self.wallet.create_self_transfer_multi(fee_per_output=0, utxos_to_spend=dusty_tx["new_utxos"], version=3)
self.add_output_to_create_multi_result(sweep_tx_2)
assert_raises_rpc_error(-26, "min relay fee not met", self.nodes[0].sendrawtransaction, sweep_tx_2["hex"])
# Test that dusty tx being reorged back into mempool doesn't invalidate descendants
# whether they spend dust or not
# Prep for fork with empty blocks
# Mine the parent transaction only while preparing a fork
fork_blocks = create_empty_fork(self.nodes[0])
self.generateblock(self.nodes[0], self.wallet.get_address(), [dusty_tx["hex"]], sync_fun=self.no_op)
utxo = self.wallet.get_utxo()
# No in-mempool deps, use version=2 and chain off of it
second_sweep_tx = self.wallet.send_self_transfer_multi(from_node=self.nodes[0], utxos_to_spend=[dusty_tx["new_utxos"][1], utxo], version=2)
child_chain = self.wallet.send_self_transfer_chain(from_node=self.nodes[0], chain_length=10, utxo_to_spend=second_sweep_tx["new_utxos"][0])
self.generateblock(self.nodes[0], self.wallet.get_address(), [dusty_tx["hex"], sweep_tx_2["hex"]], sync_fun=self.no_op)
# Everything but parent in pool
expected_pool = [sweep_tx["tx"], second_sweep_tx["tx"]] + [child["tx"] for child in child_chain]
assert_mempool_contents(self, self.nodes[0], expected=expected_pool, sync=False)
# Add ultimate parent back into mempool
expected_pool = [dusty_tx["tx"]] + expected_pool
self.trigger_reorg(fork_blocks)
assert_mempool_contents(self, self.nodes[0], expected=[dusty_tx["tx"], sweep_tx_2["tx"]], sync=False)
assert_mempool_contents(self, self.nodes[0], expected=expected_pool, sync=False)
# TRUC transactions restriction for ephemeral dust disallows further spends of ancestor chains
child_tx = self.wallet.create_self_transfer_multi(utxos_to_spend=sweep_tx_2["new_utxos"], version=3)
assert_raises_rpc_error(-26, "TRUC-violation", self.nodes[0].sendrawtransaction, child_tx["hex"])
# Clean up the mempool
self.generateblock(self.nodes[0], self.wallet.get_address(), [dusty_tx["hex"], sweep_tx_2["hex"]], sync_fun=self.no_op)
hex_to_mine = [tx.serialize().hex() for tx in expected_pool]
self.generateblock(self.nodes[0], self.wallet.get_address(), hex_to_mine, sync_fun=self.no_op)
assert_equal(self.nodes[0].getrawmempool(), [])
self.log.info("Test that ephemeral dust tx with fees or multi dust don't enter mempool via reorg")