bump(revm: step 1): bump revm to 21.0.0 release

Cargo.toml

@@ -30,7 +30,7 @@ resolver = "2"
 version = "1.1.0"
 edition = "2021"
 # Remember to update clippy.toml as well
-rust-version = "1.83"
+rust-version = "1.85"
 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
@@ -196,32 +203,32 @@ solar-parse = { version = "=0.1.2", default-features = false }
 solar-sema = { version = "=0.1.2", 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 = "21.0.0", default-features = false }
+revm-inspectors = { version = "0.18.1", features = ["serde"] }
+op-revm = { version = "3.0.2", default-features = false }
 
 ## 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.13.0", default-features = false }
+alloy-contract = { version = "0.13.0", default-features = false }
+alloy-eips = { version = "0.13.0", default-features = false }
+alloy-genesis = { version = "0.13.0", default-features = false }
+alloy-json-rpc = { version = "0.13.0", default-features = false }
+alloy-network = { version = "0.13.0", default-features = false }
+alloy-provider = { version = "0.13.0", default-features = false }
+alloy-pubsub = { version = "0.13.0", default-features = false }
+alloy-rpc-client = { version = "0.13.0", default-features = false }
+alloy-rpc-types = { version = "0.13.0", default-features = true }
+alloy-serde = { version = "0.13.0", default-features = false }
+alloy-signer = { version = "0.13.0", default-features = false }
+alloy-signer-aws = { version = "0.13.0", default-features = false }
+alloy-signer-gcp = { version = "0.13.0", default-features = false }
+alloy-signer-ledger = { version = "0.13.0", default-features = false }
+alloy-signer-local = { version = "0.13.0", default-features = false }
+alloy-signer-trezor = { version = "0.13.0", default-features = false }
+alloy-transport = { version = "0.13.0", default-features = false }
+alloy-transport-http = { version = "0.13.0", default-features = false }
+alloy-transport-ipc = { version = "0.13.0", default-features = false }
+alloy-transport-ws = { version = "0.13.0", default-features = false }
 
 ## alloy-core
 alloy-dyn-abi = "0.8.22"
@@ -237,12 +244,13 @@ alloy-sol-macro-input = "0.8.22"
 alloy-sol-types = "0.8.22"
 
 alloy-chains = "0.1"
+alloy-evm = "0.3.2"
 alloy-rlp = "0.3"
 alloy-trie = "0.7.0"
 
 ## op-alloy
-op-alloy-consensus = "0.11.0"
-op-alloy-rpc-types = "0.11.0"
+op-alloy-consensus = "0.12.0"
+op-alloy-rpc-types = "0.12.0"
 
 ## cli
 anstream = "0.6"
@@ -351,3 +359,10 @@ path-slash = "0.2"
 # 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" }
+
+## revm
+# revm = { git = "https://github.com/bluealloy/revm.git", rev = "4266922" }
+# revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors.git", rev = "a625c04" }
+
+## foundry
+foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "6144088" }

crates/anvil/Cargo.toml

@@ -27,15 +27,10 @@ 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-primitives = { workspace = true, features = ["serde"] }
 alloy-consensus = { workspace = true, features = ["k256", "kzg"] }
 alloy-contract = { workspace = true, features = ["pubsub"] }
@@ -61,6 +56,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

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/transaction/mod.rs

@@ -23,10 +23,7 @@ use alloy_serde::{OtherFields, WithOtherFields};
 use bytes::BufMut;
 use foundry_evm::traces::CallTraceNode;
 use op_alloy_consensus::{TxDeposit, DEPOSIT_TX_TYPE_ID};
-use revm::{
-    interpreter::InstructionResult,
-    primitives::{OptimismFields, TxEnv},
-};
+use revm::{context::TxEnv, interpreter::InstructionResult};
 use serde::{Deserialize, Serialize};
 use std::ops::{Deref, Mul};
 
@@ -399,15 +396,15 @@ impl PendingTransaction {
                 let TxLegacy { nonce, gas_price, gas_limit, value, to, input, .. } = tx.tx();
                 TxEnv {
                     caller,
-                    transact_to: transact_to(to),
+                    kind: transact_to(to),
                     data: input.clone(),
                     chain_id,
-                    nonce: Some(*nonce),
+                    nonce: *nonce,
                     value: (*value),
-                    gas_price: U256::from(*gas_price),
+                    gas_price: *gas_price,
                     gas_priority_fee: None,
                     gas_limit: *gas_limit,
-                    access_list: vec![],
+                    access_list: vec![].into(),
                     ..Default::default()
                 }
             }
