diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index df08661f..40894be8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -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 diff --git a/rust-toolchain b/rust-toolchain index cb908525..283edc6d 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.69.0 \ No newline at end of file +1.74.0 \ No newline at end of file diff --git a/snark-verifier-sdk/Cargo.toml b/snark-verifier-sdk/Cargo.toml index 79eac3a0..1fd91f36 100644 --- a/snark-verifier-sdk/Cargo.toml +++ b/snark-verifier-sdk/Cargo.toml @@ -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 diff --git a/snark-verifier/Cargo.toml b/snark-verifier/Cargo.toml index b0088ce5..08956794 100644 --- a/snark-verifier/Cargo.toml +++ b/snark-verifier/Cargo.toml @@ -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 }