diff --git a/zcash_client_backend/src/encoding.rs b/zcash_client_backend/src/encoding.rs index d8ed7a643..66c5d69cb 100644 --- a/zcash_client_backend/src/encoding.rs +++ b/zcash_client_backend/src/encoding.rs @@ -188,14 +188,14 @@ impl AddressCodec

for UnifiedAddress { /// let extsk = sapling::spending_key(&[0; 32][..], COIN_TYPE, AccountId::from(0)); /// let encoded = encode_extended_spending_key(HRP_SAPLING_EXTENDED_SPENDING_KEY, &extsk); /// ``` -/// [`ExtendedSpendingKey`]: zcash_primitives::zip32::ExtendedSpendingKey +/// [`ExtendedSpendingKey`]: zcash_primitives::sapling::zip32::ExtendedSpendingKey pub fn encode_extended_spending_key(hrp: &str, extsk: &ExtendedSpendingKey) -> String { bech32_encode(hrp, |w| extsk.write(w)) } /// Decodes an [`ExtendedSpendingKey`] from a Bech32-encoded string. /// -/// [`ExtendedSpendingKey`]: zcash_primitives::zip32::ExtendedSpendingKey +/// [`ExtendedSpendingKey`]: zcash_primitives::sapling::zip32::ExtendedSpendingKey pub fn decode_extended_spending_key( hrp: &str, s: &str, @@ -210,26 +210,26 @@ pub fn decode_extended_spending_key( /// ``` /// use zcash_primitives::{ /// constants::testnet::{COIN_TYPE, HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY}, +/// sapling::zip32::ExtendedFullViewingKey, /// zip32::AccountId, /// }; /// use zcash_client_backend::{ /// encoding::encode_extended_full_viewing_key, /// keys::sapling, /// }; -/// use zcash_primitives::zip32::ExtendedFullViewingKey; /// /// let extsk = sapling::spending_key(&[0; 32][..], COIN_TYPE, AccountId::from(0)); /// let extfvk = extsk.to_extended_full_viewing_key(); /// let encoded = encode_extended_full_viewing_key(HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY, &extfvk); /// ``` -/// [`ExtendedFullViewingKey`]: zcash_primitives::zip32::ExtendedFullViewingKey +/// [`ExtendedFullViewingKey`]: zcash_primitives::sapling::zip32::ExtendedFullViewingKey pub fn encode_extended_full_viewing_key(hrp: &str, extfvk: &ExtendedFullViewingKey) -> String { bech32_encode(hrp, |w| extfvk.write(w)) } /// Decodes an [`ExtendedFullViewingKey`] from a Bech32-encoded string. /// -/// [`ExtendedFullViewingKey`]: zcash_primitives::zip32::ExtendedFullViewingKey +/// [`ExtendedFullViewingKey`]: zcash_primitives::sapling::zip32::ExtendedFullViewingKey pub fn decode_extended_full_viewing_key( hrp: &str, s: &str, diff --git a/zcash_client_backend/src/keys.rs b/zcash_client_backend/src/keys.rs index 028d447fc..d1e1cc01c 100644 --- a/zcash_client_backend/src/keys.rs +++ b/zcash_client_backend/src/keys.rs @@ -53,7 +53,7 @@ pub mod sapling { /// /// let extsk = sapling::spending_key(&[0; 32][..], COIN_TYPE, AccountId::from(0)); /// ``` - /// [`ExtendedSpendingKey`]: zcash_primitives::zip32::ExtendedSpendingKey + /// [`ExtendedSpendingKey`]: zcash_primitives::sapling::zip32::ExtendedSpendingKey pub fn spending_key(seed: &[u8], coin_type: u32, account: AccountId) -> ExtendedSpendingKey { if seed.len() < 32 { panic!("ZIP 32 seeds MUST be at least 32 bytes"); diff --git a/zcash_client_backend/src/scanning.rs b/zcash_client_backend/src/scanning.rs index 073056b76..380e41a19 100644 --- a/zcash_client_backend/src/scanning.rs +++ b/zcash_client_backend/src/scanning.rs @@ -243,7 +243,7 @@ impl fmt::Display for ScanError { /// [`WalletSaplingOutput`]s, whereas the implementation for [`SaplingIvk`] cannot /// do so and will return the unit value in those outputs instead. /// -/// [`ExtendedFullViewingKey`]: zcash_primitives::zip32::ExtendedFullViewingKey +/// [`ExtendedFullViewingKey`]: zcash_primitives::sapling::zip32::ExtendedFullViewingKey /// [`SaplingIvk`]: zcash_primitives::sapling::SaplingIvk /// [`CompactBlock`]: crate::proto::compact_formats::CompactBlock /// [`ScanningKey`]: crate::scanning::ScanningKey diff --git a/zcash_client_backend/src/wallet.rs b/zcash_client_backend/src/wallet.rs index 9a467dbbd..f1f9d110d 100644 --- a/zcash_client_backend/src/wallet.rs +++ b/zcash_client_backend/src/wallet.rs @@ -253,7 +253,7 @@ pub enum OvkPolicy { /// Transaction outputs will be decryptable by the sender, in addition to the /// recipients. /// - /// [`ExtendedFullViewingKey`]: zcash_primitives::zip32::ExtendedFullViewingKey + /// [`ExtendedFullViewingKey`]: zcash_primitives::sapling::zip32::ExtendedFullViewingKey Sender, /// Use a custom outgoing viewing key. This might for instance be derived from a diff --git a/zcash_primitives/src/constants/mainnet.rs b/zcash_primitives/src/constants/mainnet.rs index bd0e473f4..2164e890a 100644 --- a/zcash_primitives/src/constants/mainnet.rs +++ b/zcash_primitives/src/constants/mainnet.rs @@ -9,7 +9,7 @@ pub const COIN_TYPE: u32 = 133; /// /// Defined in [ZIP 32]. /// -/// [`ExtendedSpendingKey`]: crate::zip32::ExtendedSpendingKey +/// [`ExtendedSpendingKey`]: crate::sapling::zip32::ExtendedSpendingKey /// [ZIP 32]: https://github.com/zcash/zips/blob/master/zip-0032.rst pub const HRP_SAPLING_EXTENDED_SPENDING_KEY: &str = "secret-extended-key-main"; @@ -17,7 +17,7 @@ pub const HRP_SAPLING_EXTENDED_SPENDING_KEY: &str = "secret-extended-key-main"; /// /// Defined in [ZIP 32]. /// -/// [`ExtendedFullViewingKey`]: crate::zip32::ExtendedFullViewingKey +/// [`ExtendedFullViewingKey`]: crate::sapling::zip32::ExtendedFullViewingKey /// [ZIP 32]: https://github.com/zcash/zips/blob/master/zip-0032.rst pub const HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY: &str = "zxviews"; diff --git a/zcash_primitives/src/constants/regtest.rs b/zcash_primitives/src/constants/regtest.rs index 86fb95eb9..0414a24a2 100644 --- a/zcash_primitives/src/constants/regtest.rs +++ b/zcash_primitives/src/constants/regtest.rs @@ -13,7 +13,7 @@ pub const COIN_TYPE: u32 = 1; /// /// It is defined in [the `zcashd` codebase]. /// -/// [`ExtendedSpendingKey`]: crate::zip32::ExtendedSpendingKey +/// [`ExtendedSpendingKey`]: crate::sapling::zip32::ExtendedSpendingKey /// [the `zcashd` codebase]: pub const HRP_SAPLING_EXTENDED_SPENDING_KEY: &str = "secret-extended-key-regtest"; @@ -21,7 +21,7 @@ pub const HRP_SAPLING_EXTENDED_SPENDING_KEY: &str = "secret-extended-key-regtest /// /// It is defined in [the `zcashd` codebase]. /// -/// [`ExtendedFullViewingKey`]: crate::zip32::ExtendedFullViewingKey +/// [`ExtendedFullViewingKey`]: crate::sapling::zip32::ExtendedFullViewingKey /// [the `zcashd` codebase]: pub const HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY: &str = "zxviewregtestsapling"; diff --git a/zcash_primitives/src/constants/testnet.rs b/zcash_primitives/src/constants/testnet.rs index d11c0e983..9f30640fe 100644 --- a/zcash_primitives/src/constants/testnet.rs +++ b/zcash_primitives/src/constants/testnet.rs @@ -9,7 +9,7 @@ pub const COIN_TYPE: u32 = 1; /// /// Defined in [ZIP 32]. /// -/// [`ExtendedSpendingKey`]: crate::zip32::ExtendedSpendingKey +/// [`ExtendedSpendingKey`]: crate::sapling::zip32::ExtendedSpendingKey /// [ZIP 32]: https://github.com/zcash/zips/blob/master/zip-0032.rst pub const HRP_SAPLING_EXTENDED_SPENDING_KEY: &str = "secret-extended-key-test"; @@ -17,7 +17,7 @@ pub const HRP_SAPLING_EXTENDED_SPENDING_KEY: &str = "secret-extended-key-test"; /// /// Defined in [ZIP 32]. /// -/// [`ExtendedFullViewingKey`]: crate::zip32::ExtendedFullViewingKey +/// [`ExtendedFullViewingKey`]: crate::sapling::zip32::ExtendedFullViewingKey /// [ZIP 32]: https://github.com/zcash/zips/blob/master/zip-0032.rst pub const HRP_SAPLING_EXTENDED_FULL_VIEWING_KEY: &str = "zxviewtestsapling"; diff --git a/zcash_primitives/src/zip32.rs b/zcash_primitives/src/zip32.rs index 2bb2c35d0..a130b6b32 100644 --- a/zcash_primitives/src/zip32.rs +++ b/zcash_primitives/src/zip32.rs @@ -7,14 +7,6 @@ use subtle::{Choice, ConditionallySelectable}; pub mod fingerprint; -#[deprecated(note = "Please use the types exported from the `zip32::sapling` module instead.")] -pub use crate::sapling::zip32::{ - sapling_address, sapling_default_address, sapling_derive_internal_fvk, sapling_find_address, - DiversifiableFullViewingKey, ExtendedFullViewingKey, ExtendedSpendingKey, - ZIP32_SAPLING_FVFP_PERSONALIZATION, ZIP32_SAPLING_INT_PERSONALIZATION, - ZIP32_SAPLING_MASTER_PERSONALIZATION, -}; - /// A type-safe wrapper for account identifiers. #[derive(Debug, Default, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct AccountId(u32);