DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not erase for now

Browse Source
This commit is contained in:
Duke Leto
2021-12-23 17:59:01 -05:00
parent 66f1f9b076
commit 361998b5d2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/wallet/wallet.cpp
View File

@@ -3055,7 +3055,7 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime)
multimap<unsigned int, CWalletTx*> mapSorted; multimap<unsigned int, CWalletTx*> mapSorted;
uint32_t now = (uint32_t)time(NULL); uint32_t now = (uint32_t)time(NULL);
std::vector<uint256> vwtxh; std::vector<uint256> vwtxh;
uint32_t erased = 0; uint32_t erased = 0, skipped = 0;
BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet) BOOST_FOREACH(PAIRTYPE(const uint256, CWalletTx)& item, mapWallet)
{ {
@@ -3069,8 +3069,8 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime)
if(fDebug) { if(fDebug) {
LogPrintf("%s: skip Relaying wtx %s nLockTime %u vs now.%u\n", __func__, wtx.GetHash().ToString(),(uint32_t)wtx.nLockTime,now); LogPrintf("%s: skip Relaying wtx %s nLockTime %u vs now.%u\n", __func__, wtx.GetHash().ToString(),(uint32_t)wtx.nLockTime,now);
} }
erased++; skipped++;
vwtxh.push_back(wtx.GetHash()); //vwtxh.push_back(wtx.GetHash());
continue; continue;
} }
mapSorted.insert(make_pair(wtx.nTimeReceived, &wtx)); mapSorted.insert(make_pair(wtx.nTimeReceived, &wtx));
@@ -3086,16 +3086,18 @@ std::vector<uint256> CWallet::ResendWalletTransactionsBefore(int64_t nTime)
} }
} }
// TODO: this does not seem to handle rescanning+finding old coinbase txs correctly
// Unless we remove these unconfirmed txs from the wallet, they will // Unless we remove these unconfirmed txs from the wallet, they will
// persist there forever. They are too old to be accepted by network // persist there forever. They are too old to be accepted by network
// consensus rules, so we erase them. // consensus rules, so we erase them.
for (auto hash : vwtxh) for (auto hash : vwtxh)
{ {
EraseFromWallet(hash); EraseFromWallet(hash);
erased++;
} }
if(erased > 0) { if(erased > 0 || skipped > 0) {
LogPrintf("%s: Prevented relaying and erased %d transactions which are too old\n", __func__, erased); LogPrintf("%s: Prevented relaying %d and erased %d transactions which are too old\n", __func__, skipped, erased);
} }
return result; return result;