Skip to content

Commit

Permalink
Fix pos conflicting txs and fastprune tests
Browse files Browse the repository at this point in the history
  • Loading branch information
timemarkovqtum committed May 23, 2024
1 parent 9e54d9f commit 37efaae
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/wallet/wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1590,6 +1590,7 @@ void CWallet::blockDisconnected(const interfaces::BlockInfo& block)

for (const CTransactionRef& ptx : Assert(block.data)->vtx) {
SyncTransaction(ptx, TxStateInactive{false, ptx->IsCoinStake()});
if(ptx->IsCoinStake()) continue;

for (const CTxIn& tx_in : ptx->vin) {
// No other wallet transactions conflicted with this transaction
Expand Down
2 changes: 1 addition & 1 deletion test/functional/feature_fastprune.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def run_test(self):
annex = b"\x50" + b"\xff" * 0x10000
tx.wit.vtxinwit[0].scriptWitness.stack.append(annex)
self.generateblock(self.nodes[0], output="raw(55)", transactions=[tx.serialize().hex()])
assert_equal(self.nodes[0].getblockcount(), 201)
assert_equal(self.nodes[0].getblockcount(), 2101)


if __name__ == '__main__':
Expand Down

0 comments on commit 37efaae

Please sign in to comment.