From 76d379f4cdbf2e1c4f7719d73b792ea249cb157d Mon Sep 17 00:00:00 2001 From: Greg Pfeil Date: Sun, 29 Sep 2024 13:38:14 -0600 Subject: [PATCH] Point zcash_script dependency at master Show that the existing Zebra main branch would work with a new zcash_script release. --- Cargo.lock | 4 ++-- Cargo.toml | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 22f5d505038..7a9e05483e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5957,10 +5957,10 @@ dependencies = [ [[package]] name = "zcash_script" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2122a042c77d529d3c60b899e74705eda39ae96a8a992460caeb06afa76990a2" +source = "git+https://github.com/ZcashFoundation/zcash_script.git?rev=9d16e79#9d16e79c72ea469642ae991f064c30de424bba99" dependencies = [ "bindgen", + "bitflags 2.6.0", "cc", ] diff --git a/Cargo.toml b/Cargo.toml index a006d6eb8a6..49d3531f1ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ "zebra-test", "zebra-utils", "zebra-scan", - "zebra-grpc", + "zebra-grpc", "tower-batch-control", "tower-fallback", ] @@ -34,6 +34,9 @@ zcash_primitives = "0.17.0" zcash_proofs = "0.17.0" zcash_protocol = "0.3.0" +[patch.crates-io] +zcash_script = { git = 'https://github.com/ZcashFoundation/zcash_script.git', rev = "9d16e79" } + [workspace.metadata.release] # We always do releases from the main branch