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 Chain type (#8433)

Browse Source
This commit is contained in:
Matthias Seitz
2024-05-28 17:27:44 +02:00
committed by GitHub
parent c54276e740
commit 9874a1b34e
9 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -7066,6 +7066,7 @@ name = "reth-execution-types"
version = "0.2.0-beta.7" version = "0.2.0-beta.7"
dependencies = [ dependencies = [
"reth-evm", "reth-evm",
"reth-execution-errors",
"reth-primitives", "reth-primitives",
"reth-trie", "reth-trie",
"revm", "revm",
@ -7678,7 +7679,6 @@ dependencies = [
"reth-codecs", "reth-codecs",
"reth-db", "reth-db",
"reth-evm", "reth-evm",
"reth-execution-errors",
"reth-execution-types", "reth-execution-types",
"reth-fs-util", "reth-fs-util",
"reth-interfaces", "reth-interfaces",

5
crates/blockchain-tree/src/blockchain_tree.rs
View File

@ -18,11 +18,10 @@ use reth_primitives::{
SealedBlock, SealedBlockWithSenders, SealedHeader, StaticFileSegment, B256, U256, SealedBlock, SealedBlockWithSenders, SealedHeader, StaticFileSegment, B256, U256,
}; };
use reth_provider::{ use reth_provider::{
chain::{ChainSplit, ChainSplitTarget},
BlockExecutionWriter, BlockNumReader, BlockWriter, BundleStateWithReceipts, BlockExecutionWriter, BlockNumReader, BlockWriter, BundleStateWithReceipts,
CanonStateNotification, CanonStateNotificationSender, CanonStateNotifications, Chain, CanonStateNotification, CanonStateNotificationSender, CanonStateNotifications, Chain,
ChainSpecProvider, DisplayBlocksChain, HeaderProvider, ProviderError, ChainSpecProvider, ChainSplit, ChainSplitTarget, DisplayBlocksChain, HeaderProvider,
StaticFileProviderFactory, ProviderError, StaticFileProviderFactory,
}; };
use reth_stages_api::{MetricEvent, MetricEventsSender}; use reth_stages_api::{MetricEvent, MetricEventsSender};
use reth_storage_errors::provider::{ProviderResult, RootMismatch}; use reth_storage_errors::provider::{ProviderResult, RootMismatch};

4
crates/evm/execution-types/Cargo.toml
View File

@ -12,10 +12,14 @@ workspace = true
[dependencies] [dependencies]
reth-primitives.workspace = true reth-primitives.workspace = true
reth-execution-errors.workspace = true
reth-trie.workspace = true reth-trie.workspace = true
reth-evm.workspace = true reth-evm.workspace = true
revm.workspace = true revm.workspace = true
[dev-dependencies]
reth-primitives = { workspace = true, features = ["test-utils"] }
[features] [features]
optimism = [] optimism = []

2
crates/storage/provider/src/chain.rs → crates/evm/execution-types/src/chain.rs
View File

@ -1,6 +1,6 @@
//! Contains [Chain], a chain of blocks and their final state. //! Contains [Chain], a chain of blocks and their final state.
use crate::bundle_state::BundleStateWithReceipts; use crate::BundleStateWithReceipts;
use reth_execution_errors::BlockExecutionError; use reth_execution_errors::BlockExecutionError;
use reth_primitives::{ use reth_primitives::{
Address, BlockHash, BlockNumHash, BlockNumber, ForkBlock, Receipt, SealedBlock, Address, BlockHash, BlockNumHash, BlockNumber, ForkBlock, Receipt, SealedBlock,

3
crates/evm/execution-types/src/lib.rs
View File

@ -10,3 +10,6 @@
mod bundle; mod bundle;
pub use bundle::*; pub use bundle::*;
mod chain;
pub use chain::*;

1
crates/storage/provider/Cargo.toml
View File

@ -14,7 +14,6 @@ workspace = true
[dependencies] [dependencies]
# reth # reth
reth-blockchain-tree-api.workspace = true reth-blockchain-tree-api.workspace = true
reth-execution-errors.workspace = true
reth-execution-types.workspace = true reth-execution-types.workspace = true
reth-primitives.workspace = true reth-primitives.workspace = true
reth-fs-util.workspace = true reth-fs-util.workspace = true

5
crates/storage/provider/src/lib.rs
View File

@ -31,11 +31,10 @@ pub mod test_utils;
/// Re-export provider error. /// Re-export provider error.
pub use reth_storage_errors::provider::ProviderError; pub use reth_storage_errors::provider::ProviderError;
pub mod chain; pub use reth_execution_types::*;
pub use chain::{Chain, DisplayBlocksChain};
pub mod bundle_state; pub mod bundle_state;
pub use bundle_state::{BundleStateWithReceipts, OriginalValuesKnown, StateChanges, StateReverts}; pub use bundle_state::{OriginalValuesKnown, StateChanges, StateReverts};
pub(crate) fn to_range<R: std::ops::RangeBounds<u64>>(bounds: R) -> std::ops::Range<u64> { pub(crate) fn to_range<R: std::ops::RangeBounds<u64>>(bounds: R) -> std::ops::Range<u64> {
let start = match bounds.start_bound() { let start = match bounds.start_bound() {

2
crates/storage/provider/src/traits/chain.rs
View File

@ -1,6 +1,6 @@
//! Canonical chain state notification trait and types. //! Canonical chain state notification trait and types.
use crate::{chain::BlockReceipts, Chain}; use crate::{BlockReceipts, Chain};
use auto_impl::auto_impl; use auto_impl::auto_impl;
use reth_primitives::SealedBlockWithSenders; use reth_primitives::SealedBlockWithSenders;
use std::{ use std::{

2
crates/transaction-pool/src/blobstore/tracker.rs
View File

@ -1,7 +1,7 @@
//! Support for maintaining the blob pool. //! Support for maintaining the blob pool.
use reth_primitives::{BlockNumber, B256}; use reth_primitives::{BlockNumber, B256};
use reth_provider::chain::ChainBlocks; use reth_provider::ChainBlocks;
use std::collections::BTreeMap; use std::collections::BTreeMap;
/// The type that is used to track canonical blob transactions. /// The type that is used to track canonical blob transactions.