bump(revm: step 2): bump alloy + revm + alloy-evm + other deps to latest

Cargo.toml

@@ -30,7 +30,7 @@ resolver = "2"
 version = "1.2.0"
 edition = "2021"
 # Remember to update clippy.toml as well
-rust-version = "1.83"
+rust-version = "1.86"
 authors = ["Foundry Contributors"]
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/foundry-rs/foundry"
@@ -116,10 +116,17 @@ alloy-sol-types.opt-level = 3
 hashbrown.opt-level = 3
 foldhash.opt-level = 3
 keccak.opt-level = 3
+revm.opt-level = 3
+revm-primitives.opt-level = 3
 revm-interpreter.opt-level = 3
 revm-precompile.opt-level = 3
-revm-primitives.opt-level = 3
-revm.opt-level = 3
+revm-database-interface.opt-level = 3
+revm-database.opt-level = 3
+revm-bytecode.opt-level = 3
+revm-state.opt-level = 3
+revm-context-interface.opt-level = 3
+revm-context.opt-level = 3
+revm-inspector.opt-level = 3
 ruint.opt-level = 3
 sha2.opt-level = 3
 sha3.opt-level = 3
@@ -188,61 +195,65 @@ foundry-wallets = { path = "crates/wallets" }
 foundry-linking = { path = "crates/linking" }
 
 # solc & compilation utilities
-foundry-block-explorers = { version = "0.13.3", default-features = false }
-foundry-compilers = { version = "0.14.0", default-features = false }
-foundry-fork-db = "0.12"
+foundry-block-explorers = { version = "0.16.0", default-features = false }
+foundry-compilers = { version = "0.16.0", default-features = false }
+foundry-fork-db = "0.13"
 solang-parser = "=0.3.3"
-solar-parse = { version = "=0.1.2", default-features = false }
-solar-sema = { version = "=0.1.2", default-features = false }
+solar-parse = { version = "=0.1.3", default-features = false }
+solar-sema = { version = "=0.1.3", default-features = false }
 
 ## revm
-revm = { version = "19.4.0", default-features = false }
-revm-primitives = { version = "15.1.0", default-features = false }
-revm-inspectors = { version = "0.16.0", features = ["serde"] }
+revm = { version = "23.1.0", default-features = false }
+revm-inspectors = { version = "0.21.0", features = ["serde"] }
+op-revm = { version = "4.0.2", default-features = false }
+
+## alloy-evm
+alloy-evm = "0.7.2"
+alloy-op-evm = "0.7.2"
 
 ## alloy
-alloy-consensus = { version = "0.12.1", default-features = false }
-alloy-contract = { version = "0.12.1", default-features = false }
-alloy-eips = { version = "0.12.1", default-features = false }
-alloy-genesis = { version = "0.12.1", default-features = false }
-alloy-json-rpc = { version = "0.12.1", default-features = false }
-alloy-network = { version = "0.12.1", default-features = false }
-alloy-provider = { version = "0.12.1", default-features = false }
-alloy-pubsub = { version = "0.12.1", default-features = false }
-alloy-rpc-client = { version = "0.12.1", default-features = false }
-alloy-rpc-types = { version = "0.12.1", default-features = true }
-alloy-serde = { version = "0.12.1", default-features = false }
-alloy-signer = { version = "0.12.1", default-features = false }
-alloy-signer-aws = { version = "0.12.1", default-features = false }
-alloy-signer-gcp = { version = "0.12.1", default-features = false }
-alloy-signer-ledger = { version = "0.12.1", default-features = false }
-alloy-signer-local = { version = "0.12.1", default-features = false }
-alloy-signer-trezor = { version = "0.12.1", default-features = false }
-alloy-transport = { version = "0.12.1", default-features = false }
-alloy-transport-http = { version = "0.12.1", default-features = false }
-alloy-transport-ipc = { version = "0.12.1", default-features = false }
-alloy-transport-ws = { version = "0.12.1", default-features = false }
+alloy-consensus = { version = "0.15", default-features = false }
+alloy-contract = { version = "0.15", default-features = false }
+alloy-eips = { version = "0.15", default-features = false }
+alloy-genesis = { version = "0.15", default-features = false }
+alloy-json-rpc = { version = "0.15", default-features = false }
+alloy-network = { version = "0.15", default-features = false }
+alloy-provider = { version = "0.15", default-features = false }
+alloy-pubsub = { version = "0.15", default-features = false }
+alloy-rpc-client = { version = "0.15", default-features = false }
+alloy-rpc-types = { version = "0.15", default-features = true }
+alloy-serde = { version = "0.15", default-features = false }
+alloy-signer = { version = "0.15", default-features = false }
+alloy-signer-aws = { version = "0.15", default-features = false }
+alloy-signer-gcp = { version = "0.15", default-features = false }
+alloy-signer-ledger = { version = "0.15", default-features = false }
+alloy-signer-local = { version = "0.15", default-features = false }
+alloy-signer-trezor = { version = "0.15", default-features = false }
+alloy-transport = { version = "0.15", default-features = false }
+alloy-transport-http = { version = "0.15", default-features = false }
+alloy-transport-ipc = { version = "0.15", default-features = false }
+alloy-transport-ws = { version = "0.15", default-features = false }
 
 ## alloy-core
