BTCPrivate
/
BitcoinPrivate-legacy
mirror of https://github.com/BTCPrivate/BitcoinPrivate-legacy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/wallet/gtest/test_wallet.cpp
View File

@ -246,3 +246,29 @@ TEST(wallet_tests, nullifier_is_spent) {
chainActive.SetTip(NULL);
mapBlockIndex.erase(blockHash);
}
TEST(wallet_tests, navigate_from_nullifier_to_note) {
CWallet wallet;
auto sk = libzcash::SpendingKey::random();
wallet.AddSpendingKey(sk);
auto wtx = GetValidReceive(sk, 10, true);
auto note = GetNote(sk, wtx, 0, 1);
auto nullifier = note.nullifier(sk);
mapNoteData_t noteData;
JSOutPoint jsoutpt {wtx.GetTxid(), 0, 1};
CNoteData nd {sk.address(), nullifier};
noteData[jsoutpt] = nd;
wtx.SetNoteData(noteData);
EXPECT_EQ(0, wallet.mapNullifiers.count(nullifier));
wallet.AddToWallet(wtx, true, NULL);
EXPECT_EQ(1, wallet.mapNullifiers.count(nullifier));
EXPECT_EQ(wtx.GetTxid(), wallet.mapNullifiers[nullifier].hash);
EXPECT_EQ(0, wallet.mapNullifiers[nullifier].js);
EXPECT_EQ(1, wallet.mapNullifiers[nullifier].n);
}

20
src/wallet/wallet.cpp
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)

2
src/wallet/wallet.h
View File

@ -625,6 +625,7 @@ public:
fBroadcastTransactions = false;
}
std::map<uint256, JSOutPoint> mapNullifiers;
std::map<uint256, CWalletTx> mapWallet;
int64_t nOrderPosNext;
@ -727,6 +728,7 @@ public:
TxItems OrderedTxItems(std::list<CAccountingEntry>& acentries, std::string strAccount = "");
void MarkDirty();
void UpdateNullifierNoteMap(const CWalletTx& wtx);
bool AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet, CWalletDB* pwalletdb);
void SyncTransaction(const CTransaction& tx, const CBlock* pblock);
bool AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate);