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

chore: remove consensus setup from node-core (#7793)

Browse Source
This commit is contained in:
Matthias Seitz
2024-04-22 14:07:21 +02:00
committed by GitHub
parent cf789dce7e
commit b0cb2d0df6
5 changed files with 24 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/node-core/Cargo.toml
View File

@ -33,7 +33,6 @@ reth-evm.workspace = true
reth-engine-primitives.workspace = true
reth-tasks.workspace = true
reth-consensus-common.workspace = true
reth-auto-seal-consensus.workspace = true
reth-beacon-consensus.workspace = true
# ethereum
@ -98,7 +97,6 @@ optimism = [
"reth-rpc-engine-api/optimism",
"reth-provider/optimism",
"reth-rpc-types-compat/optimism",
"reth-auto-seal-consensus/optimism",
"reth-consensus-common/optimism",
"reth-beacon-consensus/optimism",
]

7
crates/node-core/src/init.rs
View File

@ -235,10 +235,7 @@ pub fn insert_genesis_header<DB: Database>(
#[cfg(test)]
mod tests {
use std::sync::Arc;
use super::*;
use reth_db::{
cursor::DbCursorRO,
models::{storage_sharded_key::StorageShardedKey, ShardedKey},
@ -246,8 +243,8 @@ mod tests {
DatabaseEnv,
};
use reth_primitives::{
Address, Chain, ChainSpec, ForkTimestamps, Genesis, GenesisAccount, IntegerList, GOERLI,
GOERLI_GENESIS_HASH, MAINNET, MAINNET_GENESIS_HASH, SEPOLIA, SEPOLIA_GENESIS_HASH,
Chain, ForkTimestamps, Genesis, IntegerList, GOERLI, GOERLI_GENESIS_HASH, MAINNET,
MAINNET_GENESIS_HASH, SEPOLIA, SEPOLIA_GENESIS_HASH,
};
use reth_provider::test_utils::create_test_provider_factory_with_chain_spec;

31
crates/node-core/src/node_config.rs
View File

@ -12,15 +12,13 @@ use crate::{
use discv5::ListenConfig;
use metrics_exporter_prometheus::PrometheusHandle;
use once_cell::sync::Lazy;
use reth_auto_seal_consensus::{AutoSealConsensus, MiningMode};
use reth_beacon_consensus::BeaconConsensus;
use reth_config::{config::PruneConfig, Config};
use reth_db::{database::Database, database_metrics::DatabaseMetrics};
use reth_interfaces::{consensus::Consensus, p2p::headers::client::HeadersClient, RethResult};
use reth_interfaces::{p2p::headers::client::HeadersClient, RethResult};
use reth_network::{NetworkBuilder, NetworkConfig, NetworkManager};
use reth_primitives::{
constants::eip4844::MAINNET_KZG_TRUSTED_SETUP, kzg::KzgSettings, stage::StageId,
BlockHashOrNumber, BlockNumber, ChainSpec, Head, SealedHeader, TxHash, B256, MAINNET,
BlockHashOrNumber, BlockNumber, ChainSpec, Head, SealedHeader, B256, MAINNET,
};
use reth_provider::{
providers::StaticFileProvider, BlockHashReader, BlockNumReader, HeaderProvider,
@ -29,7 +27,6 @@ use reth_provider::{
use reth_tasks::TaskExecutor;
use secp256k1::SecretKey;
use std::{net::SocketAddr, path::PathBuf, sync::Arc};
use tokio::sync::mpsc::Receiver;
use tracing::*;
/// The default prometheus recorder handle. We use a global static to ensure that it is only
@ -291,18 +288,6 @@ impl NodeConfig {
Ok(max_block)
}
/// Get the [MiningMode] from the given dev args
pub fn mining_mode(&self, pending_transactions_listener: Receiver<TxHash>) -> MiningMode {
if let Some(interval) = self.dev.block_time {
MiningMode::interval(interval)
} else if let Some(max_transactions) = self.dev.block_max_transactions {
MiningMode::instant(max_transactions, pending_transactions_listener)
} else {
info!(target: "reth::cli", "No mining mode specified, defaulting to ReadyTransaction");
MiningMode::instant(1, pending_transactions_listener)
}
}
/// Create the [NetworkConfig] for the node
pub fn network_config<C>(
&self,
@ -337,18 +322,6 @@ impl NodeConfig {
Ok(builder)
}
/// Returns the [Consensus] instance to use.
///
/// By default this will be a [BeaconConsensus] instance, but if the `--dev` flag is set, it
/// will be an [AutoSealConsensus] instance.
pub fn consensus(&self) -> Arc<dyn Consensus> {
if self.dev.dev {
Arc::new(AutoSealConsensus::new(Arc::clone(&self.chain)))
} else {
Arc::new(BeaconConsensus::new(Arc::clone(&self.chain)))
}
}
/// Loads 'MAINNET_KZG_TRUSTED_SETUP'
pub fn kzg_settings(&self) -> eyre::Result<Arc<KzgSettings>> {
Ok(Arc::clone(&MAINNET_KZG_TRUSTED_SETUP))