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

Rename IsFromMe(nullifier) to IsSproutNullifierFromMe(nullifier).

This commit is contained in:
Simon 2018-07-30 15:35:34 -07:00
parent 78584ef794
commit 037cacf2ce
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/wallet.cpp
View File

@ -1554,7 +1554,7 @@ mapSaplingNoteData_t CWallet::FindMySaplingNotes(const CTransaction &tx) const
return noteData; return noteData;
} }
bool CWallet::IsFromMe(const uint256& nullifier) const bool CWallet::IsSproutNullifierFromMe(const uint256& nullifier) const
{ {
{ {
LOCK(cs_wallet); LOCK(cs_wallet);
@ -1707,7 +1707,7 @@ bool CWallet::IsFromMe(const CTransaction& tx) const
} }
for (const JSDescription& jsdesc : tx.vjoinsplit) { for (const JSDescription& jsdesc : tx.vjoinsplit) {
for (const uint256& nullifier : jsdesc.nullifiers) { for (const uint256& nullifier : jsdesc.nullifiers) {
if (IsFromMe(nullifier)) { if (IsSproutNullifierFromMe(nullifier)) {
return true; return true;
} }
} }
@ -1841,7 +1841,7 @@ void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,
bool isFromMyZaddr = false; bool isFromMyZaddr = false;
for (const JSDescription& js : vjoinsplit) { for (const JSDescription& js : vjoinsplit) {
for (const uint256& nullifier : js.nullifiers) { for (const uint256& nullifier : js.nullifiers) {
if (pwallet->IsFromMe(nullifier)) { if (pwallet->IsSproutNullifierFromMe(nullifier)) {
isFromMyZaddr = true; isFromMyZaddr = true;
break; break;
} }
@ -1868,7 +1868,7 @@ void CWalletTx::GetAmounts(list<COutputEntry>& listReceived,
// Check input side // Check input side
for (const uint256& nullifier : js.nullifiers) { for (const uint256& nullifier : js.nullifiers) {
if (pwallet->IsFromMe(nullifier)) { if (pwallet->IsSproutNullifierFromMe(nullifier)) {
fMyJSDesc = true; fMyJSDesc = true;
break; break;
} }

2
src/wallet/wallet.h
View File

@ -1098,7 +1098,7 @@ public:
uint8_t n) const; uint8_t n) const;
mapSproutNoteData_t FindMySproutNotes(const CTransaction& tx) const; mapSproutNoteData_t FindMySproutNotes(const CTransaction& tx) const;
mapSaplingNoteData_t FindMySaplingNotes(const CTransaction& tx) const; mapSaplingNoteData_t FindMySaplingNotes(const CTransaction& tx) const;
bool IsFromMe(const uint256& nullifier) const; bool IsSproutNullifierFromMe(const uint256& nullifier) const;
void GetSproutNoteWitnesses( void GetSproutNoteWitnesses(
std::vector<JSOutPoint> notes, std::vector<JSOutPoint> notes,
std::vector<boost::optional<SproutWitness>>& witnesses, std::vector<boost::optional<SproutWitness>>& witnesses,