bumps ECC dep versions and replaces Zebra's usage of the now-deprecated API.

Author: arya2

zebra-chain/src/parameters/network/tests/vectors.rs

@@ -1,7 +1,6 @@
 //! Fixed test vectors for the network consensus parameters.
 
-use zcash_primitives::consensus::{self as zp_consensus, Parameters};
-use zcash_protocol::consensus::NetworkConstants as _;
+use zcash_protocol::consensus::{self as zp_consensus, NetworkConstants as _, Parameters};
 
 use crate::{
     block::Height,

zebra-chain/src/primitives/address.rs

@@ -3,6 +3,7 @@
 //! Usage: <https://docs.rs/zcash_address/0.2.0/zcash_address/trait.TryFromAddress.html#examples>
 
 use zcash_address::unified::{self, Container};
+use zcash_protocol::consensus::NetworkType;
 
 use crate::{parameters::NetworkKind, transparent, BoxError};
 
@@ -44,7 +45,7 @@ impl zcash_address::TryFromAddress for Address {
     type Error = BoxError;
 
     fn try_from_transparent_p2pkh(
-        network: zcash_address::Network,
+        network: NetworkType,
         data: [u8; 20],
     ) -> Result<Self, zcash_address::ConversionError<Self::Error>> {
         Ok(Self::Transparent(transparent::Address::from_pub_key_hash(
@@ -54,7 +55,7 @@ impl zcash_address::TryFromAddress for Address {
     }
 
     fn try_from_transparent_p2sh(
-        network: zcash_address::Network,
+        network: NetworkType,
         data: [u8; 20],
     ) -> Result<Self, zcash_address::ConversionError<Self::Error>> {
         Ok(Self::Transparent(transparent::Address::from_script_hash(
@@ -64,7 +65,7 @@ impl zcash_address::TryFromAddress for Address {
     }
 
     fn try_from_sapling(
-        network: zcash_address::Network,
+        network: NetworkType,
         data: [u8; 43],
     ) -> Result<Self, zcash_address::ConversionError<Self::Error>> {
         let network = network.into();
@@ -74,7 +75,7 @@ impl zcash_address::TryFromAddress for Address {
     }
 
     fn try_from_unified(
-        network: zcash_address::Network,
+        network: NetworkType,
         unified_address: zcash_address::unified::Address,
     ) -> Result<Self, zcash_address::ConversionError<Self::Error>> {
         let network = network.into();
@@ -170,27 +171,27 @@ impl Address {
     }
 }
 
-impl From<zcash_address::Network> for NetworkKind {
-    fn from(network: zcash_address::Network) -> Self {
+impl From<NetworkType> for NetworkKind {
+    fn from(network: NetworkType) -> Self {
         match network {
-            zcash_address::Network::Main => NetworkKind::Mainnet,
-            zcash_address::Network::Test => NetworkKind::Testnet,
-            zcash_address::Network::Regtest => NetworkKind::Regtest,
+            NetworkType::Main => NetworkKind::Mainnet,
+            NetworkType::Test => NetworkKind::Testnet,
+            NetworkType::Regtest => NetworkKind::Regtest,
         }
     }
 }
 
-impl From<NetworkKind> for zcash_address::Network {
+impl From<NetworkKind> for NetworkType {
     fn from(network: NetworkKind) -> Self {
         match network {
-            NetworkKind::Mainnet => zcash_address::Network::Main,
-            NetworkKind::Testnet => zcash_address::Network::Test,
-            NetworkKind::Regtest => zcash_address::Network::Regtest,
+            NetworkKind::Mainnet => NetworkType::Main,
+            NetworkKind::Testnet => NetworkType::Test,
+            NetworkKind::Regtest => NetworkType::Regtest,
         }
     }
 }
 
-impl From<&NetworkKind> for zcash_address::Network {
+impl From<&NetworkKind> for NetworkType {
     fn from(network: &NetworkKind) -> Self {
         (*network).into()
     }

zebra-chain/src/primitives/viewing_key/sapling.rs

@@ -5,7 +5,7 @@ use zcash_client_backend::{
     encoding::decode_extended_full_viewing_key,
     keys::sapling::DiversifiableFullViewingKey as SaplingDfvk,
 };
-use zcash_primitives::constants::*;
+use zcash_protocol::constants::*;
 
 use crate::parameters::Network;
 

zebra-chain/src/primitives/zcash_primitives.rs

@@ -293,16 +293,18 @@ pub(crate) fn sighash(
             let output = &precomputed_tx_data.all_previous_outputs[input_index];
             lock_script = output.lock_script.clone().into();
             unlock_script = zcash_primitives::legacy::Script(script_code);
-            zp_tx::sighash::SignableInput::Transparent(zcash_transparent::sighash::SignableInput {
-                hash_type: hash_type.bits() as _,
-                index: input_index,
-                script_code: &unlock_script,
-                script_pubkey: &lock_script,
-                value: output
-                    .value
-                    .try_into()
-                    .expect("amount was previously validated"),
-            })
+            zp_tx::sighash::SignableInput::Transparent(
+                zcash_transparent::sighash::SignableInput::from_parts(
+                    hash_type.bits() as _,
+                    input_index,
+                    &unlock_script,
+                    &lock_script,
+                    output
+                        .value
+                        .try_into()
+                        .expect("amount was previously validated"),
+                ),
+            )
         }
         None => zp_tx::sighash::SignableInput::Shielded,
     };