zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* Set the CURRENT_NETWORK_PROTOCOL_VERSION to 170_-014

* Adjust verify_v5_transaction()
This commit is contained in:
Marek 2021-09-27 15:44:51 +02:00 committed by GitHub
parent b42ab67a4b
commit 952da4c794
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
zebra-consensus/src/transaction.rs
View File

@ -366,20 +366,22 @@ where
let shielded_sighash = transaction.sighash(upgrade, HashType::ALL, None); let shielded_sighash = transaction.sighash(upgrade, HashType::ALL, None);
let _async_checks = Self::verify_transparent_inputs_and_outputs( Ok(
&request, Self::verify_transparent_inputs_and_outputs(
network, &request,
inputs, network,
script_verifier, inputs,
)? script_verifier,
.and(Self::verify_sapling_shielded_data( )?
sapling_shielded_data, .and(Self::verify_sapling_shielded_data(
&shielded_sighash, sapling_shielded_data,
)?) &shielded_sighash,
.and(Self::verify_orchard_shielded_data( )?)
orchard_shielded_data, .and(Self::verify_orchard_shielded_data(
&shielded_sighash, orchard_shielded_data,
)?); &shielded_sighash,
)?),
)
// TODO: // TODO:
// - verify orchard shielded pool (ZIP-224) (#2105) // - verify orchard shielded pool (ZIP-224) (#2105)
@ -387,8 +389,6 @@ where
// - ZIP-244 (#1874) // - ZIP-244 (#1874)
// - remaining consensus rules (#2379) // - remaining consensus rules (#2379)
// - remove `should_panic` from tests // - remove `should_panic` from tests
unimplemented!("V5 transaction validation is not yet complete");
} }
/// Verifies if a V5 `transaction` is supported by `network_upgrade`. /// Verifies if a V5 `transaction` is supported by `network_upgrade`.

2
zebra-network/src/constants.rs
View File

@ -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 /// The current protocol version typically changes before Mainnet and Testnet
/// network upgrades. /// 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, /// The minimum network protocol version accepted by this crate for each network,
/// represented as a network upgrade. /// represented as a network upgrade.