From 7ad981ed67a45af29bcb21372e66370c77f9c0cf Mon Sep 17 00:00:00 2001 From: Blake <0xblake.sg@gmail.com> Date: Sat, 15 Aug 2026 12:53:43 +0800 Subject: [PATCH 1/5] Update Ziren dependencies to version v1.2.7 --- Cargo.lock | 148 +++++++++++-------- Cargo.toml | 36 ++--- circuits/commit-chain-proof/guest/Cargo.lock | 115 ++++++-------- circuits/commit-chain-proof/guest/Cargo.toml | 6 +- circuits/header-chain-proof/guest/Cargo.lock | 105 +++++-------- circuits/header-chain-proof/guest/Cargo.toml | 6 +- circuits/operator-proof/guest/Cargo.lock | 121 ++++++--------- circuits/operator-proof/guest/Cargo.toml | 6 +- circuits/state-chain-proof/guest/Cargo.lock | 119 ++++++--------- circuits/state-chain-proof/guest/Cargo.toml | 6 +- circuits/watchtower-proof/guest/Cargo.lock | 121 ++++++--------- circuits/watchtower-proof/guest/Cargo.toml | 6 +- 12 files changed, 314 insertions(+), 481 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e84fec93..e1682ec6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2866,7 +2866,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-verifier", "zkm-zkvm", ] @@ -3230,7 +3230,7 @@ dependencies = [ [[package]] name = "bls12_381" version = "0.8.0" -source = "git+https://github.com/ziren-patches/bls12_381?branch=patch-0.8.0#bcf9397426410acc171ad625416b508dc913be8e" +source = "git+https://github.com/ziren-patches/bls12_381?branch=patch-0.8.0#97b215f80e9bfab9ad6641e41b005b6d8e58f748" dependencies = [ "cfg-if", "ff 0.13.1", @@ -4337,7 +4337,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de" dependencies = [ "data-encoding", - "syn 1.0.109", + "syn 2.0.117", ] [[package]] @@ -5569,7 +5569,7 @@ dependencies = [ [[package]] name = "garbled-snark-verifier" version = "0.1.0" -source = "git+https://github.com/GOATNetwork/bitvm2-gc?branch=feat%2Fgoat-bitvm3#98acca9f25820cba3e18f67dea56c1e231fa67ef" +source = "git+https://github.com/GOATNetwork/bitvm2-gc?branch=dep%2Fziren-v1.2.7#785a68760c7a4d45a6cd200f5c7e0e3592915c60" dependencies = [ "ark-bn254", "ark-crypto-primitives", @@ -5795,7 +5795,7 @@ dependencies = [ [[package]] name = "guest-executor" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-consensus 1.0.41", "alloy-evm", @@ -6023,7 +6023,7 @@ dependencies = [ "serde", "sha2 0.10.9", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-zkvm", ] @@ -6244,7 +6244,7 @@ dependencies = [ [[package]] name = "host-executor" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-chains", "alloy-consensus 1.0.41", @@ -7950,7 +7950,7 @@ dependencies = [ [[package]] name = "mpt" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9547,7 +9547,7 @@ dependencies = [ "p3-field", "p3-koala-bear", "p3-symmetric", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren.git)", ] [[package]] @@ -9626,7 +9626,7 @@ dependencies = [ [[package]] name = "primitives" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-eips 1.0.41", "alloy-genesis 1.0.41", @@ -9916,7 +9916,7 @@ dependencies = [ [[package]] name = "provider" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-json-rpc 1.0.41", "alloy-provider 1.0.41", @@ -11143,7 +11143,7 @@ dependencies = [ [[package]] name = "rpc-db" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-consensus 1.0.41", "alloy-primitives", @@ -12206,7 +12206,7 @@ dependencies = [ [[package]] name = "soldering-host" version = "1.1.0" -source = "git+https://github.com/GOATNetwork/bitvm2-gc?branch=feat%2Fgoat-bitvm3#98acca9f25820cba3e18f67dea56c1e231fa67ef" +source = "git+https://github.com/GOATNetwork/bitvm2-gc?branch=dep%2Fziren-v1.2.7#785a68760c7a4d45a6cd200f5c7e0e3592915c60" dependencies = [ "ark-bn254", "ark-crypto-primitives", @@ -12479,7 +12479,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-zkvm", ] @@ -12666,7 +12666,7 @@ dependencies = [ [[package]] name = "substrate-bn" version = "0.6.0" -source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#aba71380457d798039111e6cc0fdf2e0718c6766" +source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#0dfeeb1b7bfc21941b6e4964d678abd094a54a6f" dependencies = [ "bytemuck", "byteorder", @@ -13907,7 +13907,7 @@ dependencies = [ [[package]] name = "verifiable-circuit-babe" version = "0.0.1" -source = "git+https://github.com/GOATNetwork/bitvm2-gc?branch=feat%2Fgoat-bitvm3#98acca9f25820cba3e18f67dea56c1e231fa67ef" +source = "git+https://github.com/GOATNetwork/bitvm2-gc?branch=dep%2Fziren-v1.2.7#785a68760c7a4d45a6cd200f5c7e0e3592915c60" dependencies = [ "aes", "ark-bn254", @@ -15137,8 +15137,8 @@ dependencies = [ [[package]] name = "zkm-build" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "cargo_metadata", @@ -15148,8 +15148,8 @@ dependencies = [ [[package]] name = "zkm-core-executor" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -15183,14 +15183,14 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-stark", ] [[package]] name = "zkm-core-machine" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "cfg-if", @@ -15235,14 +15235,14 @@ dependencies = [ "zkm-core-executor", "zkm-curves", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-stark", ] [[package]] name = "zkm-cuda" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "ctrlc", @@ -15259,8 +15259,8 @@ dependencies = [ [[package]] name = "zkm-curves" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "cfg-if", "curve25519-dalek", @@ -15277,14 +15277,14 @@ dependencies = [ "thiserror 1.0.69", "tracing", "typenum", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-stark", ] [[package]] name = "zkm-derive" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "proc-macro2", "quote", @@ -15293,21 +15293,41 @@ dependencies = [ [[package]] name = "zkm-lib" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "cfg-if", "elliptic-curve", "serde", "sha2 0.10.9", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", +] + +[[package]] +name = "zkm-primitives" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" +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]] name = "zkm-primitives" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren.git#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "blake3", @@ -15326,8 +15346,8 @@ dependencies = [ [[package]] name = "zkm-prover" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -15353,7 +15373,7 @@ dependencies = [ "tracing-subscriber 0.3.23", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-recursion-circuit", "zkm-recursion-compiler", "zkm-recursion-core", @@ -15363,8 +15383,8 @@ dependencies = [ [[package]] name = "zkm-recursion-circuit" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", @@ -15387,7 +15407,7 @@ dependencies = [ "zkm-core-executor", "zkm-core-machine", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-recursion-compiler", "zkm-recursion-core", "zkm-recursion-gnark-ffi", @@ -15396,8 +15416,8 @@ dependencies = [ [[package]] name = "zkm-recursion-compiler" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "backtrace", "itertools 0.13.0", @@ -15409,7 +15429,7 @@ dependencies = [ "tracing", "vec_map", "zkm-core-machine", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-recursion-core", "zkm-recursion-derive", "zkm-stark", @@ -15417,8 +15437,8 @@ dependencies = [ [[package]] name = "zkm-recursion-core" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "backtrace", "ff 0.13.1", @@ -15448,14 +15468,14 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-stark", ] [[package]] name = "zkm-recursion-derive" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "quote", "syn 1.0.109", @@ -15463,8 +15483,8 @@ dependencies = [ [[package]] name = "zkm-recursion-gnark-ffi" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -15487,8 +15507,8 @@ dependencies = [ [[package]] name = "zkm-sdk" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "alloy-primitives", "anyhow", @@ -15526,15 +15546,15 @@ dependencies = [ "zkm-core-executor", "zkm-core-machine", "zkm-cuda", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-prover", "zkm-stark", ] [[package]] name = "zkm-stark" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -15569,14 +15589,14 @@ dependencies = [ "tracing-forest", "tracing-subscriber 0.3.23", "zkm-derive", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-zkvm", ] [[package]] name = "zkm-verifier" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "ark-bn254", @@ -15603,7 +15623,7 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", "zkm-recursion-core", "zkm-sdk", "zkm-stark", @@ -15611,8 +15631,8 @@ dependencies = [ [[package]] name = "zkm-zkvm" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "cfg-if", @@ -15625,7 +15645,7 @@ dependencies = [ "serde", "sha2 0.10.9", "zkm-lib", - "zkm-primitives", + "zkm-primitives 1.2.7 (git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7)", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index c3efd591..b1fa7f4b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -87,15 +87,15 @@ uuid = { version = "1.7", features = ["v4", "serde"] } zeroize = "1.8.1" bincode = "1.3.3" -zkm-build = { git = "https://github.com/ProjectZKM/Ziren" } -zkm-core-executor = { git = "https://github.com/ProjectZKM/Ziren" } -zkm-prover = { git = "https://github.com/ProjectZKM/Ziren" } -zkm-sdk = { git = "https://github.com/ProjectZKM/Ziren" } -zkm-verifier = { git = "https://github.com/ProjectZKM/Ziren" } -zkm-primitives = { git = "https://github.com/ProjectZKM/Ziren" } -zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", features = ["verify"] } -zkm-recursion-core = { git = "https://github.com/ProjectZKM/Ziren" } -zkm-stark = { git = "https://github.com/ProjectZKM/Ziren" } +zkm-build = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7" } +zkm-core-executor = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7" } +zkm-prover = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7" } +zkm-sdk = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7" } +zkm-verifier = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7" } +zkm-primitives = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7" } +zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7", features = ["verify"] } +zkm-recursion-core = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7" } +zkm-stark = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7" } p3-bn254-fr = { git = "https://github.com/ProjectZKM/Plonky3" } p3-field = { git = "https://github.com/ProjectZKM/Plonky3" } @@ -106,9 +106,9 @@ p3-field = { git = "https://github.com/ProjectZKM/Plonky3" } #zkm-verifier = { path = "../Ziren/crates/verifier" } bitvm-lib = { package = "bitvm-gc", path = "crates/bitvm-gc" } -verifiable-circuit-babe = { git = "https://github.com/GOATNetwork/bitvm2-gc", branch = "feat/goat-bitvm3" } -garbled-snark-verifier = { git = "https://github.com/GOATNetwork/bitvm2-gc", branch = "feat/goat-bitvm3" } -soldering-host = { git = "https://github.com/GOATNetwork/bitvm2-gc", branch = "feat/goat-bitvm3" } +verifiable-circuit-babe = { git = "https://github.com/GOATNetwork/bitvm2-gc", branch = "dep/ziren-v1.2.7" } +garbled-snark-verifier = { git = "https://github.com/GOATNetwork/bitvm2-gc", branch = "dep/ziren-v1.2.7" } +soldering-host = { git = "https://github.com/GOATNetwork/bitvm2-gc", branch = "dep/ziren-v1.2.7" } #verifiable-circuit-babe = { path = "../bitvm2-gc/verifiable-circuit-babe"} #garbled-snark-verifier = { path = "../bitvm2-gc/garbled-snark-verifier"} @@ -194,15 +194,3 @@ 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" } -zkm-lib = { git = "https://github.com/VanhGer/Ziren.git", branch = "blake3" } \ No newline at end of file diff --git a/circuits/commit-chain-proof/guest/Cargo.lock b/circuits/commit-chain-proof/guest/Cargo.lock index 9b13c9b2..a96c3e31 100644 --- a/circuits/commit-chain-proof/guest/Cargo.lock +++ b/circuits/commit-chain-proof/guest/Cargo.lock @@ -276,7 +276,7 @@ dependencies = [ [[package]] name = "alloy-primitives" version = "1.4.1" -source = "git+https://github.com/ziren-patches/core.git?branch=patch-alloy-primitives-1.4.1#59313700f710f1373a5b4cdc05c51dc3227d8064" +source = "git+https://github.com/ziren-patches/core.git?branch=patch-alloy-primitives-1.4.1#0d034202c9977acd601399efdd9c30fd1c1a08a0" dependencies = [ "alloy-rlp", "bytes", @@ -1117,7 +1117,7 @@ dependencies = [ [[package]] name = "bls12_381" version = "0.8.0" -source = "git+https://github.com/ziren-patches/bls12_381?branch=patch-0.8.0#bcf9397426410acc171ad625416b508dc913be8e" +source = "git+https://github.com/ziren-patches/bls12_381?branch=patch-0.8.0#97b215f80e9bfab9ad6641e41b005b6d8e58f748" dependencies = [ "cfg-if", "ff 0.13.1", @@ -1125,7 +1125,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]] @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "guest-executor" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-consensus", "alloy-evm", @@ -2758,7 +2758,7 @@ dependencies = [ [[package]] name = "k256" version = "0.13.4" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#8266b228a39402a0ba68d644b7f26b85b5112fe3" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#6ad84b9b604911c6f5dd353b88c04927d2739a32" dependencies = [ "cfg-if", "ecdsa", @@ -2768,7 +2768,7 @@ dependencies = [ "serdect", "sha2 0.10.9", "signature", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -2922,7 +2922,7 @@ dependencies = [ [[package]] name = "mpt" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -3179,14 +3179,14 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "p256" version = "0.13.2" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8" dependencies = [ "ecdsa", "elliptic-curve", "hex", "primeorder", "sha2 0.10.9", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -3738,7 +3738,7 @@ dependencies = [ [[package]] name = "primeorder" version = "0.13.1" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8" dependencies = [ "elliptic-curve", ] @@ -3757,7 +3757,7 @@ dependencies = [ [[package]] name = "primitives" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-eips", "alloy-genesis", @@ -5185,7 +5185,7 @@ dependencies = [ [[package]] name = "substrate-bn" version = "0.6.0" -source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#aba71380457d798039111e6cc0fdf2e0718c6766" +source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#0dfeeb1b7bfc21941b6e4964d678abd094a54a6f" dependencies = [ "bytemuck", "byteorder", @@ -5195,7 +5195,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]] @@ -6247,8 +6247,8 @@ dependencies = [ [[package]] name = "zkm-core-executor" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -6282,14 +6282,14 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-core-machine" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-curves" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-derive" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "proc-macro2", "quote", @@ -6374,34 +6374,21 @@ dependencies = [ [[package]] name = "zkm-lib" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" -dependencies = [ - "bincode", - "cfg-if", - "elliptic-curve", - "serde", - "sha2 0.10.9", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", ] [[package]] name = "zkm-primitives" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "blake3", @@ -6418,28 +6405,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "zkm-primitives" -version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" -dependencies = [ - "bincode", - "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", -] - [[package]] name = "zkm-recursion-core" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "backtrace", "ff 0.13.1", @@ -6469,14 +6438,14 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-stark" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -6511,14 +6480,14 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-zkvm", ] [[package]] name = "zkm-verifier" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -6540,15 +6509,15 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-recursion-core", "zkm-stark", ] [[package]] name = "zkm-zkvm" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "blake3", @@ -6561,8 +6530,8 @@ 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-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-lib", + "zkm-primitives", ] [[package]] diff --git a/circuits/commit-chain-proof/guest/Cargo.toml b/circuits/commit-chain-proof/guest/Cargo.toml index b9706732..55cd39c7 100644 --- a/circuits/commit-chain-proof/guest/Cargo.toml +++ b/circuits/commit-chain-proof/guest/Cargo.toml @@ -11,7 +11,7 @@ bincode = "1.3.3" commit-chain = { path = "../../../crates/commit-chain" } # Ziren -zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", features = ["verify"] } +zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7", features = ["verify"] } #zkm-zkvm = { path = "../../../../Ziren/crates/zkvm/entrypoint", features = ["verify"] } # Statically turns off logging @@ -36,9 +36,5 @@ 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" } -[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", "commit-chain/imm-wrap-vk"] diff --git a/circuits/header-chain-proof/guest/Cargo.lock b/circuits/header-chain-proof/guest/Cargo.lock index f4ea7273..279dd297 100644 --- a/circuits/header-chain-proof/guest/Cargo.lock +++ b/circuits/header-chain-proof/guest/Cargo.lock @@ -1141,7 +1141,7 @@ dependencies = [ "serde", "sha2", "verifier", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", "zkm-zkvm", ] @@ -1315,7 +1315,7 @@ dependencies = [ [[package]] name = "k256" version = "0.13.4" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#8266b228a39402a0ba68d644b7f26b85b5112fe3" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#6ad84b9b604911c6f5dd353b88c04927d2739a32" dependencies = [ "cfg-if", "ecdsa 0.16.9 (git+https://github.com/ziren-patches/signatures.git?branch=patch-ecdsa-0.16.9)", @@ -1324,7 +1324,7 @@ dependencies = [ "once_cell", "sha2", "signature", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -1606,14 +1606,14 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "p256" version = "0.13.2" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8" dependencies = [ "ecdsa 0.16.9 (git+https://github.com/ziren-patches/signatures.git?branch=patch-ecdsa-0.16.9)", "elliptic-curve", "hex", "primeorder", "sha2", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -2073,7 +2073,7 @@ dependencies = [ [[package]] name = "primeorder" version = "0.13.1" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8" dependencies = [ "elliptic-curve", ] @@ -2498,7 +2498,7 @@ dependencies = [ [[package]] name = "substrate-bn" version = "0.6.0" -source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#aba71380457d798039111e6cc0fdf2e0718c6766" +source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#0dfeeb1b7bfc21941b6e4964d678abd094a54a6f" dependencies = [ "bytemuck", "byteorder", @@ -2508,7 +2508,7 @@ dependencies = [ "num-bigint 0.4.6", "rand", "rustc-hex", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -3216,8 +3216,8 @@ dependencies = [ [[package]] name = "zkm-core-executor" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -3251,14 +3251,14 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-core-machine" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-curves" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-derive" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "proc-macro2", "quote", @@ -3343,34 +3343,21 @@ dependencies = [ [[package]] name = "zkm-lib" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" -dependencies = [ - "bincode", - "cfg-if", - "elliptic-curve", - "serde", - "sha2", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", ] [[package]] name = "zkm-primitives" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "blake3", @@ -3387,28 +3374,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "zkm-primitives" -version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" -dependencies = [ - "bincode", - "hex", - "lazy_static", - "num-bigint 0.4.6", - "p3-field", - "p3-koala-bear", - "p3-monty-31", - "p3-poseidon2", - "p3-symmetric", - "serde", - "sha2", -] - [[package]] name = "zkm-recursion-core" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "backtrace", "ff 0.13.1", @@ -3438,14 +3407,14 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-stark" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -3480,14 +3449,14 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-zkvm", ] [[package]] name = "zkm-verifier" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -3509,15 +3478,15 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-recursion-core", "zkm-stark", ] [[package]] name = "zkm-zkvm" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "blake3", @@ -3530,8 +3499,8 @@ dependencies = [ "rand", "serde", "sha2", - "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)", + "zkm-lib", + "zkm-primitives", ] [[package]] diff --git a/circuits/header-chain-proof/guest/Cargo.toml b/circuits/header-chain-proof/guest/Cargo.toml index eddb2477..bc6e8612 100644 --- a/circuits/header-chain-proof/guest/Cargo.toml +++ b/circuits/header-chain-proof/guest/Cargo.toml @@ -13,7 +13,7 @@ header-chain = { path = "../../../crates/header-chain" } borsh = { version = "1.5.3", features = ["derive"] } # Ziren -zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", features = ["verify"] } +zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7", features = ["verify"] } #zkm-zkvm = { path = "../../../Ziren/crates/zkvm/entrypoint", features = ["verify"] } # Statically turns off logging @@ -37,9 +37,5 @@ alloy-primitives-v1-1-2 = { 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" } -[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", "header-chain/imm-wrap-vk"] diff --git a/circuits/operator-proof/guest/Cargo.lock b/circuits/operator-proof/guest/Cargo.lock index 1a4f84c7..2db62960 100644 --- a/circuits/operator-proof/guest/Cargo.lock +++ b/circuits/operator-proof/guest/Cargo.lock @@ -276,7 +276,7 @@ dependencies = [ [[package]] name = "alloy-primitives" version = "1.4.1" -source = "git+https://github.com/ziren-patches/core.git?branch=patch-alloy-primitives-1.4.1#59313700f710f1373a5b4cdc05c51dc3227d8064" +source = "git+https://github.com/ziren-patches/core.git?branch=patch-alloy-primitives-1.4.1#0d034202c9977acd601399efdd9c30fd1c1a08a0" dependencies = [ "alloy-rlp", "bytes", @@ -1027,7 +1027,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", "zkm-verifier", "zkm-zkvm", ] @@ -1143,7 +1143,7 @@ dependencies = [ [[package]] name = "bls12_381" version = "0.8.0" -source = "git+https://github.com/ziren-patches/bls12_381?branch=patch-0.8.0#bcf9397426410acc171ad625416b508dc913be8e" +source = "git+https://github.com/ziren-patches/bls12_381?branch=patch-0.8.0#97b215f80e9bfab9ad6641e41b005b6d8e58f748" dependencies = [ "cfg-if", "ff 0.13.1", @@ -1151,7 +1151,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]] @@ -2305,7 +2305,7 @@ dependencies = [ [[package]] name = "guest-executor" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-consensus", "alloy-evm", @@ -2458,7 +2458,7 @@ dependencies = [ "serde", "sha2 0.10.9", "verifier", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", "zkm-zkvm", ] @@ -2824,7 +2824,7 @@ dependencies = [ [[package]] name = "k256" version = "0.13.4" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#8266b228a39402a0ba68d644b7f26b85b5112fe3" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#6ad84b9b604911c6f5dd353b88c04927d2739a32" dependencies = [ "cfg-if", "ecdsa", @@ -2834,7 +2834,7 @@ dependencies = [ "serdect", "sha2 0.10.9", "signature", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -2988,7 +2988,7 @@ dependencies = [ [[package]] name = "mpt" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -3245,14 +3245,14 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "p256" version = "0.13.2" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8" dependencies = [ "ecdsa", "elliptic-curve", "hex", "primeorder", "sha2 0.10.9", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -3804,7 +3804,7 @@ dependencies = [ [[package]] name = "primeorder" version = "0.13.1" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8" dependencies = [ "elliptic-curve", ] @@ -3823,7 +3823,7 @@ dependencies = [ [[package]] name = "primitives" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-eips", "alloy-genesis", @@ -5211,7 +5211,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", "zkm-zkvm", ] @@ -5279,7 +5279,7 @@ dependencies = [ [[package]] name = "substrate-bn" version = "0.6.0" -source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#aba71380457d798039111e6cc0fdf2e0718c6766" +source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#0dfeeb1b7bfc21941b6e4964d678abd094a54a6f" dependencies = [ "bytemuck", "byteorder", @@ -5289,7 +5289,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]] @@ -6356,8 +6356,8 @@ dependencies = [ [[package]] name = "zkm-core-executor" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -6391,14 +6391,14 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-core-machine" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-curves" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-derive" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "proc-macro2", "quote", @@ -6483,34 +6483,21 @@ dependencies = [ [[package]] name = "zkm-lib" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" -dependencies = [ - "bincode", - "cfg-if", - "elliptic-curve", - "serde", - "sha2 0.10.9", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", ] [[package]] name = "zkm-primitives" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "blake3", @@ -6527,28 +6514,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "zkm-primitives" -version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" -dependencies = [ - "bincode", - "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", -] - [[package]] name = "zkm-recursion-core" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "backtrace", "ff 0.13.1", @@ -6578,14 +6547,14 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-stark" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -6620,14 +6589,14 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-zkvm", ] [[package]] name = "zkm-verifier" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -6649,15 +6618,15 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-recursion-core", "zkm-stark", ] [[package]] name = "zkm-zkvm" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "blake3", @@ -6670,8 +6639,8 @@ 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-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-lib", + "zkm-primitives", ] [[package]] diff --git a/circuits/operator-proof/guest/Cargo.toml b/circuits/operator-proof/guest/Cargo.toml index 7be63e1a..2defaac0 100644 --- a/circuits/operator-proof/guest/Cargo.toml +++ b/circuits/operator-proof/guest/Cargo.toml @@ -14,7 +14,7 @@ state-chain = { path = "../../../crates/state-chain" } bitcoin-light-client-circuit = { path = "../../../crates/bitcoin-light-client-circuit" } # Ziren -zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", features = ["verify"] } +zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7", features = ["verify"] } #zkm-zkvm = { path = "../../../Ziren/crates/zkvm/entrypoint", features = ["verify"] } # Statically turns off logging @@ -40,10 +40,6 @@ 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-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", diff --git a/circuits/state-chain-proof/guest/Cargo.lock b/circuits/state-chain-proof/guest/Cargo.lock index fdd15321..f9ba5bda 100644 --- a/circuits/state-chain-proof/guest/Cargo.lock +++ b/circuits/state-chain-proof/guest/Cargo.lock @@ -276,7 +276,7 @@ dependencies = [ [[package]] name = "alloy-primitives" version = "1.4.1" -source = "git+https://github.com/ziren-patches/core.git?branch=patch-alloy-primitives-1.4.1#59313700f710f1373a5b4cdc05c51dc3227d8064" +source = "git+https://github.com/ziren-patches/core.git?branch=patch-alloy-primitives-1.4.1#0d034202c9977acd601399efdd9c30fd1c1a08a0" dependencies = [ "alloy-rlp", "bytes", @@ -1117,7 +1117,7 @@ dependencies = [ [[package]] name = "bls12_381" version = "0.8.0" -source = "git+https://github.com/ziren-patches/bls12_381?branch=patch-0.8.0#bcf9397426410acc171ad625416b508dc913be8e" +source = "git+https://github.com/ziren-patches/bls12_381?branch=patch-0.8.0#97b215f80e9bfab9ad6641e41b005b6d8e58f748" dependencies = [ "cfg-if", "ff 0.13.1", @@ -1125,7 +1125,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]] @@ -2254,7 +2254,7 @@ dependencies = [ [[package]] name = "guest-executor" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-consensus", "alloy-evm", @@ -2407,7 +2407,7 @@ dependencies = [ "serde", "sha2 0.10.9", "verifier", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", "zkm-zkvm", ] @@ -2773,7 +2773,7 @@ dependencies = [ [[package]] name = "k256" version = "0.13.4" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#8266b228a39402a0ba68d644b7f26b85b5112fe3" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#6ad84b9b604911c6f5dd353b88c04927d2739a32" dependencies = [ "cfg-if", "ecdsa", @@ -2783,7 +2783,7 @@ dependencies = [ "serdect", "sha2 0.10.9", "signature", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -2937,7 +2937,7 @@ dependencies = [ [[package]] name = "mpt" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -3194,14 +3194,14 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "p256" version = "0.13.2" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8" dependencies = [ "ecdsa", "elliptic-curve", "hex", "primeorder", "sha2 0.10.9", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -3753,7 +3753,7 @@ dependencies = [ [[package]] name = "primeorder" version = "0.13.1" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8" dependencies = [ "elliptic-curve", ] @@ -3772,7 +3772,7 @@ dependencies = [ [[package]] name = "primitives" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-eips", "alloy-genesis", @@ -5160,7 +5160,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", "zkm-zkvm", ] @@ -5228,7 +5228,7 @@ dependencies = [ [[package]] name = "substrate-bn" version = "0.6.0" -source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#aba71380457d798039111e6cc0fdf2e0718c6766" +source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#0dfeeb1b7bfc21941b6e4964d678abd094a54a6f" dependencies = [ "bytemuck", "byteorder", @@ -5238,7 +5238,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]] @@ -6305,8 +6305,8 @@ dependencies = [ [[package]] name = "zkm-core-executor" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -6340,14 +6340,14 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-core-machine" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-curves" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-derive" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "proc-macro2", "quote", @@ -6432,34 +6432,21 @@ dependencies = [ [[package]] name = "zkm-lib" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" -dependencies = [ - "bincode", - "cfg-if", - "elliptic-curve", - "serde", - "sha2 0.10.9", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", ] [[package]] name = "zkm-primitives" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "blake3", @@ -6476,28 +6463,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "zkm-primitives" -version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" -dependencies = [ - "bincode", - "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", -] - [[package]] name = "zkm-recursion-core" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "backtrace", "ff 0.13.1", @@ -6527,14 +6496,14 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-stark" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -6569,14 +6538,14 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-zkvm", ] [[package]] name = "zkm-verifier" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -6598,15 +6567,15 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-recursion-core", "zkm-stark", ] [[package]] name = "zkm-zkvm" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "blake3", @@ -6619,8 +6588,8 @@ 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-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-lib", + "zkm-primitives", ] [[package]] diff --git a/circuits/state-chain-proof/guest/Cargo.toml b/circuits/state-chain-proof/guest/Cargo.toml index 4ec69c98..5dbf2607 100644 --- a/circuits/state-chain-proof/guest/Cargo.toml +++ b/circuits/state-chain-proof/guest/Cargo.toml @@ -11,7 +11,7 @@ bincode = "1.3.3" state-chain = { path = "../../../crates/state-chain" } # Ziren -zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", features = ["verify"] } +zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7", features = ["verify"] } #zkm-zkvm = { path = "../../../Ziren/crates/zkvm/entrypoint", features = ["verify"] } # Statically turns off logging @@ -34,9 +34,5 @@ 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" } -[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", "state-chain/imm-wrap-vk"] diff --git a/circuits/watchtower-proof/guest/Cargo.lock b/circuits/watchtower-proof/guest/Cargo.lock index 910869ad..266ae80e 100644 --- a/circuits/watchtower-proof/guest/Cargo.lock +++ b/circuits/watchtower-proof/guest/Cargo.lock @@ -276,7 +276,7 @@ dependencies = [ [[package]] name = "alloy-primitives" version = "1.4.1" -source = "git+https://github.com/ziren-patches/core.git?branch=patch-alloy-primitives-1.4.1#59313700f710f1373a5b4cdc05c51dc3227d8064" +source = "git+https://github.com/ziren-patches/core.git?branch=patch-alloy-primitives-1.4.1#0d034202c9977acd601399efdd9c30fd1c1a08a0" dependencies = [ "alloy-rlp", "bytes", @@ -1027,7 +1027,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", "zkm-verifier", "zkm-zkvm", ] @@ -1143,7 +1143,7 @@ dependencies = [ [[package]] name = "bls12_381" version = "0.8.0" -source = "git+https://github.com/ziren-patches/bls12_381?branch=patch-0.8.0#bcf9397426410acc171ad625416b508dc913be8e" +source = "git+https://github.com/ziren-patches/bls12_381?branch=patch-0.8.0#97b215f80e9bfab9ad6641e41b005b6d8e58f748" dependencies = [ "cfg-if", "ff 0.13.1", @@ -1151,7 +1151,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]] @@ -2305,7 +2305,7 @@ dependencies = [ [[package]] name = "guest-executor" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-consensus", "alloy-evm", @@ -2458,7 +2458,7 @@ dependencies = [ "serde", "sha2 0.10.9", "verifier", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", "zkm-zkvm", ] @@ -2824,7 +2824,7 @@ dependencies = [ [[package]] name = "k256" version = "0.13.4" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#8266b228a39402a0ba68d644b7f26b85b5112fe3" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-k256-0.13.4#6ad84b9b604911c6f5dd353b88c04927d2739a32" dependencies = [ "cfg-if", "ecdsa", @@ -2834,7 +2834,7 @@ dependencies = [ "serdect", "sha2 0.10.9", "signature", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -2988,7 +2988,7 @@ dependencies = [ [[package]] name = "mpt" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -3245,14 +3245,14 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "p256" version = "0.13.2" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8" dependencies = [ "ecdsa", "elliptic-curve", "hex", "primeorder", "sha2 0.10.9", - "zkm-lib 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-lib", ] [[package]] @@ -3804,7 +3804,7 @@ dependencies = [ [[package]] name = "primeorder" version = "0.13.1" -source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#a6f1a1fb07020d00f627725a20dc336983be3946" +source = "git+https://github.com/ziren-patches/elliptic-curves?branch=patch-p256-0.13.2#88d42225abcb639b9bd3a930ac5a14f2262541c8" dependencies = [ "elliptic-curve", ] @@ -3823,7 +3823,7 @@ dependencies = [ [[package]] name = "primitives" version = "0.1.0" -source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#294aa06127be4bfda47a7fd4905b93bb8e664dca" +source = "git+https://github.com/ProjectZKM/reth-processor?branch=feat%2Fslot-state-check#eee4dbfbdb7734d2785d58f95de84393dbb9009e" dependencies = [ "alloy-eips", "alloy-genesis", @@ -5211,7 +5211,7 @@ dependencies = [ "tendermint-light-client-verifier", "tracing", "verifier", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", "zkm-zkvm", ] @@ -5279,7 +5279,7 @@ dependencies = [ [[package]] name = "substrate-bn" version = "0.6.0" -source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#aba71380457d798039111e6cc0fdf2e0718c6766" +source = "git+https://github.com/ziren-patches/bn?branch=patch-0.6.0#0dfeeb1b7bfc21941b6e4964d678abd094a54a6f" dependencies = [ "bytemuck", "byteorder", @@ -5289,7 +5289,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]] @@ -6356,8 +6356,8 @@ dependencies = [ [[package]] name = "zkm-core-executor" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -6391,14 +6391,14 @@ dependencies = [ "typenum", "vec_map", "zkm-curves", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-core-machine" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-curves" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-derive" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "proc-macro2", "quote", @@ -6483,34 +6483,21 @@ dependencies = [ [[package]] name = "zkm-lib" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" 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" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" -dependencies = [ - "bincode", - "cfg-if", - "elliptic-curve", - "serde", - "sha2 0.10.9", - "zkm-primitives 1.2.5 (git+https://github.com/ProjectZKM/Ziren)", + "zkm-primitives", ] [[package]] name = "zkm-primitives" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "blake3", @@ -6527,28 +6514,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "zkm-primitives" -version = "1.2.5" -source = "git+https://github.com/ProjectZKM/Ziren#c736a41cccd623427295f89b53306673adc89966" -dependencies = [ - "bincode", - "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", -] - [[package]] name = "zkm-recursion-core" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "backtrace", "ff 0.13.1", @@ -6578,14 +6547,14 @@ dependencies = [ "zkhash", "zkm-core-machine", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-stark", ] [[package]] name = "zkm-stark" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -6620,14 +6589,14 @@ dependencies = [ "tracing-forest", "tracing-subscriber", "zkm-derive", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-zkvm", ] [[package]] name = "zkm-verifier" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "anyhow", "bincode", @@ -6649,15 +6618,15 @@ dependencies = [ "thiserror 2.0.18", "zkm-core-executor", "zkm-core-machine", - "zkm-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-primitives", "zkm-recursion-core", "zkm-stark", ] [[package]] name = "zkm-zkvm" -version = "1.2.5" -source = "git+https://github.com/VanhGer/Ziren.git?branch=blake3#a5165540e300dd7a13ea79babd392086bc67fd48" +version = "1.2.7" +source = "git+https://github.com/ProjectZKM/Ziren?tag=v1.2.7#7dc2037c6ef99d5772c756556350698fad01c559" dependencies = [ "bincode", "blake3", @@ -6670,8 +6639,8 @@ 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-primitives 1.2.5 (git+https://github.com/VanhGer/Ziren.git?branch=blake3)", + "zkm-lib", + "zkm-primitives", ] [[package]] diff --git a/circuits/watchtower-proof/guest/Cargo.toml b/circuits/watchtower-proof/guest/Cargo.toml index a6f26f94..69ee11a0 100644 --- a/circuits/watchtower-proof/guest/Cargo.toml +++ b/circuits/watchtower-proof/guest/Cargo.toml @@ -14,7 +14,7 @@ state-chain = { path = "../../../crates/state-chain" } bitcoin-light-client-circuit = { path = "../../../crates/bitcoin-light-client-circuit" } # Ziren -zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", features = ["verify"] } +zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren", tag = "v1.2.7", features = ["verify"] } #zkm-zkvm = { path = "../../../Ziren/crates/zkvm/entrypoint", features = ["verify"] } # Statically turns off logging @@ -41,10 +41,6 @@ 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-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", From 13c5f4fe8e1187b53b31fd260d9144a078fb599b Mon Sep 17 00:00:00 2001 From: Blake <0xblake.sg@gmail.com> Date: Mon, 17 Aug 2026 01:11:57 +0800 Subject: [PATCH 2/5] Refactor get_sequencer_set_hash_from_db to simplify parameters and logic --- node/src/bin/sequencer-set-publish.rs | 49 ++++++++------------------- 1 file changed, 15 insertions(+), 34 deletions(-) diff --git a/node/src/bin/sequencer-set-publish.rs b/node/src/bin/sequencer-set-publish.rs index 14d21984..8e1ce96b 100644 --- a/node/src/bin/sequencer-set-publish.rs +++ b/node/src/bin/sequencer-set-publish.rs @@ -260,44 +260,26 @@ fn save_output(input: OutputData, output_file: &str) { } /// Query sequencer set hash from local DB. -/// If `goat_block_number` is provided, find the first record at or before that goat block. +/// Find the first record at or before `goat_block_number`. /// That is, the sequencer set hash at that goat block. -/// If not provided, query the latest record. -/// For init-genesis, return the requested goat block number as the resolved height. -/// Otherwise, return the goat block number from the matched DB record. async fn get_sequencer_set_hash_from_db( db_path: &str, - goat_block_number: Option, - init_genesis: bool, -) -> Result<([u8; 32], u64, u64), Box> { - if init_genesis && goat_block_number.is_none() { - return Err("init_genesis requires an explicit goat_block_number".into()); - } - + goat_block_number: u64, +) -> Result<([u8; 32], u64), Box> { let local_db = store::create_local_db(db_path).await; let mut storage = local_db.acquire().await?; - let record = if let Some(goat_block_number) = goat_block_number { - storage - .find_first_sequencer_set_hash_change_by_goat_block_at_or_before(i64::try_from( - goat_block_number, - )?) - .await? - } else { - storage.find_latest_sequencer_set_hash_change().await? - }; + let record = storage + .find_first_sequencer_set_hash_change_by_goat_block_at_or_before(i64::try_from( + goat_block_number, + )?) + .await?; let record = record.ok_or("No validators_hash record found in db. Start the monitor task first")?; let sequencer_set_hash = <[u8; 32]>::from_hex(record.validators_hash.trim_start_matches("0x"))?; - let record_goat_block_number = u64::try_from(record.goat_block_height)?; - let goat_block_number = if init_genesis { - goat_block_number.ok_or("init_genesis requires an explicit goat_block_number")? - } else { - record_goat_block_number - }; let cosmos_block_number = u64::try_from(record.cosmos_block_height)?; - Ok((sequencer_set_hash, goat_block_number, cosmos_block_number)) + Ok((sequencer_set_hash, cosmos_block_number)) } #[derive(Subcommand, Debug)] @@ -324,7 +306,7 @@ enum Commands { #[arg(long, env = "OWNER_BTC_KEY_WIF")] owner_btc_key_wif: Option, #[arg(long)] - goat_block_number: Option, + goat_block_number: u64, #[arg(long, env = "PUBLISHER_BTC_PUBKEYS", value_delimiter = ',', value_parser = decode_btc_public_keys)] publisher_btc_pubkeys: Vec, #[arg(long, env = "NEXT_PUBLISHER_BTC_PUBKEYS", value_delimiter = ',', value_parser = decode_btc_public_keys)] @@ -342,7 +324,7 @@ enum Commands { #[arg(long, env = "OWNER_BTC_KEY_WIF")] owner_btc_key_wif: Option, #[arg(long)] - goat_block_number: Option, + goat_block_number: u64, #[arg(long, env = "PUBLISHER_BTC_PUBKEYS", value_delimiter = ',', value_parser = decode_btc_public_keys)] publisher_btc_pubkeys: Vec, #[arg(long, env = "NEXT_PUBLISHER_BTC_PUBKEYS", value_delimiter = ',', value_parser = decode_btc_public_keys)] @@ -469,8 +451,8 @@ async fn main() -> Result<(), Box> { } => { let authorized_program_ids = load_program_id_manifest(&program_id_manifest, btc_client.network())?; - let (sequencer_set_hash, goat_block_number, cosmos_block_number) = - get_sequencer_set_hash_from_db(&args.db_path, goat_block_number, false).await?; + let (sequencer_set_hash, cosmos_block_number) = + get_sequencer_set_hash_from_db(&args.db_path, goat_block_number).await?; println!( "resolved cl block number: {cosmos_block_number}, resolved el block number: {goat_block_number}" ); @@ -510,9 +492,8 @@ async fn main() -> Result<(), Box> { let authorized_program_ids = load_program_id_manifest(&program_id_manifest, btc_client.network())?; println!("goat genesis block hash: {:#?}", hex::encode(goat_genesis_block_hash)); - let (sequencer_set_hash, goat_block_number, cosmos_block_number) = - get_sequencer_set_hash_from_db(&args.db_path, goat_block_number, init_genesis) - .await?; + let (sequencer_set_hash, cosmos_block_number) = + get_sequencer_set_hash_from_db(&args.db_path, goat_block_number).await?; let sequencers = fetch_validators(&args.cosmos_rpc_url, cosmos_block_number).await?; let fee_tx = cached_output.fee_tx; From 8e9507b0a44b70d288ac50223d5373dacbadeda5 Mon Sep 17 00:00:00 2001 From: Blake <0xblake.sg@gmail.com> Date: Mon, 17 Aug 2026 11:59:54 +0800 Subject: [PATCH 3/5] Simplify CommitChainProofBuilder logic --- circuits/commit-chain-proof/host/src/lib.rs | 204 +----------------- circuits/commit-chain-proof/host/src/main.rs | 9 +- .../src/task/commit_chain_proof.rs | 28 +-- proof-builder-rpc/src/task/mod.rs | 118 +--------- 4 files changed, 17 insertions(+), 342 deletions(-) diff --git a/circuits/commit-chain-proof/host/src/lib.rs b/circuits/commit-chain-proof/host/src/lib.rs index e49bf6b2..6a32f43b 100644 --- a/circuits/commit-chain-proof/host/src/lib.rs +++ b/circuits/commit-chain-proof/host/src/lib.rs @@ -49,9 +49,6 @@ pub struct Args { #[arg(long, default_value = "commits.bin")] pub commits: String, - #[arg(long, env)] - pub upgrade_commits: Option, - #[clap(long, env, default_value_t = 1)] pub batch_size: usize, @@ -68,13 +65,6 @@ pub struct Args { pub output_proof: String, } -impl Args { - /// Returns whether this request must rebuild from Commit Genesis. - pub fn starts_from_genesis(&self) -> bool { - self.init_input || self.upgrade_commits.is_some() - } -} - impl LongRunning for Args { fn rotate(&self) -> Self { let mut next_args = self.clone(); @@ -93,7 +83,6 @@ impl LongRunning for Args { next_args.start, ); next_args.commits = format!("{}.commits", next_args.input_proof); - next_args.upgrade_commits = None; next_args } } @@ -171,106 +160,6 @@ pub async fn fetch_commit_chain( Ok(commits) } -/// Loads a full Genesis-to-latest commit replay for a Commit ProgramId upgrade. -pub fn load_upgrade_commits( - path: &str, - latest_commit: &CircuitCommit, -) -> anyhow::Result> { - let commits: Vec = - serde_json::from_slice(&std::fs::read(path).with_context(|| format!("read {path}"))?) - .with_context(|| format!("parse {path}"))?; - anyhow::ensure!(!commits.is_empty(), "upgrade commit replay must be non-empty"); - anyhow::ensure!( - commits[0].commit_txn.compute_txid().as_byte_array() == &commits[0].genesis_txid, - "upgrade replay must start at its fixed Genesis" - ); - anyhow::ensure!( - commits.last().map(|commit| commit.commit_txn.compute_txid()) - == Some(latest_commit.commit_txn.compute_txid()), - "upgrade replay final transaction does not match current commit info" - ); - - Ok(commits) -} - -/// Validates that `commits` is the complete ordered history represented by `output`. -fn validate_full_commit_history( - commits: &[CircuitCommit], - output: &CommitChainCircuitOutput, -) -> anyhow::Result<()> { - let genesis_txid = output.chain_state.genesis_txid; - let first_commit = commits.first().context("full commit history must be non-empty")?; - anyhow::ensure!( - first_commit.commit_txn.compute_txid().to_byte_array() == genesis_txid, - "full commit history must start at the proof's fixed Genesis" - ); - - for (index, commit) in commits.iter().enumerate() { - anyhow::ensure!( - commit.genesis_txid == genesis_txid, - "full commit history commit {index} has a different Genesis" - ); - } - - for (index, commits) in commits.windows(2).enumerate() { - let previous_txid = commits[0].commit_txn.compute_txid(); - let next_input = commits[1].commit_txn.input.first().with_context(|| { - format!("full commit history commit {} has no update input", index + 1) - })?; - anyhow::ensure!( - next_input.previous_output.txid == previous_txid - && next_input.previous_output.vout == 0, - "full commit history commit {} does not spend the previous commit", - index + 1 - ); - } - - let latest_txid = - commits.last().context("full commit history must be non-empty")?.commit_txn.compute_txid(); - anyhow::ensure!( - latest_txid == output.chain_state.commit_txn.compute_txid(), - "full commit history tip does not match the proof output" - ); - Ok(()) -} - -/// Builds the complete Genesis-to-tip history for the proof being saved. -fn build_full_commit_history( - input_proof: &str, - circuit_input: &CommitChainCircuitInput, - output_public_values: &[u8], -) -> anyhow::Result> { - anyhow::ensure!(!circuit_input.commits.is_empty(), "commit proof input must be non-empty"); - let current_output = decode_commit_chain_circuit_output(output_public_values); - - let full_commits = match &circuit_input.prev_proof { - CommitChainPrevProofType::GenesisBlock => circuit_input.commits.clone(), - CommitChainPrevProofType::PrevProof => { - let previous_output = - decode_commit_chain_circuit_output(&circuit_input.zkm_public_values); - let history_path = format!("{input_proof}.all-commits"); - let mut previous_commits: Vec = serde_json::from_slice( - &std::fs::read(&history_path) - .with_context(|| format!("read {history_path} error"))?, - ) - .with_context(|| format!("parse {history_path} error"))?; - let previous_tip = previous_commits - .last() - .context("previous full commit history must be non-empty")?; - anyhow::ensure!( - previous_tip.commit_txn.compute_txid() - == previous_output.chain_state.commit_txn.compute_txid(), - "previous full commit history tip does not match the predecessor proof output" - ); - previous_commits.extend(circuit_input.commits.iter().cloned()); - previous_commits - } - }; - - validate_full_commit_history(&full_commits, ¤t_output)?; - Ok(full_commits) -} - /// A program that aggregates the proofs of the simple program. pub struct CommitChainProofBuilder { client: ProverClient, @@ -407,11 +296,11 @@ impl ProofBuilder for CommitChainProofBuilder { fn save_proof( &self, ctx: &proof_builder::ProofRequest, - input: &[u8], + _input: &[u8], _cycles: u64, proof: ZKMProofWithPublicValues, ) -> anyhow::Result<(String, usize)> { - let ProofRequest::CommitChainProofRequest { input_proof, output_proof, .. } = ctx else { + let ProofRequest::CommitChainProofRequest { output_proof, commits, .. } = ctx else { anyhow::bail!("Invalid commit chain input"); }; //fs::write(&output_proof, bincode::serialize(&proof)?)?; @@ -422,9 +311,7 @@ impl ProofBuilder for CommitChainProofBuilder { //tracing::info!("Generate proof successfully, proof: {:?}", proof); //Ok((public_value_hex, proof_size)) - let circuit_input: CommitChainCircuitInput = bincode::deserialize(input)?; let public_values = proof.public_values.to_vec(); - let full_commits = build_full_commit_history(input_proof, &circuit_input, &public_values)?; std::fs::write(output_proof, proof.bytes())?; let public_value_hex = hex::encode(&public_values); @@ -433,14 +320,10 @@ impl ProofBuilder for CommitChainProofBuilder { std::fs::write(format!("{}.public_inputs.bin", output_proof), public_values)?; std::fs::write(format!("{}.vk_hash.bin", output_proof), self.verifying_key.bytes32())?; std::fs::write(format!("{}.zkm_version.bin", output_proof), zkm_version)?; - let latest_commit = - circuit_input.commits.last().context("commit proof input must be non-empty")?; + let latest_commit = commits.last().context("commit proof input must be non-empty")?; let commits_path = format!("{output_proof}.commits"); std::fs::write(&commits_path, serde_json::to_vec(std::slice::from_ref(latest_commit))?) .with_context(|| format!("write {commits_path} error"))?; - let full_commits_path = format!("{output_proof}.all-commits"); - std::fs::write(&full_commits_path, serde_json::to_vec(&full_commits)?) - .with_context(|| format!("write {full_commits_path} error"))?; Ok((public_value_hex, proof_size)) } } @@ -449,89 +332,8 @@ impl ProofBuilder for CommitChainProofBuilder { mod tests { use super::*; - use bitcoin::{Transaction, absolute::LockTime, transaction::Version}; use tracing::info; - fn circuit_commit(transaction: Transaction, genesis_txid: [u8; 32]) -> CircuitCommit { - CircuitCommit { - commit_txn: transaction, - genesis_txid, - publisher_public_keys: vec![], - threshold: 0, - next_publisher_public_keys: None, - next_threshold: None, - sequencers: vec![], - genesis_evm_block_hash: [0; 32], - program_history_root: [1; 32], - block_height: 0, - proof_checkpoint_root: [1; 32], - authorized_program_ids: AuthorizedProgramIds { - header: [1; 32], - state: [2; 32], - commit: [3; 32], - watchtower: [4; 32], - }, - } - } - - #[test] - fn upgrade_replay_starts_from_genesis_once() { - let args = Args::try_parse_from([ - "commit-chain-proof", - "--commit-info", - "commit-info.json", - "--upgrade-commits", - "upgrade-commits.json", - ]) - .unwrap(); - assert!(args.starts_from_genesis()); - - let next = args.rotate(); - assert!(!next.starts_from_genesis()); - } - - #[test] - fn upgrade_replay_requires_fixed_genesis_and_latest_commit() { - let transaction = Transaction { - version: Version::TWO, - lock_time: LockTime::ZERO, - input: vec![], - output: vec![], - }; - let genesis_txid = transaction.compute_txid().to_byte_array(); - let commit = circuit_commit(transaction, genesis_txid); - let path = std::env::temp_dir().join(format!( - "commit-upgrade-replay-{}-{}.json", - std::process::id(), - std::thread::current().name().unwrap_or("test") - )); - - std::fs::write(&path, serde_json::to_vec(&vec![commit.clone()]).unwrap()).unwrap(); - assert_eq!( - load_upgrade_commits(path.to_str().unwrap(), &commit).unwrap(), - vec![commit.clone()] - ); - - let other_latest = circuit_commit( - Transaction { - version: Version::ONE, - lock_time: LockTime::ZERO, - input: vec![], - output: vec![], - }, - genesis_txid, - ); - assert!(load_upgrade_commits(path.to_str().unwrap(), &other_latest).is_err()); - - let wrong_genesis = CircuitCommit { genesis_txid: [9; 32], ..commit.clone() }; - std::fs::write(&path, serde_json::to_vec(&vec![wrong_genesis]).unwrap()).unwrap(); - assert!(load_upgrade_commits(path.to_str().unwrap(), &commit).is_err()); - - std::fs::write(&path, serde_json::to_vec(&Vec::::new()).unwrap()).unwrap(); - assert!(load_upgrade_commits(path.to_str().unwrap(), &commit).is_err()); - std::fs::remove_file(path).unwrap(); - } - #[test] #[ignore = "local test"] fn test_parse_commit_chain_proof() { diff --git a/circuits/commit-chain-proof/host/src/main.rs b/circuits/commit-chain-proof/host/src/main.rs index 4e418204..ab72bbe9 100644 --- a/circuits/commit-chain-proof/host/src/main.rs +++ b/circuits/commit-chain-proof/host/src/main.rs @@ -1,6 +1,6 @@ //! Generate commit chain proof use clap::Parser; -use commit_chain_proof::{Args, CommitChainProofBuilder, fetch_commit_chain, load_upgrade_commits}; +use commit_chain_proof::{Args, CommitChainProofBuilder, fetch_commit_chain}; use proof_builder::{ProofBuilder, ProofRequest}; #[tokio::main] @@ -17,7 +17,7 @@ async fn main() { return; } - let mut commits = fetch_commit_chain( + let commits = fetch_commit_chain( &args.esplora_url, &args.commit_info, &args.commits, @@ -25,11 +25,8 @@ async fn main() { ) .await .unwrap(); - if let Some(path) = args.upgrade_commits.as_deref() { - commits = load_upgrade_commits(path, &commits[0]).unwrap(); - } let ctx = ProofRequest::CommitChainProofRequest { - init_input: args.starts_from_genesis(), + init_input: args.init_input, input_proof: args.input_proof.clone(), output_proof: args.output_proof.clone(), commit_info: args.commit_info.clone(), diff --git a/proof-builder-rpc/src/task/commit_chain_proof.rs b/proof-builder-rpc/src/task/commit_chain_proof.rs index 88f3cec4..926aca77 100644 --- a/proof-builder-rpc/src/task/commit_chain_proof.rs +++ b/proof-builder-rpc/src/task/commit_chain_proof.rs @@ -4,7 +4,6 @@ use crate::task::fetch_latest_long_running_task; use crate::task::fetch_next_commit_task_index; use commit_chain_proof::CommitChainProofBuilder; use commit_chain_proof::fetch_commit_chain; -use commit_chain_proof::load_upgrade_commits; use proof_builder::{ProofBuilder, ProofRequest}; use std::time::Duration; use store::localdb::LocalDB; @@ -36,8 +35,8 @@ pub(crate) fn spawn_commit_chain_proof_task( loop { tokio::select! { _ = tokio::time::sleep(Duration::from_secs(interval)) => { - let starts_from_genesis = args.starts_from_genesis(); - if !starts_from_genesis { + let init_input = args.init_input; + if !init_input { let next_task = fetch_latest_long_running_task(&local_db, CommitChainProofBuilder::name()).await?; if let Some(next_task) = next_task { info!("Commit chain's next task: {next_task:?}"); @@ -65,33 +64,17 @@ pub(crate) fn spawn_commit_chain_proof_task( } info!("Commit chain proof generate task: generate proof, args: {args:?}"); - let mut commits = match fetch_commit_chain(&args.esplora_url, &args.commit_info, &args.commits, args.bitcoin_network).await { + let commits = match fetch_commit_chain(&args.esplora_url, &args.commit_info, &args.commits, args.bitcoin_network).await { Ok(d) => d, Err(err) => { tracing::warn!("Fetch commit chain error, {err:?}, continuing"); continue; } }; - if let Some(path) = args.upgrade_commits.as_deref() { - commits = match load_upgrade_commits(path, &commits[0]) { - Ok(commits) => commits, - Err(err) => { - tracing::warn!("Load upgrade commits error, {err:?}, continuing"); - continue; - } - }; - } - let next_commit_index = if starts_from_genesis { - commits.len() - } else { - args.start.checked_add(commits.len()).ok_or_else(|| { - anyhow::anyhow!("Commit proof next index overflow") - })? - }; let block_start = commits.first().unwrap().block_height as i64; let ctx = ProofRequest::CommitChainProofRequest { - init_input: starts_from_genesis, + init_input, input_proof: args.input_proof.clone(), output_proof: args.output_proof.clone(), commit_info: args.commit_info.clone(), @@ -133,8 +116,7 @@ pub(crate) fn spawn_commit_chain_proof_task( proof_size as i64, cycles, CommitChainProofBuilder::name(), - starts_from_genesis, - next_commit_index, + init_input, proving_duration as i64, proving_time as i64, store::ProofState::Proven, diff --git a/proof-builder-rpc/src/task/mod.rs b/proof-builder-rpc/src/task/mod.rs index 8ad5faa6..86db37db 100644 --- a/proof-builder-rpc/src/task/mod.rs +++ b/proof-builder-rpc/src/task/mod.rs @@ -15,7 +15,6 @@ use crate::task::{ use ::commit_chain_proof::CommitChainProofBuilder; use ::header_chain_proof::HeaderChainProofBuilder; use ::state_chain_proof::StateChainProofBuilder; -use anyhow::Context; use bitcoin::{BlockHash, Network, Txid}; use client::btc_chain::BTCClient; use std::collections::HashSet; @@ -193,15 +192,10 @@ pub(crate) async fn run_generate_proof_tasks( pub(crate) async fn fetch_next_commit_task_index(local_db: &LocalDB) -> anyhow::Result { let mut storage_processor = local_db.acquire().await?; - let latest_proof = storage_processor - .find_latest_long_running_task_proof_by_name(CommitChainProofBuilder::name()) - .await? - .context("latest Commit proof record is missing")?; - latest_proof - .extra - .context("latest Commit proof next index is missing")? - .parse() - .context("invalid latest Commit proof next index") + let proofs = storage_processor + .find_all_running_task_proofs_by_name(CommitChainProofBuilder::name()) + .await?; + Ok(proofs.len()) } pub(crate) async fn fetch_latest_long_running_task( @@ -564,7 +558,7 @@ pub(crate) async fn create_long_running_task( .await } -/// Persists a Commit proof and its next input index, replacing prior records for a replay. +/// Persists a Commit proof, replacing prior Commit records for a Genesis replay. pub(crate) async fn create_commit_chain_proof( local_db: &LocalDB, start: i64, @@ -575,7 +569,6 @@ pub(crate) async fn create_commit_chain_proof( cycles: u64, chain_name: String, replace_existing: bool, - next_commit_index: usize, total_time_to_proof: i64, proving_time: i64, proof_state: ProofState, @@ -618,7 +611,7 @@ pub(crate) async fn create_commit_chain_proof( total_time_to_proof, proving_time, zkm_version, - extra: Some(next_commit_index.to_string()), + extra: None, created_at: current_time_secs(), updated_at: current_time_secs(), }) @@ -967,105 +960,6 @@ mod tests { } } - #[tokio::test] - async fn genesis_commit_proof_replaces_only_commit_chain_records() { - let local_db = create_local_db("sqlite::memory:").await; - let mut storage = local_db.acquire().await.unwrap(); - storage - .create_long_running_task_proof(&long_running_task("commit-chain", 10, "old-1")) - .await - .unwrap(); - storage - .create_long_running_task_proof(&long_running_task("commit-chain", 20, "old-2")) - .await - .unwrap(); - storage - .create_long_running_task_proof(&long_running_task("header-chain", 0, "header")) - .await - .unwrap(); - let header_count = storage - .find_all_running_task_proofs_by_name(HeaderChainProofBuilder::name()) - .await - .unwrap() - .len(); - drop(storage); - - create_commit_chain_proof( - &local_db, - 10, - 100, - "new".to_string(), - "public-values".to_string(), - 1, - 2, - CommitChainProofBuilder::name(), - true, - 2, - 3, - 4, - ProofState::Proven, - "v1.2.5".to_string(), - ) - .await - .unwrap(); - - let mut storage = local_db.acquire().await.unwrap(); - let commits = storage - .find_all_running_task_proofs_by_name(CommitChainProofBuilder::name()) - .await - .unwrap(); - assert_eq!(commits.len(), 1); - assert_eq!(commits[0].path_to_proof.as_deref(), Some("new")); - assert_eq!( - storage - .find_all_running_task_proofs_by_name(HeaderChainProofBuilder::name()) - .await - .unwrap() - .len(), - header_count - ); - } - - #[tokio::test] - async fn failed_genesis_commit_insert_rolls_back_old_record_deletion() { - let local_db = create_local_db("sqlite::memory:").await; - let mut storage = local_db.acquire().await.unwrap(); - storage - .create_long_running_task_proof(&long_running_task("commit-chain", 10, "old")) - .await - .unwrap(); - drop(storage); - - assert!( - create_commit_chain_proof( - &local_db, - 10, - 100, - "new".to_string(), - "public-values".to_string(), - 1, - 2, - "invalid-chain".to_string(), - true, - 99, - 3, - 4, - ProofState::Proven, - "v1.2.5".to_string(), - ) - .await - .is_err() - ); - - let mut storage = local_db.acquire().await.unwrap(); - let commits = storage - .find_all_running_task_proofs_by_name(CommitChainProofBuilder::name()) - .await - .unwrap(); - assert_eq!(commits.len(), 1); - assert_eq!(commits[0].path_to_proof.as_deref(), Some("old")); - } - #[tokio::test] async fn test_add_watchtower_task() { let db_path = std::env::var("TEST_DB") From 4d0bd244bcf0e4237a536f3a45fee422c81f6399 Mon Sep 17 00:00:00 2001 From: Blake <0xblake.sg@gmail.com> Date: Mon, 17 Aug 2026 12:06:32 +0800 Subject: [PATCH 4/5] update `bitvm-gc` --- Cargo.lock | 6 +++--- Cargo.toml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e1682ec6..3f49e0be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5569,7 +5569,7 @@ dependencies = [ [[package]] name = "garbled-snark-verifier" version = "0.1.0" -source = "git+https://github.com/GOATNetwork/bitvm2-gc?branch=dep%2Fziren-v1.2.7#785a68760c7a4d45a6cd200f5c7e0e3592915c60" +source = "git+https://github.com/GOATNetwork/bitvm-gc?branch=feat%2Fgoat-bitvm3#adb8727de26d9758e28dda0825e584b731cfe227" dependencies = [ "ark-bn254", "ark-crypto-primitives", @@ -12206,7 +12206,7 @@ dependencies = [ [[package]] name = "soldering-host" version = "1.1.0" -source = "git+https://github.com/GOATNetwork/bitvm2-gc?branch=dep%2Fziren-v1.2.7#785a68760c7a4d45a6cd200f5c7e0e3592915c60" +source = "git+https://github.com/GOATNetwork/bitvm-gc?branch=feat%2Fgoat-bitvm3#adb8727de26d9758e28dda0825e584b731cfe227" dependencies = [ "ark-bn254", "ark-crypto-primitives", @@ -13907,7 +13907,7 @@ dependencies = [ [[package]] name = "verifiable-circuit-babe" version = "0.0.1" -source = "git+https://github.com/GOATNetwork/bitvm2-gc?branch=dep%2Fziren-v1.2.7#785a68760c7a4d45a6cd200f5c7e0e3592915c60" +source = "git+https://github.com/GOATNetwork/bitvm-gc?branch=feat%2Fgoat-bitvm3#adb8727de26d9758e28dda0825e584b731cfe227" dependencies = [ "aes", "ark-bn254", diff --git a/Cargo.toml b/Cargo.toml index b1fa7f4b..647bb280 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -106,13 +106,13 @@ p3-field = { git = "https://github.com/ProjectZKM/Plonky3" } #zkm-verifier = { path = "../Ziren/crates/verifier" } bitvm-lib = { package = "bitvm-gc", path = "crates/bitvm-gc" } -verifiable-circuit-babe = { git = "https://github.com/GOATNetwork/bitvm2-gc", branch = "dep/ziren-v1.2.7" } -garbled-snark-verifier = { git = "https://github.com/GOATNetwork/bitvm2-gc", branch = "dep/ziren-v1.2.7" } -soldering-host = { git = "https://github.com/GOATNetwork/bitvm2-gc", branch = "dep/ziren-v1.2.7" } +verifiable-circuit-babe = { git = "https://github.com/GOATNetwork/bitvm-gc", branch = "feat/goat-bitvm3" } +garbled-snark-verifier = { git = "https://github.com/GOATNetwork/bitvm-gc", branch = "feat/goat-bitvm3" } +soldering-host = { git = "https://github.com/GOATNetwork/bitvm-gc", branch = "feat/goat-bitvm3" } -#verifiable-circuit-babe = { path = "../bitvm2-gc/verifiable-circuit-babe"} -#garbled-snark-verifier = { path = "../bitvm2-gc/garbled-snark-verifier"} -#soldering-host = { path = "../bitvm2-gc/babe-programs/soldering/host" } +#verifiable-circuit-babe = { path = "../bitvm-gc/verifiable-circuit-babe"} +#garbled-snark-verifier = { path = "../bitvm-gc/garbled-snark-verifier"} +#soldering-host = { path = "../bitvm-gc/babe-programs/soldering/host" } store = { path = "crates/store" } util = { path = "crates/util" } client = { path = "crates/client" } From cf6fd1e56835855d94928ce61df4ffed518cac37 Mon Sep 17 00:00:00 2001 From: Blake <0xblake.sg@gmail.com> Date: Mon, 17 Aug 2026 12:10:19 +0800 Subject: [PATCH 5/5] remove unused code --- proof-builder-rpc/src/task/mod.rs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/proof-builder-rpc/src/task/mod.rs b/proof-builder-rpc/src/task/mod.rs index 86db37db..56afa007 100644 --- a/proof-builder-rpc/src/task/mod.rs +++ b/proof-builder-rpc/src/task/mod.rs @@ -949,17 +949,6 @@ mod tests { use store::create_local_db; use uuid::Uuid; - fn long_running_task(chain_name: &str, block_start: i64, path: &str) -> LongRunningTaskProof { - LongRunningTaskProof { - block_start, - block_end: block_start + 10, - chain_name: chain_name.to_string(), - path_to_proof: Some(path.to_string()), - proof_state: ProofState::Proven.to_i64(), - ..LongRunningTaskProof::default() - } - } - #[tokio::test] async fn test_add_watchtower_task() { let db_path = std::env::var("TEST_DB")