Merge branch 'develop' into patch-2

scroll-tech · Oct 12, 2024 · d437d15 · d437d15
2 parents a719a70 + 39d6bdf
commit d437d15
Show file tree

Hide file tree

Showing 31 changed files with 294 additions and 146 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,12 +38,13 @@ jobs:
 
   test-default:
     name: Test Default
+    if: false
     needs: [runner]
     runs-on: ${{ matrix.os }}
-    concurrency: ${{ needs.runner.outputs.concurrency-group2 }}
+    concurrency: ${{ needs.runner.outputs.concurrency-group1 }}
     strategy:
       matrix:
-        os: ${{ fromJSON(needs.runner.outputs.runner-matrix2) }}
+        os: ${{ fromJSON(needs.runner.outputs.runner-matrix1) }}
 
     steps:
       - uses: actions/checkout@v4
@@ -52,12 +53,12 @@ jobs:
           echo "HOME=/home/CI" >> $GITHUB_ENV
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-12-03
+          toolchain: nightly-2024-01-25
       - name: Setup golang
         uses: actions/setup-go@v3
         with:
           cache: false
-          go-version: ~1.21
+          go-version: ~1.22
       # Go cache for building geth-utils
       - name: Go cache
         uses: actions/cache@v3
@@ -83,10 +84,10 @@ jobs:
     name: Test Scroll
     needs: [runner]
     runs-on: ${{ matrix.os }}
-    concurrency: ${{ needs.runner.outputs.concurrency-group1 }}
+    concurrency: ${{ needs.runner.outputs.concurrency-group2 }}
     strategy:
       matrix:
-        os: ${{ fromJSON(needs.runner.outputs.runner-matrix1) }}
+        os: ${{ fromJSON(needs.runner.outputs.runner-matrix2) }}
 
     steps:
       - uses: actions/checkout@v4
@@ -95,12 +96,12 @@ jobs:
           echo "HOME=/home/CI" >> $GITHUB_ENV
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-12-03
+          toolchain: nightly-2024-01-25
       - name: Setup golang
         uses: actions/setup-go@v3
         with:
           cache: false
-          go-version: ~1.21
+          go-version: ~1.22
       # Go cache for building geth-utils
       - name: Go cache
         uses: actions/cache@v3
@@ -146,7 +147,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-12-03
+          toolchain: nightly-2024-01-25
       - name: Add target
         run: rustup target add ${{ matrix.target }}
       # Go cache for building geth-utils
@@ -183,7 +184,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-12-03
+          toolchain: nightly-2024-01-25
       # Go cache for building geth-utils
       - name: Go cache
         uses: actions/cache@v3
@@ -216,7 +217,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-12-03
+          toolchain: nightly-2024-01-25
       # Go cache for building geth-utils
       - name: Go cache
         uses: actions/cache@v3
@@ -253,7 +254,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-12-03
+          toolchain: nightly-2024-01-25
           components: rustfmt
       # Go cache for building geth-utils
       - name: Go cache

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -61,7 +61,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-12-03
+          toolchain: nightly-2024-01-25
       - name: Setup golang
         uses: actions/setup-go@v3
         with:

diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-12-03
+          toolchain: nightly-2024-01-25
           components: clippy
       # Go cache for building geth-utils
       - name: Go cache

diff --git a/.github/workflows/test-features.yml b/.github/workflows/test-features.yml
@@ -42,7 +42,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-12-03
+          toolchain: nightly-2024-01-25
 
       # Go cache for building geth-utils
       - name: Go cache

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aggregator/src/lib.rs b/aggregator/src/lib.rs
@@ -1,4 +1,4 @@
-#![allow(clippy::doc_lazy_continuation)]
+#![feature(lazy_cell)]
 /// proof aggregation
 mod aggregation;
 /// This module implements `Batch` related data types.