-alloy-dyn-abi = "0.8.22"
-alloy-json-abi = "0.8.22"
-alloy-primitives = { version = "0.8.22", features = [
+alloy-dyn-abi = "1.0"
+alloy-json-abi = "1.0"
+alloy-primitives = { version = "1.0", features = [
     "getrandom",
     "rand",
     "map-fxhash",
     "map-foldhash",
 ] }
-alloy-sol-macro-expander = "0.8.22"
-alloy-sol-macro-input = "0.8.22"
-alloy-sol-types = "0.8.22"
+alloy-sol-macro-expander = "1.0"
+alloy-sol-macro-input = "1.0"
+alloy-sol-types = "1.0"
 
-alloy-chains = "0.1"
+alloy-chains = "0.2"
 alloy-rlp = "0.3"
-alloy-trie = "0.7.0"
+alloy-trie = "0.8.0"
 
 ## op-alloy
-op-alloy-consensus = "0.11.0"
-op-alloy-rpc-types = "0.11.0"
+op-alloy-consensus = "0.15.5"
+op-alloy-rpc-types = "0.15.5"
 
 ## cli
 anstream = "0.6"
@@ -289,7 +300,9 @@ mesc = "0.3"
 num-format = "0.4"
 parking_lot = "0.12"
 proptest = "1"
-rand = "0.8"
+rand = "0.9"
+rand_08 = { package = "rand", version = "0.8" }
+rand_chacha = "0.9.0"
 rayon = "1"
 regex = { version = "1", default-features = false }
 reqwest = { version = "0.12", default-features = false, features = [
@@ -359,3 +372,17 @@ idna_adapter = "=1.1.0"
 # alloy-transport-http = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" }
 # alloy-transport-ipc = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" }
 # alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" }
+
+## alloy-evm
+# alloy-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "95f6a8a" }
+# alloy-op-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "95f6a8a" }
+
+## revm
+revm = { git = "https://github.com/bluealloy/revm.git", rev = "b5808253" }
+op-revm = { git = "https://github.com/bluealloy/revm.git", rev = "b5808253" }
+# revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors.git", rev = "a625c04" }
+
+## foundry
+# foundry-compilers = { git = "https://github.com/foundry-rs/compilers.git", rev = "d05c34a" }
+# foundry-block-explorers = { git = "https://github.com/foundry-rs/block-explorers.git", rev = "beafa80" }
+# foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "cdbbe64" }

Makefile

@@ -86,7 +86,7 @@ fmt: ## Run all formatters.
 	./.github/scripts/format.sh --check
 
 lint-foundry:
-	RUSTFLAGS="-Dwarnings" cargo clippy --workspace --all-targets --all-features
+	RUSTFLAGS="-Dwarnings" cargo +nightly clippy --workspace --all-targets --all-features
 
 lint-codespell: ensure-codespell
 	codespell --skip "*.json"

clippy.toml

@@ -1,4 +1,4 @@
-msrv = "1.83"
+msrv = "1.86"
 
 # `bytes::Bytes` is included by default and `alloy_primitives::Bytes` is a wrapper around it,
 # so it is safe to ignore it as well.

crates/anvil/Cargo.toml

@@ -27,15 +27,11 @@ foundry-cli.workspace = true
 foundry-common.workspace = true
 foundry-config.workspace = true
 foundry-evm.workspace = true
+foundry-evm-core.workspace = true
 
-# evm support
-revm = { workspace = true, features = [
-    "std",
-    "serde",
-    "memory_limit",
-    "c-kzg",
-] }
-revm-inspectors.workspace = true
+# alloy
+alloy-evm.workspace = true
+alloy-op-evm.workspace = true
 alloy-primitives = { workspace = true, features = ["serde"] }
 alloy-consensus = { workspace = true, features = ["k256", "kzg"] }
 alloy-contract = { workspace = true, features = ["pubsub"] }
@@ -61,6 +57,16 @@ alloy-genesis.workspace = true
 alloy-trie.workspace = true
 op-alloy-consensus = { workspace = true, features = ["serde"] }
 
+# revm
+revm = { workspace = true, features = [
+    "std",
+    "serde",
+    "memory_limit",
+    "c-kzg",
+] }
+revm-inspectors.workspace = true
+op-revm.workspace = true
+
 # axum related
 axum.workspace = true
 hyper.workspace = true
@@ -84,6 +90,7 @@ yansi.workspace = true
 tempfile.workspace = true
 itertools.workspace = true
 rand.workspace = true
+rand_08.workspace = true
 eyre.workspace = true
 
 # cli

crates/anvil/core/Cargo.toml

@@ -21,6 +21,7 @@ revm = { workspace = true, default-features = false, features = [
     "memory_limit",
     "c-kzg",
 ] }
+op-revm.workspace = true
 
 alloy-primitives = { workspace = true, features = ["serde", "rlp"] }
 alloy-rpc-types = { workspace = true, features = ["anvil", "trace"] }

crates/anvil/core/src/eth/subscription.rs

@@ -1,6 +1,6 @@
 //! Subscription types
 use alloy_primitives::hex;
-use rand::{distributions::Alphanumeric, thread_rng, Rng};
+use rand::{distr::Alphanumeric, rng, Rng};
 use std::fmt;
 
 /// Unique subscription id
@@ -48,7 +48,7 @@ impl HexIdProvider {
     /// Generates a random hex encoded Id
     pub fn gen(&self) -> String {
         let id: String =
-            (&mut thread_rng()).sample_iter(Alphanumeric).map(char::from).take(self.len).collect();
+            (&mut rng()).sample_iter(Alphanumeric).map(char::from).take(self.len).collect();
         let out = hex::encode(id);
         format!("0x{out}")
     }