highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-10 05:57:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

wallet: track mempool conflicts

Browse Source 
Behavior changes are:
- if a tx has a mempool conflict, the wallet will not attempt to
  rebroadcast it
- if a txo is spent by a mempool-conflicted tx, that txo is no
  longer considered spent
This commit is contained in:
ishaanam
2023-05-17 20:56:25 -04:00
parent d64922b590
commit 54e07ee22f
5 changed files with 57 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/functional/wallet_abandonconflict.py
View File

@@ -232,7 +232,11 @@ class AbandonConflictTest(BitcoinTestFramework):
balance = newbalance
# Invalidate the block with the double spend. B & C's 10 BTC outputs should no longer be available
self.nodes[0].invalidateblock(self.nodes[0].getbestblockhash())
blk = self.nodes[0].getbestblockhash()
# mine 10 blocks so that when the blk is invalidated, the transactions are not
# returned to the mempool
self.generate(self.nodes[1], 10)
self.nodes[0].invalidateblock(blk)
assert_equal(alice.gettransaction(txAB1)["confirmations"], 0)
newbalance = alice.getbalance()
assert_equal(newbalance, balance - Decimal("20"))

12
test/functional/wallet_conflicts.py
View File

@@ -174,9 +174,9 @@ class TxConflicts(BitcoinTestFramework):
# broadcast tx2, replaces tx1 in mempool
tx2_txid = alice.sendrawtransaction(tx2)
# Check that unspent[0] is still not available because the wallet does not know that the tx spending it has a mempool conflicted
assert_equal(alice.listunspent(), [])
assert_equal(alice.getbalance(), 0)
# Check that unspent[0] is now available because the transaction spending it has been replaced in the mempool
assert_equal(alice.listunspent(), [unspents[0]])
assert_equal(alice.getbalance(), 25)
self.log.info("Test scenario where a mempool conflict is removed")
@@ -262,8 +262,8 @@ class TxConflicts(BitcoinTestFramework):
assert tx2_txid in bob.getrawmempool()
assert tx1_conflict_txid in bob.getrawmempool()
# check that the tx2 unspent is still not available because the wallet does not know that the tx spending it has a mempool conflict
assert_equal(bob.getbalances()["mine"]["untrusted_pending"], 0)
# check that tx3 is now conflicted, so the output from tx2 can now be spent
assert_equal(bob.getbalances()["mine"]["untrusted_pending"], Decimal("24.99990000"))
# we will be disconnecting this block in the future
alice.sendrawtransaction(tx2_conflict)
@@ -293,7 +293,7 @@ class TxConflicts(BitcoinTestFramework):
assert_equal(bob.gettransaction(tx3_txid)["confirmations"], 0)
bob.sendrawtransaction(raw_tx2)
assert_equal(bob.getbalances()["mine"]["untrusted_pending"], 0)
assert_equal(bob.getbalances()["mine"]["untrusted_pending"], Decimal("24.99990000"))
# create a conflict to previous tx (also spends unspents[2]), but don't broadcast, sends funds back to alice
raw_tx = alice.createrawtransaction(inputs=[unspents[2]], outputs=[{alice.getnewaddress() : 24.99}])