fix(consensus, blockchain): set execution payload timestamp based on CometBFT timestamp

beacond/cmd/defaults.go

@@ -61,7 +61,8 @@ func DefaultComponents() []any {
 			*BeaconBlockHeader, *BlobSidecar, *BlobSidecars,
 		],
 		components.ProvideChainService[
-			*AvailabilityStore, *BeaconBlock, *BeaconBlockBody,
+			*AvailabilityStore,
+			*ConsensusBlock, *BeaconBlock, *BeaconBlockBody,
 			*BeaconBlockHeader, *BeaconState, *BeaconStateMarshallable,
 			*BlobSidecars, *BlockStore, *Deposit, *DepositStore,
 			*ExecutionPayload, *ExecutionPayloadHeader, *Genesis,
@@ -91,7 +92,7 @@ func DefaultComponents() []any {
 		],
 		components.ProvideDepositStore[*Deposit],
 		components.ProvideDispatcher[
-			*BeaconBlock, *BlobSidecars, *Genesis, *Logger,
+			*ConsensusBlock, *BeaconBlock, *BlobSidecars, *Genesis, *Logger,
 		],
 		components.ProvideEngineClient[
 			*ExecutionPayload, *ExecutionPayloadHeader, *Logger,
@@ -107,7 +108,8 @@ func DefaultComponents() []any {
 		components.ProvideReportingService[*Logger],
 		components.ProvideCometBFTService[*Logger],
 		components.ProvideServiceRegistry[
-			*AvailabilityStore, *BeaconBlock, *BeaconBlockBody,
+			*AvailabilityStore,
+			*ConsensusBlock, *BeaconBlock, *BeaconBlockBody,
 			*BeaconBlockHeader, *BlockStore, *BeaconState,
 			*BeaconStateMarshallable, *BlobSidecar, *BlobSidecars,
 			*Deposit, *DepositStore, *ExecutionPayload, *ExecutionPayloadHeader,

beacond/cmd/types.go

@@ -26,7 +26,6 @@ import (
 	"github.com/berachain/beacon-kit/mod/beacon/validator"
 	"github.com/berachain/beacon-kit/mod/consensus-types/pkg/types"
 	cometbft "github.com/berachain/beacon-kit/mod/consensus/pkg/cometbft/service"
-	"github.com/berachain/beacon-kit/mod/consensus/pkg/cometbft/service/middleware"
 	consruntimetypes "github.com/berachain/beacon-kit/mod/consensus/pkg/types"
 	dablob "github.com/berachain/beacon-kit/mod/da/pkg/blob"
 	"github.com/berachain/beacon-kit/mod/da/pkg/da"
@@ -63,14 +62,6 @@ import (
 /* -------------------------------------------------------------------------- */
 
 type (
-	// ABCIMiddleware is a type alias for the ABCIMiddleware.
-	ABCIMiddleware = middleware.ABCIMiddleware[
-		*BeaconBlock,
-		*BlobSidecars,
-		*Genesis,
-		*SlotData,
-	]
-
 	// AttributesFactory is a type alias for the attributes factory.
 	AttributesFactory = attributes.Factory[
 		*BeaconState,
@@ -100,6 +91,7 @@ type (
 	// ChainService is a type alias for the chain service.
 	ChainService = blockchain.Service[
 		*AvailabilityStore,
+		*ConsensusBlock,
 		*BeaconBlock,
 		*BeaconBlockBody,
 		*BeaconBlockHeader,
@@ -114,9 +106,6 @@ type (
 	// CometBFTService is a type alias for the CometBFT service.
 	CometBFTService = cometbft.Service[*Logger]
 
-	// ConsensusMiddleware is a type alias for the consensus middleware.
-	ConsensusMiddleware = cometbft.MiddlewareI
-
 	// DAService is a type alias for the DA service.
 	DAService = da.Service[*AvailabilityStore, *BlobSidecars]
 
@@ -245,6 +234,7 @@ type (
 	AvailabilityStore = dastore.Store[*BeaconBlockBody]
 
 	// BeaconBlock type aliases.
+	ConsensusBlock    = consruntimetypes.ConsensusBlock[*BeaconBlock]
 	BeaconBlock       = types.BeaconBlock
 	BeaconBlockBody   = types.BeaconBlockBody
 	BeaconBlockHeader = types.BeaconBlockHeader

mod/beacon/blockchain/execution_engine.go

@@ -23,17 +23,16 @@ package blockchain
 import (
 	"context"
 
-	payloadtime "github.com/berachain/beacon-kit/mod/beacon/payload-time"
 	engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives"
 )
 
 // sendPostBlockFCU sends a forkchoice update to the execution client.
 func (s *Service[
-	_, BeaconBlockT, _, _, BeaconStateT, _, _, _, _, _,
+	_, ConsensusBlockT, _, _, _, BeaconStateT, _, _, _, _, _,
 ]) sendPostBlockFCU(
 	ctx context.Context,
 	st BeaconStateT,
-	blk BeaconBlockT,
+	blk ConsensusBlockT,
 ) {
 	lph, err := st.GetLatestExecutionPayloadHeader()
 	if err != nil {
@@ -54,18 +53,19 @@ func (s *Service[
 // sendNextFCUWithAttributes sends a forkchoice update to the execution
 // client with attributes.
 func (s *Service[
-	_, BeaconBlockT, _, _, BeaconStateT,
+	_, ConsensusBlockT, _, _, _, BeaconStateT,
 	_, _, ExecutionPayloadHeaderT, _, _,
 ]) sendNextFCUWithAttributes(
 	ctx context.Context,
 	st BeaconStateT,
-	blk BeaconBlockT,
+	blk ConsensusBlockT,
 	lph ExecutionPayloadHeaderT,
 ) {
-	var err error
+	beaconBlk := blk.GetBeaconBlock()
+
 	stCopy := st.Copy()
-	if _, err = s.stateProcessor.ProcessSlots(
-		stCopy, blk.GetSlot()+1,
+	if _, err := s.stateProcessor.ProcessSlots(
+		stCopy, beaconBlk.GetSlot()+1,
 	); err != nil {
 		s.logger.Error(
 			"failed to process slots in non-optimistic payload",
@@ -74,13 +74,12 @@ func (s *Service[
 		return
 	}
 
-	prevBlockRoot := blk.HashTreeRoot()
-	payloadTime := blk.GetBody().GetExecutionPayload().GetTimestamp()
-	if _, err = s.localBuilder.RequestPayloadAsync(
+	prevBlockRoot := beaconBlk.HashTreeRoot()
+	if _, err := s.localBuilder.RequestPayloadAsync(
 		ctx,
 		stCopy,
-		blk.GetSlot()+1,
-		payloadtime.Next(s.chainSpec, payloadTime),
+		beaconBlk.GetSlot()+1,
+		blk.GetNextPayloadTimestamp().Unwrap(),
 		prevBlockRoot,
 		lph.GetBlockHash(),
 		lph.GetParentHash(),
@@ -96,13 +95,15 @@ func (s *Service[
 // sendNextFCUWithoutAttributes sends a forkchoice update to the
 // execution client without attributes.
 func (s *Service[
-	_, BeaconBlockT, _, _, _, _, _,
+	_, ConsensusBlockT, _, _, _, _, _, _,
 	ExecutionPayloadHeaderT, _, PayloadAttributesT,
 ]) sendNextFCUWithoutAttributes(
 	ctx context.Context,
-	blk BeaconBlockT,
+	blk ConsensusBlockT,
 	lph ExecutionPayloadHeaderT,
 ) {
+	beaconBlk := blk.GetBeaconBlock()
+
 	if _, _, err := s.executionEngine.NotifyForkchoiceUpdate(
 		ctx,
 		// TODO: Switch to New().
@@ -113,7 +114,7 @@ func (s *Service[
 				SafeBlockHash:      lph.GetParentHash(),
 				FinalizedBlockHash: lph.GetParentHash(),
 			},
-			s.chainSpec.ActiveForkVersionForSlot(blk.GetSlot()),
+			s.chainSpec.ActiveForkVersionForSlot(beaconBlk.GetSlot()),
 		),
 	); err != nil {
 		s.logger.Error(

mod/beacon/blockchain/payload.go

@@ -23,12 +23,12 @@ package blockchain
 import (
 	"context"
 
-	payloadtime "github.com/berachain/beacon-kit/mod/beacon/payload-time"
+	"github.com/berachain/beacon-kit/mod/primitives/pkg/math"
 )
 
 // forceStartupHead sends a force head FCU to the execution client.
 func (s *Service[
-	_, _, _, _, BeaconStateT, _, _, _, _, _,
+	_, _, _, _, _, BeaconStateT, _, _, _, _, _,
 ]) forceStartupHead(
 	ctx context.Context,
 	st BeaconStateT,
@@ -56,12 +56,17 @@ func (s *Service[
 // handleRebuildPayloadForRejectedBlock handles the case where the incoming
 // block was rejected and we need to rebuild the payload for the current slot.
 func (s *Service[
-	_, _, _, _, BeaconStateT, _, _, _, _, _,
+	_, _, _, _, _, BeaconStateT, _, _, _, _, _,
 ]) handleRebuildPayloadForRejectedBlock(
 	ctx context.Context,
 	st BeaconStateT,
+	nextPayloadTimestamp math.U64,
 ) {
-	if err := s.rebuildPayloadForRejectedBlock(ctx, st); err != nil {
+	if err := s.rebuildPayloadForRejectedBlock(
+		ctx,
+		st,
+		nextPayloadTimestamp,
+	); err != nil {
 		s.logger.Error(
 			"failed to rebuild payload for nil block",
 			"error", err,
@@ -77,10 +82,11 @@ func (s *Service[
 // rejected the incoming block and it would be unsafe to use any
 // information from it.
 func (s *Service[
-	_, _, _, _, BeaconStateT, _, _, ExecutionPayloadHeaderT, _, _,
+	_, _, _, _, _, BeaconStateT, _, _, ExecutionPayloadHeaderT, _, _,
 ]) rebuildPayloadForRejectedBlock(
 	ctx context.Context,
 	st BeaconStateT,
+	nextPayloadTimestamp math.U64,
 ) error {
 	s.logger.Info("Rebuilding payload for rejected block ⏳ ")
 
@@ -114,7 +120,7 @@ func (s *Service[
 		st,
 		// We are rebuilding for the current slot.
 		stateSlot,
-		payloadtime.Next(s.chainSpec, lph.GetTimestamp()),
+		nextPayloadTimestamp.Unwrap(),
 		// We set the parent root to the previous block root.
 		latestHeader.HashTreeRoot(),
 		// We set the head of our chain to the previous finalized block.
@@ -134,13 +140,19 @@ func (s *Service[
 // handleOptimisticPayloadBuild handles optimistically
 // building for the next slot.
 func (s *Service[
-	_, BeaconBlockT, _, _, BeaconStateT, _, _, _, _, _,
+	_, _, BeaconBlockT, _, _, BeaconStateT, _, _, _, _, _,
 ]) handleOptimisticPayloadBuild(
 	ctx context.Context,
 	st BeaconStateT,
 	blk BeaconBlockT,
+	nextPayloadTimestamp math.U64,
 ) {
-	if err := s.optimisticPayloadBuild(ctx, st, blk); err != nil {
+	if err := s.optimisticPayloadBuild(
+		ctx,
+		st,
+		blk,
+		nextPayloadTimestamp,
+	); err != nil {
 		s.logger.Error(
 			"Failed to build optimistic payload",
 			"for_slot", (blk.GetSlot() + 1).Base10(),
@@ -151,11 +163,12 @@ func (s *Service[
 
 // optimisticPayloadBuild builds a payload for the next slot.
 func (s *Service[
-	_, BeaconBlockT, _, _, BeaconStateT, _, _, _, _, _,
+	_, _, BeaconBlockT, _, _, BeaconStateT, _, _, _, _, _,
 ]) optimisticPayloadBuild(
 	ctx context.Context,
 	st BeaconStateT,
 	blk BeaconBlockT,
+	nextPayloadTimestamp math.U64,
 ) error {
 	// We are building for the next slot, so we increment the slot relative
 	// to the block we just processed.
@@ -176,7 +189,7 @@ func (s *Service[
 	if _, err := s.localBuilder.RequestPayloadAsync(
 		ctx, st,
 		slot,
-		payloadtime.Next(s.chainSpec, payload.GetTimestamp()),
+		nextPayloadTimestamp.Unwrap(),
 		// The previous block root is simply the root of the block we just
 		// processed.
 		blk.HashTreeRoot(),

mod/beacon/blockchain/process.go

@@ -31,7 +31,7 @@ import (
 // ProcessGenesisData processes the genesis state and initializes the beacon
 // state.
 func (s *Service[
-	_, _, _, _, _, _, _, _, GenesisT, _,
+	_, _, _, _, _, _, _, _, _, GenesisT, _,
 ]) ProcessGenesisData(
 	ctx context.Context,
 	genesisData GenesisT,
@@ -47,13 +47,15 @@ func (s *Service[
 // ProcessBeaconBlock receives an incoming beacon block, it first validates
 // and then processes the block.
 func (s *Service[
-	_, BeaconBlockT, _, _, _, _, _, _, _, _,
+	_, ConsensusBlockT, _, _, _, _, _, _, _, _, _,
 ]) ProcessBeaconBlock(
 	ctx context.Context,
-	blk BeaconBlockT,
+	blk ConsensusBlockT,
 ) (transition.ValidatorUpdates, error) {
+	beaconBlk := blk.GetBeaconBlock()
+
 	// If the block is nil, exit early.
-	if blk.IsNil() {
+	if beaconBlk.IsNil() {
 		return nil, ErrNilBlk
 	}
 
@@ -67,7 +69,7 @@ func (s *Service[
 	// return an error. It is safe to use the slot off of the beacon block
 	// since it has been verified as correct already.
 	if !s.storageBackend.AvailabilityStore().IsDataAvailable(
-		ctx, blk.GetSlot(), blk.GetBody(),
+		ctx, beaconBlk.GetSlot(), beaconBlk.GetBody(),
 	) {
 		return nil, ErrDataNotAvailable
 	}
@@ -79,7 +81,7 @@ func (s *Service[
 	// via ticker later.
 	if err = s.dispatcher.Publish(
 		async.NewEvent(
-			ctx, async.BeaconBlockFinalized, blk,
+			ctx, async.BeaconBlockFinalized, beaconBlk,
 		),
 	); err != nil {
 		return nil, err
@@ -92,11 +94,11 @@ func (s *Service[
 
 // executeStateTransition runs the stf.
 func (s *Service[
-	_, BeaconBlockT, _, _, BeaconStateT, _, _, _, _, _,
+	_, ConsensusBlockT, _, _, _, BeaconStateT, _, _, _, _, _,
 ]) executeStateTransition(
 	ctx context.Context,
 	st BeaconStateT,
-	blk BeaconBlockT,
+	blk ConsensusBlockT,
 ) (transition.ValidatorUpdates, error) {
 	startTime := time.Now()
 	defer s.metrics.measureStateTransitionDuration(startTime)
@@ -125,9 +127,11 @@ func (s *Service[
 			// the "verification aspect" of this NewPayload call is
 			// actually irrelevant at this point.
 			SkipPayloadVerification: false,
+
+			NextPayloadTimestamp: blk.GetNextPayloadTimestamp(),
 		},
 		st,
-		blk,
+		blk.GetBeaconBlock(),
 	)
 	return valUpdates, err
 }