diff --git a/crates/payload/builder/src/noop.rs b/crates/payload/builder/src/noop.rs index f268d22c5a0..c67c753bf37 100644 --- a/crates/payload/builder/src/noop.rs +++ b/crates/payload/builder/src/noop.rs @@ -51,7 +51,8 @@ where PayloadServiceCommand::BestPayload(_, tx) => tx.send(None).ok(), PayloadServiceCommand::PayloadTimestamp(_, tx) => tx.send(None).ok(), PayloadServiceCommand::Resolve(_, _, tx) => tx.send(None).ok(), - PayloadServiceCommand::Subscribe(_) => None, + PayloadServiceCommand::Subscribe(_) | + PayloadServiceCommand::PublishBuiltPayload(_) => None, }; } } diff --git a/crates/payload/builder/src/service.rs b/crates/payload/builder/src/service.rs index 4d6e4a62f70..ac56689661b 100644 --- a/crates/payload/builder/src/service.rs +++ b/crates/payload/builder/src/service.rs @@ -171,6 +171,15 @@ impl PayloadBuilderHandle { } } + /// Publishes a payload that was built outside of a payload job. + /// + /// Subscribers receive it as [`Events::BuiltPayload`], like a payload resolved from a job. + /// The engine inserts the executed block of a published payload into its tree, so a later + /// `newPayload` of that block does not execute it again. + pub fn publish_built_payload(&self, payload: T::BuiltPayload) { + let _ = self.to_service.send(PayloadServiceCommand::PublishBuiltPayload(payload)); + } + /// Sends a message to the service to subscribe to payload events. /// Returns a receiver that will receive them. pub async fn subscribe(&self) -> Result, PayloadBuilderError> { @@ -521,6 +530,9 @@ where let new_rx = this.payload_events.subscribe(); let _ = tx.send(new_rx); } + PayloadServiceCommand::PublishBuiltPayload(payload) => { + this.payload_events.send(Events::BuiltPayload(payload)).ok(); + } } } @@ -555,6 +567,8 @@ pub enum PayloadServiceCommand { ), /// Payload service events Subscribe(oneshot::Sender>>), + /// Publish a payload that was built outside of a payload job + PublishBuiltPayload(T::BuiltPayload), } /// A request to build a new payload. @@ -666,8 +680,10 @@ struct PayloadJobEntry { mod tests { use super::*; use crate::test_utils::test_payload_service; - use alloy_primitives::Address; - use reth_ethereum_engine_primitives::{EthEngineTypes, EthPayloadAttributes}; + use alloy_consensus::Block; + use alloy_primitives::{Address, U256}; + use reth_ethereum_engine_primitives::{EthBuiltPayload, EthEngineTypes, EthPayloadAttributes}; + use reth_primitives_traits::{Block as _, RecoveredBlock}; use std::sync::atomic::{AtomicBool, Ordering}; struct DropProbe(Arc); @@ -707,4 +723,26 @@ mod tests { service.abort(); }); } + + #[test] + fn published_payload_reaches_subscribers() { + tokio::runtime::Builder::new_current_thread().build().unwrap().block_on(async { + let (service, handle) = test_payload_service::(); + let service = tokio::spawn(service); + let mut built_payloads = handle.subscribe().await.unwrap().into_built_payload_stream(); + + let payload = EthBuiltPayload::new( + Arc::new(RecoveredBlock::new_sealed(Block::<_>::default().seal_slow(), vec![])), + U256::from(1), + None, + None, + ); + handle.publish_built_payload(payload.clone()); + + let published = built_payloads.next().await.unwrap(); + assert_eq!(published.block().hash(), payload.block().hash()); + assert_eq!(published.fees(), payload.fees()); + service.abort(); + }); + } }