From a8cf4399a90ce856bb9b5e24ff8249e1012ed3fe Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Thu, 2 Feb 2023 10:52:26 +0100 Subject: [PATCH] eth/catalyst: return invalid params instead of invalid payload params (#26591) --- core/beacon/errors.go | 1 + eth/catalyst/api.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/beacon/errors.go b/core/beacon/errors.go index 7a30d09bb..24dc52278 100644 --- a/core/beacon/errors.go +++ b/core/beacon/errors.go @@ -80,6 +80,7 @@ var ( UnknownPayload = &EngineAPIError{code: -38001, msg: "Unknown payload"} InvalidForkChoiceState = &EngineAPIError{code: -38002, msg: "Invalid forkchoice state"} InvalidPayloadAttributes = &EngineAPIError{code: -38003, msg: "Invalid payload attributes"} + InvalidParams = &EngineAPIError{code: -32602, msg: "Invalid parameters"} STATUS_INVALID = ForkChoiceResponse{PayloadStatus: PayloadStatusV1{Status: INVALID}, PayloadID: nil} STATUS_SYNCING = ForkChoiceResponse{PayloadStatus: PayloadStatusV1{Status: SYNCING}, PayloadID: nil} diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go index 96964b619..c56e8bbac 100644 --- a/eth/catalyst/api.go +++ b/eth/catalyst/api.go @@ -168,7 +168,7 @@ func NewConsensusAPI(eth *eth.Ethereum) *ConsensusAPI { // and return its payloadID. func (api *ConsensusAPI) ForkchoiceUpdatedV1(update beacon.ForkchoiceStateV1, payloadAttributes *beacon.PayloadAttributes) (beacon.ForkChoiceResponse, error) { if payloadAttributes != nil && payloadAttributes.Withdrawals != nil { - return beacon.STATUS_INVALID, fmt.Errorf("withdrawals not supported in V1") + return beacon.STATUS_INVALID, beacon.InvalidParams.With(fmt.Errorf("withdrawals not supported in V1")) } return api.forkchoiceUpdated(update, payloadAttributes) } @@ -177,7 +177,7 @@ func (api *ConsensusAPI) ForkchoiceUpdatedV1(update beacon.ForkchoiceStateV1, pa func (api *ConsensusAPI) ForkchoiceUpdatedV2(update beacon.ForkchoiceStateV1, payloadAttributes *beacon.PayloadAttributes) (beacon.ForkChoiceResponse, error) { if payloadAttributes != nil { if err := api.verifyPayloadAttributes(payloadAttributes); err != nil { - return beacon.STATUS_INVALID, beacon.InvalidPayloadAttributes.With(err) + return beacon.STATUS_INVALID, beacon.InvalidParams.With(err) } } return api.forkchoiceUpdated(update, payloadAttributes)