chore(deps): pin librustzcash crates to upstream main

Add [patch.crates-io] directives pinning equihash, f4jumble, transparent
(zcash_transparent), and the zcash_* crates to librustzcash main
(rev 8a0ae65).

Update the miner-reward transaction builders in zebra-rpc for the
removed lifetime parameter on zcash_primitives' transaction `Builder`
(now `Builder<P, U>` instead of `Builder<'a, P, U>`).

Author: nuttycom

Cargo.lock

@@ -1551,8 +1551,7 @@ dependencies = [
 [[package]]
 name = "equihash"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "306286e8dcc39ab3dfceb74c792ce8baffdab90591321d3ffaae64829734c37f"
+source = "git+https://github.com/zcash/librustzcash.git?rev=8a0ae6537404bb95d0ce0026d14bab290910bf23#8a0ae6537404bb95d0ce0026d14bab290910bf23"
 dependencies = [
  "blake2b_simd",
  "cc",
@@ -1600,8 +1599,7 @@ dependencies = [
 [[package]]
 name = "f4jumble"
 version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d42773cb15447644d170be20231a3268600e0c4cea8987d013b93ac973d3cf7"
+source = "git+https://github.com/zcash/librustzcash.git?rev=8a0ae6537404bb95d0ce0026d14bab290910bf23#8a0ae6537404bb95d0ce0026d14bab290910bf23"
 dependencies = [
  "blake2b_simd",
 ]
@@ -7112,8 +7110,7 @@ dependencies = [
 [[package]]
 name = "zcash_address"
 version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58342d0aaa8e2fa98849636f52800ac4bf020574c944c974742fc933db58cac2"
+source = "git+https://github.com/zcash/librustzcash.git?rev=8a0ae6537404bb95d0ce0026d14bab290910bf23#8a0ae6537404bb95d0ce0026d14bab290910bf23"
 dependencies = [
  "bech32",
  "bs58",
@@ -7126,8 +7123,7 @@ dependencies = [
 [[package]]
 name = "zcash_encoding"
 version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1440921903cdb86133fb9e2fe800be488015db2939a30bedb413078a1acb0306"
+source = "git+https://github.com/zcash/librustzcash.git?rev=8a0ae6537404bb95d0ce0026d14bab290910bf23#8a0ae6537404bb95d0ce0026d14bab290910bf23"
 dependencies = [
  "corez",
  "hex",
@@ -7137,8 +7133,7 @@ dependencies = [
 [[package]]
 name = "zcash_history"
 version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fde17bf53792f9c756b313730da14880257d7661b5bfc69d0571c3a7c11a76d"
+source = "git+https://github.com/zcash/librustzcash.git?rev=8a0ae6537404bb95d0ce0026d14bab290910bf23#8a0ae6537404bb95d0ce0026d14bab290910bf23"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -7148,8 +7143,7 @@ dependencies = [
 [[package]]
 name = "zcash_keys"
 version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fbcdfbb5c8edb247439d72a397abaae9b7dd14a1c070e7e4fc3536924f9065f"
+source = "git+https://github.com/zcash/librustzcash.git?rev=8a0ae6537404bb95d0ce0026d14bab290910bf23#8a0ae6537404bb95d0ce0026d14bab290910bf23"
 dependencies = [
  "bech32",
  "blake2b_simd",
@@ -7189,8 +7183,7 @@ dependencies = [
 [[package]]
 name = "zcash_primitives"
 version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c69e07f5eb3f682a6467b4b08ee4956f1acd1e886d70b21c4766953b3a1beba2"
+source = "git+https://github.com/zcash/librustzcash.git?rev=8a0ae6537404bb95d0ce0026d14bab290910bf23#8a0ae6537404bb95d0ce0026d14bab290910bf23"
 dependencies = [
  "blake2b_simd",
  "block-buffer 0.11.0-rc.3",
@@ -7220,8 +7213,7 @@ dependencies = [
 [[package]]
 name = "zcash_proofs"
 version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3de6b0ca82e08a9d38b1121f87c5b180b5feac19fecba074cb582882210d2371"
+source = "git+https://github.com/zcash/librustzcash.git?rev=8a0ae6537404bb95d0ce0026d14bab290910bf23#8a0ae6537404bb95d0ce0026d14bab290910bf23"
 dependencies = [
  "bellman",
  "blake2b_simd",
@@ -7243,8 +7235,7 @@ dependencies = [
 [[package]]
 name = "zcash_protocol"
 version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bec496a0bd62dae98c4b26f51c5dab112d0c5350bbc2ccfdfd05bb3454f714d"
+source = "git+https://github.com/zcash/librustzcash.git?rev=8a0ae6537404bb95d0ce0026d14bab290910bf23#8a0ae6537404bb95d0ce0026d14bab290910bf23"
 dependencies = [
  "corez",
  "document-features",
@@ -7282,8 +7273,7 @@ dependencies = [
 [[package]]
 name = "zcash_transparent"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15df1908b428d4edeb7c7caae5692e05e2e92e5c38007a40b20ac098efdffd96"
+source = "git+https://github.com/zcash/librustzcash.git?rev=8a0ae6537404bb95d0ce0026d14bab290910bf23#8a0ae6537404bb95d0ce0026d14bab290910bf23"
 dependencies = [
  "bip32",
  "bs58",

Cargo.toml

@@ -378,3 +378,17 @@ unwrap_in_result = "warn"
 
 # TODOs: fix this lint eventually
 result_large_err = "allow"
+
+[patch.crates-io]
+# TEMPORARY: Pin librustzcash crates to upstream main
+equihash = { git = "https://github.com/zcash/librustzcash.git", rev = "8a0ae6537404bb95d0ce0026d14bab290910bf23" }
+f4jumble = { git = "https://github.com/zcash/librustzcash.git", rev = "8a0ae6537404bb95d0ce0026d14bab290910bf23" }
+transparent = { package = "zcash_transparent", git = "https://github.com/zcash/librustzcash.git", rev = "8a0ae6537404bb95d0ce0026d14bab290910bf23" }
+zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "8a0ae6537404bb95d0ce0026d14bab290910bf23" }
+zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "8a0ae6537404bb95d0ce0026d14bab290910bf23" }
+zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "8a0ae6537404bb95d0ce0026d14bab290910bf23" }
+zcash_keys = { git = "https://github.com/zcash/librustzcash.git", rev = "8a0ae6537404bb95d0ce0026d14bab290910bf23" }
+zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "8a0ae6537404bb95d0ce0026d14bab290910bf23" }
+zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "8a0ae6537404bb95d0ce0026d14bab290910bf23" }
+zcash_protocol = { git = "https://github.com/zcash/librustzcash.git", rev = "8a0ae6537404bb95d0ce0026d14bab290910bf23" }
+

zebra-rpc/src/methods/types/transaction.rs

@@ -167,7 +167,7 @@ impl TransactionTemplate<NegativeOrZero> {
             };
         }
 
-        let add_orchard_reward = |builder: &mut Builder<'_, _, _>, addr: &_| {
+        let add_orchard_reward = |builder: &mut Builder<_, _>, addr: &_| {
             trace_err!(
                 builder.add_orchard_output::<String>(
                     Some(::orchard::keys::OutgoingViewingKey::from([0u8; 32])),
@@ -179,7 +179,7 @@ impl TransactionTemplate<NegativeOrZero> {
             )
         };
 
-        let add_sapling_reward = |builder: &mut Builder<'_, _, _>, addr: &_| {
+        let add_sapling_reward = |builder: &mut Builder<_, _>, addr: &_| {
             trace_err!(
                 builder.add_sapling_output::<String>(
                     Some(sapling_crypto::keys::OutgoingViewingKey([0u8; 32])),
@@ -191,7 +191,7 @@ impl TransactionTemplate<NegativeOrZero> {
             )
         };
 
-        let add_transparent_reward = |builder: &mut Builder<'_, _, _>, addr| {
+        let add_transparent_reward = |builder: &mut Builder<_, _>, addr| {
             trace_err!(
                 builder.add_transparent_output(addr, miner_reward),
                 "transparent"