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

Remove sprout junk

Browse Source
This commit is contained in:
Duke Leto
2020-05-11 06:42:01 -04:00
parent dd5d932f87
commit 095157d2d9
1 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/wallet/wallet.cpp
View File

@@ -1298,7 +1298,7 @@ void CWallet::BuildWitnessCache(const CBlockIndex* pindex, bool witnessOnly)
for (std::pair<const uint256, CWalletTx>& wtxItem : mapWallet) { for (std::pair<const uint256, CWalletTx>& wtxItem : mapWallet) {
if (wtxItem.second.mapSproutNoteData.empty() && wtxItem.second.mapSaplingNoteData.empty()) if (wtxItem.second.mapSaplingNoteData.empty())
continue; continue;
if (wtxItem.second.GetDepthInMainChain() > 0) { if (wtxItem.second.GetDepthInMainChain() > 0) {
@@ -3062,38 +3062,11 @@ void CWallet::DeleteWalletTransactions(const CBlockIndex* pindex) {
continue; continue;
} }
//Check for unspent inputs or spend less than N Blocks ago. (Sprout)
for (auto & pair : pwtx->mapSproutNoteData) {
SproutNoteData nd = pair.second;
if (!nd.nullifier || pwalletMain->GetSproutSpendDepth(*nd.nullifier) <= fDeleteTransactionsAfterNBlocks) {
LogPrint("deletetx","DeleteTx - Unspent sprout input tx %s\n", pwtx->GetHash().ToString());
deleteTx = false;
continue;
}
}
if (!deleteTx) { if (!deleteTx) {
txSaveCount++; txSaveCount++;
continue; continue;
} }
//Check for outputs that no longer have parents in the wallet. Exclude parents that are in the same transaction. (Sprout)
for (int i = 0; i < pwtx->vjoinsplit.size(); i++) {
const JSDescription& jsdesc = pwtx->vjoinsplit[i];
for (const uint256 &nullifier : jsdesc.nullifiers) {
// JSOutPoint op = pwalletMain->mapSproutNullifiersToNotes[nullifier];
if (pwalletMain->IsSproutNullifierFromMe(nullifier)) {
const uint256& parentHash = pwalletMain->mapSproutNullifiersToNotes[nullifier].hash;
const CWalletTx* parent = pwalletMain->GetWalletTx(parentHash);
if (parent != NULL && parentHash != wtxid) {
LogPrint("deletetx","DeleteTx - Parent of sprout tx %s found\n", pwtx->GetHash().ToString());
deleteTx = false;
continue;
}
}
}
}
if (!deleteTx) { if (!deleteTx) {
txSaveCount++; txSaveCount++;
continue; continue;