Skip to content

feat: upgrade to halo2-axiom v0.6.0 (logUp) #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jonathanpwang wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

feat: upgrade to halo2-axiom v0.6.0 (logUp) #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3c7429
feat: upgrade to `halo2-axiom` v0.5.0 (logUp)
jonathanpwang Feb 1, 2024
2924d47
chore: bump versions
jonathanpwang Feb 1, 2024
705bc03
chore: update snark-verifier tag
jonathanpwang Feb 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions halo2-base/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 }

Expand Down
2 changes: 1 addition & 1 deletion halo2-base/src/virtual_region/tests/lookups/memory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions halo2-ecc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 }
Expand All @@ -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"

Expand Down
8 changes: 4 additions & 4 deletions hashes/zkevm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -17,13 +17,13 @@ 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"
# 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 = { 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"

Expand Down