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 trusted setups (#7274)

Browse Source
This commit is contained in:
0xAtreides
2024-03-21 16:57:30 +00:00
committed by GitHub
parent f4b5000a80
commit 6eb7397aa2
3 changed files with 8 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,9 +41,7 @@ use reth_network::{
};
use reth_node_api::ConfigureEvm;
use reth_primitives::{
constants::eip4844::{LoadKzgSettingsError, MAINNET_KZG_TRUSTED_SETUP},
kzg::KzgSettings,
stage::StageId,
constants::eip4844::MAINNET_KZG_TRUSTED_SETUP, kzg::KzgSettings, stage::StageId,
BlockHashOrNumber, BlockNumber, ChainSpec, Head, SealedHeader, TxHash, B256, MAINNET,
};
use reth_provider::{
@ -169,9 +167,6 @@ pub struct NodeConfig {
/// - WS_RPC_PORT: default + `instance` * 2 - 2
pub instance: u16,
/// Overrides the KZG trusted setup by reading from the supplied file.
pub trusted_setup_file: Option<PathBuf>,
/// All networking related arguments
pub network: NetworkArgs,
@ -235,12 +230,6 @@ impl NodeConfig {
self
}
/// Set the trusted setup file for the node
pub fn with_trusted_setup_file(mut self, trusted_setup_file: impl Into<PathBuf>) -> Self {
self.trusted_setup_file = Some(trusted_setup_file.into());
self
}
/// Set the network args for the node
pub fn with_network(mut self, network: NetworkArgs) -> Self {
self.network = network;
@ -594,16 +583,9 @@ impl NodeConfig {
Ok(pipeline)
}
/// Loads the trusted setup params from a given file path or falls back to
/// `MAINNET_KZG_TRUSTED_SETUP`.
/// Loads 'MAINNET_KZG_TRUSTED_SETUP'
pub fn kzg_settings(&self) -> eyre::Result<Arc<KzgSettings>> {
if let Some(ref trusted_setup_file) = self.trusted_setup_file {
let trusted_setup = KzgSettings::load_trusted_setup_file(trusted_setup_file)
.map_err(LoadKzgSettingsError::KzgError)?;
Ok(Arc::new(trusted_setup))
} else {
Ok(Arc::clone(&MAINNET_KZG_TRUSTED_SETUP))
}
Ok(Arc::clone(&MAINNET_KZG_TRUSTED_SETUP))
}
/// Installs the prometheus recorder.
@ -729,7 +711,7 @@ impl NodeConfig {
// try to look up the header in the database
if let Some(header) = header {
info!(target: "reth::cli", ?tip, "Successfully looked up tip block in the database");
return Ok(header.number)
return Ok(header.number);
}
Ok(self.fetch_tip_from_network(client, tip.into()).await?.number)
@ -751,7 +733,7 @@ impl NodeConfig {
match get_single_header(&client, tip).await {
Ok(tip_header) => {
info!(target: "reth::cli", ?tip, "Successfully fetched tip");
return Ok(tip_header)
return Ok(tip_header);
}
Err(error) => {
error!(target: "reth::cli", %error, "Failed to fetch the tip. Retrying...");
@ -924,7 +906,6 @@ impl Default for NodeConfig {
chain: MAINNET.clone(),
metrics: None,
instance: 1,
trusted_setup_file: None,
network: NetworkArgs::default(),
rpc: RpcServerArgs::default(),
txpool: TxPoolArgs::default(),