Merge branch 'master' of github.com:foundry-rs/foundry into rusowsky/support-num-keys

Author: 0xrusowsky

.github/workflows/nextest.yml

@@ -47,6 +47,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJson(needs.matrices.outputs.test-matrix) }}
     env:
+      ETH_RPC_URL: https://reth-ethereum.ithaca.xyz/rpc
       CARGO_PROFILE_DEV_DEBUG: 0
     steps:
       - uses: actions/checkout@v5

Cargo.lock

@@ -205,7 +205,7 @@ foundry-linking = { path = "crates/linking" }
 # solc & compilation utilities
 foundry-block-explorers = { version = "0.20.0", default-features = false }
 foundry-compilers = { version = "0.18.2", default-features = false }
-foundry-fork-db = "0.16"
+foundry-fork-db = "0.17"
 solang-parser = { version = "=0.3.9", package = "foundry-solang-parser" }
 solar-ast = { version = "=0.1.5", default-features = false }
 solar-parse = { version = "=0.1.5", default-features = false }
@@ -262,13 +262,13 @@ op-alloy-rpc-types = "0.18.13"
 op-alloy-flz = "0.13.1"
 
 ## revm
-revm = { version = "27.1.0", default-features = false }
-revm-inspectors = { version = "0.27.1", features = ["serde"] }
-op-revm = { version = "8.1.0", default-features = false }
+revm = { version = "28.0.0", default-features = false }
+revm-inspectors = { version = "0.28.0", features = ["serde"] }
+op-revm = { version = "9.0.1", default-features = false }
 
 ## alloy-evm
-alloy-evm = "0.16.0"
-alloy-op-evm = "0.16.0"
+alloy-evm = "0.18.3"
+alloy-op-evm = "0.18.3"
 
 ## cli
 anstream = "0.6"
@@ -401,14 +401,14 @@ idna_adapter = "=1.1.0"
 # alloy-op-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "7762adc" }
 
 ## revm
-revm = { git = "https://github.com/bluealloy/revm.git", rev = "d9cda3a" }
-op-revm = { git = "https://github.com/bluealloy/revm.git", rev = "d9cda3a" }
+# revm = { git = "https://github.com/bluealloy/revm.git", rev = "d9cda3a" }
+# op-revm = { git = "https://github.com/bluealloy/revm.git", rev = "d9cda3a" }
 # revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors.git", rev = "956bc98" }
 
 ## foundry
 # foundry-block-explorers = { git = "https://github.com/foundry-rs/block-explorers.git", rev = "e09cb89" }
 # foundry-compilers = { git = "https://github.com/foundry-rs/compilers.git", rev = "e4a9b04" }
-# foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "4ed9afb" }
+# foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "50683eb" }
 
 ## solar
 # solar-ast = { git = "https://github.com/paradigmxyz/solar.git", branch = "main" }

Cargo.toml

@@ -22,7 +22,6 @@ tokio = { workspace = true, features = ["full"] }
 chrono = { version = "0.4", features = ["serde"] }
 rayon.workspace = true
 clap = { version = "4", features = ["derive"] }
-num_cpus = "1.17"
 once_cell = "1.21"
 
 [dev-dependencies]

benches/Cargo.toml

@@ -1,7 +1,7 @@
 use crate::RepoConfig;
 use eyre::Result;
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, process::Command};
+use std::{collections::HashMap, process::Command, thread};
 
 /// Hyperfine benchmark result
 #[derive(Debug, Deserialize, Serialize)]
@@ -131,7 +131,10 @@ impl BenchmarkResults {
         // System info
         output.push_str("## System Information\n\n");
         output.push_str(&format!("- **OS**: {}\n", std::env::consts::OS));
-        output.push_str(&format!("- **CPU**: {}\n", num_cpus::get()));
+        output.push_str(&format!(
+            "- **CPU**: {}\n",
+            thread::available_parallelism().map_or(1, |n| n.get())
+        ));
         output.push_str(&format!(
             "- **Rustc**: {}\n",
             get_rustc_version().unwrap_or_else(|_| "unknown".to_string())

benches/src/results.rs

@@ -408,7 +408,6 @@ pub struct AnvilEvmArgs {
         long,
         short,
         visible_alias = "rpc-url",
-        env = "ETH_RPC_URL",
         value_name = "URL",
         help_heading = "Fork config"
     )]

crates/anvil/src/cmd.rs

@@ -669,11 +669,7 @@ async fn test_backward_compatibility_state_dump_deserialization_v1_2() {
                   "gas_limit": 143385,
                   "status": "Return",
                   "steps": [],
-                  "decoded": {
-                    "label": null,
-                    "return_data": null,
-                    "call_data": null
-                  }
+                  "decoded": null
                 },
                 "logs": [],
                 "ordering": []

crates/anvil/tests/it/state.rs

@@ -434,7 +434,7 @@ interface Vm {
 
     /// Returns an array of `StorageAccess` from current `vm.stateStateDiffRecording` session
     #[cheatcode(group = Evm, safety = Safe)]
-    function getStorageAccesses() external view returns (StorageAccess[] memory accesses);
+    function getStorageAccesses() external view returns (StorageAccess[] memory storageAccesses);
 
     // -------- Recording Map Writes --------