From e90dc44be9bb3e9aaacc742b3cfa9d22a8252b5c Mon Sep 17 00:00:00 2001
From: Rupam Dey <117000803+rupam-04@users.noreply.github.com>
Date: Fri, 3 May 2024 00:02:36 +0530
Subject: [PATCH] feat: remove field ```max_gas_limit``` from
 ```BasicPayloadJobGeneratorConfig``` (#7949)

---
 crates/node-ethereum/src/node.rs            |  3 +--
 crates/optimism/node/src/node.rs            |  3 +--
 crates/payload/basic/src/lib.rs             | 13 +------------
 examples/custom-engine-types/src/main.rs    |  3 +--
 examples/custom-payload-builder/src/main.rs |  3 +--
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/crates/node-ethereum/src/node.rs b/crates/node-ethereum/src/node.rs
index 9de0cbe6e..815b949de 100644
--- a/crates/node-ethereum/src/node.rs
+++ b/crates/node-ethereum/src/node.rs
@@ -175,8 +175,7 @@ where
             .interval(conf.interval())
             .deadline(conf.deadline())
             .max_payload_tasks(conf.max_payload_tasks())
-            .extradata(conf.extradata_bytes())
-            .max_gas_limit(conf.max_gas_limit());
+            .extradata(conf.extradata_bytes());
 
         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 c95f3dd95..7e7d54703 100644
--- a/crates/optimism/node/src/node.rs
+++ b/crates/optimism/node/src/node.rs
@@ -224,8 +224,7 @@ where
             .deadline(conf.deadline())
             .max_payload_tasks(conf.max_payload_tasks())
             // no extradata for OP
-            .extradata(Default::default())
-            .max_gas_limit(conf.max_gas_limit());
+            .extradata(Default::default());
 
         let payload_generator = BasicPayloadJobGenerator::with_builder(
             ctx.provider().clone(),
diff --git a/crates/payload/basic/src/lib.rs b/crates/payload/basic/src/lib.rs
index 8da9163d0..6529710ca 100644
--- a/crates/payload/basic/src/lib.rs
+++ b/crates/payload/basic/src/lib.rs
@@ -18,7 +18,7 @@ use reth_payload_builder::{
     PayloadJobGenerator,
 };
 use reth_primitives::{
-    constants::{EMPTY_WITHDRAWALS, ETHEREUM_BLOCK_GAS_LIMIT, RETH_CLIENT_VERSION, SLOT_DURATION},
+    constants::{EMPTY_WITHDRAWALS, RETH_CLIENT_VERSION, SLOT_DURATION},
     proofs, BlockNumberOrTag, Bytes, ChainSpec, SealedBlock, Withdrawals, B256, U256,
 };
 use reth_provider::{
@@ -251,8 +251,6 @@ impl PayloadTaskGuard {
 pub struct BasicPayloadJobGeneratorConfig {
     /// Data to include in the block's extra data field.
     extradata: Bytes,
-    /// Target gas ceiling for built blocks, defaults to [ETHEREUM_BLOCK_GAS_LIMIT] gas.
-    max_gas_limit: u64,
     /// 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.
@@ -296,21 +294,12 @@ impl BasicPayloadJobGeneratorConfig {
         self.extradata = extradata;
         self
     }
-
-    /// Sets the target gas ceiling for mined blocks.
-    ///
-    /// Defaults to [ETHEREUM_BLOCK_GAS_LIMIT] gas.
-    pub fn max_gas_limit(mut self, max_gas_limit: u64) -> Self {
-        self.max_gas_limit = max_gas_limit;
-        self
-    }
 }
 
 impl Default for BasicPayloadJobGeneratorConfig {
     fn default() -> Self {
         Self {
             extradata: alloy_rlp::encode(RETH_CLIENT_VERSION.as_bytes()).into(),
-            max_gas_limit: ETHEREUM_BLOCK_GAS_LIMIT,
             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 ada28c0f3..d16146420 100644
--- a/examples/custom-engine-types/src/main.rs
+++ b/examples/custom-engine-types/src/main.rs
@@ -235,8 +235,7 @@ where
             .interval(conf.interval())
             .deadline(conf.deadline())
             .max_payload_tasks(conf.max_payload_tasks())
-            .extradata(conf.extradata_bytes())
-            .max_gas_limit(conf.max_gas_limit());
+            .extradata(conf.extradata_bytes());
 
         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 2c468c34a..b2bc6af36 100644
--- a/examples/custom-payload-builder/src/main.rs
+++ b/examples/custom-payload-builder/src/main.rs
@@ -47,8 +47,7 @@ where
             .interval(conf.interval())
             .deadline(conf.deadline())
             .max_payload_tasks(conf.max_payload_tasks())
-            .extradata(conf.extradata_bytes())
-            .max_gas_limit(conf.max_gas_limit());
+            .extradata(conf.extradata_bytes());
 
         let payload_generator = EmptyBlockPayloadJobGenerator::with_builder(
             ctx.provider().clone(),