Change current network protocol version for NU5 testnet (#2803)

* Set the CURRENT_NETWORK_PROTOCOL_VERSION to 170_-014 * Adjust verify_v5_transaction()
ZcashFoundation · Sep 27, 2021 · 952da4c · 952da4c
1 parent b42ab67
commit 952da4c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/zebra-consensus/src/transaction.rs b/zebra-consensus/src/transaction.rs
@@ -366,29 +366,29 @@ where
 
         let shielded_sighash = transaction.sighash(upgrade, HashType::ALL, None);
 
-        let _async_checks = Self::verify_transparent_inputs_and_outputs(
-            &request,
-            network,
-            inputs,
-            script_verifier,
-        )?
-        .and(Self::verify_sapling_shielded_data(
-            sapling_shielded_data,
-            &shielded_sighash,
-        )?)
-        .and(Self::verify_orchard_shielded_data(
-            orchard_shielded_data,
-            &shielded_sighash,
-        )?);
+        Ok(
+            Self::verify_transparent_inputs_and_outputs(
+                &request,
+                network,
+                inputs,
+                script_verifier,
+            )?
+            .and(Self::verify_sapling_shielded_data(
+                sapling_shielded_data,
+                &shielded_sighash,
+            )?)
+            .and(Self::verify_orchard_shielded_data(
+                orchard_shielded_data,
+                &shielded_sighash,
+            )?),
+        )
 
         // TODO:
         // - verify orchard shielded pool (ZIP-224) (#2105)
         // - ZIP-216 (#1798)
         // - ZIP-244 (#1874)
         // - remaining consensus rules (#2379)
         // - remove `should_panic` from tests
-
-        unimplemented!("V5 transaction validation is not yet complete");
     }
 
     /// Verifies if a V5 `transaction` is supported by `network_upgrade`.

diff --git a/zebra-network/src/constants.rs b/zebra-network/src/constants.rs
@@ -116,7 +116,7 @@ pub const USER_AGENT: &str = "/Zebra:1.0.0-alpha.17/";
 ///
 /// The current protocol version typically changes before Mainnet and Testnet
 /// network upgrades.
-pub const CURRENT_NETWORK_PROTOCOL_VERSION: Version = Version(170_013);
+pub const CURRENT_NETWORK_PROTOCOL_VERSION: Version = Version(170_014);
 
 /// The minimum network protocol version accepted by this crate for each network,
 /// represented as a network upgrade.