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

s/SaplingInViewingKey/SaplingIncomingViewingKey

Browse Source
This commit is contained in:
Jay Graber
2018-06-04 04:59:07 -07:00
parent dd099401a3
commit 0da9aac63e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/zcash/Address.cpp
View File

@@ -55,17 +55,17 @@ SaplingFullViewingKey SaplingSpendingKey::full_viewing_key() const {
return expanded_spending_key().full_viewing_key(); return expanded_spending_key().full_viewing_key();
} }
SaplingInViewingKey SaplingFullViewingKey::in_viewing_key() const { SaplingIncomingViewingKey SaplingFullViewingKey::in_viewing_key() const {
uint256 ivk; uint256 ivk;
librustzcash_crh_ivk(ak.begin(), nk.begin(), ivk.begin()); librustzcash_crh_ivk(ak.begin(), nk.begin(), ivk.begin());
return SaplingInViewingKey(ivk); return SaplingIncomingViewingKey(ivk);
} }
SaplingSpendingKey SaplingSpendingKey::random() { SaplingSpendingKey SaplingSpendingKey::random() {
return SaplingSpendingKey(random_uint256()); return SaplingSpendingKey(random_uint256());
} }
SaplingPaymentAddress SaplingInViewingKey::address(diversifier_t d) const { SaplingPaymentAddress SaplingIncomingViewingKey::address(diversifier_t d) const {
uint256 pk_d; uint256 pk_d;
librustzcash_ivk_to_pkd(this->begin(), d.data(), pk_d.begin()); librustzcash_ivk_to_pkd(this->begin(), d.data(), pk_d.begin());
return SaplingPaymentAddress(d, pk_d); return SaplingPaymentAddress(d, pk_d);

8
src/zcash/Address.hpp
View File

@@ -125,10 +125,10 @@ public:
} }
}; };
class SaplingInViewingKey : public uint256 { class SaplingIncomingViewingKey : public uint256 {
public: public:
SaplingInViewingKey() : uint256() { } SaplingIncomingViewingKey() : uint256() { }
SaplingInViewingKey(uint256 ivk) : uint256(ivk) { } SaplingIncomingViewingKey(uint256 ivk) : uint256(ivk) { }
// Can pass in diversifier for Sapling addr // Can pass in diversifier for Sapling addr
SaplingPaymentAddress address(diversifier_t d) const; SaplingPaymentAddress address(diversifier_t d) const;
@@ -152,7 +152,7 @@ public:
READWRITE(ovk); READWRITE(ovk);
} }
SaplingInViewingKey in_viewing_key() const; SaplingIncomingViewingKey in_viewing_key() const;
friend inline bool operator==(const SaplingFullViewingKey& a, const SaplingFullViewingKey& b) { friend inline bool operator==(const SaplingFullViewingKey& a, const SaplingFullViewingKey& b) {
return a.ak == b.ak && a.nk == b.nk && a.ovk == b.ovk; return a.ak == b.ak && a.nk == b.nk && a.ovk == b.ovk;