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

Alter SaplingNote::nullifier() to take a SaplingFullViewingKey

Browse Source 
This means the API will work if you only have a SaplingExtendedSpendingKey,
as will be the case with ZIP 32.
This commit is contained in:
Jack Grigg
2018-06-16 23:06:15 +12:00
parent a7a62b724b
commit 66a519f55d
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtest/test_sapling_note.cpp
View File

@@ -49,7 +49,7 @@ TEST(SaplingNote, TestVectors)
// Test nullifier // Test nullifier
SaplingSpendingKey spendingKey(sk); SaplingSpendingKey spendingKey(sk);
ASSERT_EQ(note.nullifier(spendingKey, note_pos), nf); ASSERT_EQ(note.nullifier(spendingKey.full_viewing_key(), note_pos), nf);
} }

3
src/zcash/Note.cpp
View File

@@ -65,9 +65,8 @@ boost::optional<uint256> SaplingNote::cm() const {
} }
// Call librustzcash to compute the nullifier // Call librustzcash to compute the nullifier
boost::optional<uint256> SaplingNote::nullifier(const SaplingSpendingKey& sk, const uint64_t position) const boost::optional<uint256> SaplingNote::nullifier(const SaplingFullViewingKey& vk, const uint64_t position) const
{ {
auto vk = sk.full_viewing_key();
auto ak = vk.ak; auto ak = vk.ak;
auto nk = vk.nk; auto nk = vk.nk;

2
src/zcash/Note.hpp
View File

@@ -57,7 +57,7 @@ public:
virtual ~SaplingNote() {}; virtual ~SaplingNote() {};
boost::optional<uint256> cm() const; boost::optional<uint256> cm() const;
boost::optional<uint256> nullifier(const SaplingSpendingKey &sk, const uint64_t position) const; boost::optional<uint256> nullifier(const SaplingFullViewingKey &vk, const uint64_t position) const;
}; };
class BaseNotePlaintext { class BaseNotePlaintext {