zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add diversifier_index_t::ToTransparentChildIndex

This commit is contained in:
Kris Nuttycombe 2021-11-07 11:08:08 -05:00
parent 6e6359229a
commit cfee863644
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/zcash/address/zip32.cpp
View File

@ -72,6 +72,15 @@ uint256 ovkForShieldingFromTaddr(HDSeed& seed) {
namespace libzcash {
std::optional<unsigned int> diversifier_index_t::ToTransparentChildIndex() const {
// ensure that the diversifier index is small enough for a t-addr
if (MAX_TRANSPARENT_CHILD_IDX < *this) {
return std::nullopt;
} else {
return (unsigned int) GetUint64(0);
}
}
//
// Transparent
//
@ -336,8 +345,8 @@ std::optional<ZcashdUnifiedAddress> ZcashdUnifiedFullViewingKey::Address(diversi
ZcashdUnifiedAddress ua;
if (transparentKey.has_value()) {
// ensure that the diversifier index is small enough for a t-addr
if (MAX_TRANSPARENT_CHILD_IDX < j) return std::nullopt;
auto childIndex = j.ToTransparentChildIndex();
if (!childIndex.has_value()) return std::nullopt;
CExtPubKey changeKey;
if (!transparentKey.value().Derive(changeKey, 0)) {
@ -345,8 +354,7 @@ std::optional<ZcashdUnifiedAddress> ZcashdUnifiedFullViewingKey::Address(diversi
}
CExtPubKey childKey;
unsigned int childIndex = (unsigned int) j.GetUint64(0);
if (changeKey.Derive(childKey, childIndex)) {
if (changeKey.Derive(childKey, childIndex.value())) {
ua.transparentKey = childKey.pubkey;
} else {
return std::nullopt;

2
src/zcash/address/zip32.h
View File

@ -195,6 +195,8 @@ public:
return false; //overflow
}
std::optional<unsigned int> ToTransparentChildIndex() const;
friend bool operator<(const diversifier_index_t& a, const diversifier_index_t& b) {
for (int i = 10; i >= 0; i--) {
if (a.data[i] == b.data[i]) {