Merge branch 'main' into chore/develop

scroll-tech · Sep 10, 2024 · b84846c · b84846c
2 parents c49ec52 + cdfbe72
commit b84846c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 19 deletions.
diff --git 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
@@ -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
diff --git 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
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly-2024-07-07"