chore: replaced anvil hardforks with alloy hardforks (#10612)

* chore: replaced anvil hardforks with alloy hardforks

* fixes

* fixes

* fixes

* removed redundant op and alloy hardforks enum

* fixes

* fixes

* bumped alloy hardforks and kept default to prague and isthmus

* bumped alloy-hardforks and fixes

---------

Co-authored-by: zerosnacks <[email protected]>

Author: Rimeeeeee

Cargo.lock

@@ -230,6 +230,8 @@ alloy-transport = { version = "1.0.7", default-features = false }
 alloy-transport-http = { version = "1.0.7", default-features = false }
 alloy-transport-ipc = { version = "1.0.7", default-features = false }
 alloy-transport-ws = { version = "1.0.7", default-features = false }
+alloy-hardforks = { version = "0.2.6", default-features = false }
+alloy-op-hardforks = { version = "0.2.6", default-features = false }
 
 ## alloy-core
 alloy-dyn-abi = "1.0"

Cargo.toml

@@ -55,6 +55,8 @@ alloy-transport.workspace = true
 alloy-chains.workspace = true
 alloy-genesis.workspace = true
 alloy-trie.workspace = true
+alloy-hardforks.workspace = true
+alloy-op-hardforks.workspace = true
 op-alloy-consensus = { workspace = true, features = ["serde"] }
 
 # revm

crates/anvil/Cargo.toml

@@ -1,9 +1,10 @@
 use crate::{
     config::{ForkChoice, DEFAULT_MNEMONIC},
     eth::{backend::db::SerializableState, pool::transactions::TransactionOrder, EthApi},
-    AccountGenerator, EthereumHardfork, NodeConfig, OptimismHardfork, CHAIN_ID,
+    AccountGenerator, EthereumHardfork, NodeConfig, CHAIN_ID,
 };
 use alloy_genesis::Genesis;
+use alloy_op_hardforks::OpHardfork;
 use alloy_primitives::{utils::Unit, B256, U256};
 use alloy_signer_local::coins_bip39::{English, Mnemonic};
 use anvil_server::ServerConfig;
@@ -218,7 +219,7 @@ impl NodeArgs {
         let hardfork = match &self.hardfork {
             Some(hf) => {
                 if self.evm.optimism {
-                    Some(OptimismHardfork::from_str(hf)?.into())
+                    Some(OpHardfork::from_str(hf)?.into())
                 } else {
                     Some(EthereumHardfork::from_str(hf)?.into())
                 }
@@ -836,7 +837,7 @@ mod tests {
         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()));
+        assert_eq!(config.hardfork, Some(OpHardfork::Regolith.into()));
     }
 
     #[test]

crates/anvil/src/cmd.rs

@@ -11,13 +11,14 @@ use crate::{
         fees::{INITIAL_BASE_FEE, INITIAL_GAS_PRICE},
         pool::transactions::{PoolTransaction, TransactionOrder},
     },
-    hardfork::ChainHardfork,
+    hardfork::{ethereum_hardfork_from_block_tag, spec_id_from_ethereum_hardfork, ChainHardfork},
     mem::{self, in_memory_db::MemDb},
-    EthereumHardfork, FeeManager, OptimismHardfork, PrecompileFactory,
+    EthereumHardfork, FeeManager, PrecompileFactory,
 };
 use alloy_consensus::BlockHeader;
 use alloy_genesis::Genesis;
 use alloy_network::{AnyNetwork, TransactionResponse};
+use alloy_op_hardforks::OpHardfork;
 use alloy_primitives::{hex, map::HashMap, utils::Unit, BlockNumber, TxHash, U256};
 use alloy_provider::Provider;
 use alloy_rpc_types::{Block, BlockNumberOrTag};
@@ -530,9 +531,9 @@ impl NodeConfig {
             return hardfork;
         }
         if self.enable_optimism {
-            return OptimismHardfork::default().into();
+            return OpHardfork::Isthmus.into();
         }
-        EthereumHardfork::default().into()
+        EthereumHardfork::Cancun.into()
     }
 
     /// Sets a custom code size limit
@@ -1186,8 +1187,10 @@ impl NodeConfig {
                 let chain_id =
                     provider.get_chain_id().await.wrap_err("failed to fetch network chain ID")?;
                 if alloy_chains::NamedChain::Mainnet == chain_id {
-                    let hardfork: EthereumHardfork = fork_block_number.into();
-                    env.evm_env.cfg_env.spec = hardfork.into();
+                    let hardfork: EthereumHardfork =
+                        ethereum_hardfork_from_block_tag(fork_block_number);
+
+                    env.evm_env.cfg_env.spec = spec_id_from_ethereum_hardfork(hardfork);
                     self.hardfork = Some(ChainHardfork::Ethereum(hardfork));
                 }
                 Some(U256::from(chain_id))