From 364a69445f86e9ba906cb5ada18767d4021028da Mon Sep 17 00:00:00 2001 From: Roman Krasiuk Date: Thu, 12 Dec 2024 20:31:06 +0100 Subject: [PATCH] chore(builder): remove extra data from basic payload generator (#13353) Co-authored-by: Matthias Seitz --- Cargo.lock | 2 -- crates/ethereum/node/src/node.rs | 3 +-- crates/optimism/node/src/node.rs | 4 +--- crates/payload/basic/Cargo.toml | 6 +++--- crates/payload/basic/src/lib.rs | 14 +------------- examples/custom-engine-types/src/main.rs | 3 +-- examples/custom-payload-builder/src/main.rs | 6 ++---- 7 files changed, 9 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 151421261e76..917a4f242175 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6560,7 +6560,6 @@ dependencies = [ "alloy-consensus", "alloy-eips", "alloy-primitives", - "alloy-rlp", "futures-core", "futures-util", "metrics", @@ -6571,7 +6570,6 @@ dependencies = [ "reth-payload-builder-primitives", "reth-payload-primitives", "reth-primitives", - "reth-primitives-traits", "reth-provider", "reth-revm", "reth-tasks", diff --git a/crates/ethereum/node/src/node.rs b/crates/ethereum/node/src/node.rs index 51b5abbe4ab5..59269d3a3e01 100644 --- a/crates/ethereum/node/src/node.rs +++ b/crates/ethereum/node/src/node.rs @@ -262,8 +262,7 @@ impl EthereumPayloadBuilder { let payload_job_config = BasicPayloadJobGeneratorConfig::default() .interval(conf.interval()) .deadline(conf.deadline()) - .max_payload_tasks(conf.max_payload_tasks()) - .extradata(conf.extradata_bytes()); + .max_payload_tasks(conf.max_payload_tasks()); let payload_generator = BasicPayloadJobGenerator::with_builder( ctx.provider().clone(), diff --git a/crates/optimism/node/src/node.rs b/crates/optimism/node/src/node.rs index 43585b3762fb..4fe67b819cd3 100644 --- a/crates/optimism/node/src/node.rs +++ b/crates/optimism/node/src/node.rs @@ -545,9 +545,7 @@ where let payload_job_config = BasicPayloadJobGeneratorConfig::default() .interval(conf.interval()) .deadline(conf.deadline()) - .max_payload_tasks(conf.max_payload_tasks()) - // no extradata for OP - .extradata(Default::default()); + .max_payload_tasks(conf.max_payload_tasks()); let payload_generator = BasicPayloadJobGenerator::with_builder( ctx.provider().clone(), diff --git a/crates/payload/basic/Cargo.toml b/crates/payload/basic/Cargo.toml index 0315f73cae4e..f50f6159bd0f 100644 --- a/crates/payload/basic/Cargo.toml +++ b/crates/payload/basic/Cargo.toml @@ -15,7 +15,6 @@ workspace = true # reth reth-chainspec.workspace = true reth-primitives.workspace = true -reth-primitives-traits.workspace = true reth-transaction-pool.workspace = true reth-provider.workspace = true reth-payload-builder.workspace = true @@ -25,10 +24,11 @@ reth-tasks.workspace = true reth-evm.workspace = true reth-revm.workspace=true +# revm +revm.workspace = true + # ethereum -alloy-rlp.workspace = true alloy-primitives.workspace = true -revm.workspace = true alloy-consensus.workspace = true alloy-eips.workspace = true diff --git a/crates/payload/basic/src/lib.rs b/crates/payload/basic/src/lib.rs index 189b8a8c2f82..43292385661c 100644 --- a/crates/payload/basic/src/lib.rs +++ b/crates/payload/basic/src/lib.rs @@ -11,7 +11,7 @@ use crate::metrics::PayloadBuilderMetrics; use alloy_consensus::constants::EMPTY_WITHDRAWALS; use alloy_eips::{eip4895::Withdrawals, merge::SLOT_DURATION}; -use alloy_primitives::{Bytes, B256, U256}; +use alloy_primitives::{B256, U256}; use futures_core::ready; use futures_util::FutureExt; use reth_chainspec::EthereumHardforks; @@ -20,7 +20,6 @@ use reth_payload_builder::{KeepPayloadJobAlive, PayloadId, PayloadJob, PayloadJo use reth_payload_builder_primitives::PayloadBuilderError; use reth_payload_primitives::{BuiltPayload, PayloadBuilderAttributes, PayloadKind}; use reth_primitives::{proofs, SealedHeader}; -use reth_primitives_traits::constants::RETH_CLIENT_VERSION; use reth_provider::{BlockReaderIdExt, CanonStateNotification, StateProviderFactory}; use reth_revm::cached::CachedReads; use reth_tasks::TaskSpawner; @@ -247,8 +246,6 @@ impl PayloadTaskGuard { /// Settings for the [`BasicPayloadJobGenerator`]. #[derive(Debug, Clone)] pub struct BasicPayloadJobGeneratorConfig { - /// Data to include in the block's extra data field. - extradata: Bytes, /// The interval at which the job should build a new payload after the last. interval: Duration, /// The deadline for when the payload builder job should resolve. @@ -284,20 +281,11 @@ impl BasicPayloadJobGeneratorConfig { self.max_payload_tasks = max_payload_tasks; self } - - /// Sets the data to include in the block's extra data field. - /// - /// Defaults to the current client version: `rlp(RETH_CLIENT_VERSION)`. - pub fn extradata(mut self, extradata: Bytes) -> Self { - self.extradata = extradata; - self - } } impl Default for BasicPayloadJobGeneratorConfig { fn default() -> Self { Self { - extradata: alloy_rlp::encode(RETH_CLIENT_VERSION.as_bytes()).into(), interval: Duration::from_secs(1), // 12s slot time deadline: SLOT_DURATION, diff --git a/examples/custom-engine-types/src/main.rs b/examples/custom-engine-types/src/main.rs index 8437cf8d3c4d..8a5b9f9be7da 100644 --- a/examples/custom-engine-types/src/main.rs +++ b/examples/custom-engine-types/src/main.rs @@ -363,8 +363,7 @@ where let payload_job_config = BasicPayloadJobGeneratorConfig::default() .interval(conf.interval()) .deadline(conf.deadline()) - .max_payload_tasks(conf.max_payload_tasks()) - .extradata(conf.extradata_bytes()); + .max_payload_tasks(conf.max_payload_tasks()); let payload_generator = BasicPayloadJobGenerator::with_builder( ctx.provider().clone(), diff --git a/examples/custom-payload-builder/src/main.rs b/examples/custom-payload-builder/src/main.rs index 6ae920378294..8ce08c0262fb 100644 --- a/examples/custom-payload-builder/src/main.rs +++ b/examples/custom-payload-builder/src/main.rs @@ -18,7 +18,6 @@ use reth::{ payload::PayloadBuilderHandle, providers::CanonStateSubscriptions, transaction_pool::{PoolTransaction, TransactionPool}, - version::default_extra_data_bytes, }; use reth_basic_payload_builder::BasicPayloadJobGeneratorConfig; use reth_chainspec::ChainSpec; @@ -59,8 +58,7 @@ where let payload_job_config = BasicPayloadJobGeneratorConfig::default() .interval(conf.interval()) .deadline(conf.deadline()) - .max_payload_tasks(conf.max_payload_tasks()) - .extradata(conf.extradata_bytes()); + .max_payload_tasks(conf.max_payload_tasks()); let payload_generator = EmptyBlockPayloadJobGenerator::with_builder( ctx.provider().clone(), @@ -69,7 +67,7 @@ where payload_job_config, reth_ethereum_payload_builder::EthereumPayloadBuilder::new( EthEvmConfig::new(ctx.chain_spec()), - EthereumBuilderConfig::new(default_extra_data_bytes()), + EthereumBuilderConfig::new(conf.extradata_bytes()), ), );