From 168d3eb921ffee08fcd1bfb8c7cf5c01de4cca08 Mon Sep 17 00:00:00 2001
From: lightclient <lightclient@protonmail.com>
Date: Wed, 2 Oct 2024 10:53:36 -0600
Subject: [PATCH] beacon/engine,eth/catalyst: ensure RequestsHash is passed to
 newPayload in engine tests

---
 beacon/engine/types.go   | 10 ++++++++++
 eth/catalyst/api_test.go | 27 ++++++++++++++++++++-------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/beacon/engine/types.go b/beacon/engine/types.go
index 2a56151edc..50eccfd2a8 100644
--- a/beacon/engine/types.go
+++ b/beacon/engine/types.go
@@ -112,6 +112,16 @@ type ExecutionPayloadEnvelope struct {
 	Witness          *hexutil.Bytes  `json:"witness"`
 }
 
+// RequestsHash computes the hash of the requests contained in the envelope or
+// returns nil if the list of requests is also nil.
+func (e *ExecutionPayloadEnvelope) RequestsHash() *common.Hash {
+	if e.Requests != nil {
+		h := types.CalcRequestsHash(e.Requests)
+		return &h
+	}
+	return nil
+}
+
 type BlobsBundleV1 struct {
 	Commitments []hexutil.Bytes `json:"commitments"`
 	Proofs      []hexutil.Bytes `json:"proofs"`
diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go
index d3332e5142..c7007dac32 100644
--- a/eth/catalyst/api_test.go
+++ b/eth/catalyst/api_test.go
@@ -507,14 +507,15 @@ func setupBlocks(t *testing.T, ethservice *eth.Ethereum, n int, parent *types.He
 			h = &beaconRoots[i]
 		}
 
-		payload := getNewPayload(t, api, parent, w, h)
-		execResp, err := api.newPayload(*payload, []common.Hash{}, h, nil, false)
+		envelope := getNewEnvelope(t, api, parent, w, h)
+		execResp, err := api.newPayload(*envelope.ExecutionPayload, []common.Hash{}, h, envelope.RequestsHash(), false)
 		if err != nil {
 			t.Fatalf("can't execute payload: %v", err)
 		}
 		if execResp.Status != engine.VALID {
 			t.Fatalf("invalid status: %v %s", execResp.Status, *execResp.ValidationError)
 		}
+		payload := envelope.ExecutionPayload
 		fcState := engine.ForkchoiceStateV1{
 			HeadBlockHash:      payload.BlockHash,
 			SafeBlockHash:      payload.ParentHash,
@@ -676,7 +677,7 @@ func TestNewPayloadOnInvalidChain(t *testing.T) {
 	}
 }
 
-func assembleBlock(api *ConsensusAPI, parentHash common.Hash, params *engine.PayloadAttributes) (*engine.ExecutableData, error) {
+func assembleEnvelope(api *ConsensusAPI, parentHash common.Hash, params *engine.PayloadAttributes) (*engine.ExecutionPayloadEnvelope, error) {
 	args := &miner.BuildPayloadArgs{
 		Parent:       parentHash,
 		Timestamp:    params.Timestamp,
@@ -689,7 +690,15 @@ func assembleBlock(api *ConsensusAPI, parentHash common.Hash, params *engine.Pay
 	if err != nil {
 		return nil, err
 	}
-	return payload.ResolveFull().ExecutionPayload, nil
+	return payload.ResolveFull(), nil
+}
+
+func assembleBlock(api *ConsensusAPI, parentHash common.Hash, params *engine.PayloadAttributes) (*engine.ExecutableData, error) {
+	envelope, err := assembleEnvelope(api, parentHash, params)
+	if err != nil {
+		return nil, err
+	}
+	return envelope.ExecutionPayload, nil
 }
 
 func TestEmptyBlocks(t *testing.T) {
@@ -752,7 +761,7 @@ func TestEmptyBlocks(t *testing.T) {
 	}
 }
 
-func getNewPayload(t *testing.T, api *ConsensusAPI, parent *types.Header, withdrawals []*types.Withdrawal, beaconRoot *common.Hash) *engine.ExecutableData {
+func getNewEnvelope(t *testing.T, api *ConsensusAPI, parent *types.Header, withdrawals []*types.Withdrawal, beaconRoot *common.Hash) *engine.ExecutionPayloadEnvelope {
 	params := engine.PayloadAttributes{
 		Timestamp:             parent.Time + 1,
 		Random:                crypto.Keccak256Hash([]byte{byte(1)}),
@@ -761,11 +770,15 @@ func getNewPayload(t *testing.T, api *ConsensusAPI, parent *types.Header, withdr
 		BeaconRoot:            beaconRoot,
 	}
 
-	payload, err := assembleBlock(api, parent.Hash(), &params)
+	envelope, err := assembleEnvelope(api, parent.Hash(), &params)
 	if err != nil {
 		t.Fatal(err)
 	}
-	return payload
+	return envelope
+}
+
+func getNewPayload(t *testing.T, api *ConsensusAPI, parent *types.Header, withdrawals []*types.Withdrawal, beaconRoot *common.Hash) *engine.ExecutableData {
+	return getNewEnvelope(t, api, parent, withdrawals, beaconRoot).ExecutionPayload
 }
 
 // setBlockhash sets the blockhash of a modified ExecutableData.