Skip to content

Commit 3132ec6

Browse files
committed
Merge bitcoin/bitcoin#27177: test: fix intermittent issue in feature_bip68_sequence
272eb55 test: fix `include_immature_coinbase` logic in `get_utxos` (brunoerg) a951c34 test: fix `interface_usdt_mempool` by mining a block after each test (brunoerg) 1557bf1 test: fix mature utxos addition to wallet in `mempool_package_limits` (brunoerg) 60ced90 test: fix intermittent issue in `feature_bip68_sequence` (brunoerg) Pull request description: Fixes #27129 To avoid `bad-txns-premature-spend-of-coinbase` error, when getting a utxo (using `get_utxo`) to create a new transaction `get_utxo` shouldn't return (if possible) by default immature coinbase. ACKs for top commit: achow101: ACK 272eb55 pinheadmz: re-ACK 272eb55 Tree-SHA512: eae821c7833bf084d8b907c94876ed010a7925d2177c3013a0c61b69d9571df006da83397a19487d93b0d1fa415951152f0b8ad0de2a55d86c39f6917934f050
2 parents 5ef2c1e + 272eb55 commit 3132ec6

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

test/functional/interface_usdt_mempool.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ def handle_added_event(_, data, __):
173173

174174
self.log.info("Ensuring mempool:added event was handled successfully...")
175175
assert_equal(EXPECTED_ADDED_EVENTS, handled_added_events)
176+
self.generate(self.wallet, 1)
176177

177178
def removed_test(self):
178179
"""Expire a transaction from the mempool and make sure the tracepoint returns
@@ -223,6 +224,7 @@ def handle_removed_event(_, data, __):
223224

224225
self.log.info("Ensuring mempool:removed event was handled successfully...")
225226
assert_equal(EXPECTED_REMOVED_EVENTS, handled_removed_events)
227+
self.generate(self.wallet, 1)
226228

227229
def replaced_test(self):
228230
"""Replace one and two transactions in the mempool and make sure the tracepoint
@@ -280,6 +282,7 @@ def handle_replaced_event(_, data, __):
280282

281283
self.log.info("Ensuring mempool:replaced event was handled successfully...")
282284
assert_equal(EXPECTED_REPLACED_EVENTS, handled_replaced_events)
285+
self.generate(self.wallet, 1)
283286

284287
def rejected_test(self):
285288
"""Create an invalid transaction and make sure the tracepoint returns
@@ -321,6 +324,7 @@ def handle_rejected_event(_, data, __):
321324

322325
self.log.info("Ensuring mempool:rejected event was handled successfully...")
323326
assert_equal(EXPECTED_REJECTED_EVENTS, handled_rejected_events)
327+
self.generate(self.wallet, 1)
324328

325329
def run_test(self):
326330
"""Tests the mempool:added, mempool:removed, mempool:replaced,

test/functional/mempool_compatibility.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ def run_test(self):
4747
# unbroadcasted_tx won't pass old_node's `MemPoolAccept::PreChecks`.
4848
self.connect_nodes(0, 1)
4949
self.sync_blocks()
50-
self.stop_node(1)
5150

5251
self.log.info("Add a transaction to mempool on old node and shutdown")
5352
old_tx_hash = new_wallet.send_self_transfer(from_node=old_node)["txid"]
5453
assert old_tx_hash in old_node.getrawmempool()
5554
self.stop_node(0)
55+
self.stop_node(1)
5656

5757
self.log.info("Move mempool.dat from old to new node")
5858
old_node_mempool = os.path.join(old_node.datadir, self.chain, 'mempool.dat')

test/functional/mempool_package_limits.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ def set_test_params(self):
4646
def run_test(self):
4747
self.wallet = MiniWallet(self.nodes[0])
4848
# Add enough mature utxos to the wallet so that all txs spend confirmed coins.
49-
self.generate(self.wallet, 35)
50-
self.generate(self.nodes[0], COINBASE_MATURITY)
49+
self.generate(self.wallet, COINBASE_MATURITY + 35)
5150

5251
self.test_chain_limits()
5352
self.test_desc_count_limits()

test/functional/mempool_persist.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ def run_test(self):
191191
def test_persist_unbroadcast(self):
192192
node0 = self.nodes[0]
193193
self.start_node(0)
194+
self.start_node(2)
194195

195196
# clear out mempool
196197
self.generate(node0, 1, sync_fun=self.no_op)

test/functional/test_framework/wallet.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,12 @@ def get_utxo(self, *, txid: str = '', vout: Optional[int] = None, mark_as_spent=
218218
txid: get the first utxo we find from a specific transaction
219219
"""
220220
self._utxos = sorted(self._utxos, key=lambda k: (k['value'], -k['height'])) # Put the largest utxo last
221+
blocks_height = self._test_node.getblockchaininfo()['blocks']
222+
mature_coins = list(filter(lambda utxo: not utxo['coinbase'] or COINBASE_MATURITY - 1 <= blocks_height - utxo['height'], self._utxos))
221223
if txid:
222224
utxo_filter: Any = filter(lambda utxo: txid == utxo['txid'], self._utxos)
223225
else:
224-
utxo_filter = reversed(self._utxos) # By default the largest utxo
226+
utxo_filter = reversed(mature_coins) # By default the largest utxo
225227
if vout is not None:
226228
utxo_filter = filter(lambda utxo: vout == utxo['vout'], utxo_filter)
227229
index = self._utxos.index(next(utxo_filter))
@@ -233,7 +235,8 @@ def get_utxo(self, *, txid: str = '', vout: Optional[int] = None, mark_as_spent=
233235
def get_utxos(self, *, include_immature_coinbase=False, mark_as_spent=True):
234236
"""Returns the list of all utxos and optionally mark them as spent"""
235237
if not include_immature_coinbase:
236-
utxo_filter = filter(lambda utxo: not utxo['coinbase'] or COINBASE_MATURITY <= utxo['confirmations'], self._utxos)
238+
blocks_height = self._test_node.getblockchaininfo()['blocks']
239+
utxo_filter = filter(lambda utxo: not utxo['coinbase'] or COINBASE_MATURITY - 1 <= blocks_height - utxo['height'], self._utxos)
237240
else:
238241
utxo_filter = self._utxos
239242
utxos = deepcopy(list(utxo_filter))

0 commit comments

Comments
 (0)