renamed OptimismPayloadBuilderAttributes to OpPayloadBuilderAttributes (#12213)

crates/optimism/node/src/engine.rs

@@ -16,7 +16,7 @@ use reth_node_api::{
 use reth_optimism_chainspec::OpChainSpec;
 use reth_optimism_forks::{OptimismHardfork, OptimismHardforks};
 use reth_optimism_payload_builder::{
-    builder::decode_eip_1559_params, OptimismBuiltPayload, OptimismPayloadBuilderAttributes,
+    builder::decode_eip_1559_params, OpPayloadBuilderAttributes, OptimismBuiltPayload,
 };
 
 /// The types used in the optimism beacon consensus engine.
@@ -53,7 +53,7 @@ pub struct OptimismPayloadTypes;
 impl PayloadTypes for OptimismPayloadTypes {
     type BuiltPayload = OptimismBuiltPayload;
     type PayloadAttributes = OpPayloadAttributes;
-    type PayloadBuilderAttributes = OptimismPayloadBuilderAttributes;
+    type PayloadBuilderAttributes = OpPayloadBuilderAttributes;
 }
 
 /// Validator for Optimism engine API.

crates/optimism/node/src/lib.rs

@@ -23,7 +23,7 @@ pub use node::OptimismNode;
 pub mod txpool;
 
 pub use reth_optimism_payload_builder::{
-    OptimismBuiltPayload, OptimismPayloadBuilder, OptimismPayloadBuilderAttributes,
+    OpPayloadBuilderAttributes, OptimismBuiltPayload, OptimismPayloadBuilder,
 };
 
 pub use reth_optimism_evm::*;

crates/optimism/node/tests/e2e/utils.rs

@@ -6,7 +6,7 @@ use reth_e2e_test_utils::{
 };
 use reth_optimism_chainspec::OpChainSpecBuilder;
 use reth_optimism_node::{
-    node::OptimismAddOns, OptimismBuiltPayload, OptimismNode, OptimismPayloadBuilderAttributes,
+    node::OptimismAddOns, OpPayloadBuilderAttributes, OptimismBuiltPayload, OptimismNode,
 };
 use reth_payload_builder::EthPayloadBuilderAttributes;
 use std::sync::Arc;
@@ -31,7 +31,7 @@ pub(crate) async fn advance_chain(
     length: usize,
     node: &mut OpNode,
     wallet: Arc<Mutex<Wallet>>,
-) -> eyre::Result<Vec<(OptimismBuiltPayload, OptimismPayloadBuilderAttributes)>> {
+) -> eyre::Result<Vec<(OptimismBuiltPayload, OpPayloadBuilderAttributes)>> {
     node.advance(length as u64, |_| {
         let wallet = wallet.clone();
         Box::pin(async move {
@@ -49,7 +49,7 @@ pub(crate) async fn advance_chain(
 }
 
 /// Helper function to create a new eth payload attributes
-pub(crate) fn optimism_payload_attributes(timestamp: u64) -> OptimismPayloadBuilderAttributes {
+pub(crate) fn optimism_payload_attributes(timestamp: u64) -> OpPayloadBuilderAttributes {
     let attributes = PayloadAttributes {
         timestamp,
         prev_randao: B256::ZERO,
@@ -58,7 +58,7 @@ pub(crate) fn optimism_payload_attributes(timestamp: u64) -> OptimismPayloadBuil
         parent_beacon_block_root: Some(B256::ZERO),
     };
 
-    OptimismPayloadBuilderAttributes {
+    OpPayloadBuilderAttributes {
         payload_attributes: EthPayloadBuilderAttributes::new(B256::ZERO, attributes),
         transactions: vec![],
         no_tx_pool: false,

crates/optimism/payload/src/builder.rs

@@ -33,7 +33,7 @@ use tracing::{debug, trace, warn};
 
 use crate::{
     error::OptimismPayloadBuilderError,
-    payload::{OptimismBuiltPayload, OptimismPayloadBuilderAttributes},
+    payload::{OpPayloadBuilderAttributes, OptimismBuiltPayload},
 };
 use op_alloy_consensus::DepositTransaction;
 
@@ -77,7 +77,7 @@ where
     /// (that has the `parent` as its parent).
     pub fn cfg_and_block_env(
         &self,
-        config: &PayloadConfig<OptimismPayloadBuilderAttributes>,
+        config: &PayloadConfig<OpPayloadBuilderAttributes>,
         parent: &Header,
     ) -> Result<(CfgEnvWithHandlerCfg, BlockEnv), EvmConfig::Error> {
         let next_attributes = NextBlockEnvAttributes {
@@ -96,12 +96,12 @@ where
     Pool: TransactionPool,
     EvmConfig: ConfigureEvm<Header = Header>,
 {
-    type Attributes = OptimismPayloadBuilderAttributes;
+    type Attributes = OpPayloadBuilderAttributes;
     type BuiltPayload = OptimismBuiltPayload;
 
     fn try_build(
         &self,
-        args: BuildArguments<Pool, Client, OptimismPayloadBuilderAttributes, OptimismBuiltPayload>,
+        args: BuildArguments<Pool, Client, OpPayloadBuilderAttributes, OptimismBuiltPayload>,
     ) -> Result<BuildOutcome<OptimismBuiltPayload>, PayloadBuilderError> {
         let (cfg_env, block_env) = self
             .cfg_and_block_env(&args.config, &args.config.parent_header)
@@ -111,7 +111,7 @@ where
 
     fn on_missing_payload(
         &self,
-        _args: BuildArguments<Pool, Client, OptimismPayloadBuilderAttributes, OptimismBuiltPayload>,
+        _args: BuildArguments<Pool, Client, OpPayloadBuilderAttributes, OptimismBuiltPayload>,
     ) -> MissingPayloadBehaviour<Self::BuiltPayload> {
         // we want to await the job that's already in progress because that should be returned as
         // is, there's no benefit in racing another job
@@ -154,7 +154,7 @@ where
 #[inline]
 pub(crate) fn optimism_payload<EvmConfig, Pool, Client>(
     evm_config: &EvmConfig,
-    args: BuildArguments<Pool, Client, OptimismPayloadBuilderAttributes, OptimismBuiltPayload>,
+    args: BuildArguments<Pool, Client, OpPayloadBuilderAttributes, OptimismBuiltPayload>,
     initialized_cfg: CfgEnvWithHandlerCfg,
     initialized_block_env: BlockEnv,
     _compute_pending_block: bool,

crates/optimism/payload/src/lib.rs

@@ -15,4 +15,4 @@ pub mod builder;
 pub use builder::OptimismPayloadBuilder;
 pub mod error;
 pub mod payload;
-pub use payload::{OpPayloadAttributes, OptimismBuiltPayload, OptimismPayloadBuilderAttributes};
+pub use payload::{OpPayloadAttributes, OpPayloadBuilderAttributes, OptimismBuiltPayload};

crates/optimism/payload/src/payload.rs

@@ -25,7 +25,7 @@ use std::sync::Arc;
 
 /// Optimism Payload Builder Attributes
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
-pub struct OptimismPayloadBuilderAttributes {
+pub struct OpPayloadBuilderAttributes {
     /// Inner ethereum payload builder attributes
     pub payload_attributes: EthPayloadBuilderAttributes,
     /// `NoTxPool` option for the generated payload
@@ -39,7 +39,7 @@ pub struct OptimismPayloadBuilderAttributes {
     pub eip_1559_params: Option<B64>,
 }
 
-impl OptimismPayloadBuilderAttributes {
+impl OpPayloadBuilderAttributes {
     /// Extracts the `eip1559` parameters for the payload.
     pub fn get_holocene_extra_data(
         &self,
@@ -73,7 +73,7 @@ impl OptimismPayloadBuilderAttributes {
     }
 }
 
-impl PayloadBuilderAttributes for OptimismPayloadBuilderAttributes {
+impl PayloadBuilderAttributes for OpPayloadBuilderAttributes {
     type RpcPayloadAttributes = OpPayloadAttributes;
     type Error = alloy_rlp::Error;
 
@@ -169,7 +169,7 @@ pub struct OptimismBuiltPayload {
     /// The rollup's chainspec.
     pub(crate) chain_spec: Arc<OpChainSpec>,
     /// The payload attributes.
-    pub(crate) attributes: OptimismPayloadBuilderAttributes,
+    pub(crate) attributes: OpPayloadBuilderAttributes,
 }
 
 // === impl BuiltPayload ===
@@ -181,7 +181,7 @@ impl OptimismBuiltPayload {
         block: SealedBlock,
         fees: U256,
         chain_spec: Arc<OpChainSpec>,
-        attributes: OptimismPayloadBuilderAttributes,
+        attributes: OpPayloadBuilderAttributes,
         executed_block: Option<ExecutedBlock>,
     ) -> Self {
         Self { id, block, executed_block, fees, sidecars: Vec::new(), chain_spec, attributes }
@@ -411,7 +411,7 @@ mod tests {
 
     #[test]
     fn test_get_extra_data_post_holocene() {
-        let attributes = OptimismPayloadBuilderAttributes {
+        let attributes = OpPayloadBuilderAttributes {
             eip_1559_params: Some(B64::from_str("0x0000000800000008").unwrap()),
             ..Default::default()
         };
@@ -421,10 +421,8 @@ mod tests {
 
     #[test]
     fn test_get_extra_data_post_holocene_default() {
-        let attributes = OptimismPayloadBuilderAttributes {
-            eip_1559_params: Some(B64::ZERO),
-            ..Default::default()
-        };
+        let attributes =
+            OpPayloadBuilderAttributes { eip_1559_params: Some(B64::ZERO), ..Default::default() };
         let extra_data = attributes.get_holocene_extra_data(BaseFeeParams::new(80, 60));
         assert_eq!(extra_data.unwrap(), Bytes::copy_from_slice(&[0, 0, 0, 0, 80, 0, 0, 0, 60]));
     }