eth/catalyst: update simulated beacon for cancun

eth/catalyst/simulated_beacon.go

@@ -18,6 +18,7 @@ package catalyst
 
 import (
 	"crypto/rand"
+	"crypto/sha256"
 	"errors"
 	"math/big"
 	"sync"
@@ -27,6 +28,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/txpool"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto/kzg4844"
 	"github.com/ethereum/go-ethereum/eth"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/node"
@@ -149,26 +151,38 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp u
 	c.feeRecipientLock.Unlock()
 
 	// Reset to CurrentBlock in case of the chain was rewound
-	if header := c.eth.BlockChain().CurrentBlock(); c.curForkchoiceState.HeadBlockHash != header.Hash() {
+	var (
+		header   = c.eth.BlockChain().CurrentBlock()
+		number   = new(big.Int).Add(header.Number, big.NewInt(1))
+		isCancun = c.eth.BlockChain().Config().IsCancun(number, timestamp)
+	)
+	if c.curForkchoiceState.HeadBlockHash != header.Hash() {
 		finalizedHash := c.finalizedBlockHash(header.Number.Uint64())
 		c.setCurrentState(header.Hash(), *finalizedHash)
 	}
 
-	var random [32]byte
+	var (
+		random         [32]byte
+		payloadVersion = engine.PayloadV2
+		attrs          = &engine.PayloadAttributes{
+			Timestamp:             timestamp,
+			SuggestedFeeRecipient: feeRecipient,
+			Withdrawals:           withdrawals,
+			Random:                random,
+		}
+	)
 	rand.Read(random[:])
-	fcResponse, err := c.engineAPI.forkchoiceUpdated(c.curForkchoiceState, &engine.PayloadAttributes{
-		Timestamp:             timestamp,
-		SuggestedFeeRecipient: feeRecipient,
-		Withdrawals:           withdrawals,
-		Random:                random,
-	}, engine.PayloadV2, true)
+	if isCancun {
+		payloadVersion = engine.PayloadV3
+		attrs.BeaconRoot = &common.Hash{}
+	}
+	fcResponse, err := c.engineAPI.forkchoiceUpdated(c.curForkchoiceState, attrs, payloadVersion, true)
 	if err != nil {
 		return err
 	}
 	if fcResponse == engine.STATUS_SYNCING {
 		return errors.New("chain rewind prevented invocation of payload creation")
 	}
-
 	envelope, err := c.engineAPI.getPayload(*fcResponse.PayloadID, true)
 	if err != nil {
 		return err
@@ -187,8 +201,26 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp u
 	}
 
 	// Mark the payload as canon
-	if _, err = c.engineAPI.NewPayloadV2(*payload); err != nil {
-		return err
+	if isCancun {
+		blobHashes := make([]common.Hash, 0)
+		if envelope.BlobsBundle != nil {
+			hasher := sha256.New()
+			for _, commit := range envelope.BlobsBundle.Commitments {
+				var c kzg4844.Commitment
+				if len(commit) != len(c) {
+					return errors.New("invalid commitment length")
+				}
+				copy(c[:], commit)
+				blobHashes = append(blobHashes, kzg4844.CalcBlobHashV1(hasher, &c))
+			}
+		}
+		if _, err = c.engineAPI.NewPayloadV3(*payload, blobHashes, &common.Hash{}); err != nil {
+			return err
+		}
+	} else {
+		if _, err = c.engineAPI.NewPayloadV2(*payload); err != nil {
+			return err
+		}
 	}
 	c.setCurrentState(payload.BlockHash, finalizedHash)