From c3a0a5b3d940a88db71fe8c5cd2b84151caa16bc Mon Sep 17 00:00:00 2001
From: Somnath Banerjee <snb895@outlook.com>
Date: Wed, 2 Oct 2024 00:12:40 +0400
Subject: [PATCH 1/6] Flatten 7251 req

---
 types/types.proto | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/types/types.proto b/types/types.proto
index 38df0f1..0365a4c 100644
--- a/types/types.proto
+++ b/types/types.proto
@@ -97,9 +97,7 @@ message WithdrawalRequest {
 }
 
 message ConsolidationRequest {
-  H160 source_address = 1;
-  bytes source_pubkey = 2;
-  bytes target_pubkey = 3;
+  bytes request_data = 1;
 }
 
 message Withdrawal {

From aff39dff2b5440f04ea8a64b402563b9640363cb Mon Sep 17 00:00:00 2001
From: Somnath Banerjee <snb895@outlook.com>
Date: Mon, 14 Oct 2024 13:38:51 +0400
Subject: [PATCH 2/6] Replace requests with generic requests

---
 execution/execution.proto |  1 +
 types/types.proto         | 30 +++++++++---------------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/execution/execution.proto b/execution/execution.proto
index 1bbaa16..7282260 100644
--- a/execution/execution.proto
+++ b/execution/execution.proto
@@ -143,6 +143,7 @@ message AssembledBlockData {
     types.ExecutionPayload execution_payload = 1;
     types.H256 block_value = 2;
     types.BlobsBundleV1 blobs_bundle = 3;
+    types.RequestsBundle requests = 4;
 }
 
 message GetAssembledBlockResponse {
diff --git a/types/types.proto b/types/types.proto
index 0365a4c..a4a3aa7 100644
--- a/types/types.proto
+++ b/types/types.proto
@@ -77,27 +77,6 @@ message ExecutionPayload {
   repeated Withdrawal withdrawals = 16;
   optional uint64 blob_gas_used = 17;
   optional uint64 excess_blob_gas = 18;
-  repeated DepositRequest deposit_requests = 19;
-  repeated WithdrawalRequest withdrawal_requests = 20;
-  repeated ConsolidationRequest consolidation_requests = 21;
-}
-
-message DepositRequest {
-  bytes pubkey = 1;
-  H256 withdrawal_credentials = 2;
-  uint64 amount = 3;
-  bytes signature = 4;
-  uint64 index = 5;
-}
-
-message WithdrawalRequest {
-  H160 source_address = 1;
-  bytes validator_pubkey = 2;
-  uint64 amount = 3;
-}
-
-message ConsolidationRequest {
-  bytes request_data = 1;
 }
 
 message Withdrawal {
@@ -115,6 +94,15 @@ message BlobsBundleV1 {
   repeated bytes proofs = 3;
 }
 
+message GenericRequest {
+  byte request_type = 1;
+  bytes request_data = 2; 
+}
+
+message RequestsBundle {
+  repeated GenericRequest = 1;
+}
+
 // End of Engine API types
 // ------------------------------------------------------------------------
 

From 907d9c8d0d139c56899ad712535e8e49ab80e81f Mon Sep 17 00:00:00 2001
From: Somnath Banerjee <snb895@outlook.com>
Date: Mon, 14 Oct 2024 15:03:44 +0400
Subject: [PATCH 3/6] fix type

---
 types/types.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/types.proto b/types/types.proto
index a4a3aa7..161fe4a 100644
--- a/types/types.proto
+++ b/types/types.proto
@@ -100,7 +100,7 @@ message GenericRequest {
 }
 
 message RequestsBundle {
-  repeated GenericRequest = 1;
+  repeated GenericRequest requests = 1;
 }
 
 // End of Engine API types

From 3279c283180eb1cbda494732544698add6ea1e6b Mon Sep 17 00:00:00 2001
From: Somnath Banerjee <snb895@outlook.com>
Date: Mon, 14 Oct 2024 15:04:54 +0400
Subject: [PATCH 4/6] change byte to uint8

---
 types/types.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/types.proto b/types/types.proto
index 161fe4a..4c8922f 100644
--- a/types/types.proto
+++ b/types/types.proto
@@ -95,7 +95,7 @@ message BlobsBundleV1 {
 }
 
 message GenericRequest {
-  byte request_type = 1;
+  uint8 request_type = 1;
   bytes request_data = 2; 
 }
 

From 59e101d4c27c07cd69909833ab11763c0109f84e Mon Sep 17 00:00:00 2001
From: Somnath Banerjee <snb895@outlook.com>
Date: Mon, 14 Oct 2024 15:10:43 +0400
Subject: [PATCH 5/6] Simplify requests bundle

---
 types/types.proto | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/types/types.proto b/types/types.proto
index 4c8922f..72c43f5 100644
--- a/types/types.proto
+++ b/types/types.proto
@@ -94,13 +94,8 @@ message BlobsBundleV1 {
   repeated bytes proofs = 3;
 }
 
-message GenericRequest {
-  uint8 request_type = 1;
-  bytes request_data = 2; 
-}
-
 message RequestsBundle {
-  repeated GenericRequest requests = 1;
+  repeated bytes requests = 1;
 }
 
 // End of Engine API types

From 12172cd7fedc920a963c93a7e9305eb5d7cb8b3b Mon Sep 17 00:00:00 2001
From: Somnath Banerjee <snb895@outlook.com>
Date: Thu, 17 Oct 2024 00:05:29 +0400
Subject: [PATCH 6/6] Rename requests_hash and remove reqs from body

---
 execution/execution.proto | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/execution/execution.proto b/execution/execution.proto
index 7282260..39309fd 100644
--- a/execution/execution.proto
+++ b/execution/execution.proto
@@ -56,7 +56,7 @@ message Header {
   optional uint64 blob_gas_used = 19;                // added in Dencun (EIP-4844)
   optional uint64 excess_blob_gas = 20;              // added in Dencun (EIP-4844)
   optional types.H256 parent_beacon_block_root = 21; // added in Dencun (EIP-4788)
-  optional types.H256 requests_root = 22;            // added in Pectra (EIP-7685)
+  optional types.H256 requests_hash = 22;            // added in Pectra (EIP-7685)
   // AuRa
   optional uint64 aura_step  = 23;
   optional bytes aura_seal = 24;
@@ -70,7 +70,6 @@ message BlockBody {
   repeated bytes transactions = 3;
   repeated Header uncles = 4;
   repeated types.Withdrawal withdrawals = 5; // added in Shapella (EIP-4895)
-  repeated bytes requests = 6;               // added in Pectra (EIP-7685)
 }
 
 message Block {