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

unlock locked utxo before fetching unspents, then relock them.

Browse Source
This commit is contained in:
blackjok3r
2018-11-21 18:20:31 +08:00
parent 7a89c512ce
commit 692de95bb7
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/wallet/rpcwallet.cpp
View File

@@ -1058,6 +1058,11 @@ UniValue cleanwallettransactions(const UniValue& params, bool fHelp)
} }
else else
{ {
// get all locked utxos to relock them later.
vector<COutPoint> vLockedUTXO;
pwalletMain->ListLockedCoins(vLockedUTXO);
// unlock all coins so that the following call containes all utxos.
pwalletMain->UnlockAllCoins();
// listunspent call... this gets us all the txids that are unspent, we search this list for the oldest tx, // listunspent call... this gets us all the txids that are unspent, we search this list for the oldest tx,
vector<COutput> vecOutputs; vector<COutput> vecOutputs;
assert(pwalletMain != NULL); assert(pwalletMain != NULL);
@@ -1068,7 +1073,11 @@ UniValue cleanwallettransactions(const UniValue& params, bool fHelp)
if ( out.nDepth > oldestTxDepth ) if ( out.nDepth > oldestTxDepth )
oldestTxDepth = out.nDepth; oldestTxDepth = out.nDepth;
} }
oldestTxDepth = oldestTxDepth + 1; // add extra 10 blocks just for safety. oldestTxDepth = oldestTxDepth + 1; // add extra block just for safety.
// lock all the previouly locked coins.
BOOST_FOREACH(COutPoint &outpt, vOutpts) {
pwalletMain->LockCoin(outpt);
}
// then add all txs in the wallet before this block to the list to remove. // then add all txs in the wallet before this block to the list to remove.
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)