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

feat: make engine block downloaders generic over block (#13273)

Browse Source
This commit is contained in:
Arsenii Kulikov
2024-12-10 19:38:37 +04:00
committed by GitHub
parent 4c39b98b62
commit 88a9bd72d4
8 changed files with 74 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/engine/service/src/service.rs
View File

@ -16,8 +16,8 @@ pub use reth_engine_tree::{
engine::EngineApiEvent,
};
use reth_evm::execute::BlockExecutorProvider;
use reth_network_p2p::EthBlockClient;
use reth_node_types::{BlockTy, NodeTypes, NodeTypesWithEngine};
use reth_network_p2p::BlockClient;
use reth_node_types::{BlockTy, BodyTy, HeaderTy, NodeTypes, NodeTypesWithEngine};
use reth_payload_builder::PayloadBuilderHandle;
use reth_primitives::EthPrimitives;
use reth_provider::{providers::BlockchainProvider2, ProviderFactory};
@ -42,7 +42,7 @@ type EngineServiceType<N, Client> = ChainOrchestrator<
<N as NodeTypes>::Primitives,
>,
EngineMessageStream<<N as NodeTypesWithEngine>::Engine>,
BasicBlockDownloader<Client>,
BasicBlockDownloader<Client, BlockTy<N>>,
>,
PipelineSync<N>,
>;
@ -53,7 +53,7 @@ type EngineServiceType<N, Client> = ChainOrchestrator<
pub struct EngineService<N, Client, E>
where
N: EngineNodeTypes,
Client: EthBlockClient + 'static,
Client: BlockClient<Header = HeaderTy<N>, Body = BodyTy<N>> + 'static,
E: BlockExecutorProvider + 'static,
{
orchestrator: EngineServiceType<N, Client>,
@ -63,13 +63,13 @@ where
impl<N, Client, E> EngineService<N, Client, E>
where
N: EngineNodeTypes,
Client: EthBlockClient + 'static,
Client: BlockClient<Header = HeaderTy<N>, Body = BodyTy<N>> + 'static,
E: BlockExecutorProvider<Primitives = N::Primitives> + 'static,
{
/// Constructor for `EngineService`.
#[allow(clippy::too_many_arguments)]
pub fn new<V>(
consensus: Arc<dyn FullConsensus>,
consensus: Arc<dyn FullConsensus<N::Primitives>>,
executor_factory: E,
chain_spec: Arc<N::ChainSpec>,
client: Client,
@ -131,10 +131,10 @@ where
impl<N, Client, E> Stream for EngineService<N, Client, E>
where
N: EngineNodeTypes,
Client: EthBlockClient + 'static,
Client: BlockClient<Header = HeaderTy<N>, Body = BodyTy<N>> + 'static,
E: BlockExecutorProvider + 'static,
{
type Item = ChainEvent<BeaconConsensusEngineEvent>;
type Item = ChainEvent<BeaconConsensusEngineEvent<N::Primitives>>;
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
let mut orchestrator = self.project().orchestrator;