highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-30 02:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#26499: wallet: Abandon descendants of orphaned coinbases

Browse Source 
b0fa5989e1 test: Check that orphaned coinbase unconf spend is still abandoned (Andrew Chow)
9addbd7890 wallet: Automatically abandon orphaned coinbases and their children (Andrew Chow)

Pull request description:

  When a block is reorged out of the main chain, any descendants of the coinbase will no longer be valid. Currently they are only marked as inactive, which means that our balance calculations will still include them. In order to be excluded from the balance calculation, they need to either be abandoned or conflicted. This PR goes with the abandoned method.

  Note that even when they are included in balance calculations, coin selection will not select outputs belonging to these transactions because they are not in the mempool.

  Fixes #14148

ACKs for top commit:
  furszy:
    ACK b0fa5989 with a not-blocking nit.
  aureleoules:
    reACK b0fa5989e1
  ishaanam:
    ACK b0fa5989e1

Tree-SHA512: 68f12e7aa8df392d8817dc6ac0becce8dbe83837bfa538f47027e6730e5b2e1b1a090cfcea2dc598398fdb66090e02d321d799f087020d7e1badcf96e598c3ac
This commit is contained in:
glozow
2023-01-30 10:05:27 +00:00
parent 37fea41bbf b0fa5989e1
commit b1329b7523
3 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
test/functional/wallet_orphanedreward.py
View File

@ -34,29 +34,40 @@ class OrphanedBlockRewardTest(BitcoinTestFramework):
# the existing balance and the block reward.
self.generate(self.nodes[0], 150)
assert_equal(self.nodes[1].getbalance(), 10 + 25)
pre_reorg_conf_bals = self.nodes[1].getbalances()
txid = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 30)
orig_chain_tip = self.nodes[0].getbestblockhash()
self.sync_mempools()
# Orphan the block reward and make sure that the original coins
# from the wallet can still be spent.
self.nodes[0].invalidateblock(blk)
self.generate(self.nodes[0], 152)
# Without the following abandontransaction call, the coins are
# not considered available yet.
assert_equal(self.nodes[1].getbalances()["mine"], {
"trusted": 0,
"untrusted_pending": 0,
"immature": 0,
})
# The following abandontransaction is necessary to make the later
# lines succeed, and probably should not be needed; see
# https://github.com/bitcoin/bitcoin/issues/14148.
self.nodes[1].abandontransaction(txid)
blocks = self.generate(self.nodes[0], 152)
conflict_block = blocks[0]
# We expect the descendants of orphaned rewards to no longer be considered
assert_equal(self.nodes[1].getbalances()["mine"], {
"trusted": 10,
"untrusted_pending": 0,
"immature": 0,
})
self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 9)
# And the unconfirmed tx to be abandoned
assert_equal(self.nodes[1].gettransaction(txid)["details"][0]["abandoned"], True)
# The abandoning should persist through reloading
self.nodes[1].unloadwallet(self.default_wallet_name)
self.nodes[1].loadwallet(self.default_wallet_name)
assert_equal(self.nodes[1].gettransaction(txid)["details"][0]["abandoned"], True)
# If the orphaned reward is reorged back into the main chain, any unconfirmed
# descendant txs at the time of the original reorg remain abandoned.
self.nodes[0].invalidateblock(conflict_block)
self.nodes[0].reconsiderblock(blk)
assert_equal(self.nodes[0].getbestblockhash(), orig_chain_tip)
self.generate(self.nodes[0], 3)
assert_equal(self.nodes[1].getbalances(), pre_reorg_conf_bals)
assert_equal(self.nodes[1].gettransaction(txid)["details"][0]["abandoned"], True)
if __name__ == '__main__':
OrphanedBlockRewardTest().main()