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: relax PayloadBuilderService bound (#13456)

Browse Source
This commit is contained in:
Arsenii Kulikov
2024-12-19 16:58:07 +02:00
committed by GitHub
parent b271f0cc6d
commit 058cfe2f98
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -8686,6 +8686,7 @@ dependencies = [
"reth-payload-builder-primitives", "reth-payload-builder-primitives",
"reth-payload-primitives", "reth-payload-primitives",
"reth-primitives", "reth-primitives",
"reth-primitives-traits",
"revm", "revm",
"tokio", "tokio",
"tokio-stream", "tokio-stream",

4
crates/payload/basic/src/lib.rs
View File

@ -19,7 +19,7 @@ use reth_evm::state_change::post_block_withdrawals_balance_increments;
use reth_payload_builder::{KeepPayloadJobAlive, PayloadId, PayloadJob, PayloadJobGenerator}; use reth_payload_builder::{KeepPayloadJobAlive, PayloadId, PayloadJob, PayloadJobGenerator};
use reth_payload_builder_primitives::PayloadBuilderError; use reth_payload_builder_primitives::PayloadBuilderError;
use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes, PayloadKind}; use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes, PayloadKind};
use reth_primitives::{proofs, SealedHeader}; use reth_primitives::{proofs, NodePrimitives, SealedHeader};
use reth_provider::{BlockReaderIdExt, CanonStateNotification, StateProviderFactory}; use reth_provider::{BlockReaderIdExt, CanonStateNotification, StateProviderFactory};
use reth_revm::cached::CachedReads; use reth_revm::cached::CachedReads;
use reth_tasks::TaskSpawner; use reth_tasks::TaskSpawner;
@ -191,7 +191,7 @@ where
Ok(job) Ok(job)
} }
fn on_new_state(&mut self, new_state: CanonStateNotification) { fn on_new_state<N: NodePrimitives>(&mut self, new_state: CanonStateNotification<N>) {
let mut cached = CachedReads::default(); let mut cached = CachedReads::default();
// extract the state from the notification and put it into the cache // extract the state from the notification and put it into the cache

10
crates/payload/builder/Cargo.toml
View File

@ -14,6 +14,7 @@ workspace = true
[dependencies] [dependencies]
# reth # reth
reth-primitives = { workspace = true, optional = true } reth-primitives = { workspace = true, optional = true }
reth-primitives-traits.workspace = true
reth-chain-state.workspace = true reth-chain-state.workspace = true
reth-payload-builder-primitives.workspace = true reth-payload-builder-primitives.workspace = true
reth-payload-primitives.workspace = true reth-payload-primitives.workspace = true
@ -44,8 +45,9 @@ alloy-consensus.workspace = true
[features] [features]
test-utils = [ test-utils = [
"alloy-primitives", "alloy-primitives",
"reth-chain-state/test-utils", "reth-chain-state/test-utils",
"reth-primitives/test-utils", "reth-primitives/test-utils",
"revm/test-utils", "revm/test-utils",
"reth-primitives-traits/test-utils"
] ]

6
crates/payload/builder/src/service.rs
View File

@ -14,6 +14,7 @@ use reth_payload_builder_primitives::{
Events, PayloadBuilder, PayloadBuilderError, PayloadEvents, PayloadStoreExt, Events, PayloadBuilder, PayloadBuilderError, PayloadEvents, PayloadStoreExt,
}; };
use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes, PayloadKind, PayloadTypes}; use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes, PayloadKind, PayloadTypes};
use reth_primitives_traits::NodePrimitives;
use std::{ use std::{
fmt, fmt,
future::Future, future::Future,
@ -352,12 +353,13 @@ where
} }
} }
impl<Gen, St, T> Future for PayloadBuilderService<Gen, St, T> impl<Gen, St, T, N> Future for PayloadBuilderService<Gen, St, T>
where where
T: PayloadTypes, T: PayloadTypes,
N: NodePrimitives,
Gen: PayloadJobGenerator + Unpin + 'static, Gen: PayloadJobGenerator + Unpin + 'static,
<Gen as PayloadJobGenerator>::Job: Unpin + 'static, <Gen as PayloadJobGenerator>::Job: Unpin + 'static,
St: Stream<Item = CanonStateNotification> + Send + Unpin + 'static, St: Stream<Item = CanonStateNotification<N>> + Send + Unpin + 'static,
Gen::Job: PayloadJob<PayloadAttributes = T::PayloadBuilderAttributes>, Gen::Job: PayloadJob<PayloadAttributes = T::PayloadBuilderAttributes>,
<Gen::Job as PayloadJob>::BuiltPayload: Into<T::BuiltPayload>, <Gen::Job as PayloadJob>::BuiltPayload: Into<T::BuiltPayload>,
{ {

3
crates/payload/builder/src/traits.rs
View File

@ -3,6 +3,7 @@
use reth_chain_state::CanonStateNotification; use reth_chain_state::CanonStateNotification;
use reth_payload_builder_primitives::PayloadBuilderError; use reth_payload_builder_primitives::PayloadBuilderError;
use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes, PayloadKind}; use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes, PayloadKind};
use reth_primitives_traits::NodePrimitives;
use std::future::Future; use std::future::Future;
/// A type that can build a payload. /// A type that can build a payload.
@ -105,7 +106,7 @@ pub trait PayloadJobGenerator: Send + Sync {
/// ///
/// This is intended for any logic that needs to be run when the chain state changes or used to /// This is intended for any logic that needs to be run when the chain state changes or used to
/// use the in memory state for the head block. /// use the in memory state for the head block.
fn on_new_state(&mut self, new_state: CanonStateNotification) { fn on_new_state<N: NodePrimitives>(&mut self, new_state: CanonStateNotification<N>) {
let _ = new_state; let _ = new_state;
} }
} }