From 7907424db935b93c2fe6a3c0faab943adebe8557 Mon Sep 17 00:00:00 2001
From: lightclient <14004106+lightclient@users.noreply.github.com>
Date: Fri, 19 Apr 2024 11:23:20 -0600
Subject: [PATCH] engine: rename for 7002 partial withdrawals and 7685 requests
 (#535)

* engine: rename for 7002 partial withdrawals and 7685 requests

* engine: update schema

* engine: remove couple extra instances of exit

Co-authored-by: lightclient <lightclient@protonmail.com>
Co-authored-by: Mikhail Kalinin <noblesse.knight@gmail.com>

---------

Co-authored-by: Mikhail Kalinin <noblesse.knight@gmail.com>
---
 src/engine/openrpc/schemas/payload.yaml | 24 ++++++++++++------------
 src/engine/prague.md                    | 16 ++++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/engine/openrpc/schemas/payload.yaml b/src/engine/openrpc/schemas/payload.yaml
index b57289c55..a24690176 100644
--- a/src/engine/openrpc/schemas/payload.yaml
+++ b/src/engine/openrpc/schemas/payload.yaml
@@ -264,8 +264,8 @@ ExecutionPayloadV4:
     - withdrawals
     - blobGasUsed
     - excessBlobGas
-    - depositReceipts
-    - exits
+    - depositRequests
+    - withdrawalRequests
   properties:
     parentHash:
       $ref: '#/components/schemas/ExecutionPayloadV3/properties/parentHash'
@@ -301,16 +301,16 @@ ExecutionPayloadV4:
       $ref: '#/components/schemas/ExecutionPayloadV3/properties/blobGasUsed'
     excessBlobGas:
       $ref: '#/components/schemas/ExecutionPayloadV3/properties/excessBlobGas'
-    depositReceipts:
-      title: Deposit receipts
+    depositRequests:
+      title: Deposit requests
       type: array
       items:
-        $ref: '#/components/schemas/DepositReceiptV1'
-    exits:
-      title: Exits
+        $ref: '#/components/schemas/DepositRequestV1'
+    withdrawalRequests:
+      title: Withdrawals requests
       type: array
       items:
-        $ref: '#/components/schemas/ExitV1'
+        $ref: '#/components/schemas/WithdrawalRequestV1'
 ExecutionPayloadBodyV1:
   title: Execution payload body object V1
   type: object
@@ -349,8 +349,8 @@ BlobsBundleV1:
       type: array
       items:
         $ref: '#/components/schemas/bytes'
-DepositReceiptV1:
-  title: Deposit receipt object V1
+DepositRequestV1:
+  title: Deposit request object V1
   type: object
   required:
     - pubkey
@@ -374,8 +374,8 @@ DepositReceiptV1:
     index:
       title: Deposit index
       $ref: '#/components/schemas/uint64'
-ExitV1:
-  title: Exit object V1
+WithdrawalRequestV1:
+  title: Withdrawal request object V1
   type: object
   required:
     - sourceAddress
diff --git a/src/engine/prague.md b/src/engine/prague.md
index c8430dff8..763c5302c 100644
--- a/src/engine/prague.md
+++ b/src/engine/prague.md
@@ -12,8 +12,8 @@ This specification is based on and extends [Engine API - Cancun](./cancun.md) sp
 - [Engine API -- Prague](#engine-api----prague)
   - [Table of contents](#table-of-contents)
   - [Structures](#structures)
-    - [DepositReceiptV1](#depositreceiptv1)
-    - [ExitV1](#exitv1)
+    - [DepositRequestV1](#depositrequestv1)
+    - [WithdrawalRequestV1](#withdrawalrequestv1)
     - [ExecutionPayloadV4](#executionpayloadv4)
   - [Methods](#methods)
     - [engine\_newPayloadV4](#engine_newpayloadv4)
@@ -29,7 +29,7 @@ This specification is based on and extends [Engine API - Cancun](./cancun.md) sp
 
 ## Structures
 
-### DepositReceiptV1
+### DepositRequestV1
 This structure maps onto the deposit object from [EIP-6110](https://eips.ethereum.org/EIPS/eip-6110).
 The fields are encoded as follows:
 
@@ -41,9 +41,9 @@ The fields are encoded as follows:
 
 *Note:* The `amount` value is represented in Gwei.
 
-### ExitV1
+### WithdrawalRequestV1
 
-This structure represents an execution layer triggered exit operation.
+This structure represents an execution layer triggered withdrawal request.
 The fields are encoded as follows:
 
 - `sourceAddress`: `DATA`, 20 Bytes
@@ -54,7 +54,7 @@ The fields are encoded as follows:
 
 ### ExecutionPayloadV4
 
-This structure has the syntax of [`ExecutionPayloadV3`](./cancun.md#executionpayloadv3) and appends the new fields: `depositReceipts` and `exits`.
+This structure has the syntax of [`ExecutionPayloadV3`](./cancun.md#executionpayloadv3) and appends the new fields: `depositRequests` and `withdrawalRequests`.
 
 - `parentHash`: `DATA`, 32 Bytes
 - `feeRecipient`:  `DATA`, 20 Bytes
@@ -73,8 +73,8 @@ This structure has the syntax of [`ExecutionPayloadV3`](./cancun.md#executionpay
 - `withdrawals`: `Array of WithdrawalV1` - Array of withdrawals, each object is an `OBJECT` containing the fields of a `WithdrawalV1` structure.
 - `blobGasUsed`: `QUANTITY`, 64 Bits
 - `excessBlobGas`: `QUANTITY`, 64 Bits
-- `depositReceipts`: `Array of DepositReceiptV1` - Array of deposits, each object is an `OBJECT` containing the fields of a `DepositReceiptV1` structure.
-- `exits`: `Array of ExitV1` - Array of exits, each object is an `OBJECT` containing the fields of a `ExitV1` structure.
+- `depositRequests`: `Array of DepositRequestV1` - Array of deposits, each object is an `OBJECT` containing the fields of a `DepositRequestV1` structure.
+- `withdrawalRequests`: `Array of WithdrawalRequestV1` - Array of withdrawal requests, each object is an `OBJECT` containing the fields of a `WithdrawalRequestV1` structure.
 
 ## Methods