diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go index 284b6ea953..57a344ffb8 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go @@ -184,7 +184,7 @@ func (vs *Server) BuildBlockParallel(ctx context.Context, sBlk interfaces.Signed vs.setBlsToExecData(sBlk, head) }() - localPayload, overrideBuilder, err := vs.getLocalPayloadAndBlobs(ctx, sBlk.Block(), head) + localPayload, overrideBuilder, err := vs.getLocalPayload(ctx, sBlk.Block(), head) if err != nil { return status.Errorf(codes.Internal, "Could not get local payload: %v", err) } diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go index be62504204..4f956038ec 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_bellatrix_test.go @@ -78,7 +78,7 @@ func TestServer_setExecutionData(t *testing.T) { blk, err := blocks.NewSignedBeaconBlock(util.NewBeaconBlockCapella()) require.NoError(t, err) b := blk.Block() - localPayload, _, err := vs.getLocalPayloadAndBlobs(ctx, b, capellaTransitionState) + localPayload, _, err := vs.getLocalPayload(ctx, b, capellaTransitionState) require.NoError(t, err) builderPayload, err := vs.getBuilderPayloadAndBlobs(ctx, b.Slot(), b.ProposerIndex()) require.NoError(t, err) @@ -137,7 +137,7 @@ func TestServer_setExecutionData(t *testing.T) { vs.HeadFetcher = chain b := blk.Block() - localPayload, _, err := vs.getLocalPayloadAndBlobs(ctx, b, capellaTransitionState) + localPayload, _, err := vs.getLocalPayload(ctx, b, capellaTransitionState) require.NoError(t, err) builderPayload, err := vs.getBuilderPayloadAndBlobs(ctx, b.Slot(), b.ProposerIndex()) require.NoError(t, err) @@ -199,7 +199,7 @@ func TestServer_setExecutionData(t *testing.T) { vs.HeadFetcher = chain b := blk.Block() - localPayload, _, err := vs.getLocalPayloadAndBlobs(ctx, b, capellaTransitionState) + localPayload, _, err := vs.getLocalPayload(ctx, b, capellaTransitionState) require.NoError(t, err) builderPayload, err := vs.getBuilderPayloadAndBlobs(ctx, b.Slot(), b.ProposerIndex()) require.NoError(t, err) @@ -213,7 +213,7 @@ func TestServer_setExecutionData(t *testing.T) { require.NoError(t, err) vs.ExecutionEngineCaller = &powtesting.EngineClient{PayloadIDBytes: id, ExecutionPayloadCapella: &v1.ExecutionPayloadCapella{BlockNumber: 3}, BlockValue: 2} b := blk.Block() - localPayload, _, err := vs.getLocalPayloadAndBlobs(ctx, b, capellaTransitionState) + localPayload, _, err := vs.getLocalPayload(ctx, b, capellaTransitionState) require.NoError(t, err) builderPayload, err := vs.getBuilderPayloadAndBlobs(ctx, b.Slot(), b.ProposerIndex()) require.NoError(t, err) @@ -233,7 +233,7 @@ func TestServer_setExecutionData(t *testing.T) { require.NoError(t, err) vs.ExecutionEngineCaller = &powtesting.EngineClient{PayloadIDBytes: id, ExecutionPayloadCapella: &v1.ExecutionPayloadCapella{BlockNumber: 3}, BlockValue: 1} b := blk.Block() - localPayload, _, err := vs.getLocalPayloadAndBlobs(ctx, b, capellaTransitionState) + localPayload, _, err := vs.getLocalPayload(ctx, b, capellaTransitionState) require.NoError(t, err) builderPayload, err := vs.getBuilderPayloadAndBlobs(ctx, b.Slot(), b.ProposerIndex()) require.NoError(t, err) @@ -254,7 +254,7 @@ func TestServer_setExecutionData(t *testing.T) { } vs.ExecutionEngineCaller = &powtesting.EngineClient{PayloadIDBytes: id, ExecutionPayloadCapella: &v1.ExecutionPayloadCapella{BlockNumber: 4}, BlockValue: 0} b := blk.Block() - localPayload, _, err := vs.getLocalPayloadAndBlobs(ctx, b, capellaTransitionState) + localPayload, _, err := vs.getLocalPayload(ctx, b, capellaTransitionState) require.NoError(t, err) builderPayload, err := vs.getBuilderPayloadAndBlobs(ctx, b.Slot(), b.ProposerIndex()) require.ErrorIs(t, consensus_types.ErrNilObjectWrapped, err) // Builder returns fault. Use local block @@ -285,7 +285,7 @@ func TestServer_setExecutionData(t *testing.T) { ExecutionPayloadDeneb: &v1.ExecutionPayloadDeneb{BlockNumber: 4}, BlockValue: 0} blk.SetSlot(primitives.Slot(params.BeaconConfig().DenebForkEpoch) * params.BeaconConfig().SlotsPerEpoch) - localPayload, _, err := vs.getLocalPayloadAndBlobs(ctx, blk.Block(), capellaTransitionState) + localPayload, _, err := vs.getLocalPayload(ctx, blk.Block(), capellaTransitionState) require.NoError(t, err) require.Equal(t, uint64(4), localPayload.BlockNumber()) require.DeepEqual(t, fullBlobsBundle, blobsBundle) diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go index 85a88f06b9..a5f1cc43ce 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload.go @@ -42,8 +42,7 @@ var ( ) // This returns the local execution payload of a given slot. The function has full awareness of pre and post merge. -// It also returns the blobs bundle. -func (vs *Server) getLocalPayloadAndBlobs(ctx context.Context, blk interfaces.ReadOnlyBeaconBlock, st state.BeaconState) (interfaces.ExecutionData, bool, error) { +func (vs *Server) getLocalPayload(ctx context.Context, blk interfaces.ReadOnlyBeaconBlock, st state.BeaconState) (interfaces.ExecutionData, bool, error) { ctx, span := trace.StartSpan(ctx, "ProposerServer.getLocalPayload") defer span.End() diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload_test.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload_test.go index 4dbac639a4..58f4ebbe8a 100644 --- a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload_test.go +++ b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer_execution_payload_test.go @@ -159,7 +159,7 @@ func TestServer_getExecutionPayload(t *testing.T) { b, err := blocks.NewSignedBeaconBlock(blk) require.NoError(t, err) var gotOverride bool - _, gotOverride, err = vs.getLocalPayloadAndBlobs(context.Background(), b.Block(), tt.st) + _, gotOverride, err = vs.getLocalPayload(context.Background(), b.Block(), tt.st) if tt.errString != "" { require.ErrorContains(t, tt.errString, err) } else { @@ -202,7 +202,7 @@ func TestServer_getExecutionPayloadContextTimeout(t *testing.T) { blk.Block.ParentRoot = bytesutil.PadTo([]byte{'a'}, 32) b, err := blocks.NewSignedBeaconBlock(blk) require.NoError(t, err) - _, _, err = vs.getLocalPayloadAndBlobs(context.Background(), b.Block(), nonTransitionSt) + _, _, err = vs.getLocalPayload(context.Background(), b.Block(), nonTransitionSt) require.NoError(t, err) } @@ -254,7 +254,7 @@ func TestServer_getExecutionPayload_UnexpectedFeeRecipient(t *testing.T) { blk.Block.ParentRoot = bytesutil.PadTo([]byte{}, 32) b, err := blocks.NewSignedBeaconBlock(blk) require.NoError(t, err) - gotPayload, _, err := vs.getLocalPayloadAndBlobs(context.Background(), b.Block(), transitionSt) + gotPayload, _, err := vs.getLocalPayload(context.Background(), b.Block(), transitionSt) require.NoError(t, err) require.NotNil(t, gotPayload) @@ -266,7 +266,7 @@ func TestServer_getExecutionPayload_UnexpectedFeeRecipient(t *testing.T) { payload.FeeRecipient = evilRecipientAddress[:] vs.ProposerSlotIndexCache = cache.NewProposerPayloadIDsCache() - gotPayload, _, err = vs.getLocalPayloadAndBlobs(context.Background(), b.Block(), transitionSt) + gotPayload, _, err = vs.getLocalPayload(context.Background(), b.Block(), transitionSt) require.NoError(t, err) require.NotNil(t, gotPayload)