Diff from upstream, for ref only

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
           - state: all-features
             all-features: true
           - state: NU7
-            all-features: true
+            all-features: true # ZIP-233 feature is enabled
             rustflags: '--cfg zcash_unstable="nu7"'
 
     env:
@@ -109,7 +109,7 @@ jobs:
           - state: all-features
             all-features: true
           - state: NU7
-            all-features: true
+            all-features: true # ZIP-233 feature is enabled
             rustflags: '--cfg zcash_unstable="nu7"'
 
         exclude:
@@ -143,6 +143,12 @@ jobs:
           cargo test
           --workspace
           ${{ steps.prepare.outputs.feature-flags }}
+      - name: Run pczt end-to-end tests
+        run: >
+          cargo test
+          --package pczt
+          --test end_to_end
+          --features "io-finalizer,prover,signer,tx-extractor,spend-finalizer,zcp-builder,internal-tests"
       - name: Verify working directory is clean
         run: git diff --exit-code
 
@@ -172,7 +178,7 @@ jobs:
           - state: all-features
             all-features: true
           - state: NU7
-            all-features: true
+            all-features: true # ZIP-233 feature is enabled
             rustflags: '--cfg zcash_unstable="nu7"'
 
     env:
@@ -227,10 +233,10 @@ jobs:
             os: windows-latest
 
           - state: ZFuture
-            rustflags: '--cfg zcash_unstable="zfuture"'
+            rustflags: '--cfg zcash_unstable="nu7" --cfg zcash_unstable="zfuture"'
           - state: ZFuture-allfeatures
             all-features: true
-            rustflags: '--cfg zcash_unstable="zfuture"'
+            rustflags: '--cfg zcash_unstable="nu7" --cfg zcash_unstable="zfuture"'
 
     env:
       RUSTFLAGS: ${{ matrix.rustflags }}

Cargo.toml

@@ -228,3 +228,12 @@ unexpected_cfgs = { level = "warn", check-cfg = [
   'cfg(zcash_unstable, values("zfuture", "nu7"))',
   'cfg(live_network_tests)',
 ] }
+
+[patch.crates-io]
+# core2 0.3.x was yanked from crates.io (Apr 2026); patch to the archived git source
+core2 = { git = "https://github.com/bbqsrc/core2", rev = "7bf2611bd9a52b438300c640e142ad5c1298b05b" }
+sapling = { package = "sapling-crypto", git = "https://github.com/QED-it/sapling-crypto", rev = "59535fb5d34b5c5cf1b20ef18269f5c65228378c" }
+orchard = { git = "https://github.com/QED-it/orchard", rev = "77d3274cb1f4620e9a1b86477c490fa123dff6bd" }
+sinsemilla = { git = "https://github.com/zcash/sinsemilla", rev = "aabb707e862bc3d7b803c77d14e5a771bcee3e8c" }
+zcash_note_encryption = { git = "https://github.com/zcash/zcash_note_encryption", rev = "9f7e93d42cef839d02b9d75918117941d453f8cb" }
+zcash_spec = { git = "https://github.com/QED-it/zcash_spec", rev = "d5e84264d2ad0646b587a837f4e2424ca64d3a05" }

components/zcash_protocol/src/consensus.rs

@@ -39,7 +39,7 @@
 
 impl fmt::Display for BlockHeight {
     fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.0.fmt(formatter)
     }
 }
 
@@ -63,7 +63,7 @@
 
 impl From<BlockHeight> for u32 {
     fn from(value: BlockHeight) -> u32 {
         value.0
     }
 }
 
@@ -77,7 +77,7 @@
 
 impl From<BlockHeight> for u64 {
     fn from(value: BlockHeight) -> u64 {
         value.0 as u64
     }
 }
 
@@ -99,7 +99,7 @@
 
 impl From<BlockHeight> for i64 {
     fn from(value: BlockHeight) -> i64 {
         value.0 as i64
     }
 }
 
@@ -123,7 +123,7 @@
     type Output = u32;
 
     fn sub(self, other: BlockHeight) -> u32 {
         self.0.saturating_sub(other.0)
     }
 }
 
@@ -526,7 +526,39 @@
             NetworkUpgrade::Nu6 => Some(BlockHeight(2_976_000)),
             NetworkUpgrade::Nu6_1 => Some(BlockHeight(3_536_500)),
             #[cfg(zcash_unstable = "nu7")]
-            NetworkUpgrade::Nu7 => None,
+            NetworkUpgrade::Nu7 => Some(BlockHeight(4_000_000)),
+            #[cfg(zcash_unstable = "zfuture")]
+            NetworkUpgrade::ZFuture => None,
+        }
+    }
+}
+
+/// Marker struct for the regtest network.
+#[derive(PartialEq, Eq, Copy, Clone, Debug)]
+pub struct RegtestNetwork;
+
+#[cfg(feature = "std")]
+memuse::impl_no_dynamic_usage!(RegtestNetwork);
+
+pub const REGTEST_NETWORK: RegtestNetwork = RegtestNetwork;
+
+impl Parameters for RegtestNetwork {
+    fn network_type(&self) -> NetworkType {
+        NetworkType::Regtest
+    }
+
+    fn activation_height(&self, nu: NetworkUpgrade) -> Option<BlockHeight> {
+        match nu {
+            NetworkUpgrade::Overwinter => Some(BlockHeight(1)),
+            NetworkUpgrade::Sapling => Some(BlockHeight(1)),
+            NetworkUpgrade::Blossom => Some(BlockHeight(1)),
+            NetworkUpgrade::Heartwood => Some(BlockHeight(1)),
+            NetworkUpgrade::Canopy => Some(BlockHeight(1)),
+            NetworkUpgrade::Nu5 => Some(BlockHeight(1)),
+            NetworkUpgrade::Nu6 => Some(BlockHeight(1)),
+            NetworkUpgrade::Nu6_1 => Some(BlockHeight(1)),
+            #[cfg(zcash_unstable = "nu7")]
+            NetworkUpgrade::Nu7 => Some(BlockHeight(1)),
             #[cfg(zcash_unstable = "zfuture")]
             NetworkUpgrade::ZFuture => None,
         }
@@ -540,6 +572,8 @@
     MainNetwork,
     /// Zcash Testnet.
     TestNetwork,
+    /// Zcash Regtest.
+    RegtestNetwork,
 }
 
 #[cfg(feature = "std")]
@@ -550,13 +584,15 @@
         match self {
             Network::MainNetwork => NetworkType::Main,
             Network::TestNetwork => NetworkType::Test,
+            Network::RegtestNetwork => NetworkType::Regtest,
         }
     }
 
     fn activation_height(&self, nu: NetworkUpgrade) -> Option<BlockHeight> {
         match self {
             Network::MainNetwork => MAIN_NETWORK.activation_height(nu),
             Network::TestNetwork => TEST_NETWORK.activation_height(nu),
+            Network::RegtestNetwork => REGTEST_NETWORK.activation_height(nu),
         }
     }
 }
