From d9a1499119533f68fd883dfb56a1ff92f004cc03 Mon Sep 17 00:00:00 2001 From: Blake <0xblake.sg@gmail.com> Date: Sun, 2 Aug 2026 09:36:33 +0800 Subject: [PATCH 1/5] patch Ziren --- Cargo.lock | 85 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 11 +++++++ 2 files changed, 53 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ebe450dd..4db40df1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,7 +116,7 @@ dependencies = [ "alloy-rpc-client 1.8.3", "alloy-rpc-types 1.8.3", "alloy-serde 1.8.3", - "alloy-signer 1.8.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-signer 1.8.3", "alloy-signer-local", "alloy-transport 1.8.3", "alloy-transport-http 1.8.3", @@ -501,7 +501,7 @@ dependencies = [ "alloy-rpc-types-any 1.8.3", "alloy-rpc-types-eth 1.8.3", "alloy-serde 1.8.3", - "alloy-signer 1.8.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-signer 1.8.3", "alloy-sol-types", "async-trait", "auto_impl", @@ -651,7 +651,7 @@ dependencies = [ "alloy-rpc-types-eth 1.8.3", "alloy-rpc-types-trace 1.8.3", "alloy-rpc-types-txpool", - "alloy-signer 1.8.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-signer 1.8.3", "alloy-sol-types", "alloy-transport 1.8.3", "alloy-transport-http 1.8.3", @@ -988,21 +988,6 @@ dependencies = [ "thiserror 2.0.18", ] -[[package]] -name = "alloy-signer" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f447aefab0f1c0649f71edc33f590992d4e122bc35fb9cdbbf67d4421ace85" -dependencies = [ - "alloy-primitives", - "async-trait", - "auto_impl", - "either", - "elliptic-curve", - "k256", - "thiserror 2.0.18", -] - [[package]] name = "alloy-signer" version = "1.8.3" @@ -1025,7 +1010,7 @@ dependencies = [ "alloy-consensus 1.8.3", "alloy-network 1.8.3", "alloy-primitives", - "alloy-signer 1.8.3 (git+https://github.com/alloy-rs/alloy)", + "alloy-signer 1.8.3", "async-trait", "k256", "rand 0.8.5", @@ -3167,9 +3152,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.8.4" +version = "1.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e" +checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" dependencies = [ "arrayref", "arrayvec", @@ -3252,7 +3237,7 @@ dependencies = [ "pairing 0.23.0", "rand_core 0.6.4", "subtle", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -4351,7 +4336,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de" dependencies = [ "data-encoding", - "syn 2.0.117", + "syn 1.0.109", ] [[package]] @@ -12685,7 +12670,7 @@ dependencies = [ "num-bigint 0.4.6", "rand 0.8.5", "rustc-hex", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -15147,7 +15132,7 @@ dependencies = [ [[package]] name = "zkm-build" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "cargo_metadata", @@ -15158,7 +15143,7 @@ dependencies = [ [[package]] name = "zkm-core-executor" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -15199,7 +15184,7 @@ dependencies = [ [[package]] name = "zkm-core-machine" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", "cfg-if", @@ -15251,7 +15236,7 @@ dependencies = [ [[package]] name = "zkm-cuda" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", "ctrlc", @@ -15269,7 +15254,7 @@ dependencies = [ [[package]] name = "zkm-curves" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "cfg-if", "curve25519-dalek", @@ -15293,13 +15278,26 @@ dependencies = [ [[package]] name = "zkm-derive" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "proc-macro2", "quote", "syn 1.0.109", ] +[[package]] +name = "zkm-lib" +version = "1.2.5" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +dependencies = [ + "bincode", + "cfg-if", + "elliptic-curve", + "serde", + "sha2 0.10.9", + "zkm-primitives", +] + [[package]] name = "zkm-lib" version = "1.2.5" @@ -15316,9 +15314,10 @@ dependencies = [ [[package]] name = "zkm-primitives" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", + "blake3", "hex", "lazy_static", "num-bigint 0.4.6", @@ -15329,12 +15328,13 @@ dependencies = [ "p3-symmetric", "serde", "sha2 0.10.9", + "tracing", ] [[package]] name = "zkm-prover" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -15371,7 +15371,7 @@ dependencies = [ [[package]] name = "zkm-recursion-circuit" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", @@ -15404,7 +15404,7 @@ dependencies = [ [[package]] name = "zkm-recursion-compiler" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "backtrace", "itertools 0.13.0", @@ -15425,7 +15425,7 @@ dependencies = [ [[package]] name = "zkm-recursion-core" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "backtrace", "ff 0.13.1", @@ -15462,7 +15462,7 @@ dependencies = [ [[package]] name = "zkm-recursion-derive" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "quote", "syn 1.0.109", @@ -15471,7 +15471,7 @@ dependencies = [ [[package]] name = "zkm-recursion-gnark-ffi" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -15495,10 +15495,9 @@ dependencies = [ [[package]] name = "zkm-sdk" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "alloy-primitives", - "alloy-signer 1.8.3 (registry+https://github.com/rust-lang/crates.io-index)", "anyhow", "async-trait", "bincode", @@ -15542,7 +15541,7 @@ dependencies = [ [[package]] name = "zkm-stark" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -15584,7 +15583,7 @@ dependencies = [ [[package]] name = "zkm-verifier" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "ark-bn254", @@ -15620,7 +15619,7 @@ dependencies = [ [[package]] name = "zkm-zkvm" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", "cfg-if", @@ -15632,7 +15631,7 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.10.9", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-primitives", ] diff --git a/Cargo.toml b/Cargo.toml index 4fc54ca9..32f7af72 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -194,3 +194,14 @@ rust.unreachable_pub = "warn" rust.unused_must_use = "deny" rust.rust_2018_idioms = { level = "deny", priority = -1 } rustdoc.all = "warn" + +[patch."https://github.com/ProjectZKM/Ziren"] +zkm-build = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } +zkm-core-executor = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } +zkm-prover = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } +zkm-sdk = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } +zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } +zkm-primitives = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } +zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } +zkm-recursion-core = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } +zkm-stark = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } \ No newline at end of file From bb14ac23ecd6ad9bcd6b36691366949cb34df834 Mon Sep 17 00:00:00 2001 From: Blake <0xblake.sg@gmail.com> Date: Mon, 3 Aug 2026 07:20:55 +0800 Subject: [PATCH 2/5] add `imm-wrap-vk` feature --- circuits/commit-chain-proof/guest/Cargo.lock | 95 +++++++++++++---- circuits/commit-chain-proof/guest/Cargo.toml | 6 ++ circuits/header-chain-proof/guest/Cargo.lock | 91 +++++++++++++---- circuits/header-chain-proof/guest/Cargo.toml | 6 ++ circuits/operator-proof/guest/Cargo.lock | 101 +++++++++++++++---- circuits/operator-proof/guest/Cargo.toml | 6 ++ circuits/state-chain-proof/guest/Cargo.lock | 99 ++++++++++++++---- circuits/state-chain-proof/guest/Cargo.toml | 6 ++ circuits/watchtower-proof/guest/Cargo.lock | 101 +++++++++++++++---- circuits/watchtower-proof/guest/Cargo.toml | 5 + 10 files changed, 415 insertions(+), 101 deletions(-) diff --git a/circuits/commit-chain-proof/guest/Cargo.lock b/circuits/commit-chain-proof/guest/Cargo.lock index 61a4d9f4..b36d8ded 100644 --- a/circuits/commit-chain-proof/guest/Cargo.lock +++ b/circuits/commit-chain-proof/guest/Cargo.lock @@ -1069,6 +1069,20 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake3" +version = "1.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "cpufeatures 0.3.0", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -1111,7 +1125,7 @@ dependencies = [ "pairing 0.23.0", "rand_core 0.6.4", "subtle", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -1282,7 +1296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "531185e432bb31db1ecda541e9e7ab21468d4d844ad7505e0546a49b4945d49b" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "proptest", "serde_core", ] @@ -1343,6 +1357,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crc" version = "3.4.0" @@ -1424,7 +1447,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "curve25519-dalek-derive", "fiat-crypto", "rustc_version 0.4.1", @@ -2745,7 +2768,7 @@ dependencies = [ "serdect", "sha2 0.10.9", "signature", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -2754,7 +2777,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", ] [[package]] @@ -3163,7 +3186,7 @@ dependencies = [ "hex", "primeorder", "sha2 0.10.9", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -4985,7 +5008,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.9.0", "opaque-debug", ] @@ -4996,7 +5019,7 @@ version = "0.10.9" source = "git+https://github.com/ziren-patches/RustCrypto-hashes?branch=patch-sha2-0.10.9#dbfdbd088ac7b55e03c0b9eb192278efe35d67dc" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.10.7", ] @@ -5172,7 +5195,7 @@ dependencies = [ "num-bigint 0.4.6", "rand 0.8.5", "rustc-hex", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -6259,7 +6282,7 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6311,7 +6334,7 @@ dependencies = [ "zkm-core-executor", "zkm-curves", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6335,7 +6358,7 @@ dependencies = [ "thiserror 1.0.69", "tracing", "typenum", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6349,6 +6372,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zkm-lib" +version = "1.2.5" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +dependencies = [ + "bincode", + "cfg-if", + "elliptic-curve", + "serde", + "sha2 0.10.9", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", +] + [[package]] name = "zkm-lib" version = "1.2.5" @@ -6359,7 +6395,27 @@ dependencies = [ "elliptic-curve", "serde", "sha2 0.10.9", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", +] + +[[package]] +name = "zkm-primitives" +version = "1.2.5" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +dependencies = [ + "bincode", + "blake3", + "hex", + "lazy_static", + "num-bigint 0.4.6", + "p3-field", + "p3-koala-bear", + "p3-monty-31", + "p3-poseidon2", + "p3-symmetric", + "serde", + "sha2 0.10.9", + "tracing", ] [[package]] @@ -6413,7 +6469,7 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6455,7 +6511,7 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -6484,7 +6540,7 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-recursion-core", "zkm-stark", ] @@ -6492,9 +6548,10 @@ dependencies = [ [[package]] name = "zkm-zkvm" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", + "blake3", "cfg-if", "getrandom 0.2.17", "lazy_static", @@ -6504,8 +6561,8 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.10.9", - "zkm-lib", - "zkm-primitives", + "zkm-lib 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", ] [[package]] diff --git a/circuits/commit-chain-proof/guest/Cargo.toml b/circuits/commit-chain-proof/guest/Cargo.toml index 8f2d2e57..5d1cbaa0 100644 --- a/circuits/commit-chain-proof/guest/Cargo.toml +++ b/circuits/commit-chain-proof/guest/Cargo.toml @@ -35,3 +35,9 @@ alloy-primitives-v1-1-2 = { git = "https://github.com/ziren-patches/core.git", p alloy-primitives-v1-4-1 = { git = "https://github.com/ziren-patches/core.git", package = "alloy-primitives", branch = "patch-alloy-primitives-1.4.1" } secp256k1-v0-29-1 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.29.1" } #secp256k1-v0-30-0 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.30.0" } + +[patch."https://github.com/ProjectZKM/Ziren"] +zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } + +[features] +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] \ No newline at end of file diff --git a/circuits/header-chain-proof/guest/Cargo.lock b/circuits/header-chain-proof/guest/Cargo.lock index 4aee28cd..ddf2a65d 100644 --- a/circuits/header-chain-proof/guest/Cargo.lock +++ b/circuits/header-chain-proof/guest/Cargo.lock @@ -347,6 +347,20 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake3" +version = "1.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "cpufeatures 0.3.0", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -512,6 +526,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crossbeam-deque" version = "0.8.6" @@ -572,7 +595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "curve25519-dalek-derive", "fiat-crypto", "rustc_version", @@ -1118,7 +1141,7 @@ dependencies = [ "serde", "sha2", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -1301,7 +1324,7 @@ dependencies = [ "once_cell", "sha2", "signature", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -1310,7 +1333,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", ] [[package]] @@ -1590,7 +1613,7 @@ dependencies = [ "hex", "primeorder", "sha2", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -2361,7 +2384,7 @@ version = "0.10.9" source = "git+https://github.com/ziren-patches/RustCrypto-hashes?branch=patch-sha2-0.10.9#dbfdbd088ac7b55e03c0b9eb192278efe35d67dc" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest", ] @@ -2485,7 +2508,7 @@ dependencies = [ "num-bigint 0.4.6", "rand", "rustc-hex", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -3228,7 +3251,7 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -3280,7 +3303,7 @@ dependencies = [ "zkm-core-executor", "zkm-curves", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -3304,7 +3327,7 @@ dependencies = [ "thiserror 1.0.69", "tracing", "typenum", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -3318,6 +3341,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zkm-lib" +version = "1.2.5" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +dependencies = [ + "bincode", + "cfg-if", + "elliptic-curve", + "serde", + "sha2", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", +] + [[package]] name = "zkm-lib" version = "1.2.5" @@ -3328,7 +3364,27 @@ dependencies = [ "elliptic-curve", "serde", "sha2", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", +] + +[[package]] +name = "zkm-primitives" +version = "1.2.5" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +dependencies = [ + "bincode", + "blake3", + "hex", + "lazy_static", + "num-bigint 0.4.6", + "p3-field", + "p3-koala-bear", + "p3-monty-31", + "p3-poseidon2", + "p3-symmetric", + "serde", + "sha2", + "tracing", ] [[package]] @@ -3382,7 +3438,7 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -3424,7 +3480,7 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -3453,7 +3509,7 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-recursion-core", "zkm-stark", ] @@ -3461,9 +3517,10 @@ dependencies = [ [[package]] name = "zkm-zkvm" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", + "blake3", "cfg-if", "getrandom 0.2.17", "lazy_static", @@ -3473,8 +3530,8 @@ dependencies = [ "rand", "serde", "sha2", - "zkm-lib", - "zkm-primitives", + "zkm-lib 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", ] [[package]] diff --git a/circuits/header-chain-proof/guest/Cargo.toml b/circuits/header-chain-proof/guest/Cargo.toml index fe58279e..666d8a09 100644 --- a/circuits/header-chain-proof/guest/Cargo.toml +++ b/circuits/header-chain-proof/guest/Cargo.toml @@ -36,3 +36,9 @@ alloy-primitives-v1-1-0 = { git = "https://github.com/ziren-patches/core.git", p alloy-primitives-v1-1-2 = { git = "https://github.com/ziren-patches/core.git", package = "alloy-primitives", branch = "patch-alloy-primitives-1.1.2" } secp256k1-v0-29-1 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.29.1" } #secp256k1-v0-30-0 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.30.0" } + +[patch."https://github.com/ProjectZKM/Ziren"] +zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } + +[features] +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] diff --git a/circuits/operator-proof/guest/Cargo.lock b/circuits/operator-proof/guest/Cargo.lock index 5ebbd2d9..f7528078 100644 --- a/circuits/operator-proof/guest/Cargo.lock +++ b/circuits/operator-proof/guest/Cargo.lock @@ -1027,7 +1027,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-verifier", "zkm-zkvm", ] @@ -1095,6 +1095,20 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake3" +version = "1.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "cpufeatures 0.3.0", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -1137,7 +1151,7 @@ dependencies = [ "pairing 0.23.0", "rand_core 0.6.4", "subtle", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -1308,7 +1322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "531185e432bb31db1ecda541e9e7ab21468d4d844ad7505e0546a49b4945d49b" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "proptest", "serde_core", ] @@ -1381,6 +1395,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crc" version = "3.4.0" @@ -1462,7 +1485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "curve25519-dalek-derive", "fiat-crypto", "rustc_version 0.4.1", @@ -2435,7 +2458,7 @@ dependencies = [ "serde", "sha2 0.10.9", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -2811,7 +2834,7 @@ dependencies = [ "serdect", "sha2 0.10.9", "signature", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -2820,7 +2843,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", ] [[package]] @@ -3229,7 +3252,7 @@ dependencies = [ "hex", "primeorder", "sha2 0.10.9", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -5051,7 +5074,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.9.0", "opaque-debug", ] @@ -5062,7 +5085,7 @@ version = "0.10.9" source = "git+https://github.com/ziren-patches/RustCrypto-hashes?branch=patch-sha2-0.10.9#dbfdbd088ac7b55e03c0b9eb192278efe35d67dc" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.10.7", ] @@ -5188,7 +5211,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -5266,7 +5289,7 @@ dependencies = [ "num-bigint 0.4.6", "rand 0.8.5", "rustc-hex", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -6368,7 +6391,7 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6420,7 +6443,7 @@ dependencies = [ "zkm-core-executor", "zkm-curves", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6444,7 +6467,7 @@ dependencies = [ "thiserror 1.0.69", "tracing", "typenum", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6458,6 +6481,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zkm-lib" +version = "1.2.5" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +dependencies = [ + "bincode", + "cfg-if", + "elliptic-curve", + "serde", + "sha2 0.10.9", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", +] + [[package]] name = "zkm-lib" version = "1.2.5" @@ -6468,7 +6504,27 @@ dependencies = [ "elliptic-curve", "serde", "sha2 0.10.9", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", +] + +[[package]] +name = "zkm-primitives" +version = "1.2.5" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +dependencies = [ + "bincode", + "blake3", + "hex", + "lazy_static", + "num-bigint 0.4.6", + "p3-field", + "p3-koala-bear", + "p3-monty-31", + "p3-poseidon2", + "p3-symmetric", + "serde", + "sha2 0.10.9", + "tracing", ] [[package]] @@ -6522,7 +6578,7 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6564,7 +6620,7 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -6593,7 +6649,7 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-recursion-core", "zkm-stark", ] @@ -6601,9 +6657,10 @@ dependencies = [ [[package]] name = "zkm-zkvm" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", + "blake3", "cfg-if", "getrandom 0.2.17", "lazy_static", @@ -6613,8 +6670,8 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.10.9", - "zkm-lib", - "zkm-primitives", + "zkm-lib 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", ] [[package]] diff --git a/circuits/operator-proof/guest/Cargo.toml b/circuits/operator-proof/guest/Cargo.toml index f3ff6ba3..5d1c7b59 100644 --- a/circuits/operator-proof/guest/Cargo.toml +++ b/circuits/operator-proof/guest/Cargo.toml @@ -39,3 +39,9 @@ alloy-primitives-v1-4-1 = { git = "https://github.com/ziren-patches/core.git", p secp256k1-v0-29-1 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.29.1" } #secp256k1-v0-30-0 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.30.0" } #bitcoin = { git = "https://github.com/ProjectZKM/rust-bitcoin", branch = "patch-0.32.7" } + +[patch."https://github.com/ProjectZKM/Ziren"] +zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } + +[features] +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] \ No newline at end of file diff --git a/circuits/state-chain-proof/guest/Cargo.lock b/circuits/state-chain-proof/guest/Cargo.lock index 7084b519..42f572af 100644 --- a/circuits/state-chain-proof/guest/Cargo.lock +++ b/circuits/state-chain-proof/guest/Cargo.lock @@ -1069,6 +1069,20 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake3" +version = "1.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "cpufeatures 0.3.0", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -1111,7 +1125,7 @@ dependencies = [ "pairing 0.23.0", "rand_core 0.6.4", "subtle", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -1261,7 +1275,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "531185e432bb31db1ecda541e9e7ab21468d4d844ad7505e0546a49b4945d49b" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "proptest", "serde_core", ] @@ -1334,6 +1348,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crc" version = "3.4.0" @@ -1415,7 +1438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "curve25519-dalek-derive", "fiat-crypto", "rustc_version 0.4.1", @@ -2384,7 +2407,7 @@ dependencies = [ "serde", "sha2 0.10.9", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -2760,7 +2783,7 @@ dependencies = [ "serdect", "sha2 0.10.9", "signature", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -2769,7 +2792,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", ] [[package]] @@ -3178,7 +3201,7 @@ dependencies = [ "hex", "primeorder", "sha2 0.10.9", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -5000,7 +5023,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.9.0", "opaque-debug", ] @@ -5011,7 +5034,7 @@ version = "0.10.9" source = "git+https://github.com/ziren-patches/RustCrypto-hashes?branch=patch-sha2-0.10.9#dbfdbd088ac7b55e03c0b9eb192278efe35d67dc" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.10.7", ] @@ -5137,7 +5160,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -5215,7 +5238,7 @@ dependencies = [ "num-bigint 0.4.6", "rand 0.8.5", "rustc-hex", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -6317,7 +6340,7 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6369,7 +6392,7 @@ dependencies = [ "zkm-core-executor", "zkm-curves", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6393,7 +6416,7 @@ dependencies = [ "thiserror 1.0.69", "tracing", "typenum", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6407,6 +6430,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zkm-lib" +version = "1.2.5" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +dependencies = [ + "bincode", + "cfg-if", + "elliptic-curve", + "serde", + "sha2 0.10.9", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", +] + [[package]] name = "zkm-lib" version = "1.2.5" @@ -6417,7 +6453,27 @@ dependencies = [ "elliptic-curve", "serde", "sha2 0.10.9", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", +] + +[[package]] +name = "zkm-primitives" +version = "1.2.5" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +dependencies = [ + "bincode", + "blake3", + "hex", + "lazy_static", + "num-bigint 0.4.6", + "p3-field", + "p3-koala-bear", + "p3-monty-31", + "p3-poseidon2", + "p3-symmetric", + "serde", + "sha2 0.10.9", + "tracing", ] [[package]] @@ -6471,7 +6527,7 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6513,7 +6569,7 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -6542,7 +6598,7 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-recursion-core", "zkm-stark", ] @@ -6550,9 +6606,10 @@ dependencies = [ [[package]] name = "zkm-zkvm" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", + "blake3", "cfg-if", "getrandom 0.2.17", "lazy_static", @@ -6562,8 +6619,8 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.10.9", - "zkm-lib", - "zkm-primitives", + "zkm-lib 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", ] [[package]] diff --git a/circuits/state-chain-proof/guest/Cargo.toml b/circuits/state-chain-proof/guest/Cargo.toml index 66d0f092..d1bf0c8c 100644 --- a/circuits/state-chain-proof/guest/Cargo.toml +++ b/circuits/state-chain-proof/guest/Cargo.toml @@ -33,3 +33,9 @@ alloy-primitives-v1-1-2 = { git = "https://github.com/ziren-patches/core.git", p alloy-primitives-v1-4-1 = { git = "https://github.com/ziren-patches/core.git", package = "alloy-primitives", branch = "patch-alloy-primitives-1.4.1" } secp256k1-v0-29-1 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.29.1" } #secp256k1-v0-30-0 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.30.0" } + +[patch."https://github.com/ProjectZKM/Ziren"] +zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } + +[features] +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] \ No newline at end of file diff --git a/circuits/watchtower-proof/guest/Cargo.lock b/circuits/watchtower-proof/guest/Cargo.lock index 573afc9f..5d5c8e2a 100644 --- a/circuits/watchtower-proof/guest/Cargo.lock +++ b/circuits/watchtower-proof/guest/Cargo.lock @@ -1027,7 +1027,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-verifier", "zkm-zkvm", ] @@ -1095,6 +1095,20 @@ dependencies = [ "constant_time_eq", ] +[[package]] +name = "blake3" +version = "1.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aa83c34e62843d924f905e0f5c866eb1dd6545fc4d719e803d9ba6030371fce" +dependencies = [ + "arrayref", + "arrayvec", + "cc", + "cfg-if", + "constant_time_eq", + "cpufeatures 0.3.0", +] + [[package]] name = "block-buffer" version = "0.9.0" @@ -1137,7 +1151,7 @@ dependencies = [ "pairing 0.23.0", "rand_core 0.6.4", "subtle", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -1308,7 +1322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "531185e432bb31db1ecda541e9e7ab21468d4d844ad7505e0546a49b4945d49b" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "proptest", "serde_core", ] @@ -1381,6 +1395,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crc" version = "3.4.0" @@ -1462,7 +1485,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "curve25519-dalek-derive", "fiat-crypto", "rustc_version 0.4.1", @@ -2435,7 +2458,7 @@ dependencies = [ "serde", "sha2 0.10.9", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -2811,7 +2834,7 @@ dependencies = [ "serdect", "sha2 0.10.9", "signature", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -2820,7 +2843,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb26cec98cce3a3d96cbb7bced3c4b16e3d13f27ec56dbd62cbc8f39cfb9d653" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", ] [[package]] @@ -3229,7 +3252,7 @@ dependencies = [ "hex", "primeorder", "sha2 0.10.9", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -5051,7 +5074,7 @@ checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.9.0", "opaque-debug", ] @@ -5062,7 +5085,7 @@ version = "0.10.9" source = "git+https://github.com/ziren-patches/RustCrypto-hashes?branch=patch-sha2-0.10.9#dbfdbd088ac7b55e03c0b9eb192278efe35d67dc" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.17", "digest 0.10.7", ] @@ -5188,7 +5211,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -5266,7 +5289,7 @@ dependencies = [ "num-bigint 0.4.6", "rand 0.8.5", "rustc-hex", - "zkm-lib", + "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", ] [[package]] @@ -6368,7 +6391,7 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6420,7 +6443,7 @@ dependencies = [ "zkm-core-executor", "zkm-curves", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6444,7 +6467,7 @@ dependencies = [ "thiserror 1.0.69", "tracing", "typenum", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6458,6 +6481,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "zkm-lib" +version = "1.2.5" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +dependencies = [ + "bincode", + "cfg-if", + "elliptic-curve", + "serde", + "sha2 0.10.9", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", +] + [[package]] name = "zkm-lib" version = "1.2.5" @@ -6468,7 +6504,27 @@ dependencies = [ "elliptic-curve", "serde", "sha2 0.10.9", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", +] + +[[package]] +name = "zkm-primitives" +version = "1.2.5" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +dependencies = [ + "bincode", + "blake3", + "hex", + "lazy_static", + "num-bigint 0.4.6", + "p3-field", + "p3-koala-bear", + "p3-monty-31", + "p3-poseidon2", + "p3-symmetric", + "serde", + "sha2 0.10.9", + "tracing", ] [[package]] @@ -6522,7 +6578,7 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-stark", ] @@ -6564,7 +6620,7 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-zkvm", ] @@ -6593,7 +6649,7 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives", + "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", "zkm-recursion-core", "zkm-stark", ] @@ -6601,9 +6657,10 @@ dependencies = [ [[package]] name = "zkm-zkvm" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", + "blake3", "cfg-if", "getrandom 0.2.17", "lazy_static", @@ -6613,8 +6670,8 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.10.9", - "zkm-lib", - "zkm-primitives", + "zkm-lib 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", ] [[package]] diff --git a/circuits/watchtower-proof/guest/Cargo.toml b/circuits/watchtower-proof/guest/Cargo.toml index d3a665fe..2320e502 100644 --- a/circuits/watchtower-proof/guest/Cargo.toml +++ b/circuits/watchtower-proof/guest/Cargo.toml @@ -41,3 +41,8 @@ secp256k1-v0-29-1 = { git = "https://github.com/ziren-patches/rust-secp256k1", p #secp256k1-v0-30-0 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.30.0" } #bitcoin = { git = "https://github.com/ProjectZKM/rust-bitcoin", branch = "patch-0.32.7" } +[patch."https://github.com/ProjectZKM/Ziren"] +zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } + +[features] +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] \ No newline at end of file From 7398335a5449bfc14dd8aae6d787bdcfa3a48ffd Mon Sep 17 00:00:00 2001 From: Blake <0xblake.sg@gmail.com> Date: Mon, 3 Aug 2026 21:15:01 +0800 Subject: [PATCH 3/5] patch Ziren to use `blake3` branch --- circuits/commit-chain-proof/guest/Cargo.lock | 26 ++++++++++---------- circuits/commit-chain-proof/guest/Cargo.toml | 3 ++- circuits/header-chain-proof/guest/Cargo.lock | 26 ++++++++++---------- circuits/header-chain-proof/guest/Cargo.toml | 1 + circuits/operator-proof/guest/Cargo.lock | 26 ++++++++++---------- circuits/operator-proof/guest/Cargo.toml | 3 ++- circuits/state-chain-proof/guest/Cargo.lock | 26 ++++++++++---------- circuits/state-chain-proof/guest/Cargo.toml | 3 ++- circuits/watchtower-proof/guest/Cargo.lock | 26 ++++++++++---------- circuits/watchtower-proof/guest/Cargo.toml | 3 ++- 10 files changed, 74 insertions(+), 69 deletions(-) diff --git a/circuits/commit-chain-proof/guest/Cargo.lock b/circuits/commit-chain-proof/guest/Cargo.lock index b36d8ded..9b13c9b2 100644 --- a/circuits/commit-chain-proof/guest/Cargo.lock +++ b/circuits/commit-chain-proof/guest/Cargo.lock @@ -6248,7 +6248,7 @@ dependencies = [ [[package]] name = "zkm-core-executor" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -6282,14 +6282,14 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-core-machine" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", "cfg-if", @@ -6334,14 +6334,14 @@ dependencies = [ "zkm-core-executor", "zkm-curves", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-curves" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "cfg-if", "curve25519-dalek", @@ -6358,14 +6358,14 @@ dependencies = [ "thiserror 1.0.69", "tracing", "typenum", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-derive" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "proc-macro2", "quote", @@ -6439,7 +6439,7 @@ dependencies = [ [[package]] name = "zkm-recursion-core" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "backtrace", "ff 0.13.1", @@ -6469,14 +6469,14 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-stark" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -6511,14 +6511,14 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-zkvm", ] [[package]] name = "zkm-verifier" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -6540,7 +6540,7 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-recursion-core", "zkm-stark", ] diff --git a/circuits/commit-chain-proof/guest/Cargo.toml b/circuits/commit-chain-proof/guest/Cargo.toml index 5d1cbaa0..113a7b12 100644 --- a/circuits/commit-chain-proof/guest/Cargo.toml +++ b/circuits/commit-chain-proof/guest/Cargo.toml @@ -37,7 +37,8 @@ secp256k1-v0-29-1 = { git = "https://github.com/ziren-patches/rust-secp256k1", p #secp256k1-v0-30-0 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.30.0" } [patch."https://github.com/ProjectZKM/Ziren"] +zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } [features] -imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] \ No newline at end of file +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] diff --git a/circuits/header-chain-proof/guest/Cargo.lock b/circuits/header-chain-proof/guest/Cargo.lock index ddf2a65d..f4ea7273 100644 --- a/circuits/header-chain-proof/guest/Cargo.lock +++ b/circuits/header-chain-proof/guest/Cargo.lock @@ -3217,7 +3217,7 @@ dependencies = [ [[package]] name = "zkm-core-executor" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -3251,14 +3251,14 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-core-machine" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", "cfg-if", @@ -3303,14 +3303,14 @@ dependencies = [ "zkm-core-executor", "zkm-curves", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-curves" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "cfg-if", "curve25519-dalek", @@ -3327,14 +3327,14 @@ dependencies = [ "thiserror 1.0.69", "tracing", "typenum", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-derive" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "proc-macro2", "quote", @@ -3408,7 +3408,7 @@ dependencies = [ [[package]] name = "zkm-recursion-core" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "backtrace", "ff 0.13.1", @@ -3438,14 +3438,14 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-stark" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -3480,14 +3480,14 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-zkvm", ] [[package]] name = "zkm-verifier" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -3509,7 +3509,7 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-recursion-core", "zkm-stark", ] diff --git a/circuits/header-chain-proof/guest/Cargo.toml b/circuits/header-chain-proof/guest/Cargo.toml index 666d8a09..bd2eeb38 100644 --- a/circuits/header-chain-proof/guest/Cargo.toml +++ b/circuits/header-chain-proof/guest/Cargo.toml @@ -38,6 +38,7 @@ secp256k1-v0-29-1 = { git = "https://github.com/ziren-patches/rust-secp256k1", p #secp256k1-v0-30-0 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.30.0" } [patch."https://github.com/ProjectZKM/Ziren"] +zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } [features] diff --git a/circuits/operator-proof/guest/Cargo.lock b/circuits/operator-proof/guest/Cargo.lock index f7528078..1a4f84c7 100644 --- a/circuits/operator-proof/guest/Cargo.lock +++ b/circuits/operator-proof/guest/Cargo.lock @@ -6357,7 +6357,7 @@ dependencies = [ [[package]] name = "zkm-core-executor" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -6391,14 +6391,14 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-core-machine" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", "cfg-if", @@ -6443,14 +6443,14 @@ dependencies = [ "zkm-core-executor", "zkm-curves", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-curves" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "cfg-if", "curve25519-dalek", @@ -6467,14 +6467,14 @@ dependencies = [ "thiserror 1.0.69", "tracing", "typenum", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-derive" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "proc-macro2", "quote", @@ -6548,7 +6548,7 @@ dependencies = [ [[package]] name = "zkm-recursion-core" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "backtrace", "ff 0.13.1", @@ -6578,14 +6578,14 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-stark" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -6620,14 +6620,14 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-zkvm", ] [[package]] name = "zkm-verifier" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -6649,7 +6649,7 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-recursion-core", "zkm-stark", ] diff --git a/circuits/operator-proof/guest/Cargo.toml b/circuits/operator-proof/guest/Cargo.toml index 5d1c7b59..bea1ea6d 100644 --- a/circuits/operator-proof/guest/Cargo.toml +++ b/circuits/operator-proof/guest/Cargo.toml @@ -41,7 +41,8 @@ secp256k1-v0-29-1 = { git = "https://github.com/ziren-patches/rust-secp256k1", p #bitcoin = { git = "https://github.com/ProjectZKM/rust-bitcoin", branch = "patch-0.32.7" } [patch."https://github.com/ProjectZKM/Ziren"] +zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } [features] -imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] \ No newline at end of file +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] diff --git a/circuits/state-chain-proof/guest/Cargo.lock b/circuits/state-chain-proof/guest/Cargo.lock index 42f572af..fdd15321 100644 --- a/circuits/state-chain-proof/guest/Cargo.lock +++ b/circuits/state-chain-proof/guest/Cargo.lock @@ -6306,7 +6306,7 @@ dependencies = [ [[package]] name = "zkm-core-executor" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -6340,14 +6340,14 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-core-machine" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", "cfg-if", @@ -6392,14 +6392,14 @@ dependencies = [ "zkm-core-executor", "zkm-curves", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-curves" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "cfg-if", "curve25519-dalek", @@ -6416,14 +6416,14 @@ dependencies = [ "thiserror 1.0.69", "tracing", "typenum", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-derive" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "proc-macro2", "quote", @@ -6497,7 +6497,7 @@ dependencies = [ [[package]] name = "zkm-recursion-core" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "backtrace", "ff 0.13.1", @@ -6527,14 +6527,14 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-stark" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -6569,14 +6569,14 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-zkvm", ] [[package]] name = "zkm-verifier" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -6598,7 +6598,7 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-recursion-core", "zkm-stark", ] diff --git a/circuits/state-chain-proof/guest/Cargo.toml b/circuits/state-chain-proof/guest/Cargo.toml index d1bf0c8c..11284caf 100644 --- a/circuits/state-chain-proof/guest/Cargo.toml +++ b/circuits/state-chain-proof/guest/Cargo.toml @@ -35,7 +35,8 @@ secp256k1-v0-29-1 = { git = "https://github.com/ziren-patches/rust-secp256k1", p #secp256k1-v0-30-0 = { git = "https://github.com/ziren-patches/rust-secp256k1", package = "secp256k1", branch = "patch-0.30.0" } [patch."https://github.com/ProjectZKM/Ziren"] +zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } [features] -imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] \ No newline at end of file +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] diff --git a/circuits/watchtower-proof/guest/Cargo.lock b/circuits/watchtower-proof/guest/Cargo.lock index 5d5c8e2a..910869ad 100644 --- a/circuits/watchtower-proof/guest/Cargo.lock +++ b/circuits/watchtower-proof/guest/Cargo.lock @@ -6357,7 +6357,7 @@ dependencies = [ [[package]] name = "zkm-core-executor" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -6391,14 +6391,14 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-core-machine" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "bincode", "cfg-if", @@ -6443,14 +6443,14 @@ dependencies = [ "zkm-core-executor", "zkm-curves", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-curves" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "cfg-if", "curve25519-dalek", @@ -6467,14 +6467,14 @@ dependencies = [ "thiserror 1.0.69", "tracing", "typenum", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-derive" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "proc-macro2", "quote", @@ -6548,7 +6548,7 @@ dependencies = [ [[package]] name = "zkm-recursion-core" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "backtrace", "ff 0.13.1", @@ -6578,14 +6578,14 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-stark", ] [[package]] name = "zkm-stark" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -6620,14 +6620,14 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-zkvm", ] [[package]] name = "zkm-verifier" version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" +source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" dependencies = [ "anyhow", "bincode", @@ -6649,7 +6649,7 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", "zkm-recursion-core", "zkm-stark", ] diff --git a/circuits/watchtower-proof/guest/Cargo.toml b/circuits/watchtower-proof/guest/Cargo.toml index 2320e502..d80c4974 100644 --- a/circuits/watchtower-proof/guest/Cargo.toml +++ b/circuits/watchtower-proof/guest/Cargo.toml @@ -42,7 +42,8 @@ secp256k1-v0-29-1 = { git = "https://github.com/ziren-patches/rust-secp256k1", p #bitcoin = { git = "https://github.com/ProjectZKM/rust-bitcoin", branch = "patch-0.32.7" } [patch."https://github.com/ProjectZKM/Ziren"] +zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } [features] -imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] \ No newline at end of file +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] From d8db575d06486b55ccf6ee562a932265b9cb02ba Mon Sep 17 00:00:00 2001 From: Blake <0xblake.sg@gmail.com> Date: Mon, 3 Aug 2026 23:49:33 +0800 Subject: [PATCH 4/5] update `imm-wrap-vk` feature dependencies --- circuits/commit-chain-proof/guest/Cargo.toml | 2 +- circuits/header-chain-proof/guest/Cargo.toml | 2 +- circuits/operator-proof/guest/Cargo.toml | 5 ++++- circuits/state-chain-proof/guest/Cargo.toml | 2 +- circuits/watchtower-proof/guest/Cargo.toml | 5 ++++- crates/bitcoin-light-client-circuit/Cargo.toml | 8 ++++++++ crates/commit-chain/Cargo.toml | 3 +++ crates/header-chain/Cargo.toml | 3 +++ crates/state-chain/Cargo.toml | 3 +++ crates/verifier/Cargo.toml | 3 +++ 10 files changed, 31 insertions(+), 5 deletions(-) diff --git a/circuits/commit-chain-proof/guest/Cargo.toml b/circuits/commit-chain-proof/guest/Cargo.toml index 113a7b12..b9706732 100644 --- a/circuits/commit-chain-proof/guest/Cargo.toml +++ b/circuits/commit-chain-proof/guest/Cargo.toml @@ -41,4 +41,4 @@ zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } [features] -imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk", "commit-chain/imm-wrap-vk"] diff --git a/circuits/header-chain-proof/guest/Cargo.toml b/circuits/header-chain-proof/guest/Cargo.toml index bd2eeb38..eddb2477 100644 --- a/circuits/header-chain-proof/guest/Cargo.toml +++ b/circuits/header-chain-proof/guest/Cargo.toml @@ -42,4 +42,4 @@ zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } [features] -imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk", "header-chain/imm-wrap-vk"] diff --git a/circuits/operator-proof/guest/Cargo.toml b/circuits/operator-proof/guest/Cargo.toml index bea1ea6d..7be63e1a 100644 --- a/circuits/operator-proof/guest/Cargo.toml +++ b/circuits/operator-proof/guest/Cargo.toml @@ -45,4 +45,7 @@ zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } [features] -imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] +imm-wrap-vk = [ + "zkm-zkvm/imm-wrap-vk", + "bitcoin-light-client-circuit/imm-wrap-vk", +] diff --git a/circuits/state-chain-proof/guest/Cargo.toml b/circuits/state-chain-proof/guest/Cargo.toml index 11284caf..4ec69c98 100644 --- a/circuits/state-chain-proof/guest/Cargo.toml +++ b/circuits/state-chain-proof/guest/Cargo.toml @@ -39,4 +39,4 @@ zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } [features] -imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] +imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk", "state-chain/imm-wrap-vk"] diff --git a/circuits/watchtower-proof/guest/Cargo.toml b/circuits/watchtower-proof/guest/Cargo.toml index d80c4974..a6f26f94 100644 --- a/circuits/watchtower-proof/guest/Cargo.toml +++ b/circuits/watchtower-proof/guest/Cargo.toml @@ -46,4 +46,7 @@ zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } [features] -imm-wrap-vk = ["zkm-zkvm/imm-wrap-vk"] +imm-wrap-vk = [ + "zkm-zkvm/imm-wrap-vk", + "bitcoin-light-client-circuit/imm-wrap-vk", +] diff --git a/crates/bitcoin-light-client-circuit/Cargo.toml b/crates/bitcoin-light-client-circuit/Cargo.toml index b651533d..24c8383f 100644 --- a/crates/bitcoin-light-client-circuit/Cargo.toml +++ b/crates/bitcoin-light-client-circuit/Cargo.toml @@ -43,6 +43,14 @@ tendermint-light-client-verifier = { git = "https://github.com/ProjectZKM/tender "rust-crypto", ] } +[features] +imm-wrap-vk = [ + "verifier/imm-wrap-vk", + "header-chain/imm-wrap-vk", + "commit-chain/imm-wrap-vk", + "state-chain/imm-wrap-vk", +] + [dev-dependencies] rand = "0.8.5" diff --git a/crates/commit-chain/Cargo.toml b/crates/commit-chain/Cargo.toml index b981bd7c..c9491613 100644 --- a/crates/commit-chain/Cargo.toml +++ b/crates/commit-chain/Cargo.toml @@ -40,6 +40,9 @@ tendermint-light-client-verifier = { git = "https://github.com/ProjectZKM/tender "rust-crypto", ] } +[features] +imm-wrap-vk = ["verifier/imm-wrap-vk"] + [dev-dependencies] rand = "0.8.5" diff --git a/crates/header-chain/Cargo.toml b/crates/header-chain/Cargo.toml index 603ac692..ff078902 100644 --- a/crates/header-chain/Cargo.toml +++ b/crates/header-chain/Cargo.toml @@ -15,5 +15,8 @@ zkm-zkvm = { workspace = true } verifier = { workspace = true } zkm-primitives = { workspace = true } +[features] +imm-wrap-vk = ["verifier/imm-wrap-vk"] + [dev-dependencies] hex-literal = "1.0.0" diff --git a/crates/state-chain/Cargo.toml b/crates/state-chain/Cargo.toml index d810a532..2e9159c3 100644 --- a/crates/state-chain/Cargo.toml +++ b/crates/state-chain/Cargo.toml @@ -43,6 +43,9 @@ tendermint-light-client-verifier = { git = "https://github.com/ProjectZKM/tender "rust-crypto", ] } +[features] +imm-wrap-vk = ["verifier/imm-wrap-vk", "header-chain/imm-wrap-vk"] + #pbjson = "0.8" [dev-dependencies] diff --git a/crates/verifier/Cargo.toml b/crates/verifier/Cargo.toml index d9deba1b..2dc17574 100644 --- a/crates/verifier/Cargo.toml +++ b/crates/verifier/Cargo.toml @@ -7,5 +7,8 @@ edition.workspace = true sha2 = { workspace = true } zkm-verifier = { workspace = true } +[features] +imm-wrap-vk = ["zkm-verifier/imm-wrap-vk"] + [lints] workspace = true From d5af430aeadcef48fbe9f4720dc5d3317008cfbb Mon Sep 17 00:00:00 2001 From: Blake <0xblake.sg@gmail.com> Date: Wed, 5 Aug 2026 18:08:59 +0800 Subject: [PATCH 5/5] update zkm-lib dependency to use the blake3 branch --- Cargo.lock | 19 +++---------------- Cargo.toml | 3 ++- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4db40df1..b8a782ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3237,7 +3237,7 @@ dependencies = [ "pairing 0.23.0", "rand_core 0.6.4", "subtle", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -12670,7 +12670,7 @@ dependencies = [ "num-bigint 0.4.6", "rand 0.8.5", "rustc-hex", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -15298,19 +15298,6 @@ dependencies = [ "zkm-primitives", ] -[[package]] -name = "zkm-lib" -version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#53a8eff4e716d6091c2ced0401b7b9537535392a" -dependencies = [ - "bincode", - "cfg-if", - "elliptic-curve", - "serde", - "sha2 0.10.9", - "zkm-primitives", -] - [[package]] name = "zkm-primitives" version = "1.2.5" @@ -15631,7 +15618,7 @@ dependencies = [ "rand 0.8.5", "serde", "sha2 0.10.9", - "zkm-lib 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-lib", "zkm-primitives", ] diff --git a/Cargo.toml b/Cargo.toml index 32f7af72..c3efd591 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -204,4 +204,5 @@ zkm-verifier = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" zkm-primitives = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } zkm-zkvm = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } zkm-recursion-core = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } -zkm-stark = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } \ No newline at end of file +zkm-stark = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } +zkm-lib = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } \ No newline at end of file