@@ -425,12 +422,12 @@ impl PendingTransaction {
                 } = tx.tx();
                 TxEnv {
                     caller,
-                    transact_to: transact_to(to),
+                    kind: transact_to(to),
                     data: input.clone(),
                     chain_id: Some(*chain_id),
-                    nonce: Some(*nonce),
+                    nonce: *nonce,
                     value: *value,
-                    gas_price: U256::from(*gas_price),
+                    gas_price: *gas_price,
                     gas_priority_fee: None,
                     gas_limit: *gas_limit,
                     access_list: access_list.clone().into(),
@@ -452,13 +449,13 @@ impl PendingTransaction {
                 } = tx.tx();
                 TxEnv {
                     caller,
-                    transact_to: transact_to(to),
+                    kind: transact_to(to),
                     data: input.clone(),
                     chain_id: Some(*chain_id),
-                    nonce: Some(*nonce),
+                    nonce: *nonce,
                     value: *value,
-                    gas_price: U256::from(*max_fee_per_gas),
-                    gas_priority_fee: Some(U256::from(*max_priority_fee_per_gas)),
+                    gas_price: *max_fee_per_gas,
+                    gas_priority_fee: Some(*max_priority_fee_per_gas),
                     gas_limit: *gas_limit,
                     access_list: access_list.clone().into(),
                     ..Default::default()
@@ -481,14 +478,14 @@ impl PendingTransaction {
                 } = tx.tx().tx();
                 TxEnv {
                     caller,
-                    transact_to: TxKind::Call(*to),
+                    kind: TxKind::Call(*to),
                     data: input.clone(),
                     chain_id: Some(*chain_id),
-                    nonce: Some(*nonce),
+                    nonce: *nonce,
                     value: *value,
-                    gas_price: U256::from(*max_fee_per_gas),
-                    gas_priority_fee: Some(U256::from(*max_priority_fee_per_gas)),
-                    max_fee_per_blob_gas: Some(U256::from(*max_fee_per_blob_gas)),
+                    gas_price: *max_fee_per_gas,
+                    gas_priority_fee: Some(*max_priority_fee_per_gas),
+                    max_fee_per_blob_gas: *max_fee_per_blob_gas,
                     blob_hashes: blob_versioned_hashes.clone(),
                     gas_limit: *gas_limit,
                     access_list: access_list.clone().into(),
@@ -510,16 +507,16 @@ impl PendingTransaction {
                 } = tx.tx();
                 TxEnv {
                     caller,
-                    transact_to: TxKind::Call(*to),
+                    kind: TxKind::Call(*to),
                     data: input.clone(),
                     chain_id: Some(*chain_id),
-                    nonce: Some(*nonce),
+                    nonce: *nonce,
                     value: *value,
-                    gas_price: U256::from(*max_fee_per_gas),
-                    gas_priority_fee: Some(U256::from(*max_priority_fee_per_gas)),
+                    gas_price: *max_fee_per_gas,
+                    gas_priority_fee: Some(*max_priority_fee_per_gas),
                     gas_limit: *gas_limit,
                     access_list: access_list.clone().into(),
-                    authorization_list: Some(authorization_list.clone().into()),
+                    authorization_list: authorization_list.clone(),
                     ..Default::default()
                 }
             }
@@ -538,21 +535,22 @@ impl PendingTransaction {
                 } = tx;
                 TxEnv {
                     caller,
-                    transact_to: transact_to(kind),
+                    kind: transact_to(kind),
                     data: input.clone(),
                     chain_id,
-                    nonce: Some(*nonce),
+                    nonce: *nonce,
                     value: *value,
-                    gas_price: U256::ZERO,
+                    gas_price: 0,
                     gas_priority_fee: None,
                     gas_limit: { *gas_limit },
-                    access_list: vec![],
-                    optimism: OptimismFields {
-                        source_hash: Some(*source_hash),
-                        mint: Some(mint.to::<u128>()),
-                        is_system_transaction: Some(*is_system_tx),
-                        enveloped_tx: None,
-                    },
+                    access_list: vec![].into(),
+                    // TODO: add Optimism support
+                    // optimism: OptimismFields {
+                    //     source_hash: Some(*source_hash),
+                    //     mint: Some(mint.to::<u128>()),
+                    //     is_system_transaction: Some(*is_system_tx),
+                    //     enveloped_tx: None,
+                    // },
                     ..Default::default()
                 }
             }

crates/anvil/src/cmd.rs

@@ -1,7 +1,6 @@
 use crate::{
     config::{ForkChoice, DEFAULT_MNEMONIC},
     eth::{backend::db::SerializableState, pool::transactions::TransactionOrder, EthApi},
-    hardfork::OptimismHardfork,
     AccountGenerator, EthereumHardfork, NodeConfig, CHAIN_ID,
 };
 use alloy_genesis::Genesis;
@@ -218,11 +217,11 @@ impl NodeArgs {
 
         let hardfork = match &self.hardfork {
             Some(hf) => {
-                if self.evm.optimism {
-                    Some(OptimismHardfork::from_str(hf)?.into())
-                } else {
-                    Some(EthereumHardfork::from_str(hf)?.into())
-                }
+                // if self.evm.optimism {
+                //     Some(OptimismHardfork::from_str(hf)?.into())
+                // } else {
+                Some(EthereumHardfork::from_str(hf)?.into())
+                // }
             }
             None => None,
         };
@@ -521,7 +520,7 @@ pub struct AnvilEvmArgs {
 
     /// The block gas limit.
     #[arg(long, alias = "block-gas-limit", help_heading = "Environment config")]
-    pub gas_limit: Option<u128>,
+    pub gas_limit: Option<u64>,
 
     /// Disable the `call.gas_limit <= block.gas_limit` constraint.
     #[arg(
@@ -834,13 +833,13 @@ mod tests {
         assert_eq!(config.hardfork, Some(EthereumHardfork::Berlin.into()));
     }
 
-    #[test]
-    fn can_parse_optimism_hardfork() {
-        let args: NodeArgs =
-            NodeArgs::parse_from(["anvil", "--optimism", "--hardfork", "Regolith"]);
-        let config = args.into_node_config().unwrap();
-        assert_eq!(config.hardfork, Some(OptimismHardfork::Regolith.into()));
-    }
+    // #[test]
+    // fn can_parse_optimism_hardfork() {
+    //     let args: NodeArgs =
+    //         NodeArgs::parse_from(["anvil", "--optimism", "--hardfork", "Regolith"]);
+    //     let config = args.into_node_config().unwrap();
+    //     assert_eq!(config.hardfork, Some(OptimismHardfork::Regolith.into()));
+    // }
 
     #[test]
     fn cant_parse_invalid_hardfork() {