jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: phase out reth-primitives from op-evm (#14428)

Browse Source
This commit is contained in:
Matthias Seitz
2025-02-12 00:57:03 +01:00
committed by GitHub
parent 77bd2115fb
commit 771a99be53
5 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -8464,7 +8464,6 @@ dependencies = [
"reth-optimism-consensus", "reth-optimism-consensus",
"reth-optimism-forks", "reth-optimism-forks",
"reth-optimism-primitives", "reth-optimism-primitives",
"reth-primitives",
"reth-primitives-traits", "reth-primitives-traits",
"reth-revm", "reth-revm",
"revm", "revm",

3
crates/optimism/evm/Cargo.toml
View File

@ -15,7 +15,6 @@ workspace = true
reth-chainspec.workspace = true reth-chainspec.workspace = true
reth-ethereum-forks.workspace = true reth-ethereum-forks.workspace = true
reth-evm.workspace = true reth-evm.workspace = true
reth-primitives.workspace = true
reth-primitives-traits.workspace = true reth-primitives-traits.workspace = true
reth-execution-errors.workspace = true reth-execution-errors.workspace = true
reth-execution-types.workspace = true reth-execution-types.workspace = true
@ -46,7 +45,6 @@ thiserror.workspace = true
[dev-dependencies] [dev-dependencies]
reth-evm = { workspace = true, features = ["test-utils"] } reth-evm = { workspace = true, features = ["test-utils"] }
reth-revm = { workspace = true, features = ["test-utils"] } reth-revm = { workspace = true, features = ["test-utils"] }
reth-primitives = { workspace = true, features = ["test-utils"] }
reth-optimism-chainspec.workspace = true reth-optimism-chainspec.workspace = true
alloy-genesis.workspace = true alloy-genesis.workspace = true
alloy-consensus.workspace = true alloy-consensus.workspace = true
@ -56,7 +54,6 @@ reth-optimism-primitives = { workspace = true, features = ["arbitrary"] }
default = ["std"] default = ["std"]
std = [ std = [
"reth-consensus/std", "reth-consensus/std",
"reth-primitives/std",
"reth-revm/std", "reth-revm/std",
"alloy-consensus/std", "alloy-consensus/std",
"alloy-eips/std", "alloy-eips/std",

7
crates/optimism/evm/src/execute.rs
View File

@ -22,8 +22,7 @@ use reth_optimism_chainspec::OpChainSpec;
use reth_optimism_consensus::validate_block_post_execution; use reth_optimism_consensus::validate_block_post_execution;
use reth_optimism_forks::OpHardforks; use reth_optimism_forks::OpHardforks;
use reth_optimism_primitives::{transaction::signed::OpTransaction, DepositReceipt, OpPrimitives}; use reth_optimism_primitives::{transaction::signed::OpTransaction, DepositReceipt, OpPrimitives};
use reth_primitives::{NodePrimitives, RecoveredBlock}; use reth_primitives_traits::{BlockBody, NodePrimitives, RecoveredBlock, SignedTransaction};
use reth_primitives_traits::{BlockBody, SignedTransaction};
use revm::State; use revm::State;
use revm_primitives::{db::DatabaseCommit, ResultAndState}; use revm_primitives::{db::DatabaseCommit, ResultAndState};
use tracing::trace; use tracing::trace;
@ -320,7 +319,7 @@ impl OpExecutorProvider {
mod tests { mod tests {
use super::*; use super::*;
use crate::OpChainSpec; use crate::OpChainSpec;
use alloy_consensus::{Header, TxEip1559}; use alloy_consensus::{Block, BlockBody, Header, TxEip1559};
use alloy_primitives::{ use alloy_primitives::{
b256, Address, PrimitiveSignature as Signature, StorageKey, StorageValue, U256, b256, Address, PrimitiveSignature as Signature, StorageKey, StorageValue, U256,
}; };
@ -329,7 +328,7 @@ mod tests {
use reth_evm::execute::{BasicBlockExecutorProvider, BatchExecutor, BlockExecutorProvider}; use reth_evm::execute::{BasicBlockExecutorProvider, BatchExecutor, BlockExecutorProvider};
use reth_optimism_chainspec::OpChainSpecBuilder; use reth_optimism_chainspec::OpChainSpecBuilder;
use reth_optimism_primitives::{OpReceipt, OpTransactionSigned}; use reth_optimism_primitives::{OpReceipt, OpTransactionSigned};
use reth_primitives::{Account, Block, BlockBody}; use reth_primitives_traits::Account;
use reth_revm::{ use reth_revm::{
database::StateProviderDatabase, test_utils::StateProviderTest, L1_BLOCK_CONTRACT, database::StateProviderDatabase, test_utils::StateProviderTest, L1_BLOCK_CONTRACT,
}; };

5
crates/optimism/evm/src/l1.rs
View File

@ -350,13 +350,12 @@ where
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*;
use alloy_consensus::{Block, BlockBody};
use alloy_eips::eip2718::Decodable2718; use alloy_eips::eip2718::Decodable2718;
use reth_optimism_chainspec::OP_MAINNET; use reth_optimism_chainspec::OP_MAINNET;
use reth_optimism_forks::OpHardforks; use reth_optimism_forks::OpHardforks;
use reth_optimism_primitives::OpTransactionSigned; use reth_optimism_primitives::OpTransactionSigned;
use reth_primitives::{Block, BlockBody};
use super::*;
#[test] #[test]
fn sanity_l1_block() { fn sanity_l1_block() {

2
crates/optimism/evm/src/lib.rs
View File

@ -296,7 +296,7 @@ mod tests {
}; };
use reth_optimism_chainspec::BASE_MAINNET; use reth_optimism_chainspec::BASE_MAINNET;
use reth_optimism_primitives::{OpBlock, OpPrimitives, OpReceipt}; use reth_optimism_primitives::{OpBlock, OpPrimitives, OpReceipt};
use reth_primitives::{Account, Log, RecoveredBlock}; use reth_primitives_traits::{Account, Log, RecoveredBlock};
use revm::{ use revm::{
db::{BundleState, CacheDB, EmptyDBTyped}, db::{BundleState, CacheDB, EmptyDBTyped},
inspectors::NoOpInspector, inspectors::NoOpInspector,