eth/catalyst: disallow forkchoiceupdate v1 post-shanghai (ethereum#26645

)
shekhirin · Jun 6, 2023 · 050c082 · 050c082
1 parent 3000fcc
commit 050c082
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -169,8 +169,13 @@ func NewConsensusAPI(eth *eth.Ethereum) *ConsensusAPI {
 // If there are payloadAttributes: we try to assemble a block with the payloadAttributes
 // and return its payloadID.
 func (api *ConsensusAPI) ForkchoiceUpdatedV1(update engine.ForkchoiceStateV1, payloadAttributes *engine.PayloadAttributes) (engine.ForkChoiceResponse, error) {
-	if payloadAttributes != nil && payloadAttributes.Withdrawals != nil {
-		return engine.STATUS_INVALID, engine.InvalidParams.With(fmt.Errorf("withdrawals not supported in V1"))
+	if payloadAttributes != nil {
+		if payloadAttributes.Withdrawals != nil {
+			return engine.STATUS_INVALID, engine.InvalidParams.With(fmt.Errorf("withdrawals not supported in V1"))
+		}
+		if api.eth.BlockChain().Config().IsShanghai(payloadAttributes.Timestamp) {
+			return engine.STATUS_INVALID, engine.InvalidParams.With(fmt.Errorf("forkChoiceUpdateV1 called post-shanghai"))
+		}
 	}
 	return api.forkchoiceUpdated(update, payloadAttributes)
 }