@@ -745,7 +781,7 @@
             0xc8e7_1055 => Ok(BranchId::Nu6),
             0x4dec_4df0 => Ok(BranchId::Nu6_1),
             #[cfg(zcash_unstable = "nu7")]
-            0xffff_ffff => Ok(BranchId::Nu7),
+            0x7719_0ad8 => Ok(BranchId::Nu7),
             #[cfg(zcash_unstable = "zfuture")]
             0xffff_ffff => Ok(BranchId::ZFuture),
             _ => Err("Unknown consensus branch ID"),
@@ -766,7 +802,7 @@
             BranchId::Nu6 => 0xc8e7_1055,
             BranchId::Nu6_1 => 0x4dec_4df0,
             #[cfg(zcash_unstable = "nu7")]
-            BranchId::Nu7 => 0xffff_ffff,
+            BranchId::Nu7 => 0x7719_0ad8,
             #[cfg(zcash_unstable = "zfuture")]
             BranchId::ZFuture => 0xffff_ffff,
         }

components/zcash_protocol/src/constants.rs

@@ -41,7 +41,7 @@ pub const V5_VERSION_GROUP_ID: u32 = 0x26A7270A;
 pub const V6_TX_VERSION: u32 = 6;
 /// The version group ID for Zcash v6 transactions.
 #[cfg(zcash_unstable = "nu7")]
-pub const V6_VERSION_GROUP_ID: u32 = 0xFFFFFFFF;
+pub const V6_VERSION_GROUP_ID: u32 = 0x77777777;
 
 /// This version is used exclusively for in-development transaction
 /// serialization, and will never be active under the consensus rules.

pczt/Cargo.toml

@@ -62,6 +62,7 @@ shardtree.workspace = true
 zcash_primitives = { workspace = true, features = [
     "test-dependencies",
     "transparent-inputs",
+    "zsa-issuance",
 ] }
 zcash_proofs = { workspace = true, features = ["bundled-prover"] }
 zip32.workspace = true

pczt/src/orchard.rs

@@ -528,7 +528,7 @@ impl Bundle {
                     output: Output {
                         cmx: output.cmx().to_bytes(),
                         ephemeral_key: output.encrypted_note().epk_bytes,
-                        enc_ciphertext: output.encrypted_note().enc_ciphertext.to_vec(),
+                        enc_ciphertext: output.encrypted_note().enc_ciphertext.0.to_vec(),
                         out_ciphertext: output.encrypted_note().out_ciphertext.to_vec(),
                         recipient: action
                             .output()

pczt/src/roles/signer/mod.rs

@@ -19,7 +19,7 @@ use rand_core::OsRng;
 
 use ::transparent::sighash::{SIGHASH_ANYONECANPAY, SIGHASH_NONE, SIGHASH_SINGLE};
 use zcash_primitives::transaction::{
-    Authorization, TransactionData, TxDigests, TxVersion, sighash::SignableInput,
+    Authorization, OrchardBundle, TransactionData, TxDigests, TxVersion, sighash::SignableInput,
     sighash_v5::v5_signature_hash, txid::TxIdDigester,
 };
 use zcash_protocol::consensus::BranchId;
@@ -384,7 +384,10 @@ pub(crate) fn pczt_to_tx_data(
 
     let sapling_bundle = sapling.extract_effects().map_err(Error::SaplingExtract)?;
 
-    let orchard_bundle = orchard.extract_effects().map_err(Error::OrchardExtract)?;
+    let orchard_bundle = orchard
+        .extract_effects()
+        .map_err(Error::OrchardExtract)?
+        .map(OrchardBundle::OrchardVanilla);
 
     Ok(TransactionData::from_parts(
         version,
@@ -400,6 +403,8 @@ pub(crate) fn pczt_to_tx_data(
         None,
         sapling_bundle,
         orchard_bundle,
+        #[cfg(zcash_unstable = "nu7")]
+        None,
     ))
 }
 
@@ -409,6 +414,8 @@ impl Authorization for EffectsOnly {
     type TransparentAuth = transparent::bundle::EffectsOnly;
     type SaplingAuth = sapling::bundle::EffectsOnly;
     type OrchardAuth = orchard::bundle::EffectsOnly;
+    #[cfg(zcash_unstable = "nu7")]
+    type IssueAuth = orchard::issuance::EffectsOnly;
     #[cfg(zcash_unstable = "zfuture")]
     type TzeAuth = core::convert::Infallible;
 }