From f6e55876a8b472a0735ca86e7734438ea8f10409 Mon Sep 17 00:00:00 2001 From: Oscar Pepper Date: Thu, 2 Jul 2026 11:13:05 +0100 Subject: [PATCH] replace patches with LRZ nu6.3 release --- Cargo.lock | 236 +++++++++++++++++++++++++++++++++++++++-------------- Cargo.toml | 25 +----- 2 files changed, 178 insertions(+), 83 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 782bcfc..197cc80 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1423,7 +1423,8 @@ dependencies = [ [[package]] name = "equihash" version = "0.3.0" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "306286e8dcc39ab3dfceb74c792ce8baffdab90591321d3ffaae64829734c37f" dependencies = [ "blake2b_simd", "corez", @@ -1459,7 +1460,8 @@ dependencies = [ [[package]] name = "f4jumble" version = "0.1.1" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d42773cb15447644d170be20231a3268600e0c4cea8987d013b93ac973d3cf7" dependencies = [ "blake2b_simd", ] @@ -3561,6 +3563,40 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "orchard" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a54f8d29bfb1e76a9d4e868a1a08cce2e57dd2bdc66232982822ad3114b91ab3" +dependencies = [ + "aes", + "bitvec", + "blake2b_simd", + "corez", + "ff", + "fpe", + "getset", + "group", + "halo2_poseidon", + "hex", + "incrementalmerkletree", + "lazy_static", + "memuse", + "nonempty", + "pasta_curves", + "rand 0.8.6", + "rand_core 0.6.4", + "reddsa", + "serde", + "sinsemilla", + "subtle", + "tracing", + "visibility", + "zcash_note_encryption", + "zcash_spec", + "zip32", +] + [[package]] name = "orchard" version = "0.15.0-pre.1" @@ -4617,10 +4653,10 @@ dependencies = [ "secp256k1", "sha2 0.10.9", "tokio", - "zcash_keys", + "zcash_keys 0.14.0", "zcash_local_net", - "zcash_protocol", - "zcash_transparent", + "zcash_protocol 0.9.0", + "zcash_transparent 0.8.0", "zebra-node-services", "zebra-rpc", "zingo_common_components", @@ -5837,7 +5873,7 @@ dependencies = [ [[package]] name = "tower-batch-control" version = "1.0.1" -source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#831c87a72357a3ee0680c8a3af990f119fec3ad7" +source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#848f9a868620178ca76b671c73c3ecbeba73003a" dependencies = [ "futures", "futures-core", @@ -5853,7 +5889,7 @@ dependencies = [ [[package]] name = "tower-fallback" version = "0.2.41" -source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#831c87a72357a3ee0680c8a3af990f119fec3ad7" +source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#848f9a868620178ca76b671c73c3ecbeba73003a" dependencies = [ "futures-core", "pin-project", @@ -7014,20 +7050,36 @@ checksum = "2164e798d9e3d84ee2c91139ace54638059a3b23e361f5c11781c2c6459bde0f" [[package]] name = "zcash_address" version = "0.12.0" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58342d0aaa8e2fa98849636f52800ac4bf020574c944c974742fc933db58cac2" dependencies = [ "bech32", "bs58", "corez", "f4jumble", "zcash_encoding", - "zcash_protocol", + "zcash_protocol 0.9.0", +] + +[[package]] +name = "zcash_address" +version = "0.13.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cf2918e73eff76388cda87695a6e7398f96a2e3383a0de7b77729a204ec00a0" +dependencies = [ + "bech32", + "bs58", + "corez", + "f4jumble", + "zcash_encoding", + "zcash_protocol 0.10.0-pre.0", ] [[package]] name = "zcash_encoding" version = "0.4.0" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1440921903cdb86133fb9e2fe800be488015db2939a30bedb413078a1acb0306" dependencies = [ "corez", "hex", @@ -7036,8 +7088,9 @@ dependencies = [ [[package]] name = "zcash_history" -version = "0.4.0" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" +version = "0.5.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82e8634d011026cb181cb67b2a412e601dc344a2827b9c576fe3a727fdebf441" dependencies = [ "blake2b_simd", "byteorder", @@ -7047,7 +7100,36 @@ dependencies = [ [[package]] name = "zcash_keys" version = "0.14.0" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fbcdfbb5c8edb247439d72a397abaae9b7dd14a1c070e7e4fc3536924f9065f" +dependencies = [ + "bech32", + "blake2b_simd", + "bls12_381", + "bs58", + "corez", + "document-features", + "group", + "memuse", + "nonempty", + "orchard 0.14.0", + "rand_core 0.6.4", + "sapling-crypto", + "secrecy", + "subtle", + "tracing", + "zcash_address 0.12.0", + "zcash_encoding", + "zcash_protocol 0.9.0", + "zcash_transparent 0.8.0", + "zip32", +] + +[[package]] +name = "zcash_keys" +version = "0.15.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a0bac3a9e5b0d954684ba1f07386d55b5ae4588b3ba2d93cad05ee09f3e0947" dependencies = [ "bech32", "blake2b_simd", @@ -7058,16 +7140,16 @@ dependencies = [ "group", "memuse", "nonempty", - "orchard", + "orchard 0.15.0-pre.1", "rand_core 0.6.4", "sapling-crypto", "secrecy", "subtle", "tracing", - "zcash_address", + "zcash_address 0.13.0-pre.0", "zcash_encoding", - "zcash_protocol", - "zcash_transparent", + "zcash_protocol 0.10.0-pre.0", + "zcash_transparent 0.9.0-pre.0", "zip32", ] @@ -7085,7 +7167,7 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber", - "zcash_protocol", + "zcash_protocol 0.10.0-pre.0", "zebra-chain", "zebra-node-services", "zebra-rpc", @@ -7108,8 +7190,9 @@ dependencies = [ [[package]] name = "zcash_primitives" -version = "0.28.0" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" +version = "0.29.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba7bfe66975658f44dba87d535f9ebb9fb4c9c0c4fecca3f5c40cbe1583dece6" dependencies = [ "blake2b_simd", "block-buffer 0.11.0-rc.3", @@ -7123,7 +7206,7 @@ dependencies = [ "jubjub", "memuse", "nonempty", - "orchard", + "orchard 0.15.0-pre.1", "rand_core 0.6.4", "redjubjub", "sapling-crypto", @@ -7131,15 +7214,16 @@ dependencies = [ "sha2 0.10.9", "zcash_encoding", "zcash_note_encryption", - "zcash_protocol", + "zcash_protocol 0.10.0-pre.0", "zcash_script", - "zcash_transparent", + "zcash_transparent 0.9.0-pre.0", ] [[package]] name = "zcash_proofs" -version = "0.28.0" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" +version = "0.29.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39b90964ffe6bdc314368c7b849aaa6dcc2b495249a3bf1b9bfbdc92ba4e4f6" dependencies = [ "bellman", "blake2b_simd", @@ -7161,7 +7245,21 @@ dependencies = [ [[package]] name = "zcash_protocol" version = "0.9.0" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bec496a0bd62dae98c4b26f51c5dab112d0c5350bbc2ccfdfd05bb3454f714d" +dependencies = [ + "corez", + "document-features", + "hex", + "memuse", + "zcash_encoding", +] + +[[package]] +name = "zcash_protocol" +version = "0.10.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97f339a9801c7f70295732a5cf822346f194202cea6425fc2fc14a5af679b004" dependencies = [ "corez", "document-features", @@ -7199,7 +7297,8 @@ dependencies = [ [[package]] name = "zcash_transparent" version = "0.8.0" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15df1908b428d4edeb7c7caae5692e05e2e92e5c38007a40b20ac098efdffd96" dependencies = [ "bip32", "bs58", @@ -7212,9 +7311,34 @@ dependencies = [ "secp256k1", "sha2 0.10.9", "subtle", - "zcash_address", + "zcash_address 0.12.0", "zcash_encoding", - "zcash_protocol", + "zcash_protocol 0.9.0", + "zcash_script", + "zcash_spec", + "zip32", +] + +[[package]] +name = "zcash_transparent" +version = "0.9.0-pre.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e941230f67056aad41c8fa9b926f9cc4d9d1a321f32e95c39c0b0e38e85f79b" +dependencies = [ + "bip32", + "bs58", + "corez", + "document-features", + "getset", + "hex", + "nonempty", + "ripemd 0.1.3", + "secp256k1", + "sha2 0.10.9", + "subtle", + "zcash_address 0.13.0-pre.0", + "zcash_encoding", + "zcash_protocol 0.10.0-pre.0", "zcash_script", "zcash_spec", "zip32", @@ -7223,7 +7347,7 @@ dependencies = [ [[package]] name = "zebra-chain" version = "9.0.0" -source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#831c87a72357a3ee0680c8a3af990f119fec3ad7" +source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#848f9a868620178ca76b671c73c3ecbeba73003a" dependencies = [ "bech32", "bitflags", @@ -7249,7 +7373,7 @@ dependencies = [ "jubjub", "lazy_static", "num-integer", - "orchard", + "orchard 0.15.0-pre.1", "primitive-types", "rand_core 0.6.4", "rayon", @@ -7273,20 +7397,20 @@ dependencies = [ "tracing", "uint 0.10.0", "x25519-dalek", - "zcash_address", + "zcash_address 0.13.0-pre.0", "zcash_encoding", "zcash_history", "zcash_note_encryption", "zcash_primitives", - "zcash_protocol", + "zcash_protocol 0.10.0-pre.0", "zcash_script", - "zcash_transparent", + "zcash_transparent 0.9.0-pre.0", ] [[package]] name = "zebra-consensus" version = "8.0.0" -source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#831c87a72357a3ee0680c8a3af990f119fec3ad7" +source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#848f9a868620178ca76b671c73c3ecbeba73003a" dependencies = [ "bellman", "blake2b_simd", @@ -7302,7 +7426,7 @@ dependencies = [ "metrics", "mset", "once_cell", - "orchard", + "orchard 0.15.0-pre.1", "rand 0.8.6", "rayon", "sapling-crypto", @@ -7316,9 +7440,9 @@ dependencies = [ "tracing-futures", "zcash_primitives", "zcash_proofs", - "zcash_protocol", + "zcash_protocol 0.10.0-pre.0", "zcash_script", - "zcash_transparent", + "zcash_transparent 0.9.0-pre.0", "zebra-chain", "zebra-node-services", "zebra-script", @@ -7328,7 +7452,7 @@ dependencies = [ [[package]] name = "zebra-jsonl-trace" version = "0.1.0" -source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#831c87a72357a3ee0680c8a3af990f119fec3ad7" +source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#848f9a868620178ca76b671c73c3ecbeba73003a" dependencies = [ "tokio", "tokio-util", @@ -7338,7 +7462,7 @@ dependencies = [ [[package]] name = "zebra-network" version = "8.0.0" -source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#831c87a72357a3ee0680c8a3af990f119fec3ad7" +source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#848f9a868620178ca76b671c73c3ecbeba73003a" dependencies = [ "bitflags", "blake2b_simd", @@ -7379,7 +7503,7 @@ dependencies = [ [[package]] name = "zebra-node-services" version = "7.0.0" -source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#831c87a72357a3ee0680c8a3af990f119fec3ad7" +source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#848f9a868620178ca76b671c73c3ecbeba73003a" dependencies = [ "color-eyre", "jsonrpsee-types", @@ -7394,7 +7518,7 @@ dependencies = [ [[package]] name = "zebra-rpc" version = "9.0.0" -source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#831c87a72357a3ee0680c8a3af990f119fec3ad7" +source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#848f9a868620178ca76b671c73c3ecbeba73003a" dependencies = [ "base64", "chrono", @@ -7413,7 +7537,7 @@ dependencies = [ "metrics", "nix", "openrpsee", - "orchard", + "orchard 0.15.0-pre.1", "phf", "prost", "rand 0.8.6", @@ -7427,6 +7551,7 @@ dependencies = [ "serde_with", "strum", "strum_macros", + "subtle", "thiserror 2.0.18", "tokio", "tokio-rustls", @@ -7438,13 +7563,13 @@ dependencies = [ "tower 0.4.13", "tracing", "which", - "zcash_address", - "zcash_keys", + "zcash_address 0.13.0-pre.0", + "zcash_keys 0.15.0-pre.0", "zcash_primitives", "zcash_proofs", - "zcash_protocol", + "zcash_protocol 0.10.0-pre.0", "zcash_script", - "zcash_transparent", + "zcash_transparent 0.9.0-pre.0", "zebra-chain", "zebra-consensus", "zebra-network", @@ -7456,7 +7581,7 @@ dependencies = [ [[package]] name = "zebra-script" version = "8.0.0" -source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#831c87a72357a3ee0680c8a3af990f119fec3ad7" +source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#848f9a868620178ca76b671c73c3ecbeba73003a" dependencies = [ "libzcash_script", "rand 0.8.6", @@ -7469,7 +7594,7 @@ dependencies = [ [[package]] name = "zebra-state" version = "8.0.0" -source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#831c87a72357a3ee0680c8a3af990f119fec3ad7" +source = "git+https://github.com/zingolabs/zebra?branch=feat%2Fironwood#848f9a868620178ca76b671c73c3ecbeba73003a" dependencies = [ "bincode", "chrono", @@ -7494,6 +7619,7 @@ dependencies = [ "sapling-crypto", "semver", "serde", + "serde-big-array", "tempfile", "thiserror 2.0.18", "tokio", @@ -7600,6 +7726,8 @@ dependencies = [ [[package]] name = "zingo_common_components" version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29f41ddb12ba9aa1fdbf4025fb54639f1fddd25c6e297574922b39fabfb730d4" dependencies = [ "hex", ] @@ -7629,13 +7757,3 @@ name = "zmij" version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" - -[[patch.unused]] -name = "zcash_client_backend" -version = "0.23.0" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" - -[[patch.unused]] -name = "zip321" -version = "0.8.0" -source = "git+https://github.com/zingolabs/librustzcash?branch=feat%2Fironwood#644b1ecf4679e17a9166782f57a795a4f4194d5e" diff --git a/Cargo.toml b/Cargo.toml index 8b61d5c..5443e24 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ zcash_local_net = { path = "zcash_local_net" } zingo_common_components = "0.4.0" #zcash -zcash_protocol = { version = "0.9.0", features = ["local-consensus"] } +zcash_protocol = { version = "0.10.0-pre.0", features = ["local-consensus"] } # zebra zebra-chain = "9.0.0" @@ -52,26 +52,3 @@ libzcash_script = { git = "https://github.com/zancas/zcash_script", branch = "fi zebra-chain = { git = "https://github.com/zingolabs/zebra", branch = "feat/ironwood" } zebra-rpc = { git = "https://github.com/zingolabs/zebra", branch = "feat/ironwood" } zebra-node-services = { git = "https://github.com/zingolabs/zebra", branch = "feat/ironwood" } - -# Ironwood (NU6.3) — librustzcash. Consume the zingolabs librustzcash fork so -# there is a single orchard 0.15.0-pre.1 in the graph (no 0.14/0.15 split). -# Same crate versions as crates.io — a source swap that enables the Ironwood -# code paths behind `--cfg zcash_unstable="nu6.3"`. Mirrors zingolib's patch -# set so the harness and its consumer build against the same revs. -zcash_address = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" } -zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" } -zcash_encoding = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" } -# zcash_history carries the Ironwood V3 history-tree node data that zebra's -# value-pool code consumes (`zcash_history::V3`). zingolib's wallet stack does -# not touch history trees, so its patch set omits it — but zebra-chain (pulled -# in transitively here) needs it from the fork, and a dependency's own -# `[patch]` table is ignored: only this top-level workspace's patches apply. -zcash_history = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" } -zcash_keys = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" } -zcash_primitives = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" } -zcash_proofs = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" } -zcash_protocol = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" } -zcash_transparent = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" } -zip321 = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" } -equihash = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" } -f4jumble = { git = "https://github.com/zingolabs/librustzcash", branch = "feat/ironwood" }