From b3c742901b4cf490420c0f6b32dc2cffed759f21 Mon Sep 17 00:00:00 2001 From: Jonathan Wang <31040440+jonathanpwang@users.noreply.github.com> Date: Wed, 31 Jan 2024 22:44:11 -0800 Subject: [PATCH 1/3] feat: upgrade to `halo2-axiom` v0.5.0 (logUp) Use new logUp lookup scheme in halo2 backend. --- halo2-base/Cargo.toml | 2 +- halo2-base/src/virtual_region/tests/lookups/memory.rs | 2 +- hashes/zkevm/Cargo.toml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/halo2-base/Cargo.toml b/halo2-base/Cargo.toml index fe3788c0..7f9d93fb 100644 --- a/halo2-base/Cargo.toml +++ b/halo2-base/Cargo.toml @@ -24,7 +24,7 @@ getset = "0.1.2" ark-std = { version = "0.3.0", features = ["print-trace"], optional = true } # Use Axiom's custom halo2 monorepo for faster proving when feature = "halo2-axiom" is on -halo2_proofs_axiom = { version = "0.4", package = "halo2-axiom", optional = true } +halo2_proofs_axiom = { version = "0.5.0-alpha", package = "halo2-axiom", optional = true } # Use PSE halo2 and halo2curves for compatibility when feature = "halo2-pse" is on halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v0.3.0", features = ["circuit-params", "derive_serde"], optional = true } diff --git a/halo2-base/src/virtual_region/tests/lookups/memory.rs b/halo2-base/src/virtual_region/tests/lookups/memory.rs index 8b94a6e5..100003bb 100644 --- a/halo2-base/src/virtual_region/tests/lookups/memory.rs +++ b/halo2-base/src/virtual_region/tests/lookups/memory.rs @@ -181,7 +181,7 @@ fn test_ram_mock() { } #[test] -#[should_panic = "called `Result::unwrap()` on an `Err` value: [Lookup dynamic lookup table(index: 2) is not satisfied in Region 2 ('[BasicDynLookupConfig] Advice cells to lookup') at offset 16]"] +#[should_panic = "called `Result::unwrap()` on an `Err` value: [Lookup dummy(index: 1) is not satisfied in Region 2 ('[BasicDynLookupConfig] Advice cells to lookup') at offset 16]"] fn test_ram_mock_failed_access() { let k = 5u32; const CYCLES: usize = 50; diff --git a/hashes/zkevm/Cargo.toml b/hashes/zkevm/Cargo.toml index b8c25f9c..7bdb0b40 100644 --- a/hashes/zkevm/Cargo.toml +++ b/hashes/zkevm/Cargo.toml @@ -22,8 +22,8 @@ serde = { version = "1.0", features = ["derive"] } rayon = "1.8" sha3 = "0.10.8" # always included but without features to use Native poseidon and get CircuitExt trait -# snark-verifier-sdk = { version = "=0.1.7", default-features = false } -snark-verifier-sdk = { version = "=0.1.7", git = "https://github.com/axiom-crypto/snark-verifier.git", tag = "v0.1.7-git", default-features = false } +# snark-verifier-sdk = { version = "0.2.0-alpha", default-features = false } +snark-verifier-sdk = { version = "0.2.0-alpha", git = "https://github.com/axiom-crypto/snark-verifier.git", tag = "v0.1.7-git", default-features = false } getset = "0.1.2" type-map = "0.5.0" From 2924d474d79964787f15b164c7b01d78f9443495 Mon Sep 17 00:00:00 2001 From: Jonathan Wang <31040440+jonathanpwang@users.noreply.github.com> Date: Wed, 31 Jan 2024 22:59:58 -0800 Subject: [PATCH 2/3] chore: bump versions --- halo2-base/Cargo.toml | 2 +- halo2-ecc/Cargo.toml | 6 +++--- hashes/zkevm/Cargo.toml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/halo2-base/Cargo.toml b/halo2-base/Cargo.toml index 7f9d93fb..9f2b8499 100644 --- a/halo2-base/Cargo.toml +++ b/halo2-base/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "halo2-base" -version = "0.4.2-alpha.0" +version = "0.5.0-alpha.0" authors = ["Intrinsic Technologies"] license = "MIT" edition = "2021" diff --git a/halo2-ecc/Cargo.toml b/halo2-ecc/Cargo.toml index 9eb79e86..8a9db067 100644 --- a/halo2-ecc/Cargo.toml +++ b/halo2-ecc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "halo2-ecc" -version = "0.4.1" +version = "0.5.0-alpha.0" authors = ["Intrinsic Technologies"] license = "MIT" edition = "2021" @@ -22,7 +22,7 @@ serde_json = "1.0" rayon = "1.8" test-case = "3.1.0" -halo2-base = { version = "0.4.2-alpha", path = "../halo2-base", default-features = false } +halo2-base = { version = "0.5.0-alpha", path = "../halo2-base", default-features = false } # plotting circuit layout plotters = { version = "0.3.0", optional = true } @@ -32,7 +32,7 @@ ark-std = { version = "0.3.0", features = ["print-trace"] } pprof = { version = "0.13", features = ["criterion", "flamegraph"] } criterion = "0.5.1" criterion-macro = "0.4" -halo2-base = { version = "0.4.2-alpha", path = "../halo2-base", default-features = false, features = ["test-utils"] } +halo2-base = { version = "0.5.0-alpha", path = "../halo2-base", default-features = false, features = ["test-utils"] } test-log = "0.2.12" env_logger = "0.10.0" diff --git a/hashes/zkevm/Cargo.toml b/hashes/zkevm/Cargo.toml index 7bdb0b40..d3fff033 100644 --- a/hashes/zkevm/Cargo.toml +++ b/hashes/zkevm/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zkevm-hashes" -version = "0.2.1" +version = "0.3.0-alpha.0" authors = ["Privacy Scaling Explorations Team", "Taiko Labs", "Intrinsic Technologies"] license = "MIT OR Apache-2.0" edition = "2021" @@ -17,7 +17,7 @@ itertools = "0.11" lazy_static = "1.4" log = "0.4" num-bigint = { version = "0.4" } -halo2-base = { version = "0.4.2-alpha", path = "../../halo2-base", default-features = false, features = ["test-utils"] } +halo2-base = { version = "0.5.0-alpha", path = "../../halo2-base", default-features = false, features = ["test-utils"] } serde = { version = "1.0", features = ["derive"] } rayon = "1.8" sha3 = "0.10.8" From 705bc038900cdf137cb77169af4c1af1b9a66166 Mon Sep 17 00:00:00 2001 From: Jonathan Wang <31040440+jonathanpwang@users.noreply.github.com> Date: Wed, 31 Jan 2024 23:08:26 -0800 Subject: [PATCH 3/3] chore: update snark-verifier tag --- hashes/zkevm/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hashes/zkevm/Cargo.toml b/hashes/zkevm/Cargo.toml index d3fff033..4f775657 100644 --- a/hashes/zkevm/Cargo.toml +++ b/hashes/zkevm/Cargo.toml @@ -23,7 +23,7 @@ rayon = "1.8" sha3 = "0.10.8" # always included but without features to use Native poseidon and get CircuitExt trait # snark-verifier-sdk = { version = "0.2.0-alpha", default-features = false } -snark-verifier-sdk = { version = "0.2.0-alpha", git = "https://github.com/axiom-crypto/snark-verifier.git", tag = "v0.1.7-git", default-features = false } +snark-verifier-sdk = { git = "https://github.com/axiom-crypto/snark-verifier.git", tag = "v0.2.0-alpha.0", default-features = false } getset = "0.1.2" type-map = "0.5.0"