jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: extra data (#13410)

Browse Source
This commit is contained in:
Roman Krasiuk
2024-12-16 04:58:36 +01:00
committed by GitHub
parent 091c5499ba
commit f36e369021
11 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crates/node/core/src/args/payload_builder.rs
View File

@ -13,8 +13,8 @@ use std::{borrow::Cow, ffi::OsStr, time::Duration};
#[command(next_help_heading = "Builder")]
pub struct PayloadBuilderArgs {
/// Block extra data set by the payload builder.
#[arg(long = "builder.extradata", value_parser = ExtradataValueParser::default(), default_value_t = default_extra_data())]
pub extradata: String,
#[arg(long = "builder.extradata", value_parser = ExtraDataValueParser::default(), default_value_t = default_extra_data())]
pub extra_data: String,
/// Target gas limit for built blocks.
#[arg(long = "builder.gaslimit", default_value_t = ETHEREUM_BLOCK_GAS_LIMIT, value_name = "GAS_LIMIT")]
@ -40,7 +40,7 @@ pub struct PayloadBuilderArgs {
impl Default for PayloadBuilderArgs {
fn default() -> Self {
Self {
extradata: default_extra_data(),
extra_data: default_extra_data(),
gas_limit: ETHEREUM_BLOCK_GAS_LIMIT,
interval: Duration::from_secs(1),
deadline: SLOT_DURATION,
@ -50,8 +50,8 @@ impl Default for PayloadBuilderArgs {
}
impl PayloadBuilderConfig for PayloadBuilderArgs {
fn extradata(&self) -> Cow<'_, str> {
self.extradata.as_str().into()
fn extra_data(&self) -> Cow<'_, str> {
self.extra_data.as_str().into()
}
fn interval(&self) -> Duration {
@ -73,9 +73,9 @@ impl PayloadBuilderConfig for PayloadBuilderArgs {
#[derive(Clone, Debug, Default)]
#[non_exhaustive]
struct ExtradataValueParser;
struct ExtraDataValueParser;
impl TypedValueParser for ExtradataValueParser {
impl TypedValueParser for ExtraDataValueParser {
type Value = String;
fn parse_ref(
@ -130,23 +130,23 @@ mod tests {
#[test]
fn test_default_extra_data() {
let extradata = default_extra_data();
let extra_data = default_extra_data();
let args = CommandParser::<PayloadBuilderArgs>::parse_from([
"reth",
"--builder.extradata",
extradata.as_str(),
extra_data.as_str(),
])
.args;
assert_eq!(args.extradata, extradata);
assert_eq!(args.extra_data, extra_data);
}
#[test]
fn test_invalid_extradata() {
let extradata = "x".repeat(MAXIMUM_EXTRA_DATA_SIZE + 1);
fn test_invalid_extra_data() {
let extra_data = "x".repeat(MAXIMUM_EXTRA_DATA_SIZE + 1);
let args = CommandParser::<PayloadBuilderArgs>::try_parse_from([
"reth",
"--builder.extradata",
extradata.as_str(),
extra_data.as_str(),
]);
assert!(args.is_err());
}

8
crates/node/core/src/cli/config.rs
View File

@ -11,11 +11,11 @@ use std::{borrow::Cow, time::Duration};
/// [`PayloadBuilderArgs`](crate::args::PayloadBuilderArgs) type.
pub trait PayloadBuilderConfig {
/// Block extra data set by the payload builder.
fn extradata(&self) -> Cow<'_, str>;
fn extra_data(&self) -> Cow<'_, str>;
/// Returns the extradata as bytes.
fn extradata_bytes(&self) -> Bytes {
self.extradata().as_bytes().to_vec().into()
/// Returns the extra data as bytes.
fn extra_data_bytes(&self) -> Bytes {
self.extra_data().as_bytes().to_vec().into()
}
/// The interval at which the job should build a new payload after the last.

6
crates/node/core/src/version.rs
View File

@ -149,8 +149,8 @@ mod tests {
use super::*;
#[test]
fn assert_extradata_less_32bytes() {
let extradata = default_extra_data();
assert!(extradata.len() <= 32, "extradata must be less than 32 bytes: {extradata}")
fn assert_extra_data_less_32bytes() {
let extra_data = default_extra_data();
assert!(extra_data.len() <= 32, "extra data must be less than 32 bytes: {extra_data}")
}
}