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: move op types; less op cfgs (#7255)

Browse Source
This commit is contained in:
Matthias Seitz
2024-03-20 19:17:23 +01:00
committed by GitHub
parent 713da1bde6
commit 28b983403e
21 changed files with 627 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/reth/Cargo.toml
View File

@ -37,7 +37,6 @@ reth-network-api.workspace = true
reth-downloaders.workspace = true
reth-tracing.workspace = true
reth-tasks.workspace = true
reth-optimism-payload-builder = { workspace = true, optional = true }
reth-ethereum-payload-builder.workspace = true
reth-payload-builder.workspace = true
reth-payload-validator.workspace = true
@ -129,8 +128,6 @@ optimism = [
"reth-network/optimism",
"reth-network-api/optimism",
"reth-blockchain-tree/optimism",
"reth-payload-builder/optimism",
"reth-optimism-payload-builder/optimism",
"dep:reth-node-optimism",
"reth-node-core/optimism",
]

20
bin/reth/src/commands/debug_cmd/build_block.rs
View File

@ -23,13 +23,7 @@ use reth_interfaces::{consensus::Consensus, RethResult};
use reth_node_api::PayloadBuilderAttributes;
#[cfg(not(feature = "optimism"))]
use reth_node_ethereum::EthEvmConfig;
#[cfg(feature = "optimism")]
use reth_node_optimism::OptimismEvmConfig;
use reth_payload_builder::database::CachedReads;
#[cfg(not(feature = "optimism"))]
use reth_payload_builder::EthPayloadBuilderAttributes;
#[cfg(feature = "optimism")]
use reth_payload_builder::OptimismPayloadBuilderAttributes;
use reth_primitives::{
constants::eip4844::{LoadKzgSettingsError, MAINNET_KZG_TRUSTED_SETUP},
fs,
@ -167,7 +161,7 @@ impl Command {
let consensus: Arc<dyn Consensus> = Arc::new(BeaconConsensus::new(Arc::clone(&self.chain)));
#[cfg(feature = "optimism")]
let evm_config = OptimismEvmConfig::default();
let evm_config = reth_node_optimism::OptimismEvmConfig::default();
#[cfg(not(feature = "optimism"))]
let evm_config = EthEvmConfig::default();
@ -265,7 +259,7 @@ impl Command {
Arc::clone(&best_block),
Bytes::default(),
#[cfg(feature = "optimism")]
OptimismPayloadBuilderAttributes::try_new(
reth_node_optimism::OptimismPayloadBuilderAttributes::try_new(
best_block.hash(),
OptimismPayloadAttributes {
payload_attributes: payload_attrs,
@ -275,7 +269,10 @@ impl Command {
},
)?,
#[cfg(not(feature = "optimism"))]
EthPayloadBuilderAttributes::try_new(best_block.hash(), payload_attrs)?,
reth_payload_builder::EthPayloadBuilderAttributes::try_new(
best_block.hash(),
payload_attrs,
)?,
self.chain.clone(),
);
@ -289,9 +286,8 @@ impl Command {
);
#[cfg(feature = "optimism")]
let payload_builder =
reth_optimism_payload_builder::OptimismPayloadBuilder::new(self.chain.clone())
.compute_pending_block();
let payload_builder = reth_node_optimism::OptimismPayloadBuilder::new(self.chain.clone())
.compute_pending_block();
#[cfg(not(feature = "optimism"))]
let payload_builder = reth_ethereum_payload_builder::EthereumPayloadBuilder::default();

9
bin/reth/src/commands/debug_cmd/replay_engine.rs
View File

@ -22,8 +22,6 @@ use reth_network_api::NetworkInfo;
use reth_node_core::engine_api_store::{EngineApiStore, StoredEngineApiMessage};
#[cfg(not(feature = "optimism"))]
use reth_node_ethereum::{EthEngineTypes, EthEvmConfig};
#[cfg(feature = "optimism")]
use reth_node_optimism::{OptimismEngineTypes, OptimismEvmConfig};
use reth_payload_builder::{PayloadBuilderHandle, PayloadBuilderService};
use reth_primitives::{fs, ChainSpec, PruneModes};
use reth_provider::{providers::BlockchainProvider, CanonStateSubscriptions, ProviderFactory};
@ -129,7 +127,7 @@ impl Command {
let evm_config = EthEvmConfig::default();
#[cfg(feature = "optimism")]
let evm_config = OptimismEvmConfig::default();
let evm_config = reth_node_optimism::OptimismEvmConfig::default();
// Configure blockchain tree
let tree_externals = TreeExternals::new(
@ -163,8 +161,7 @@ impl Command {
// Optimism's payload builder is implemented on the OptimismPayloadBuilder type.
#[cfg(feature = "optimism")]
let payload_builder =
reth_optimism_payload_builder::OptimismPayloadBuilder::new(self.chain.clone());
let payload_builder = reth_node_optimism::OptimismPayloadBuilder::new(self.chain.clone());
let payload_generator = BasicPayloadJobGenerator::with_builder(
blockchain_db.clone(),
@ -178,7 +175,7 @@ impl Command {
#[cfg(feature = "optimism")]
let (payload_service, payload_builder): (
_,
PayloadBuilderHandle<OptimismEngineTypes>,
PayloadBuilderHandle<reth_node_optimism::OptimismEngineTypes>,
) = PayloadBuilderService::new(payload_generator, blockchain_db.canonical_state_stream());
#[cfg(not(feature = "optimism"))]