From 37efaae6e6371bc16f321e7c46d2536d044e4555 Mon Sep 17 00:00:00 2001 From: timemarkovqtum Date: Thu, 23 May 2024 12:00:20 +0200 Subject: [PATCH] Fix pos conflicting txs and fastprune tests --- src/wallet/wallet.cpp | 1 + test/functional/feature_fastprune.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index b2fc4a918c..4fe6696bb2 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -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 diff --git a/test/functional/feature_fastprune.py b/test/functional/feature_fastprune.py index c913c4f93a..b9d24e5b00 100755 --- a/test/functional/feature_fastprune.py +++ b/test/functional/feature_fastprune.py @@ -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__':