From fa4e088cbac035b8029a10b492849540150d0622 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 1 May 2020 17:36:17 +0200 Subject: wallet: Mark replaced tx to not be in the mempool anymore --- src/wallet/wallet.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/wallet/wallet.cpp') diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 08e480225d..2e742f2927 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -791,6 +791,12 @@ bool CWallet::MarkReplaced(const uint256& originalHash, const uint256& newHash) wtx.mapValue["replaced_by_txid"] = newHash.ToString(); + // Refresh mempool status without waiting for transactionRemovedFromMempool + // notification so the wallet is in an internally consistent state and + // immediately knows the old transaction should not be considered trusted + // and is eligible to be abandoned + wtx.fInMempool = chain().isInMempool(originalHash); + WalletBatch batch(GetDatabase()); bool success = true; -- cgit v1.2.3