fix: do not rlp encode extradata (paradigmxyz#7256)

Co-authored-by: Matthias Seitz <[email protected]>
SilasZhr · Mar 20, 2024 · 52668c6 · 52668c6
1 parent 28b9834
commit 52668c6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/node-core/Cargo.toml b/crates/node-core/Cargo.toml
@@ -75,7 +75,6 @@ hyper.workspace = true
 tracing.workspace = true
 
 # crypto
-alloy-rlp.workspace = true
 secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }
 
 # async

diff --git a/crates/node-core/src/args/payload_builder_args.rs b/crates/node-core/src/args/payload_builder_args.rs
@@ -89,7 +89,7 @@ impl TypedValueParser for ExtradataValueParser {
             return Err(clap::Error::raw(
                 clap::error::ErrorKind::InvalidValue,
                 format!(
-                    "Payload builder extradata size exceeds {MAXIMUM_EXTRA_DATA_SIZE}bytes limit"
+                    "Payload builder extradata size exceeds {MAXIMUM_EXTRA_DATA_SIZE}-byte limit"
                 ),
             ))
         }

diff --git a/crates/node-core/src/cli/config.rs b/crates/node-core/src/cli/config.rs
@@ -86,9 +86,9 @@ pub trait PayloadBuilderConfig {
     /// Block extra data set by the payload builder.
     fn extradata(&self) -> Cow<'_, str>;
 
-    /// Returns the rlp-encoded extradata bytes.
-    fn extradata_rlp_bytes(&self) -> Bytes {
-        alloy_rlp::encode(self.extradata().as_bytes()).into()
+    /// Returns the extradata as bytes.
+    fn extradata_bytes(&self) -> Bytes {
+        self.extradata().as_bytes().to_vec().into()
     }
 
     /// The interval at which the job should build a new payload after the last.

diff --git a/crates/node-ethereum/src/node.rs b/crates/node-ethereum/src/node.rs
@@ -158,7 +158,7 @@ where
             .interval(conf.interval())
             .deadline(conf.deadline())
             .max_payload_tasks(conf.max_payload_tasks())
-            .extradata(conf.extradata_rlp_bytes())
+            .extradata(conf.extradata_bytes())
             .max_gas_limit(conf.max_gas_limit());
 
         let payload_generator = BasicPayloadJobGenerator::with_builder(

diff --git a/examples/custom-node/src/main.rs b/examples/custom-node/src/main.rs
@@ -241,7 +241,7 @@ where
             .interval(conf.interval())
             .deadline(conf.deadline())
             .max_payload_tasks(conf.max_payload_tasks())
-            .extradata(conf.extradata_rlp_bytes())
+            .extradata(conf.extradata_bytes())
             .max_gas_limit(conf.max_gas_limit());
 
         let payload_generator = BasicPayloadJobGenerator::with_builder(

diff --git a/examples/custom-payload-builder/src/main.rs b/examples/custom-payload-builder/src/main.rs
@@ -47,7 +47,7 @@ where
             .interval(conf.interval())
             .deadline(conf.deadline())
             .max_payload_tasks(conf.max_payload_tasks())
-            .extradata(conf.extradata_rlp_bytes())
+            .extradata(conf.extradata_bytes())
             .max_gas_limit(conf.max_gas_limit());
 
         let payload_generator = EmptyBlockPayloadJobGenerator::with_builder(