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.

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

Use dedicated a6 testnet branch for halo2 dependency #2

Merged
merged 2 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
cache-on-failure: true

- name: Install solc
run: (hash svm 2>/dev/null || cargo install --locked --git https://github.com/alloy-rs/svm-rs) && svm install 0.8.21 && solc --version
run: (hash svm 2>/dev/null || cargo install svm-rs) && svm install 0.8.21 && solc --version

- name: Run test
run: cargo test --all --all-features -- --nocapture
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.69.0
1.74.0
2 changes: 1 addition & 1 deletion snark-verifier-sdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ark-std = { version = "0.3.0", features = ["print-trace"], optional = true }
snark-verifier = { path = "../snark-verifier", default-features = false }

# system_halo2
halo2_proofs = { git = "https://github.com/taikoxyz/halo2", branch = "taiko/unstable" } # not optional for now
halo2_proofs = { git = "https://github.com/taikoxyz/halo2", branch = "taiko/a6-integration" } # not optional for now
halo2curves = { git = 'https://github.com/privacy-scaling-explorations/halo2curves', tag = "0.3.2" } # must be same version as in halo2_proofs

# loader_halo2
Expand Down
2 changes: 1 addition & 1 deletion snark-verifier/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ halo2_curves = { git = "https://github.com/privacy-scaling-explorations/halo2cur
rayon = { version = "1.5.3", optional = true }

# system_halo2
halo2_proofs = { git = "https://github.com/taikoxyz/halo2", branch = "taiko/unstable", optional = true }
halo2_proofs = { git = "https://github.com/taikoxyz/halo2", branch = "taiko/a6-integration", optional = true }

# loader_evm
sha3 = { version = "0.10", optional = true }
Expand Down
Loading