From e9dc511a7e9a562f953ff93f358102f555f583e6 Mon Sep 17 00:00:00 2001 From: glozow Date: Mon, 15 Apr 2024 10:00:53 +0100 Subject: fixup: get all utxos up front in fill_mempool, discourage wallet mixing Co-authored-by: Sebastian Falbesoner --- test/functional/rpc_packages.py | 8 +++++++- test/functional/test_framework/util.py | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/test/functional/rpc_packages.py b/test/functional/rpc_packages.py index e061030da3..37c42f2533 100755 --- a/test/functional/rpc_packages.py +++ b/test/functional/rpc_packages.py @@ -386,12 +386,14 @@ class RPCPackagesTest(BitcoinTestFramework): "-maxmempool=5", "-persistmempool=0", ]) + self.wallet.rescan_utxos() fill_mempool(self, node, self.wallet) minrelay = node.getmempoolinfo()["minrelaytxfee"] parent = self.wallet.create_self_transfer( fee_rate=minrelay, + confirmed_only=True, ) child = self.wallet.create_self_transfer( @@ -411,6 +413,7 @@ class RPCPackagesTest(BitcoinTestFramework): # Reset maxmempool, datacarriersize, reset dynamic mempool minimum feerate, and empty mempool. self.restart_node(0) + self.wallet.rescan_utxos() assert_equal(node.getrawmempool(), []) @@ -420,7 +423,10 @@ class RPCPackagesTest(BitcoinTestFramework): assert_equal(node.getrawmempool(), []) self.log.info("Submitpackage maxburnamount arg testing") - chained_txns_burn = self.wallet.create_self_transfer_chain(chain_length=2) + chained_txns_burn = self.wallet.create_self_transfer_chain( + chain_length=2, + utxo_to_spend=self.wallet.get_utxo(confirmed_only=True), + ) chained_burn_hex = [t["hex"] for t in chained_txns_burn] tx = tx_from_hex(chained_burn_hex[1]) diff --git a/test/functional/test_framework/util.py b/test/functional/test_framework/util.py index dbaf42fdaa..0de09b6440 100644 --- a/test/functional/test_framework/util.py +++ b/test/functional/test_framework/util.py @@ -505,6 +505,8 @@ def fill_mempool(test_framework, node, miniwallet): It will not ensure mempools become synced as it is based on a single node and assumes -minrelaytxfee is 1 sat/vbyte. + To avoid unintentional tx dependencies, it is recommended to use separate miniwallets for + mempool filling vs transactions in tests. """ test_framework.log.info("Fill the mempool until eviction is triggered and the mempoolminfee rises") txouts = gen_return_txouts() @@ -522,8 +524,14 @@ def fill_mempool(test_framework, node, miniwallet): # Mine COINBASE_MATURITY - 1 blocks so that the UTXOs are allowed to be spent test_framework.generate(node, 100 - 1) + # Get all UTXOs up front to ensure none of the transactions spend from each other, as that may + # change their effective feerate and thus the order in which they are selected for eviction. + confirmed_utxos = [miniwallet.get_utxo(confirmed_only=True) for _ in range(num_of_batches * tx_batch_size + 1)] + assert_equal(len(confirmed_utxos), num_of_batches * tx_batch_size + 1) + test_framework.log.debug("Create a mempool tx that will be evicted") - tx_to_be_evicted_id = miniwallet.send_self_transfer(from_node=node, fee_rate=relayfee)["txid"] + tx_to_be_evicted_id = miniwallet.send_self_transfer(from_node=node, utxo_to_spend=confirmed_utxos[0], fee_rate=relayfee)["txid"] + del confirmed_utxos[0] # Increase the tx fee rate to give the subsequent transactions a higher priority in the mempool # The tx has an approx. vsize of 65k, i.e. multiplying the previous fee rate (in sats/kvB) @@ -534,7 +542,9 @@ def fill_mempool(test_framework, node, miniwallet): with node.assert_debug_log(["rolling minimum fee bumped"]): for batch_of_txid in range(num_of_batches): fee = (batch_of_txid + 1) * base_fee - create_lots_of_big_transactions(miniwallet, node, fee, tx_batch_size, txouts) + utxos = confirmed_utxos[:tx_batch_size] + create_lots_of_big_transactions(miniwallet, node, fee, tx_batch_size, txouts, utxos) + del confirmed_utxos[:tx_batch_size] test_framework.log.debug("The tx should be evicted by now") # The number of transactions created should be greater than the ones present in the mempool -- cgit v1.2.3