Create mapping from nullifiers to received notes

This is used in the same way as CTxIn.prevout (e.g. to mark transactions dirty).
This commit is contained in:
Jack Grigg
2016-08-24 15:51:56 +12:00
parent 0f1060478f
commit 8db7e25c3f
3 changed files with 48 additions and 0 deletions

View File

@@ -722,6 +722,16 @@ void CWallet::MarkDirty()
}
}
void CWallet::UpdateNullifierNoteMap(const CWalletTx& wtx)
{
{
LOCK(cs_wallet);
for (const mapNoteData_t::value_type& item : wtx.mapNoteData) {
mapNullifiers[item.second.nullifier] = item.first;
}
}
}
bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletDB* pwalletdb)
{
uint256 hash = wtxIn.GetTxid();
@@ -730,6 +740,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletD
{
mapWallet[hash] = wtxIn;
mapWallet[hash].BindWallet(this);
UpdateNullifierNoteMap(mapWallet[hash]);
AddToSpends(hash);
}
else
@@ -739,6 +750,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletD
pair<map<uint256, CWalletTx>::iterator, bool> ret = mapWallet.insert(make_pair(hash, wtxIn));
CWalletTx& wtx = (*ret.first).second;
wtx.BindWallet(this);
UpdateNullifierNoteMap(wtx);
bool fInsertedNew = ret.second;
if (fInsertedNew)
{
@@ -894,6 +906,14 @@ void CWallet::SyncTransaction(const CTransaction& tx, const CBlock* pblock)
if (mapWallet.count(txin.prevout.hash))
mapWallet[txin.prevout.hash].MarkDirty();
}
for (const JSDescription& jsdesc : tx.vjoinsplit) {
for (const uint256& nullifier : jsdesc.nullifiers) {
if (mapNullifiers.count(nullifier) &&
mapWallet.count(mapNullifiers[nullifier].hash)) {
mapWallet[mapNullifiers[nullifier].hash].MarkDirty();
}
}
}
}
void CWallet::EraseFromWallet(const uint256 &hash)