Skip to content

Commit

Permalink
chore(builder): remove extra data from basic payload generator
Browse files Browse the repository at this point in the history
  • Loading branch information
rkrasiuk committed Dec 12, 2024
1 parent 90fcfb9 commit 9d175e3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 18 deletions.
1 change: 0 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions crates/ethereum/node/src/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,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(),
Expand Down
5 changes: 3 additions & 2 deletions crates/payload/basic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,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

Expand Down
14 changes: 1 addition & 13 deletions crates/payload/basic/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 9d175e3

Please sign in to comment.