diff --git a/src/zcash/address/zip32.cpp b/src/zcash/address/zip32.cpp index 9aa3bba97..af41fb085 100644 --- a/src/zcash/address/zip32.cpp +++ b/src/zcash/address/zip32.cpp @@ -76,7 +76,7 @@ namespace libzcash { // Transparent // -std::optional> DeriveBip44TransparentAccountKey(const HDSeed& seed, uint32_t bip44CoinType, uint32_t accountId) { +std::optional> DeriveBip44TransparentAccountKey(const MnemonicSeed& seed, uint32_t bip44CoinType, uint32_t accountId) { auto rawSeed = seed.RawSeed(); auto m = CExtKey::Master(rawSeed.data(), rawSeed.size()); @@ -242,7 +242,7 @@ SaplingExtendedSpendingKey SaplingExtendedSpendingKey::Derive(uint32_t i) const return xsk_i; } -std::pair SaplingExtendedSpendingKey::ForAccount(const HDSeed& seed, uint32_t bip44CoinType, uint32_t accountId) { +std::pair SaplingExtendedSpendingKey::ForAccount(const MnemonicSeed& seed, uint32_t bip44CoinType, uint32_t accountId) { auto m = Master(seed); // We use a fixed keypath scheme of m/32'/coin_type'/account' @@ -260,7 +260,7 @@ std::pair SaplingExtendedSpendingKey::For return std::make_pair(xsk, hdKeypath); } -std::pair SaplingExtendedSpendingKey::Legacy(const HDSeed& seed, uint32_t bip44CoinType, uint32_t addressIndex) { +std::pair SaplingExtendedSpendingKey::Legacy(const MnemonicSeed& seed, uint32_t bip44CoinType, uint32_t addressIndex) { auto m = Master(seed); // We use a fixed keypath scheme of m/32'/coin_type'/0x7FFFFFFF'/addressIndex' diff --git a/src/zcash/address/zip32.h b/src/zcash/address/zip32.h index f5f23810a..cdd281a44 100644 --- a/src/zcash/address/zip32.h +++ b/src/zcash/address/zip32.h @@ -287,8 +287,8 @@ struct SaplingExtendedSpendingKey { } static SaplingExtendedSpendingKey Master(const HDSeed& seed); - static std::pair ForAccount(const HDSeed& seed, uint32_t bip44CoinType, uint32_t accountId); - static std::pair Legacy(const HDSeed& seed, uint32_t bip44CoinType, uint32_t addressIndex); + static std::pair ForAccount(const MnemonicSeed& seed, uint32_t bip44CoinType, uint32_t accountId); + static std::pair Legacy(const MnemonicSeed& seed, uint32_t bip44CoinType, uint32_t addressIndex); SaplingExtendedSpendingKey Derive(uint32_t i) const;