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(chainspec): remove MAINNET usage from ChainSpec::default (#14565)

Browse Source
This commit is contained in:
DaniPopes
2025-02-18 16:36:57 +01:00
committed by GitHub
parent c0a30f051e
commit 3485ce45be
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/chainspec/src/constants.rs
View File

@ -4,6 +4,10 @@ use alloy_primitives::b256;
/// Gas per transaction not creating a contract. /// Gas per transaction not creating a contract.
pub const MIN_TRANSACTION_GAS: u64 = 21_000u64; pub const MIN_TRANSACTION_GAS: u64 = 21_000u64;
/// Mainnet prune delete limit.
pub const MAINNET_PRUNE_DELETE_LIMIT: usize = 20000;
/// Deposit contract address: `0x00000000219ab540356cbb839cbe05303d7705fa` /// Deposit contract address: `0x00000000219ab540356cbb839cbe05303d7705fa`
pub(crate) const MAINNET_DEPOSIT_CONTRACT: DepositContract = DepositContract::new( pub(crate) const MAINNET_DEPOSIT_CONTRACT: DepositContract = DepositContract::new(
MAINNET_DEPOSIT_CONTRACT_ADDRESS, MAINNET_DEPOSIT_CONTRACT_ADDRESS,

4
crates/chainspec/src/lib.rs
View File

@ -12,8 +12,8 @@
extern crate alloc; extern crate alloc;
/// Chain specific constants /// Chain specific constants
pub(crate) mod constants; mod constants;
pub use constants::MIN_TRANSACTION_GAS; pub use constants::*;
mod api; mod api;
/// The chain info module. /// The chain info module.

7
crates/chainspec/src/spec.rs
View File

@ -1,6 +1,9 @@
pub use alloy_eips::eip1559::BaseFeeParams; pub use alloy_eips::eip1559::BaseFeeParams;
use crate::{constants::MAINNET_DEPOSIT_CONTRACT, EthChainSpec}; use crate::{
constants::{MAINNET_DEPOSIT_CONTRACT, MAINNET_PRUNE_DELETE_LIMIT},
EthChainSpec,
};
use alloc::{boxed::Box, collections::BTreeMap, string::String, sync::Arc, vec::Vec}; use alloc::{boxed::Box, collections::BTreeMap, string::String, sync::Arc, vec::Vec};
use alloy_chains::{Chain, NamedChain}; use alloy_chains::{Chain, NamedChain};
use alloy_consensus::{ use alloy_consensus::{
@ -320,7 +323,7 @@ impl Default for ChainSpec {
hardforks: Default::default(), hardforks: Default::default(),
deposit_contract: Default::default(), deposit_contract: Default::default(),
base_fee_params: BaseFeeParamsKind::Constant(BaseFeeParams::ethereum()), base_fee_params: BaseFeeParamsKind::Constant(BaseFeeParams::ethereum()),
prune_delete_limit: MAINNET.prune_delete_limit, prune_delete_limit: MAINNET_PRUNE_DELETE_LIMIT,
blob_params: Default::default(), blob_params: Default::default(),
} }
} }

4
crates/prune/prune/src/builder.rs
View File

@ -1,6 +1,6 @@
use crate::{segments::SegmentSet, Pruner}; use crate::{segments::SegmentSet, Pruner};
use alloy_eips::eip2718::Encodable2718; use alloy_eips::eip2718::Encodable2718;
use reth_chainspec::MAINNET; use reth_chainspec::MAINNET_PRUNE_DELETE_LIMIT;
use reth_config::PruneConfig; use reth_config::PruneConfig;
use reth_db_api::{table::Value, transaction::DbTxMut}; use reth_db_api::{table::Value, transaction::DbTxMut};
use reth_exex_types::FinishedExExHeight; use reth_exex_types::FinishedExExHeight;
@ -129,7 +129,7 @@ impl Default for PrunerBuilder {
Self { Self {
block_interval: 5, block_interval: 5,
segments: PruneModes::none(), segments: PruneModes::none(),
delete_limit: MAINNET.prune_delete_limit, delete_limit: MAINNET_PRUNE_DELETE_LIMIT,
timeout: None, timeout: None,
finished_exex_height: watch::channel(FinishedExExHeight::NoExExs).1, finished_exex_height: watch::channel(FinishedExExHeight::NoExExs).1,
} }

3
crates/prune/types/src/lib.rs
View File

@ -20,8 +20,9 @@ mod target;
use alloc::{collections::BTreeMap, vec::Vec}; use alloc::{collections::BTreeMap, vec::Vec};
use alloy_primitives::{Address, BlockNumber}; use alloy_primitives::{Address, BlockNumber};
pub use checkpoint::PruneCheckpoint;
use core::ops::Deref; use core::ops::Deref;
pub use checkpoint::PruneCheckpoint;
pub use event::PrunerEvent; pub use event::PrunerEvent;
pub use mode::PruneMode; pub use mode::PruneMode;
pub use pruner::{ pub use pruner::{