Remove stale wallet transactions on initial load.

presstab · Warrows · commit 48d705fbc49e · 2019-10-09T17:44:26.000+02:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -2015,7 +2015,7 @@ bool AppInit2()
 #ifdef ENABLE_WALLET
     if (pwalletMain) {
         // Add wallet transactions that aren't already in a block to mapTransactions
-        pwalletMain->ReacceptWalletTransactions();
+        pwalletMain->ReacceptWalletTransactions(/*fFirstLoad*/true);
 
         // Run a thread to flush wallet periodically
         threadGroup.create_thread(boost::bind(&ThreadFlushWalletDB, boost::ref(pwalletMain->strWalletFile)));
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -927,6 +927,7 @@ void CWallet::EraseFromWallet(const uint256& hash)
         LOCK(cs_wallet);
         if (mapWallet.erase(hash))
             CWalletDB(strWalletFile).EraseTx(hash);
+        LogPrintf("%s: Erased wtx %s from wallet\n", __func__, hash.GetHex());
     }
     return;
 }
@@ -1508,7 +1509,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate, b
     return ret;
 }
 
-void CWallet::ReacceptWalletTransactions()
+void CWallet::ReacceptWalletTransactions(bool fFirstLoad)
 {
     LOCK2(cs_main, cs_wallet);
     std::map<int64_t, CWalletTx*> mapSorted;
@@ -1520,7 +1521,6 @@ void CWallet::ReacceptWalletTransactions()
         assert(wtx.GetHash() == wtxid);
 
         int nDepth = wtx.GetDepthInMainChain();
-
         if (!wtx.IsCoinBase() && !wtx.IsCoinStake() && nDepth == 0  && !wtx.isAbandoned()) {
             mapSorted.insert(std::make_pair(wtx.nOrderPos, &wtx));
         }
@@ -1532,7 +1532,12 @@ void CWallet::ReacceptWalletTransactions()
         CWalletTx& wtx = *(item.second);
 
         LOCK(mempool.cs);
-        wtx.AcceptToMemoryPool(false);
+        bool fSuccess = wtx.AcceptToMemoryPool(false);
+        if (!fSuccess && fFirstLoad && GetTime() - wtx.GetTxTime() > 12*60*60) {
+            //First load of wallet, failed to accept to mempool, and older than 12 hours... not likely to ever
+            //make it in to mempool
+            AbandonTransaction(wtx.GetHash());
+        }
     }
 }
 
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -426,7 +426,7 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate);
     void EraseFromWallet(const uint256& hash);
     int ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate = false, bool fromStartup = false);
-    void ReacceptWalletTransactions();
+    void ReacceptWalletTransactions(bool fFirstLoad = false);
     void ResendWalletTransactions();
     CAmount GetBalance() const;
     CAmount GetZerocoinBalance(bool fMatureOnly) const;

Original file line number	Diff line number	Diff line change
`@@ -927,6 +927,7 @@ void CWallet::EraseFromWallet(const uint256& hash)`
`927`	`927`	`LOCK(cs_wallet);`
`928`	`928`	`if (mapWallet.erase(hash))`
`929`	`929`	`CWalletDB(strWalletFile).EraseTx(hash);`
	`930`	`+ LogPrintf("%s: Erased wtx %s from wallet\n", __func__, hash.GetHex());`
`930`	`931`	`}`
`931`	`932`	`return;`
`932`	`933`	`}`
`@@ -1508,7 +1509,7 @@ int CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool fUpdate, b`
`1508`	`1509`	`return ret;`
`1509`	`1510`	`}`
`1510`	`1511`
`1511`		`-void CWallet::ReacceptWalletTransactions()`
	`1512`	`+void CWallet::ReacceptWalletTransactions(bool fFirstLoad)`
`1512`	`1513`	`{`
`1513`	`1514`	`LOCK2(cs_main, cs_wallet);`
`1514`	`1515`	`std::map<int64_t, CWalletTx*> mapSorted;`
`@@ -1520,7 +1521,6 @@ void CWallet::ReacceptWalletTransactions()`
`1520`	`1521`	`assert(wtx.GetHash() == wtxid);`
`1521`	`1522`
`1522`	`1523`	`int nDepth = wtx.GetDepthInMainChain();`
`1523`		`-`
`1524`	`1524`	`if (!wtx.IsCoinBase() && !wtx.IsCoinStake() && nDepth == 0 && !wtx.isAbandoned()) {`
`1525`	`1525`	`mapSorted.insert(std::make_pair(wtx.nOrderPos, &wtx));`
`1526`	`1526`	`}`
`@@ -1532,7 +1532,12 @@ void CWallet::ReacceptWalletTransactions()`
`1532`	`1532`	`CWalletTx& wtx = *(item.second);`
`1533`	`1533`
`1534`	`1534`	`LOCK(mempool.cs);`
`1535`		`- wtx.AcceptToMemoryPool(false);`
	`1535`	`+ bool fSuccess = wtx.AcceptToMemoryPool(false);`
	`1536`	`+ if (!fSuccess && fFirstLoad && GetTime() - wtx.GetTxTime() > 126060) {`
	`1537`	`+ //First load of wallet, failed to accept to mempool, and older than 12 hours... not likely to ever`
	`1538`	`+ //make it in to mempool`
	`1539`	`+ AbandonTransaction(wtx.GetHash());`
	`1540`	`+ }`
`1536`	`1541`	`}`
`1537`	`1542`	`}`
`1538`	`1543`