Skip to content
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

Jump to bottom

Feat/update aggregator snark verifier #1318

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

Feat/update aggregator snark verifier #1318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9dcffdb
separate aggregator snark-verifier dependencies
May 31, 2024
13ffce7
use halo2 libs from snark-verifier
Jun 3, 2024
939a4b1
Merge branch 'develop' into feat/update_aggregator_snark_verifier
z2trillion Jun 3, 2024
30578c4
fix Shplonk import
Jun 3, 2024
070c3a3
fix blob Context
Jun 3, 2024
5c3fc49
fix ContextParams imports
Jun 3, 2024
071f05e
fix SnarkWitness import error
Jun 7, 2024
c7eb138
wip
Jun 17, 2024
6087eb9
wip
Jun 21, 2024
c2819e3
Use git branches instead of local files. Does not compile
Jun 24, 2024
3e57a8f
wip
Jun 27, 2024
f16421f
fix barycentric circuit compilation errors
Jun 27, 2024
6ba0925
wip
Jul 1, 2024
7bbfb7e
make compression workspace member
Jul 1, 2024
4213258
move compression circuit into own workspace member
Jul 1, 2024
a384824
compiles by commenting out
Jul 2, 2024
7d292b8
fix flatten_snarks function
Jul 2, 2024
27cb21f
cleanup
Jul 2, 2024
506c17f
cleanup
Jul 8, 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
1,093 changes: 801 additions & 292 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 10 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ members = [
"mock",
"testool",
"aggregator",
"prover"
"prover",
"compression",
]
resolver = "2"

Expand All @@ -32,7 +33,7 @@ ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "
ethers-providers = "=2.0.7"
ethers-signers = "=2.0.7"
ff = "0.13"
halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1" }
halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1", features = ["circuit-params"] }
halo2curves = { version = "0.1.0", features = [ "derive_serde" ] }
poseidon-base = { package = "poseidon-base", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "main" }
hash-circuit = { package = "poseidon-circuit", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "main" }
Expand All @@ -56,8 +57,11 @@ serde = {version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_stacker = "0.1"
sha3 = "0.10"
snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" }
snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "feat/circuit_params" }
snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "feat/circuit_params", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
aggregator-snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "axiom-community-edition", package = "snark-verifier", default-features = false, features = ["loader_halo2", "halo2-pse", "loader_evm", "revm"] }
aggregator-snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "axiom-community-edition", default-features = false, features = ["loader_halo2", "halo2-pse", "loader_evm", "revm"], package = "snark-verifier-sdk" }

strum = "0.25"
strum_macros = "0.25"
subtle = "2.4"
Expand All @@ -74,17 +78,17 @@ ethers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.
ethers-etherscan = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
ethers-signers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" }
gobuild = { git = "https://github.com/scroll-tech/gobuild.git" }
halo2curves = { git = "https://github.com/scroll-tech/halo2curves", branch = "v0.1.0" }
halo2curves = { git = "https://github.com/scroll-tech/halo2curves", branch = "use_pairing" }

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

[patch."https://github.com/privacy-scaling-explorations/poseidon.git"]
poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "main" }

[patch."https://github.com/privacy-scaling-explorations/bls12_381"]
bls12_381 = { git = "https://github.com/scroll-tech/bls12_381", branch = "feat/impl_scalar_field" }


# Definition of benchmarks profile to use.
[profile.bench]
opt-level = 3
Expand Down
12 changes: 7 additions & 5 deletions aggregator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,20 @@ ark-std.workspace = true
ctor.workspace = true
env_logger.workspace = true
ethers-core.workspace = true
halo2_proofs.workspace = true
hex.workspace = true
log.workspace = true
itertools.workspace = true
once_cell.workspace = true
serde.workspace = true
serde_json.workspace = true
rand.workspace = true
halo2-base.workspace = true
halo2-ecc.workspace = true
halo2_proofs.workspace = true
snark-verifier.workspace = true
snark-verifier-sdk.workspace = true
# halo2-base.workspace = true
# halo2-ecc.workspace = true
# halo2_proofs.workspace = true
halo2curves.workspace = true
aggregator-snark-verifier.workspace = true
aggregator-snark-verifier-sdk.workspace = true
strum.workspace = true
strum_macros.workspace = true

Expand Down
Loading
Loading