From 6ae503347aef073760c8b4e7b37e7a882b6f67ed Mon Sep 17 00:00:00 2001
From: Somnath <snb895@outlook.com>
Date: Wed, 23 Oct 2024 18:53:01 +0530
Subject: [PATCH] Som/pectra4 engine api (#239)

* Flatten 7251 req

* Replace requests with generic requests

* fix type

* change byte to uint8

* Simplify requests bundle

* Rename requests_hash and remove reqs from body
---
 execution/execution.proto |  2 +-
 types/types.proto         | 23 ++++-------------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/execution/execution.proto b/execution/execution.proto
index d294451..397fe1d 100644
--- a/execution/execution.proto
+++ b/execution/execution.proto
@@ -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 {
@@ -143,6 +142,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 3c4c3cf..1bf410e 100644
--- a/types/types.proto
+++ b/types/types.proto
@@ -77,25 +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 {
-  bytes request_data = 1;
-}
-
-message ConsolidationRequest {
-  bytes request_data = 1;
 }
 
 message Withdrawal {
@@ -113,6 +94,10 @@ message BlobsBundleV1 {
   repeated bytes proofs = 3;
 }
 
+message RequestsBundle {
+  repeated bytes requests = 1;
+}
+
 // End of Engine API types
 // ------------------------------------------------------------------------