add withdrawalRequests to execution payload (#12155)

Cherry pick #10369 Co-authored-by: racytech <82003208+racytech@users.noreply.github.com>
erigontech · Oct 1, 2024 · 61fb230 · 61fb230
1 parent ee01d5a
commit 61fb230
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 18 deletions.
diff --git a/core/types/withdrawal_requests.go b/core/types/withdrawal_requests.go
@@ -0,0 +1,11 @@
+package types
+
+import libcommon "github.com/ledgerwatch/erigon-lib/common"
+
+type WithdrawalRequest struct {
+	SourceAddress   libcommon.Address
+	ValidatorPubkey [pLen]byte // bls
+	Amount          uint64
+}
+
+type WithdrawalRequests []*WithdrawalRequest
diff --git a/turbo/engineapi/engine_types/jsonrpc.go b/turbo/engineapi/engine_types/jsonrpc.go
@@ -17,24 +17,25 @@ import (
 
 // ExecutionPayload represents an execution payload (aka block)
 type ExecutionPayload struct {
-	ParentHash      common.Hash         `json:"parentHash"    gencodec:"required"`
-	FeeRecipient    common.Address      `json:"feeRecipient"  gencodec:"required"`
-	StateRoot       common.Hash         `json:"stateRoot"     gencodec:"required"`
-	ReceiptsRoot    common.Hash         `json:"receiptsRoot"  gencodec:"required"`
-	LogsBloom       hexutility.Bytes    `json:"logsBloom"     gencodec:"required"`
-	PrevRandao      common.Hash         `json:"prevRandao"    gencodec:"required"`
-	BlockNumber     hexutil.Uint64      `json:"blockNumber"   gencodec:"required"`
-	GasLimit        hexutil.Uint64      `json:"gasLimit"      gencodec:"required"`
-	GasUsed         hexutil.Uint64      `json:"gasUsed"       gencodec:"required"`
-	Timestamp       hexutil.Uint64      `json:"timestamp"     gencodec:"required"`
-	ExtraData       hexutility.Bytes    `json:"extraData"     gencodec:"required"`
-	BaseFeePerGas   *hexutil.Big        `json:"baseFeePerGas" gencodec:"required"`
-	BlockHash       common.Hash         `json:"blockHash"     gencodec:"required"`
-	Transactions    []hexutility.Bytes  `json:"transactions"  gencodec:"required"`
-	Withdrawals     []*types.Withdrawal `json:"withdrawals"`
-	BlobGasUsed     *hexutil.Uint64     `json:"blobGasUsed"`
-	ExcessBlobGas   *hexutil.Uint64     `json:"excessBlobGas"`
-	DepositRequests types.Deposits      `json:"depositRequests"` // do not forget to add it into erigon-lib/gointerfaces/types if needed
+	ParentHash         common.Hash              `json:"parentHash"    gencodec:"required"`
+	FeeRecipient       common.Address           `json:"feeRecipient"  gencodec:"required"`
+	StateRoot          common.Hash              `json:"stateRoot"     gencodec:"required"`
+	ReceiptsRoot       common.Hash              `json:"receiptsRoot"  gencodec:"required"`
+	LogsBloom          hexutility.Bytes         `json:"logsBloom"     gencodec:"required"`
+	PrevRandao         common.Hash              `json:"prevRandao"    gencodec:"required"`
+	BlockNumber        hexutil.Uint64           `json:"blockNumber"   gencodec:"required"`
+	GasLimit           hexutil.Uint64           `json:"gasLimit"      gencodec:"required"`
+	GasUsed            hexutil.Uint64           `json:"gasUsed"       gencodec:"required"`
+	Timestamp          hexutil.Uint64           `json:"timestamp"     gencodec:"required"`
+	ExtraData          hexutility.Bytes         `json:"extraData"     gencodec:"required"`
+	BaseFeePerGas      *hexutil.Big             `json:"baseFeePerGas" gencodec:"required"`
+	BlockHash          common.Hash              `json:"blockHash"     gencodec:"required"`
+	Transactions       []hexutility.Bytes       `json:"transactions"  gencodec:"required"`
+	Withdrawals        []*types.Withdrawal      `json:"withdrawals"`
+	BlobGasUsed        *hexutil.Uint64          `json:"blobGasUsed"`
+	ExcessBlobGas      *hexutil.Uint64          `json:"excessBlobGas"`
+	DepositRequests    types.Deposits           `json:"depositRequests"` // do not forget to add it into erigon-lib/gointerfaces/types if needed
+	WithdrawalRequests types.WithdrawalRequests `json:"withdrawalRequests"`
 }
 
 // PayloadAttributes represent the attributes required to start assembling a payload