From 8c86e3382cf9377668944f67e0c4add521f1e8ce Mon Sep 17 00:00:00 2001 From: Timofey Luin Date: Tue, 6 Feb 2024 12:30:55 +0100 Subject: [PATCH] quickfix: pin some dependencies --- Cargo.toml | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ba496c7..799bcc9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ halo2-base = { git = "https://github.com/axiom-crypto/halo2-lib", branch = "comm halo2-ecc = { git = "https://github.com/axiom-crypto/halo2-lib", branch = "community-edition", default-features = false } zkevm-hashes = { git = "https://github.com/axiom-crypto/halo2-lib", branch = "community-edition", default-features = false } -halo2curves = { package = "halo2curves-axiom", version = "0.5" } +halo2curves = { package = "halo2curves-axiom", version = "=0.5.2" } # verifier SDK snark-verifier = { git = "https://github.com/axiom-crypto/snark-verifier.git", branch = "community-edition", default-features = false, features = [ @@ -75,7 +75,7 @@ group = "0.13" num-bigint = { version = "0.4", features = ["rand"] } pasta_curves = "0.5.1" ff = "0.13" -sha2 = { version = "0.9", features = ["compress"] } +sha2 = { version = "0.10", features = ["compress"] } uint = "0.9.1" # misc @@ -89,34 +89,17 @@ ark-std = { version = "0.4.0", features = ["print-trace"] } [patch.crates-io] -halo2curves = { git = "https://github.com/timoftime/halo2curves", package = "halo2curves-axiom", branch = "support_bls12-381" } ssz_rs = { git = "https://github.com/ralexstokes/ssz-rs", rev = "5f1ec833718efa07bbbff427ab28a1eeaa706164" } - +halo2-base = { git = "https://github.com/timoftime/halo2-lib", branch = "feat/zkevm-sha256-builder" } +halo2-ecc = { git = "https://github.com/timoftime/halo2-lib", branch = "feat/zkevm-sha256-builder" } +zkevm-hashes = { git = "https://github.com/timoftime/halo2-lib", branch = "feat/zkevm-sha256-builder" } [patch."https://github.com/axiom-crypto/halo2-lib"] -halo2-base = { git = "https://github.com/timoftime/halo2-lib", branch = "feat/zkevm-sha256-builder", default-features = false, features = [ - "halo2-pse", - "display", - "jemallocator", -] } -halo2-ecc = { git = "https://github.com/timoftime/halo2-lib", branch = "feat/zkevm-sha256-builder", default-features = false, features = [ - "halo2-pse", - "jemallocator", -] } -zkevm-hashes = { git = "https://github.com/timoftime/halo2-lib", branch = "feat/zkevm-sha256-builder", default-features = false } -# halo2-base = { path = "../halo2-lib/halo2-base", default-features = false, features = [ -# "halo2-pse", -# "display", -# ] } -# halo2-ecc = { path = "../halo2-lib/halo2-ecc", default-features = false, features = [ -# "halo2-pse", -# ] } -# zkevm-hashes = { path = "../halo2-lib/hashes/zkevm", default-features = false } +halo2-base = { git = "https://github.com/timoftime/halo2-lib", branch = "feat/zkevm-sha256-builder" } +halo2-ecc = { git = "https://github.com/timoftime/halo2-lib", branch = "feat/zkevm-sha256-builder" } +zkevm-hashes = { git = "https://github.com/timoftime/halo2-lib", branch = "feat/zkevm-sha256-builder" } [patch."https://github.com/axiom-crypto/snark-verifier.git"] -snark-verifier = { git = "https://github.com/timoftime/snark-verifier", branch = "yul-codegen", default-features = false } -snark-verifier-sdk = { git = "https://github.com/timoftime/snark-verifier", branch = "yul-codegen", default-features = false } -# snark-verifier = { path = "../snark-verifier/snark-verifier" } -# snark-verifier-sdk = { path = "../snark-verifier/snark-verifier-sdk" } - +snark-verifier = { git = "https://github.com/timoftime/snark-verifier", branch = "yul-codegen" } +snark-verifier-sdk = { git = "https://github.com/timoftime/snark-verifier", branch = "yul-codegen" }