zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Create CWallet::AddToSaplingSpends() to track Sapling nullifiers.

This commit is contained in:
Simon 2018-07-28 10:06:55 -07:00
parent 3a83e7c9a4
commit 52332fb417
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/wallet/wallet.cpp
View File

@ -758,6 +758,18 @@ void CWallet::AddToSpends(const uint256& wtxid)
AddToSproutSpends(nullifier, wtxid);
}
}
for (const SpendDescription &spend : thisTx.vShieldedSpend) {
AddToSaplingSpends(spend.nullifier, wtxid);
}
}
void CWallet::AddToSaplingSpends(const uint256& nullifier, const uint256& wtxid)
{
mapTxSaplingNullifiers.insert(make_pair(nullifier, wtxid));
pair<TxNullifiers::iterator, TxNullifiers::iterator> range;
range = mapTxSaplingNullifiers.equal_range(nullifier);
SyncMetaData<uint256>(range);
}
void CWallet::ClearNoteWitnessCache()
@ -1248,12 +1260,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletD
wtxIn.GetHash().ToString(),
wtxIn.hashBlock.ToString());
}
<<<<<<< HEAD
AddToSproutSpends(hash);
=======
AddToSpends(hash);
AddToSaplingSpends(hash);
>>>>>>> e9b1ce0... fix
}
bool fUpdated = false;

2
src/wallet/wallet.h
View File

@ -726,10 +726,12 @@ private:
*/
typedef TxSpendMap<uint256> TxNullifiers;
TxNullifiers mapTxSproutNullifiers;
TxNullifiers mapTxSaplingNullifiers;
void AddToTransparentSpends(const COutPoint& outpoint, const uint256& wtxid);
void AddToSproutSpends(const uint256& nullifier, const uint256& wtxid);
void AddToSpends(const uint256& wtxid);
void AddToSaplingSpends(const uint256& nullifier, const uint256& wtxid);
public:
/*