Reintroduce public reexports as deprecated replacement modules & types.

Due to limitations described in
rust-lang/rust#30827, we can't just deprecate
the `pub use` stanzas; instead, we have to replace reexports with
new (deprecated) modules and public types which then internally reexport
the module internals or alias the reexported types, respectively.

components/zcash_address/CHANGELOG.md

@@ -7,6 +7,9 @@ and this library adheres to Rust's notion of
 
 ## [Unreleased]
 
+### Deprecated
+- `zcash_address::Network` (use `zcash_protocol::consensus::NetworkType` instead).
+
 ## [0.6.2] - 2024-12-13
 ### Fixed
 - Migrated to `f4jumble 0.1.1` to fix `no-std` support.

components/zcash_address/src/lib.rs

@@ -137,8 +137,6 @@ extern crate alloc;
 #[cfg(feature = "std")]
 extern crate std;
 
-use alloc::string::String;
-
 mod convert;
 mod encoding;
 mod kind;
@@ -151,8 +149,14 @@ pub use convert::{
 };
 pub use encoding::ParseError;
 pub use kind::unified;
+
+use alloc::string::String;
+
 use kind::unified::Receiver;
-//pub use zcash_protocol::consensus::NetworkType as Network;
+
+#[deprecated(note = "use ::zcash_protocol::consensus::NetworkType instead")]
+pub type Network = zcash_protocol::consensus::NetworkType;
+
 use zcash_protocol::{consensus::NetworkType, PoolType};
 
 /// A Zcash address.

zcash_client_backend/CHANGELOG.md

@@ -10,6 +10,14 @@ and this library adheres to Rust's notion of
 ### Changed
 - Migrated to `nonempty 0.11`
 
+### Deprecated
+- `zcash_client_backend::address` (use `zcash_keys::address` instead)
+- `zcash_client_backend::encoding` (use `zcash_keys::encoding` instead)
+- `zcash_client_backend::keys` (use `zcash_keys::keys` instead)
+- `zcash_client_backend::zip321` (use the `zip321` crate instead)
+- `zcash_client_backend::PoolType` (use `zcash_protocol::PoolType` instead)
+- `zcash_client_backend::ShieldedProtocol` (use `zcash_protocol::ShieldedProtocol` instead)
+
 ## [0.16.0] - 2024-12-16
 
 ### Added

zcash_client_backend/src/lib.rs

@@ -61,18 +61,14 @@
 // Temporary until we have addressed all Result<T, ()> cases.
 #![allow(clippy::result_unit_err)]
 
-//pub use zcash_keys::address;
 pub mod data_api;
 mod decrypt;
-//pub use zcash_keys::encoding;
 pub mod fees;
-//pub use zcash_keys::keys;
 pub mod proposal;
 pub mod proto;
 pub mod scan;
 pub mod scanning;
 pub mod wallet;
-//pub use zip321;
 
 #[cfg(feature = "sync")]
 pub mod sync;
@@ -84,7 +80,27 @@ pub mod serialization;
 pub mod tor;
 
 pub use decrypt::{decrypt_transaction, DecryptedOutput, TransferType};
-//pub use zcash_protocol::{PoolType, ShieldedProtocol};
+
+#[deprecated(note = "This module is deprecated; use `::zcash_keys::address` instead.")]
+pub mod address {
+    pub use zcash_keys::address::*;
+}
+#[deprecated(note = "This module is deprecated; use `::zcash_keys::encoding` instead.")]
+pub mod encoding {
+    pub use zcash_keys::encoding::*;
+}
+#[deprecated(note = "This module is deprecated; use `::zcash_keys::keys` instead.")]
+pub mod keys {
+    pub use zcash_keys::keys::*;
+}
+#[deprecated(note = "use ::zcash_protocol::PoolType instead")]
+pub type PoolType = zcash_protocol::PoolType;
+#[deprecated(note = "use ::zcash_protocol::ShieldedProtocol instead")]
+pub type ShieldedProtocol = zcash_protocol::ShieldedProtocol;
+#[deprecated(note = "This module is deprecated; use the `zip321` crate instead.")]
+pub mod zip321 {
+    pub use zip321::*;
+}
 
 #[cfg(test)]
 #[macro_use]

zcash_primitives/CHANGELOG.md

@@ -10,6 +10,28 @@ and this library adheres to Rust's notion of
 ### Changed
 - Migrated to `nonempty 0.11`
 