diff --git a/bus-mapping/src/circuit_input_builder/builder_client.rs b/bus-mapping/src/circuit_input_builder/builder_client.rs
@@ -525,7 +525,7 @@ impl<P: JsonRpcClient> BuilderClient<P> {
     ) -> Result<CircuitInputBuilder, Error> {
         let block_trace = external_tracer::l2trace(trace_config)?;
         let mut builder =
-            CircuitInputBuilder::new_from_l2_trace(self.circuits_params, block_trace, false)?;
+            CircuitInputBuilder::new_from_l2_trace(self.circuits_params, block_trace)?;
         builder
             .finalize_building()
             .expect("could not finalize building block");

diff --git a/bus-mapping/src/circuit_input_builder/l2.rs b/bus-mapping/src/circuit_input_builder/l2.rs
@@ -113,7 +113,6 @@ impl CircuitInputBuilder {
     pub fn new_from_l2_trace(
         circuits_params: CircuitsParams,
         l2_trace: BlockTrace,
-        light_mode: bool,
     ) -> Result<Self, Error> {
         let chain_id = l2_trace.chain_id;
 
@@ -152,7 +151,7 @@ impl CircuitInputBuilder {
             );
 
             Some(state)
-        } else if !light_mode {
+        } else {
             let mpt_init_state = ZktrieState::from_trace_with_additional(
                 old_root,
                 Self::collect_account_proofs(&l2_trace.storage_trace),
@@ -171,8 +170,6 @@ impl CircuitInputBuilder {
             );
 
             Some(mpt_init_state)
-        } else {
-            None
         };
 
         let mut sdb = StateDB::new();

diff --git a/bus-mapping/src/lib.rs b/bus-mapping/src/lib.rs
@@ -208,7 +208,6 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 // Temporary until we have more of the crate implemented.
 #![allow(dead_code)]
-#![allow(clippy::doc_lazy_continuation)]
 // We want to have UPPERCASE idents sometimes.
 #![allow(non_snake_case)]
 // Catch documentation errors caused by code changes.
@@ -219,6 +218,7 @@
 #![allow(clippy::result_large_err)] // it's large, but what can we do?
 #![allow(clippy::collapsible_else_if)]
 #![allow(incomplete_features)]
+#![feature(lazy_cell)]
 #![feature(adt_const_params)]
 
 extern crate alloc;

diff --git a/eth-types/src/evm_types/opcode_ids.rs b/eth-types/src/evm_types/opcode_ids.rs
@@ -1247,13 +1247,10 @@ impl FromStr for OpcodeId {
             #[cfg(not(feature = "scroll"))]
             "SELFDESTRUCT" => OpcodeId::SELFDESTRUCT,
             "CHAINID" => OpcodeId::CHAINID,
-            "opcode 0x48 not defined" => OpcodeId::BASEFEE,
             "BASEFEE" => OpcodeId::BASEFEE,
             "BLOBHASH" => OpcodeId::INVALID(0x49),
             "BLOBBASEFEE" => OpcodeId::INVALID(0x4a),
-            "opcode 0x5c not defined" => OpcodeId::TLOAD,
             "TLOAD" => OpcodeId::TLOAD,
-            "opcode 0x5d not defined" => OpcodeId::TSTORE,
             "TSTORE" => OpcodeId::TSTORE,
             _ => {
                 // Parse an invalid opcode value as reported by geth

diff --git a/eth-types/src/lib.rs b/eth-types/src/lib.rs
@@ -10,6 +10,7 @@
 #![deny(rustdoc::broken_intra_doc_links)]
 // GasCost is used as type parameter
 #![feature(adt_const_params)]
+#![feature(lazy_cell)]
 #![deny(missing_docs)]
 //#![deny(unsafe_code)] Allowed now until we find a
 // better way to handle downcasting from Operation into it's variants.

diff --git a/geth-utils/l2geth/go.mod b/geth-utils/l2geth/go.mod
@@ -1,20 +1,22 @@
 module l2gethutil
 
-go 1.21
+go 1.22
+
+toolchain go1.23.2
 
 require (
 	github.com/imdario/mergo v0.3.16
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20240717120140-0360eba83660
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20241001202020-2ed7456a4bc0
 )
 
 require (
 	github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
-	github.com/bits-and-blooms/bitset v1.13.0 // indirect
+	github.com/bits-and-blooms/bitset v1.14.3 // indirect
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/consensys/bavard v0.1.13 // indirect
-	github.com/consensys/gnark-crypto v0.12.1 // indirect
-	github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
+	github.com/consensys/bavard v0.1.22 // indirect
+	github.com/consensys/gnark-crypto v0.14.0 // indirect
+	github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/edsrzf/mmap-go v1.0.0 // indirect
@@ -30,9 +32,9 @@ require (
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
-	github.com/holiman/uint256 v1.2.4 // indirect
+	github.com/holiman/uint256 v1.3.1 // indirect
 	github.com/huin/goupnp v1.0.2 // indirect
-	github.com/iden3/go-iden3-crypto v0.0.16 // indirect
+	github.com/iden3/go-iden3-crypto v0.0.17 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mmcloughlin/addchain v0.4.0 // indirect
@@ -46,16 +48,16 @@ require (
 	github.com/scroll-tech/zktrie v0.8.4 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 // indirect
-	github.com/supranational/blst v0.3.12 // indirect
+	github.com/supranational/blst v0.3.13 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/tklauser/go-sysconf v0.3.14 // indirect
-	github.com/tklauser/numcpus v0.8.0 // indirect
+	github.com/tklauser/numcpus v0.9.0 // indirect
 	github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
-	golang.org/x/crypto v0.24.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 )