diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index ae71851e5..cbcb1a7ef 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2023-12-03 + toolchain: nightly-2024-07-07 components: rustfmt - name: Cargo cache uses: Swatinem/rust-cache@v2 @@ -59,7 +59,7 @@ jobs: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2023-12-03 + toolchain: nightly-2024-07-07 components: clippy - name: Cargo cache uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml index 4dad81265..61c7ca79e 100644 --- a/.github/workflows/unit_test.yml +++ b/.github/workflows/unit_test.yml @@ -48,7 +48,7 @@ jobs: - run: git config --system --add safe.directory /__w/scroll-prover/scroll-prover - uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2023-12-03 + toolchain: nightly-2024-07-07 - name: Cargo cache uses: Swatinem/rust-cache@v2 - name: Setup golang diff --git a/Cargo.lock b/Cargo.lock index 1481ad47b..932b62c15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2272,6 +2272,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.6" @@ -2929,7 +2938,7 @@ dependencies = [ [[package]] name = "poseidon-base" version = "0.1.0" -source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#6cc36ab9dfa153f554ff7b84305f39838366a8df" +source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#becce8bdd31315108c8f1e0a39ca4e5d20c67dcc" dependencies = [ "bitvec", "halo2curves", @@ -2940,10 +2949,11 @@ dependencies = [ [[package]] name = "poseidon-circuit" version = "0.1.0" -source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#6cc36ab9dfa153f554ff7b84305f39838366a8df" +source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=main#becce8bdd31315108c8f1e0a39ca4e5d20c67dcc" dependencies = [ "ff", "halo2_proofs", + "itertools 0.13.0", "log", "poseidon-base", "rand", @@ -4544,26 +4554,27 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if 1.0.0", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -4581,9 +4592,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4591,22 +4602,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" diff --git a/Cargo.toml b/Cargo.toml index 67137daf1..f614b5ffe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ ethers-providers = "2" glob = "0.3" itertools = "0.10" log = "0.4" -log4rs = { version = "1.2", default_features = false, features = ["console_appender", "file_appender"] } +log4rs = { version = "1.2", default-features = false, features = ["console_appender", "file_appender"] } rand = "0.8" rand_xorshift = "0.3" reqwest = { version = "0.11", default-features = false, features = [ "json", "rustls-tls" ] } diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 27c108be5..000000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -nightly-2023-12-03 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 000000000..804a8d611 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "nightly-2024-07-07"