+### Deprecated
+- `zcash_primitives::consensus` (use `zcash_protocol::consensus` instead)
+- `zcash_primitives::constants` (use `zcash_protocol::constants` instead)
+- `zcash_primitives::memo` (use `zcash_protocol::memo` instead)
+- `zcash_primitives::zip32` (use the `zip32` crate instead)
+- `zcash_primitives::legacy` (use the `zcash_transparent` crate instead)
+- `zcash_primitives::transaction::components::Amount` (use `zcash_protocol::value::ZatBalance` instead)
+- `zcash_primitives::transaction::components::amount`:
+  - `BalanceError` (use `zcash_protocol::value::BalanceError` instead)
+  - `Amount` (use `zcash_protocol::value::ZatBalance` instead)
+  - `NonNegativeAmount` (use `zcash_protocol::value::Zatoshis` instead)
+  - `COIN` (use `zcash_protocol::value::COIN` instead)
+  - module `testing` (use `zcash_protocol::value::testing` instead)
+    - `arb_positive_amount` (use `zcash_protocol::value::testing::arb_positive_zat_balance` instead.)
+    - `arb_amount` (use `zcash_protocol::value::testing::arb_zat_balance` instead.)
+    - `arb_nonnegative_amount` (use `::zcash_protocol::value::testing::arb_zatoshis` instead.)
+
+### Removed
+- `zcash_primitives::transaction::sighash::TransparentAuthorizingContext` was
+  removed as there is no way to deprecate a previously-reexported trait name.
+  Use `zcash_transparent::sighash::TransparentAuthorizingContext` instead.
+
 ## [0.21.0] - 2024-12-16
 
 ### Added

zcash_primitives/src/lib.rs

@@ -18,17 +18,33 @@
 #![allow(clippy::single_component_path_imports)]
 
 pub mod block;
-//pub use zcash_protocol::consensus;
-//pub use zcash_protocol::constants;
-//pub use zcash_protocol::memo;
-pub mod merkle_tree;
-pub mod transaction;
-//pub use zip32;
 #[cfg(zcash_unstable = "zfuture")]
 pub mod extensions;
+pub mod merkle_tree;
+pub mod transaction;
 
-//pub mod legacy {
-//    pub use transparent::address::*;
-//    #[cfg(feature = "transparent-inputs")]
-//    pub use transparent::keys;
-//}
+#[deprecated(note = "This module is deprecated; use `::zcash_protocol::consensus` instead.")]
+pub mod consensus {
+    pub use zcash_protocol::consensus::*;
+}
+#[deprecated(note = "This module is deprecated; use `::zcash_protocol::constants` instead.")]
+pub mod constants {
+    pub use zcash_protocol::constants::*;
+}
+#[deprecated(note = "This module is deprecated; use `::zcash_protocol::memo` instead.")]
+pub mod memo {
+    pub use zcash_protocol::memo::*;
+}
+#[deprecated(note = "This module is deprecated; use the `zip32` crate instead.")]
+pub mod zip32 {
+    pub use zip32::*;
+}
+#[deprecated(note = "This module is deprecated; use the `zcash_transparent` crate instead.")]
+pub mod legacy {
+    pub use transparent::address::*;
+    #[cfg(feature = "transparent-inputs")]
+    #[deprecated(note = "This module is deprecated; use `::zcash_transparent::keys` instead.")]
+    pub mod keys {
+        pub use transparent::keys::*;
+    }
+}

zcash_primitives/src/transaction/components.rs

@@ -1,35 +1,58 @@
 //! Structs representing the components within Zcash transactions.
-//pub mod amount {
-//    pub use zcash_protocol::value::{
-//        BalanceError, ZatBalance as Amount, Zatoshis as NonNegativeAmount, COIN,
-//    };
-//
-//    #[cfg(any(test, feature = "test-dependencies"))]
-//    pub mod testing {
-//        pub use zcash_protocol::value::testing::{
-//            arb_positive_zat_balance as arb_positive_amount, arb_zat_balance as arb_amount,
-//            arb_zatoshis as arb_nonnegative_amount,
-//        };
-//    }
-//}
 pub mod orchard;
 pub mod sapling;
 pub mod sprout;
 #[cfg(zcash_unstable = "zfuture")]
 pub mod tze;
 
