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

Change default_address to return SaplingPaymentAddr and not boost::optional

Browse Source
This commit is contained in:
Jay Graber
2018-06-30 12:57:04 -07:00
parent f82a864dc1
commit 8e91ebf76c
8 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/zcash/Address.cpp
View File

@@ -75,8 +75,11 @@ boost::optional<SaplingPaymentAddress> SaplingIncomingViewingKey::address(divers
}
}
boost::optional<SaplingPaymentAddress> SaplingSpendingKey::default_address() const {
return full_viewing_key().in_viewing_key().address(default_diversifier(*this));
SaplingPaymentAddress SaplingSpendingKey::default_address() const {
// Iterates within default_diversifier to ensure a valid address is returned
auto addrOpt = full_viewing_key().in_viewing_key().address(default_diversifier(*this));
assert(addrOpt != boost::none);
return addrOpt.value();
}
}

2
src/zcash/Address.hpp
View File

@@ -202,7 +202,7 @@ public:
SaplingFullViewingKey full_viewing_key() const;
// Can derive Sapling addr from default diversifier
boost::optional<SaplingPaymentAddress> default_address() const;
SaplingPaymentAddress default_address() const;
};
typedef boost::variant<InvalidEncoding, SproutPaymentAddress, SaplingPaymentAddress> PaymentAddress;