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

Merge pull request #45 from blackjok3rtt/cleanwalletnotarisations

Browse Source 
Cleanwalletnotarisations
This commit is contained in:
blackjok3rtt
2018-11-11 16:25:36 +08:00
committed by GitHub
parent 2016042c79 2e91034c1e
commit 0026050cfb
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/wallet/rpcwallet.cpp
View File

@@ -1064,7 +1064,7 @@ UniValue cleanwalletnotarisations(const UniValue& params, bool fHelp)
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it) for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
{ {
const CWalletTx& wtx = (*it).second; const CWalletTx& wtx = (*it).second;
if (!CheckFinalTx(wtx) || wtx.GetBlocksToMaturity() > 0 || wtx.GetDepthInMainChain() < 50 ) if (!CheckFinalTx(wtx) || wtx.GetBlocksToMaturity() > 0 || wtx.GetDepthInMainChain() < 360 )
continue; continue;
CCoins coins; CCoins coins;
@@ -1080,12 +1080,19 @@ UniValue cleanwalletnotarisations(const UniValue& params, bool fHelp)
} }
if ( spents == mine ) if ( spents == mine )
{ {
TxToRemove.push_back(wtx.GetHash());
for (unsigned int n = 0; n < wtx.vin.size() ; n++) for (unsigned int n = 0; n < wtx.vin.size() ; n++)
{ {
if ( pwalletMain->IsMine(wtx.vin[n]) ) CTransaction vintx; uint256 hashBlock;
TxToRemove.push_back(wtx.vin[n].prevout.hash); if ( GetTransaction(wtx.vin[n].prevout.hash,vintx,hashBlock,false) != 0 )
{
for (unsigned int z = 0; z < vintx.vin.size() ; z++)
{
TxToRemove.push_back(vintx.vin[z].prevout.hash);
}
}
TxToRemove.push_back(wtx.vin[n].prevout.hash);
} }
TxToRemove.push_back(wtx.GetHash());
} }
} }
@@ -1108,7 +1115,7 @@ UniValue cleanwalletnotarisations(const UniValue& params, bool fHelp)
if ( SpentHash == tx.vin[n].prevout.hash ) if ( SpentHash == tx.vin[n].prevout.hash )
{ {
pwalletMain->EraseFromWallet(tx.GetHash()); pwalletMain->EraseFromWallet(tx.GetHash());
//fprintf(stderr, "ERASED Notarisation: %s\n",tx.GetHash().ToString().c_str()); LogPrintf("ERASED Notarisation: %s\n",tx.GetHash().ToString().c_str());
} }
} }
} }
@@ -1119,7 +1126,7 @@ UniValue cleanwalletnotarisations(const UniValue& params, bool fHelp)
BOOST_FOREACH (uint256& hash, TxToRemove) BOOST_FOREACH (uint256& hash, TxToRemove)
{ {
pwalletMain->EraseFromWallet(hash); pwalletMain->EraseFromWallet(hash);
//fprintf(stderr, "ERASED spent Tx: %s\n",hash.ToString().c_str()); LogPrintf("ERASED spent Tx: %s\n",hash.ToString().c_str());
} }
// build return JSON for stats. // build return JSON for stats.