rust: Migrate to latest revision of zcash/librustzcash crates

.cargo/config.offline

@@ -4,5 +4,10 @@ linker = "aarch64-linux-gnu-gcc"
 [source.crates-io]
 replace-with = "vendored-sources"
 
+[source."https://github.com/zcash/librustzcash.git"]
+git = "https://github.com/zcash/librustzcash.git"
+rev = "64d657ed3157adfd0b6c68a61716fdfd9dd1a9a4"
+replace-with = "vendored-sources"
+
 [source.vendored-sources]
 # The directory for this source is set to RUST_VENDORED_SOURCES by src/Makefile.am

Cargo.toml

@@ -63,8 +63,8 @@ zcash_address = "0.3"
 zcash_encoding = "0.2"
 zcash_history = "0.3"
 zcash_note_encryption = "0.4"
-zcash_primitives = { version = "=0.13.0-rc.1", features = ["temporary-zcashd", "transparent-inputs"] }
-zcash_proofs = { version = "=0.13.0-rc.1", features = ["directories"] }
+zcash_primitives = { version = "0.13", features = ["temporary-zcashd", "transparent-inputs"] }
+zcash_proofs = { version = "0.13", features = ["directories"] }
 ed25519-zebra = "4"
 zeroize = "1.4.2"
 wagyu-zcash-parameters = "0.2"
@@ -109,7 +109,7 @@ time = { version = "0.3", features = ["formatting", "macros"] }
 [dev-dependencies]
 incrementalmerkletree = { version = "0.5", features = ["test-dependencies"] }
 proptest = "1.0.0"
-zcash_primitives = { version = "=0.13.0-rc.1", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
+zcash_primitives = { version = "0.13", features = ["temporary-zcashd", "transparent-inputs", "test-dependencies"] }
 
 [dependencies.tracing-subscriber]
 version = "0.3"
@@ -120,3 +120,12 @@ features = ["ansi", "env-filter", "fmt", "time"]
 lto = 'thin'
 panic = 'abort'
 codegen-units = 1
+
+[patch.crates-io]
+equihash = { git = "https://github.com/zcash/librustzcash.git", rev = "64d657ed3157adfd0b6c68a61716fdfd9dd1a9a4" }
+zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "64d657ed3157adfd0b6c68a61716fdfd9dd1a9a4" }
+zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "64d657ed3157adfd0b6c68a61716fdfd9dd1a9a4" }
+zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "64d657ed3157adfd0b6c68a61716fdfd9dd1a9a4" }
+zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "64d657ed3157adfd0b6c68a61716fdfd9dd1a9a4" }
+zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "64d657ed3157adfd0b6c68a61716fdfd9dd1a9a4" }
+zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "64d657ed3157adfd0b6c68a61716fdfd9dd1a9a4" }

src/rust/bin/inspect/context.rs

@@ -9,7 +9,7 @@ use serde::{
 use zcash_primitives::{
     consensus::Network,
     legacy::Script,
-    transaction::components::{transparent, Amount, TxOut},
+    transaction::components::{amount::NonNegativeAmount, transparent, TxOut},
     zip32::AccountId,
 };
 
@@ -162,7 +162,7 @@ impl fmt::Display for ZUint256 {
 }
 
 #[derive(Clone, Debug)]
-struct ZOutputValue(Amount);
+struct ZOutputValue(NonNegativeAmount);
 
 struct ZOutputValueVisitor;
 
@@ -177,9 +177,11 @@ impl<'de> Visitor<'de> for ZOutputValueVisitor {
     where
         E: serde::de::Error,
     {
-        Amount::from_u64(v).map(ZOutputValue).map_err(|()| {
-            serde::de::Error::invalid_type(Unexpected::Unsigned(v), &"a valid zatoshi amount")
-        })
+        NonNegativeAmount::from_u64(v)
+            .map(ZOutputValue)
+            .map_err(|()| {
+                serde::de::Error::invalid_type(Unexpected::Unsigned(v), &"a valid zatoshi amount")
+            })
     }
 }