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

refactor(primitive-traits): use alloy EPOCH_SLOTS constant (#12018)

Browse Source
This commit is contained in:
Thomas Coratger
2024-10-24 01:15:45 +02:00
committed by GitHub
parent 565e4b400d
commit 044e2d6aea
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -6394,6 +6394,7 @@ dependencies = [
name = "reth-beacon-consensus" name = "reth-beacon-consensus"
version = "1.1.0" version = "1.1.0"
dependencies = [ dependencies = [
"alloy-eips",
"alloy-genesis", "alloy-genesis",
"alloy-primitives", "alloy-primitives",
"alloy-rpc-types-engine", "alloy-rpc-types-engine",

1
crates/consensus/beacon/Cargo.toml
View File

@ -33,6 +33,7 @@ reth-chainspec = { workspace = true, optional = true }
# ethereum # ethereum
alloy-primitives.workspace = true alloy-primitives.workspace = true
alloy-rpc-types-engine.workspace = true alloy-rpc-types-engine.workspace = true
alloy-eips.workspace = true
# async # async
tokio = { workspace = true, features = ["sync"] } tokio = { workspace = true, features = ["sync"] }

5
crates/consensus/beacon/src/engine/mod.rs
View File

@ -1,3 +1,4 @@
use alloy_eips::merge::EPOCH_SLOTS;
use alloy_primitives::{BlockNumber, B256}; use alloy_primitives::{BlockNumber, B256};
use alloy_rpc_types_engine::{ use alloy_rpc_types_engine::{
ExecutionPayload, ExecutionPayloadSidecar, ForkchoiceState, PayloadStatus, PayloadStatusEnum, ExecutionPayload, ExecutionPayloadSidecar, ForkchoiceState, PayloadStatus, PayloadStatusEnum,
@ -19,9 +20,7 @@ use reth_node_types::NodeTypesWithEngine;
use reth_payload_builder::PayloadBuilderHandle; use reth_payload_builder::PayloadBuilderHandle;
use reth_payload_primitives::{PayloadAttributes, PayloadBuilder, PayloadBuilderAttributes}; use reth_payload_primitives::{PayloadAttributes, PayloadBuilder, PayloadBuilderAttributes};
use reth_payload_validator::ExecutionPayloadValidator; use reth_payload_validator::ExecutionPayloadValidator;
use reth_primitives::{ use reth_primitives::{BlockNumHash, Head, Header, SealedBlock, SealedHeader};
constants::EPOCH_SLOTS, BlockNumHash, Head, Header, SealedBlock, SealedHeader,
};
use reth_provider::{ use reth_provider::{
providers::ProviderNodeTypes, BlockIdReader, BlockReader, BlockSource, CanonChainTracker, providers::ProviderNodeTypes, BlockIdReader, BlockReader, BlockSource, CanonChainTracker,
ChainSpecProvider, ProviderError, StageCheckpointReader, ChainSpecProvider, ProviderError, StageCheckpointReader,

3
crates/primitives-traits/src/constants/mod.rs
View File

@ -9,9 +9,6 @@ pub use gas_units::{GIGAGAS, KILOGAS, MEGAGAS};
/// The client version: `reth/v{major}.{minor}.{patch}` /// The client version: `reth/v{major}.{minor}.{patch}`
pub const RETH_CLIENT_VERSION: &str = concat!("reth/v", env!("CARGO_PKG_VERSION")); pub const RETH_CLIENT_VERSION: &str = concat!("reth/v", env!("CARGO_PKG_VERSION"));
/// An EPOCH is a series of 32 slots.
pub const EPOCH_SLOTS: u64 = 32;
/// The default block nonce in the beacon consensus /// The default block nonce in the beacon consensus
pub const BEACON_NONCE: u64 = 0u64; pub const BEACON_NONCE: u64 = 0u64;

3
crates/storage/provider/src/providers/state/historical.rs
View File

@ -2,6 +2,7 @@ use crate::{
providers::{state::macros::delegate_provider_impls, StaticFileProvider}, providers::{state::macros::delegate_provider_impls, StaticFileProvider},
AccountReader, BlockHashReader, ProviderError, StateProvider, StateRootProvider, AccountReader, BlockHashReader, ProviderError, StateProvider, StateRootProvider,
}; };
use alloy_eips::merge::EPOCH_SLOTS;
use alloy_primitives::{ use alloy_primitives::{
map::{HashMap, HashSet}, map::{HashMap, HashSet},
Address, BlockNumber, Bytes, StorageKey, StorageValue, B256, Address, BlockNumber, Bytes, StorageKey, StorageValue, B256,
@ -13,7 +14,7 @@ use reth_db_api::{
table::Table, table::Table,
transaction::DbTx, transaction::DbTx,
}; };
use reth_primitives::{constants::EPOCH_SLOTS, Account, Bytecode, StaticFileSegment}; use reth_primitives::{Account, Bytecode, StaticFileSegment};
use reth_storage_api::{StateProofProvider, StorageRootProvider}; use reth_storage_api::{StateProofProvider, StorageRootProvider};
use reth_storage_errors::provider::ProviderResult; use reth_storage_errors::provider::ProviderResult;
use reth_trie::{ use reth_trie::{