From 79eaffa5d0e6bf02a0e8d062c032903e730cf740 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Wed, 23 Aug 2023 01:50:01 +0200 Subject: [PATCH] beacon/engine: fixup --- beacon/engine/types.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/beacon/engine/types.go b/beacon/engine/types.go index b78444c7ba..874f3e90af 100644 --- a/beacon/engine/types.go +++ b/beacon/engine/types.go @@ -269,11 +269,7 @@ func BlockToExecutableData(block *types.Block, fees *big.Int, sidecars []*types. bundle.Proofs = append(bundle.Proofs, hexutil.Bytes(sidecar.Proofs[j][:])) } } -<<<<<<< Updated upstream - return &ExecutionPayloadEnvelope{ExecutionPayload: data, BlockValue: fees, BlobsBundle: &blobsBundle} -======= - return &ExecutionPayloadEnvelope{ExecutionPayload: data, BlockValue: fees, BlobsBundle: &bundle, Override: false} ->>>>>>> Stashed changes + return &ExecutionPayloadEnvelope{ExecutionPayload: data, BlockValue: fees, BlobsBundle: &bundle} } // ExecutionPayloadBodyV1 is used in the response to GetPayloadBodiesByHashV1 and GetPayloadBodiesByRangeV1