Skip to content

Commit

Permalink
chore: use released halo2-lib v0.4.1
Browse files Browse the repository at this point in the history
Turns off halo2-pse for crates.io release
  • Loading branch information
jonathanpwang committed Jan 18, 2024
1 parent 38f7a0d commit 6b47987
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 84 deletions.
91 changes: 16 additions & 75 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 11 additions & 6 deletions snark-verifier-sdk/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
[package]
name = "snark-verifier-sdk"
version = "0.1.7"
authors = ["Privacy Scaling Explorations Team", "Intrinsic Technologies"]
license = "MIT"
edition = "2021"
repository = "https://github.com/axiom-crypto/snark-verifier"
readme = "../README.md"
description = "SDK for using snark-verifier."
rust-version = "1.73.0"
autobenches = false

[dependencies]
Expand All @@ -18,14 +24,13 @@ serde_json = "1.0"
serde_with = { version = "2.2", optional = true }
bincode = "1.3.3"
ark-std = { version = "0.3.0", features = ["print-trace"], optional = true }
halo2-base = { git = "https://github.com/axiom-crypto/halo2-lib.git", branch = "release-0.4.1-rc", default-features = false }
snark-verifier = { path = "../snark-verifier", default-features = false }
halo2-base = { version = "=0.4.1", default-features = false }
#halo2-base = { git = "https://github.com/axiom-crypto/halo2-lib.git", branch = "main", default-features = false }
snark-verifier = { version = "=0.1.7", path = "../snark-verifier", default-features = false }
getset = "0.1.2"

# loader_evm
ethereum-types = { version = "=0.14.1", default-features = false, features = [
"std",
], optional = true }
ethereum-types = { version = "=0.14.1", default-features = false, features = ["std"], optional = true }

# zkevm benchmarks
# zkevm-circuits = { git = "https://github.com/privacy-scaling-explorations/zkevm-circuits.git", rev = "f834e61", features = [
Expand Down Expand Up @@ -53,7 +58,7 @@ loader_evm = ["snark-verifier/loader_evm", "dep:ethereum-types"]
revm = ["snark-verifier/revm"]
parallel = ["snark-verifier/parallel"]
# EXACTLY one of halo2-pse / halo2-axiom should always be turned on; not sure how to enforce this with Cargo
halo2-pse = ["snark-verifier/halo2-pse", "dep:serde_with"]
# halo2-pse = ["snark-verifier/halo2-pse", "dep:serde_with"]
halo2-axiom = ["snark-verifier/halo2-axiom"]

# zkevm = ["dep:zkevm-circuits", "dep:bus-mapping", "dep:mock", "dep:eth-types"]
Expand Down
8 changes: 5 additions & 3 deletions snark-verifier/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ serde = { version = "1.0", features = ["derive"] }
pairing = { version = "0.23" }

# Use halo2-base as non-optional dependency because it re-exports halo2_proofs, halo2curves, and poseidon, using different repos based on feature flag "halo2-axiom" or "halo2-pse"
halo2-base = { git = "https://github.com/axiom-crypto/halo2-lib.git", branch = "release-0.4.1-rc", default-features = false }
halo2-base = { version = "=0.4.1", default-features = false }
# halo2-base = { git = "https://github.com/axiom-crypto/halo2-lib.git", branch = "main", default-features = false }

# loader_halo2
halo2-ecc = { git = "https://github.com/axiom-crypto/halo2-lib.git", branch = "release-0.4.1-rc", default-features = false, optional = true }
halo2-ecc = { version = "=0.4.1", default-features = false, optional = true }
# halo2-ecc = { git = "https://github.com/axiom-crypto/halo2-lib.git", branch = "main", default-features = false, optional = true }

# parallel
rayon = { version = "1.8", optional = true }
Expand Down Expand Up @@ -48,7 +50,7 @@ loader_evm = ["dep:sha3", "dep:ruint"]
revm = ["loader_evm", "dep:revm"]
parallel = ["dep:rayon"]
# EXACTLY one of halo2-pse / halo2-axiom should always be turned on; not sure how to enforce this with Cargo
halo2-pse = ["halo2-base/halo2-pse", "halo2-ecc?/halo2-pse"]
# halo2-pse = ["halo2-base/halo2-pse", "halo2-ecc?/halo2-pse"]
halo2-axiom = ["halo2-base/halo2-axiom", "halo2-ecc?/halo2-axiom"]

[[example]]
Expand Down

0 comments on commit 6b47987

Please sign in to comment.