Skip to content

Halo2 ecc snark verifier 0220: sync ff 0.13.0 #1

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

Open
zhenfeizhang wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Halo2 ecc snark verifier 0220: sync ff 0.13.0 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
451a9a9
halo2-ecc-ecdsa-0129
zhenfeizhang Feb 3, 2023
e8430c0
update links
zhenfeizhang Feb 8, 2023
f57cf7a
sync up changes after rebase main
zhenfeizhang Feb 20, 2023
4dca32b
update dependencies
zhenfeizhang Mar 6, 2023
da3075e
sync up with ff/group 0.13.0
zhenfeizhang Mar 9, 2023
2b12bb5
sync ff group 0.13.0
zhenfeizhang Mar 9, 2023
3e0126a
remove unused life timer
zhenfeizhang Mar 19, 2023
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
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ Cargo.lock

/halo2_ecc/src/bn254/data/
/halo2_ecc/src/secp256k1/data/

*.data
*.csv
*.txt
*.srs
19 changes: 15 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
members = [
"halo2-base",
"halo2-ecc",
"hashes/zkevm-keccak",
# "hashes/zkevm-keccak",
]

[profile.dev]
Expand Down Expand Up @@ -40,6 +40,17 @@ inherits = "release"
debug = true

# patch so snark-verifier uses this crate's halo2-base
[patch."https://github.com/axiom-crypto/halo2-lib.git"]
halo2-base = { path = "./halo2-base" }
halo2-ecc = { path = "./halo2-ecc" }
# [patch."https://github.com/axiom-crypto/halo2-lib.git"]
# halo2-base = { path = "./halo2-base" }
# halo2-ecc = { path = "./halo2-ecc" }

# [patch."https://github.com/privacy-scaling-explorations/halo2.git"]
# halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0220" }



[patch."https://github.com/privacy-scaling-explorations/halo2curves.git"]
halo2curves = { git = 'https://github.com/scroll-tech/halo2curves', branch = "halo2-ecc-snark-verifier-0220" }

[patch."https://github.com/privacy-scaling-explorations/poseidon.git"]
poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "halo2-ecc-snark-verifier-0220" }
21 changes: 13 additions & 8 deletions halo2-base/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ num-integer = "0.1"
num-traits = "0.2"
rand_chacha = "0.3"
rustc-hash = "1.1"
ff = "0.12"

# Use Axiom's custom halo2 monorepo for faster proving when feature = "halo2-axiom" is on
halo2_proofs_axiom = { git = "https://github.com/axiom-crypto/halo2.git", tag = "v2023_01_17", package = "halo2_proofs", optional = true }
# halo2_proofs_axiom = { git = "https://github.com/axiom-crypto/halo2.git", tag = "v2023_01_17", package = "halo2_proofs", 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 = "v2023_01_20", optional = true }
# halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_01_20", optional = true }
halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "halo2-ecc-snark-verifier-0220" }

# plotting circuit layout
plotters = { version = "0.3.0", optional = true }
Expand All @@ -35,12 +35,17 @@ jemallocator = { version = "0.5", optional = true }
mimalloc = { version = "0.1", default-features = false, optional = true }

[features]
default = ["halo2-axiom", "display"]
dev-graph = ["halo2_proofs?/dev-graph", "halo2_proofs_axiom?/dev-graph", "plotters"]
halo2-pse = ["halo2_proofs"]
halo2-axiom = ["halo2_proofs_axiom"]
default = [ "halo2-pse", "display"]
dev-graph = [
"halo2_proofs/dev-graph",
# "halo2_proofs_axiom?/dev-graph",
"plotters"
]
# halo2-pse = ["halo2_proofs"]
halo2-pse = []
# halo2-axiom = ["halo2_proofs_axiom"]
display = []
profile = ["halo2_proofs_axiom?/profile"]
# profile = ["halo2_proofs_axiom?/profile"]

[[bench]]
name = "mul"
Expand Down
Loading