Merge branch 'scroll' into chore-merge-upstream-b48c72fad2

Author: greged93

.github/workflows/bench.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Install cargo-codspeed
         uses: taiki-e/install-action@v2
         with:
-          tool: cargo-codspeed
+          tool: cargo-codspeed@4.0.5
       - name: Build the benchmark target(s)
         run: ./.github/scripts/codspeed-build.sh
       - name: Run the benchmarks

crates/scroll/evm/src/lib.rs

@@ -114,6 +114,11 @@ pub fn spec_id_at_timestamp_and_number(
     chain_spec: impl ScrollHardforks,
 ) -> ScrollSpecId {
     if chain_spec
+        .scroll_fork_activation(ScrollHardfork::Galileo)
+        .active_at_timestamp_or_number(timestamp, number)
+    {
+        ScrollSpecId::GALILEO
+    } else if chain_spec
         .scroll_fork_activation(ScrollHardfork::Feynman)
         .active_at_timestamp_or_number(timestamp, number)
     {

crates/scroll/node/src/builder/pool.rs

@@ -345,7 +345,7 @@ mod tests {
             err.kind,
             PoolErrorKind::InvalidTransaction(
                 InvalidPoolTransactionError::Consensus(InvalidTransactionError::InsufficientFunds(GotExpectedBoxed(expected)))
-            ) if *expected == GotExpected{ got: U256::from(400000), expected: U256::from(4205858031847u64) }
+            ) if *expected == GotExpected{ got: U256::from(400000), expected: U256::from(483673629772436u64) }
         ));
 
         // explicitly drop the manager here otherwise the `TransactionValidationTaskExecutor` will