-//pub mod transparent {
-//    pub use transparent::builder;
-//    pub use transparent::bundle::*;
-//    pub use transparent::pczt;
-//}
-
-pub use self::{
-    //    amount::Amount,
-    sprout::JsDescription,
-    //    transparent::{OutPoint, TxIn, TxOut},
-};
-//pub use crate::sapling::bundle::{OutputDescription, SpendDescription};
+pub use self::sprout::JsDescription;
+
+#[deprecated(note = "This module is deprecated; use `::zcash_protocol::value` instead.")]
+pub mod amount {
+    #[deprecated(note = "Use `::zcash_protocol::value::BalanceError` instead.")]
+    pub type BalanceError = zcash_protocol::value::BalanceError;
+    #[deprecated(note = "Use `::zcash_protocol::value::ZatBalance` instead.")]
+    pub type Amount = zcash_protocol::value::ZatBalance;
+    #[deprecated(note = "Use `::zcash_protocol::value::Zatoshis` instead.")]
+    pub type NonNegativeAmount = zcash_protocol::value::Zatoshis;
+    #[deprecated(note = "Use `::zcash_protocol::value::COIN` instead.")]
+    pub const COIN: u64 = zcash_protocol::value::COIN;
+
+    #[cfg(any(test, feature = "test-dependencies"))]
+    #[deprecated(note = "Use `::zcash_protocol::value::testing` instead.")]
+    pub mod testing {
+        pub use zcash_protocol::value::testing::arb_positive_zat_balance as arb_positive_amount;
+        pub use zcash_protocol::value::testing::arb_zat_balance as arb_amount;
+        pub use zcash_protocol::value::testing::arb_zatoshis as arb_nonnegative_amount;
+    }
+}
+
+#[deprecated(note = "This module is deprecated; use the `zcash_transparent` crate instead.")]
+pub mod transparent {
+    #[deprecated(note = "This module is deprecated; use `::zcash_transparent::builder` instead.")]
+    pub mod builder {
+        pub use ::transparent::builder::*;
+    }
+    pub use ::transparent::bundle::*;
+    #[deprecated(note = "This module is deprecated; use `::zcash_transparent::pczt` instead.")]
+    pub mod pczt {
+        pub use ::transparent::pczt::*;
+    }
+}
+
+#[deprecated(note = "use `::zcash_transparent::bundle::OutPoint` instead.")]
+pub type OutPoint = ::transparent::bundle::OutPoint;
+#[deprecated(note = "use `::zcash_transparent::bundle::TxIn` instead.")]
+pub type TxIn<A> = ::transparent::bundle::TxIn<A>;
+#[deprecated(note = "use `::zcash_transparent::bundle::TxIn` instead.")]
+pub type TxOut = ::transparent::bundle::TxOut;
+#[deprecated(note = "use `::zcash_protocol::value::ZatBalance` instead.")]
+pub type Amount = zcash_protocol::value::ZatBalance;
+
+#[deprecated(note = "Use `::sapling_crypto::bundle::OutputDescription` instead.")]
+pub type OutputDescription<A> = ::sapling::bundle::OutputDescription<A>;
+#[deprecated(note = "Use `::sapling_crypto::bundle::SpendDescription` instead.")]
+pub type SpendDescription<A> = ::sapling::bundle::SpendDescription<A>;
 
 #[cfg(zcash_unstable = "zfuture")]
 pub use self::tze::{TzeIn, TzeOut};

zcash_primitives/src/transaction/sighash.rs

@@ -9,7 +9,19 @@ use ::sapling::{self, bundle::GrothProofBytes};
 #[cfg(zcash_unstable = "zfuture")]
 use {crate::extensions::transparent::Precondition, zcash_protocol::value::Zatoshis};
 
-//pub use transparent::sighash::*;
+#[deprecated(note = "use `::zcash_transparent::sighash::SIGHASH_ALL` instead.")]
+pub const SIGHASH_ALL: u8 = ::transparent::sighash::SIGHASH_ALL;
+#[deprecated(note = "use `::zcash_transparent::sighash::SIGHASH_NONE` instead.")]
+pub const SIGHASH_NONE: u8 = ::transparent::sighash::SIGHASH_NONE;
+#[deprecated(note = "use `::zcash_transparent::sighash::SIGHASH_SINGLE` instead.")]
+pub const SIGHASH_SINGLE: u8 = ::transparent::sighash::SIGHASH_SINGLE;
+#[deprecated(note = "use `::zcash_transparent::sighash::SIGHASH_MASK` instead.")]
+pub const SIGHASH_MASK: u8 = ::transparent::sighash::SIGHASH_MASK;
+#[deprecated(note = "use `::zcash_transparent::sighash::SIGHASH_ANYONECANPAY` instead.")]
+pub const SIGHASH_ANYONECANPAY: u8 = ::transparent::sighash::SIGHASH_ANYONECANPAY;
+
+#[deprecated(note = "use `::zcash_transparent::sighash::SighashType` instead.")]
+pub type SighashType = ::transparent::sighash::SighashType;
 
 pub enum SignableInput<'a> {
     Shielded,