From 56b5937691d656c0de1e21d25406da8a77caba32 Mon Sep 17 00:00:00 2001
From: Steven <112043913+stevencartavia@users.noreply.github.com>
Date: Mon, 11 Nov 2024 05:56:06 -0600
Subject: [PATCH] Move payload_attributes function to trait (#12427)

---
 crates/payload/builder/src/service.rs   | 24 ++++++++++++------------
 crates/payload/primitives/src/traits.rs |  6 ++++++
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/crates/payload/builder/src/service.rs b/crates/payload/builder/src/service.rs
index 43beaf82c3..2c9975cb4c 100644
--- a/crates/payload/builder/src/service.rs
+++ b/crates/payload/builder/src/service.rs
@@ -156,6 +156,18 @@ where
         let _ = self.to_service.send(PayloadServiceCommand::Subscribe(tx));
         Ok(PayloadEvents { receiver: rx.await? })
     }
+
+    /// Returns the payload attributes associated with the given identifier.
+    ///
+    /// Note: this returns the attributes of the payload and does not resolve the job.
+    async fn payload_attributes(
+        &self,
+        id: PayloadId,
+    ) -> Option<Result<T::PayloadBuilderAttributes, PayloadBuilderError>> {
+        let (tx, rx) = oneshot::channel();
+        self.to_service.send(PayloadServiceCommand::PayloadAttributes(id, tx)).ok()?;
+        rx.await.ok()?
+    }
 }
 
 impl<T> PayloadBuilderHandle<T>
@@ -169,18 +181,6 @@ where
     pub const fn new(to_service: mpsc::UnboundedSender<PayloadServiceCommand<T>>) -> Self {
         Self { to_service }
     }
-
-    /// Returns the payload attributes associated with the given identifier.
-    ///
-    /// Note: this returns the attributes of the payload and does not resolve the job.
-    async fn payload_attributes(
-        &self,
-        id: PayloadId,
-    ) -> Option<Result<T::PayloadBuilderAttributes, PayloadBuilderError>> {
-        let (tx, rx) = oneshot::channel();
-        self.to_service.send(PayloadServiceCommand::PayloadAttributes(id, tx)).ok()?;
-        rx.await.ok()?
-    }
 }
 
 impl<T> Clone for PayloadBuilderHandle<T>
diff --git a/crates/payload/primitives/src/traits.rs b/crates/payload/primitives/src/traits.rs
index d66b0add45..86f04a5b55 100644
--- a/crates/payload/primitives/src/traits.rs
+++ b/crates/payload/primitives/src/traits.rs
@@ -50,6 +50,12 @@ pub trait PayloadBuilder: Send + Sync + Unpin {
     /// Sends a message to the service to subscribe to payload events.
     /// Returns a receiver that will receive them.
     async fn subscribe(&self) -> Result<PayloadEvents<Self::PayloadType>, Self::Error>;
+
+    /// Returns the payload attributes associated with the given identifier.
+    async fn payload_attributes(
+        &self,
+        id: PayloadId,
+    ) -> Option<Result<<Self::PayloadType as PayloadTypes>::PayloadBuilderAttributes, Self::Error>>;
 }
 
 /// Represents a built payload type that contains a built [`SealedBlock`] and can be converted into