feat(execution): delete base-execution-evm crate

Author: refcell

Cargo.lock

@@ -96,6 +96,9 @@ unreachable-pub = "warn"
 unused-must-use = "deny"
 rust-2018-idioms = "deny"
 unnameable-types = "warn"
+# base_metrics::define_metrics! uses cfg(feature = "metrics") in macro expansions
+# which are evaluated in the destination crate's context, not the defining crate's.
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(feature, values("metrics"))'] }
 
 [workspace.lints.rustdoc]
 all = "warn"
@@ -182,7 +185,6 @@ base-alloy-rpc-types = { path = "crates/common/rpc-types" }
 base-access-lists = { path = "crates/common/access-lists" }
 base-alloy-flashblocks = { path = "crates/common/flashblocks" }
 base-alloy-rpc-jsonrpsee = { path = "crates/common/rpc-jsonrpsee" }
-base-alloy-evm = { path = "crates/common/evm", default-features = false }
 base-alloy-flz = { path = "crates/common/flz", default-features = false }
 base-alloy-consensus = { path = "crates/common/consensus", default-features = false }
 base-alloy-rpc-types-engine = { path = "crates/common/rpc-types-engine", default-features = false }
@@ -220,7 +222,6 @@ base-consensus-providers = { path = "crates/consensus/providers-alloy", default-
 # Execution
 base-node-core = { path = "crates/execution/node" }
 base-execution-cli = { path = "crates/execution/cli" }
-base-execution-evm = { path = "crates/execution/evm" }
 base-execution-rpc = { path = "crates/execution/rpc" }
 base-node-runner = { path = "crates/execution/runner" }
 base-execution-exex = { path = "crates/execution/exex" }
@@ -234,7 +235,7 @@ base-execution-chainspec = { path = "crates/execution/chainspec" }
 base-execution-consensus = { path = "crates/execution/consensus" }
 base-execution-primitives = { path = "crates/execution/primitives" }
 base-execution-payload-builder = { path = "crates/execution/payload" }
-base-revm = { path = "crates/execution/revm", default-features = false }
+base-evm = { path = "crates/execution/evm", default-features = false }
 
 # Txpool
 base-txpool = { path = "crates/txpool" }

Cargo.toml

@@ -16,7 +16,6 @@ workspace = true
 reth-evm = { workspace = true, features = ["std"] }
 
 # revm
-base-revm = { workspace = true, features = ["std"] }
 revm.workspace = true
 
 # alloy
@@ -35,6 +34,9 @@ alloy-signer.workspace = true
 alloy-eips.workspace = true
 alloy-rlp.workspace = true
 
+# base-evm
+base-evm = { workspace = true, features = ["reth"] }
+
 # base-alloy
 base-alloy-consensus = { workspace = true, features = ["std", "evm"] }
 base-alloy-rpc-types-engine.workspace = true
@@ -55,7 +57,6 @@ base-consensus-engine.workspace = true
 base-batcher-encoder.workspace = true
 base-consensus-node.workspace = true
 base-batcher-source.workspace = true
-base-execution-evm.workspace = true
 base-batcher-core.workspace = true
 base-tx-manager.workspace = true
 base-runtime.workspace = true

actions/harness/Cargo.toml

@@ -11,13 +11,12 @@ use alloy_signer::SignerSync;
 use alloy_signer_local::PrivateKeySigner;
 use alloy_trie::{EMPTY_ROOT_HASH, TrieAccount, root::state_root_unhashed};
 use base_alloy_chains::BaseUpgrade;
-use base_alloy_consensus::{OpBlock, OpTxEnvelope};
+use base_alloy_consensus::{EIP1559ParamError, OpBlock, OpTxEnvelope};
 use base_alloy_rpc_types_engine::{OpExecutionPayload, OpNetworkPayloadEnvelope, PayloadHash};
 use base_consensus_genesis::{L1ChainConfig, RollupConfig, SystemConfig};
+use base_evm::{OpEvmConfig, OpTransaction};
 use base_execution_chainspec::OpChainSpecBuilder;
-use base_execution_evm::OpEvmConfig;
 use base_protocol::{BlockInfo, L1BlockInfoTx, L2BlockInfo, OpAttributesWithParent};
-use base_revm::OpTransaction;
 use reth_evm::{ConfigureEvm, Evm as _, FromRecoveredTx};
 use revm::{
     DatabaseCommit,
@@ -691,8 +690,9 @@ impl StatefulL2Executor {
             let sender = tx_sender(tx, TEST_ACCOUNT_ADDRESS);
             let op_tx: OpTransaction<TxEnv> = OpTransaction::from_recovered_tx(tx, sender);
 
-            let evm_env =
-                evm_config.evm_env(&header).map_err(|e| L2SequencerError::Evm(e.to_string()))?;
+            let evm_env = evm_config
+                .evm_env(&header)
+                .map_err(|e: EIP1559ParamError| L2SequencerError::Evm(e.to_string()))?;
             let mut evm = evm_config.evm_with_env(&mut self.db, evm_env);
             match evm.transact(op_tx) {
                 Ok(ResultAndState { state, result }) => {

actions/harness/src/l2.rs

@@ -42,7 +42,6 @@ reth-payload-util.workspace = true
 reth-node-builder.workspace = true
 reth-network-peers.workspace = true
 reth-tracing-otlp.workspace = true
-base-execution-evm.workspace = true
 reth-node-ethereum.workspace = true
 base-execution-forks.workspace = true
 reth-cli-commands.workspace = true
@@ -65,7 +64,7 @@ base-execution-rpc = { workspace = true, features = ["client"] }
 
 # revm
 revm.workspace = true
-base-revm.workspace = true
+base-evm = { workspace = true, features = ["reth"] }
 
 # alloy
 alloy-evm.workspace = true
@@ -94,7 +93,6 @@ base-alloy-network.workspace = true
 base-alloy-consensus.workspace = true
 base-alloy-rpc-types.workspace = true
 base-alloy-rpc-types-engine.workspace = true
-base-alloy-evm = { workspace = true, features = ["std"] }
 
 # tokio
 tokio.workspace = true

crates/builder/core/Cargo.toml

@@ -9,8 +9,8 @@ use ExecutionMeteringLimitExceeded::{
 };
 use alloy_primitives::{Address, U256};
 use base_alloy_consensus::OpReceipt;
+use base_evm::OpTransactionError;
 use base_execution_primitives::OpTransactionSigned;
-use base_revm::OpTransactionError;
 use derive_more::Display;
 use thiserror::Error;
 

crates/builder/core/src/execution.rs

@@ -12,12 +12,10 @@ use alloy_rpc_types_eth::Withdrawals;
 use base_access_lists::FBALBuilderDb;
 use base_alloy_chains::BaseUpgrades;
 use base_alloy_consensus::{OpDepositReceipt, OpReceipt, OpTxType};
-use base_alloy_evm::OpReceiptBuilder;
+use base_evm::{L1BlockInfo, OpEvmConfig, OpNextBlockEnvAttributes, OpReceiptBuilder, OpSpecId};
 use base_execution_chainspec::OpChainSpec;
-use base_execution_evm::{OpEvmConfig, OpNextBlockEnvAttributes};
 use base_execution_payload_builder::{OpPayloadBuilderAttributes, error::OpPayloadBuilderError};
 use base_execution_primitives::OpTransactionSigned;
-use base_revm::{L1BlockInfo, OpSpecId};
 use base_txpool::{
     BundleTransaction, TimestampedTransaction, estimated_da_size::DataAvailabilitySized,
 };

crates/builder/core/src/flashblocks/context.rs

@@ -19,8 +19,8 @@ use base_alloy_flashblocks::{
     ExecutionPayloadBaseV1, ExecutionPayloadFlashblockDeltaV1, FlashblocksPayloadV1,
 };
 use base_builder_publish::WebSocketPublisher;
+use base_evm::{OpEvmConfig, OpNextBlockEnvAttributes};
 use base_execution_consensus::{calculate_receipt_root_no_memo_optimism, isthmus};
-use base_execution_evm::{OpEvmConfig, OpNextBlockEnvAttributes};
 use base_execution_payload_builder::{OpBuiltPayload, OpPayloadBuilderAttributes};
 use base_execution_primitives::OpTransactionSigned;
 use either::Either;

crates/builder/core/src/flashblocks/payload.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use base_builder_publish::WebSocketPublisher;
-use base_execution_evm::OpEvmConfig;
+use base_evm::OpEvmConfig;
 use base_node_core::{
     OpConsensusBuilder, OpExecutorBuilder, OpNetworkBuilder, node::OpPoolBuilder,
 };

crates/builder/core/src/flashblocks/service.rs

@@ -22,15 +22,14 @@ reth-evm.workspace = true
 reth-revm.workspace = true
 reth-provider.workspace = true
 reth-trie-common.workspace = true
-base-execution-evm.workspace = true
 reth-primitives-traits.workspace = true
 base-execution-chainspec.workspace = true
 
 # revm
 revm-database.workspace = true
 
-# base-revm
-base-revm.workspace = true
+# base-evm
+base-evm = { workspace = true, features = ["reth"] }
 
 # alloy
 alloy-primitives.workspace = true