fix(state-transition): skip execution payload timestamp validation on Bartio

beacond/cmd/defaults.go

@@ -120,7 +120,7 @@ func DefaultComponents() []any {
 			*BeaconBlock, *BeaconBlockBody, *BeaconBlockHeader,
 		],
 		components.ProvideStateProcessor[
-			*BeaconBlock, *BeaconBlockBody, *BeaconBlockHeader,
+			*Logger, *BeaconBlock, *BeaconBlockBody, *BeaconBlockHeader,
 			*BeaconState, *BeaconStateMarshallable, *Deposit, *ExecutionPayload,
 			*ExecutionPayloadHeader, *KVStore,
 		],

mod/beacon/blockchain/process.go

@@ -130,6 +130,7 @@ func (s *Service[
 
 			ProposerAddress:      blk.GetProposerAddress(),
 			NextPayloadTimestamp: blk.GetNextPayloadTimestamp(),
+			ConsensusBlockHeight: blk.GetConsensusBlockHeight(),
 		},
 		st,
 		blk.GetBeaconBlock(),

mod/beacon/blockchain/receive.go

@@ -130,6 +130,7 @@ func (s *Service[
 			SkipValidateRandao:      false,
 			ProposerAddress:         blk.GetProposerAddress(),
 			NextPayloadTimestamp:    blk.GetNextPayloadTimestamp(),
+			ConsensusBlockHeight:    blk.GetConsensusBlockHeight(),
 		},
 		st, blk.GetBeaconBlock(),
 	)

mod/beacon/blockchain/types.go

@@ -53,6 +53,11 @@ type ConsensusBlock[BeaconBlockT any] interface {
 	// consensus for the next payload to be proposed. It is also
 	// used to bound current payload upon validation
 	GetNextPayloadTimestamp() math.U64
+
+	// GetConsensusBlockHeight returns the height of consensus block,
+	//  which may be different from execution payload height
+	// in some networks. Currently only used for logging
+	GetConsensusBlockHeight() math.U64
 }
 
 // BeaconBlock represents a beacon block interface.

mod/beacon/validator/block_builder.go

@@ -116,6 +116,7 @@ func (s *Service[
 			ctx,
 			slotData.GetProposerAddress(),
 			slotData.GetNextPayloadTimestamp(),
+			slotData.GetConsensusBlockHeight(),
 			st,
 			blk,
 		)
@@ -339,13 +340,15 @@ func (s *Service[
 	ctx context.Context,
 	proposerAddress []byte,
 	nextPayloadTimestamp math.U64,
+	consensusBlockHeight math.U64,
 	st BeaconStateT,
 	blk BeaconBlockT,
 ) error {
 	stateRoot, err := s.computeStateRoot(
 		ctx,
 		proposerAddress,
 		nextPayloadTimestamp,
+		consensusBlockHeight,
 		st,
 		blk,
 	)
@@ -368,6 +371,7 @@ func (s *Service[
 	ctx context.Context,
 	proposerAddress []byte,
 	nextPayloadTimestamp math.U64,
+	consensusBlockHeight math.U64,
 	st BeaconStateT,
 	blk BeaconBlockT,
 ) (common.Root, error) {
@@ -385,6 +389,7 @@ func (s *Service[
 			SkipValidateRandao:      true,
 			ProposerAddress:         proposerAddress,
 			NextPayloadTimestamp:    nextPayloadTimestamp,
+			ConsensusBlockHeight:    consensusBlockHeight,
 		},
 		st, blk,
 	); err != nil {

mod/beacon/validator/types.go

@@ -197,6 +197,11 @@ type SlotData[AttestationDataT, SlashingInfoT any] interface {
 	// consensus for the next payload to be proposed. It is also
 	// used to bound current payload upon validation
 	GetNextPayloadTimestamp() math.U64
+
+	// GetConsensusBlockHeight returns the height of consensus block,
+	// which may be different from execution payload height
+	// in some networks. Currently only used for logging.
+	GetConsensusBlockHeight() math.U64
 }
 
 // StateProcessor defines the interface for processing the state.

mod/config/pkg/spec/special_cases.go

@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: BUSL-1.1
+//
+// Copyright (C) 2024, Berachain Foundation. All rights reserved.
+// Use of this software is governed by the Business Source License included
+// in the LICENSE file of this repository and at www.mariadb.com/bsl11.
+//
+// ANY USE OF THE LICENSED WORK IN VIOLATION OF THIS LICENSE WILL AUTOMATICALLY
+// TERMINATE YOUR RIGHTS UNDER THIS LICENSE FOR THE CURRENT AND ALL OTHER
+// VERSIONS OF THE LICENSED WORK.
+//
+// THIS LICENSE DOES NOT GRANT YOU ANY RIGHT IN ANY TRADEMARK OR LOGO OF
+// LICENSOR OR ITS AFFILIATES (PROVIDED THAT YOU MAY USE A TRADEMARK OR LOGO OF
+// LICENSOR AS EXPRESSLY REQUIRED BY THIS LICENSE).
+//
+// TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+// AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+// EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+// TITLE.
+
+package spec
+
+// Special cased Bartio for some ad-hoc handling due to the way
+// some bugs were handled on Bartio. To be removed.
+const (
+	BartioChainID uint64 = 80084
+
+	//nolint:lll // temporary.
+	BArtioValRoot = "0x9147586693b6e8faa837715c0f3071c2000045b54233901c2e7871b15872bc43"
+)

mod/consensus-types/pkg/types/payload.go

@@ -21,6 +21,7 @@
 package types
 
 import (
+	"github.com/berachain/beacon-kit/mod/config/pkg/spec"
 	engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives"
 	"github.com/berachain/beacon-kit/mod/errors"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/bytes"
@@ -569,8 +570,7 @@ func (p *ExecutionPayload) ToHeader(
 
 	// TODO: This is live on bArtio with a bug and needs to be hardforked
 	// off of. This is a temporary solution to avoid breaking changes.
-	//nolint:mnd // don't want the circular dep.
-	if eth1ChainID == 80084 {
+	if eth1ChainID == spec.BartioChainID {
 		txsRoot = engineprimitives.BartioTransactions(
 			p.GetTransactions(),
 		).HashTreeRoot()

mod/consensus/pkg/types/common.go

@@ -23,9 +23,14 @@ package types
 import "github.com/berachain/beacon-kit/mod/primitives/pkg/math"
 
 type commonConsensusData struct {
+	// use to verify block builder
 	proposerAddress []byte
 
+	// used to build next block and validate current payload timestamp
 	nextPayloadTimestamp math.U64
+
+	// useful for logging
+	consensusBlkHeight math.U64
 }
 
 // GetProposerAddress returns the address of the validator
@@ -40,3 +45,10 @@ func (c *commonConsensusData) GetProposerAddress() []byte {
 func (c *commonConsensusData) GetNextPayloadTimestamp() math.U64 {
 	return c.nextPayloadTimestamp
 }
+
+// GetConsensusBlockHeight returns the height of consensus block,
+// which may be different from execution payload height
+// in some networks. Currently only used for logging.
+func (c *commonConsensusData) GetConsensusBlockHeight() math.U64 {
+	return c.consensusBlkHeight
+}

mod/node-core/pkg/components/interfaces.go

@@ -91,6 +91,11 @@ type (
 		// consensus for the next payload to be proposed. It is also
 		// used to bound current payload upon validation
 		GetNextPayloadTimestamp() math.U64
+
+		// GetConsensusBlockHeight returns the height of consensus block,
+		//  which may be different from execution payload height
+		// in some networks. Currently only used for logging
+		GetConsensusBlockHeight() math.U64
 	}
 
 	// BeaconBlock represents a generic interface for a beacon block.

mod/node-core/pkg/components/state_processor.go

@@ -24,6 +24,7 @@ import (
 	"cosmossdk.io/depinject"
 	engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives"
 	"github.com/berachain/beacon-kit/mod/execution/pkg/engine"
+	"github.com/berachain/beacon-kit/mod/log"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/common"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/crypto"
 	"github.com/berachain/beacon-kit/mod/state-transition/pkg/core"
@@ -32,6 +33,7 @@ import (
 // StateProcessorInput is the input for the state processor for the depinject
 // framework.
 type StateProcessorInput[
+	LoggerT log.AdvancedLogger[LoggerT],
 	ExecutionPayloadT ExecutionPayload[
 		ExecutionPayloadT, ExecutionPayloadHeaderT, WithdrawalsT,
 	],
@@ -40,6 +42,7 @@ type StateProcessorInput[
 	WithdrawalsT Withdrawals[WithdrawalT],
 ] struct {
 	depinject.In
+	Logger          LoggerT
 	ChainSpec       common.ChainSpec
 	ExecutionEngine *engine.Engine[
 		ExecutionPayloadT,
@@ -53,6 +56,7 @@ type StateProcessorInput[
 // ProvideStateProcessor provides the state processor to the depinject
 // framework.
 func ProvideStateProcessor[
+	LoggerT log.AdvancedLogger[LoggerT],
 	BeaconBlockT BeaconBlock[BeaconBlockT, BeaconBlockBodyT, BeaconBlockHeaderT],
 	BeaconBlockBodyT BeaconBlockBody[
 		BeaconBlockBodyT, *AttestationData, DepositT,
@@ -78,7 +82,9 @@ func ProvideStateProcessor[
 	WithdrawalT Withdrawal[WithdrawalT],
 ](
 	in StateProcessorInput[
-		ExecutionPayloadT, ExecutionPayloadHeaderT, WithdrawalT, WithdrawalsT,
+		LoggerT,
+		ExecutionPayloadT, ExecutionPayloadHeaderT,
+		WithdrawalT, WithdrawalsT,
 	],
 ) *core.StateProcessor[
 	BeaconBlockT, BeaconBlockBodyT, BeaconBlockHeaderT,
@@ -105,6 +111,7 @@ func ProvideStateProcessor[
 		WithdrawalsT,
 		WithdrawalCredentials,
 	](
+		in.Logger.With("service", "state-processor"),
 		in.ChainSpec,
 		in.ExecutionEngine,
 		in.Signer,

mod/primitives/pkg/transition/context.go

@@ -48,6 +48,11 @@ type Context struct {
 	// consensus for the next payload to be proposed. It is also
 	// used to bound current payload upon validation
 	NextPayloadTimestamp math.U64
+
+	// ConsensusBlockHeight is the height of consensus block,
+	//  which may be different from execution payload height
+	// in some networks. Currently only used for logging
+	ConsensusBlockHeight math.U64
 }
 
 // GetOptimisticEngine returns whether to optimistically assume the execution
@@ -88,6 +93,13 @@ func (c *Context) GetNextPayloadTimestamp() math.U64 {
 	return c.NextPayloadTimestamp
 }
 
+// GetConsensusBlockHeight returns the height of consensus block,
+// which may be different from execution payload height
+// in some networks. Currently only used for logging.
+func (c *Context) GetConsensusBlockHeight() math.U64 {
+	return c.ConsensusBlockHeight
+}
+
 // Unwrap returns the underlying standard context.
 func (c *Context) Unwrap() context.Context {
 	return c.Context

mod/state-transition/pkg/core/helpers_test.go

@@ -32,6 +32,7 @@ import (
 	storetypes "cosmossdk.io/store/types"
 	"github.com/berachain/beacon-kit/mod/consensus-types/pkg/types"
 	engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives"
+	"github.com/berachain/beacon-kit/mod/log/pkg/noop"
 	"github.com/berachain/beacon-kit/mod/node-core/pkg/components"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/common"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/crypto"
@@ -130,6 +131,7 @@ func createStateProcessor(
 		engineprimitives.Withdrawals,
 		types.WithdrawalCredentials,
 	](
+		noop.NewLogger[any](),
 		cs,
 		execEngine,
 		signer,

mod/state-transition/pkg/core/state_processor.go

@@ -24,6 +24,7 @@ import (
 	"bytes"
 
 	"github.com/berachain/beacon-kit/mod/errors"
+	"github.com/berachain/beacon-kit/mod/log"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/common"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/constants"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/crypto"
@@ -77,6 +78,8 @@ type StateProcessor[
 	},
 	WithdrawalCredentialsT ~[32]byte,
 ] struct {
+	// logger is used for logging information and errors.
+	logger log.Logger
 	// cs is the chain specification for the beacon chain.
 	cs common.ChainSpec
 	// signer is the BLS signer used for cryptographic operations.
@@ -140,6 +143,7 @@ func NewStateProcessor[
 	},
 	WithdrawalCredentialsT ~[32]byte,
 ](
+	logger log.Logger,
 	cs common.ChainSpec,
 	executionEngine ExecutionEngine[
 		ExecutionPayloadT, ExecutionPayloadHeaderT, WithdrawalsT,
@@ -158,6 +162,7 @@ func NewStateProcessor[
 		ExecutionPayloadHeaderT, ForkT, ForkDataT, KVStoreT, ValidatorT,
 		ValidatorsT, WithdrawalT, WithdrawalsT, WithdrawalCredentialsT,
 	]{
+		logger:                logger,
 		cs:                    cs,
 		executionEngine:       executionEngine,
 		signer:                signer,

mod/state-transition/pkg/core/state_processor_genesis.go

@@ -21,6 +21,7 @@
 package core
 
 import (
+	"github.com/berachain/beacon-kit/mod/config/pkg/spec"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/common"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/constants"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/encoding/hex"
@@ -29,12 +30,6 @@ import (
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/version"
 )
 
-//nolint:lll // temporary.
-const (
-	bArtioValRoot = "0x9147586693b6e8faa837715c0f3071c2000045b54233901c2e7871b15872bc43"
-	bArtioChainID = 80084
-)
-
 // InitializePreminedBeaconStateFromEth1 initializes the beacon state.
 //
 //nolint:gocognit,funlen // todo fix.
@@ -119,9 +114,9 @@ func (sp *StateProcessor[
 	}
 
 	// Handle special case bartio genesis.
-	if sp.cs.DepositEth1ChainID() == bArtioChainID {
+	if sp.cs.DepositEth1ChainID() == spec.BartioChainID {
 		if err = st.SetGenesisValidatorsRoot(
-			common.Root(hex.MustToBytes(bArtioValRoot))); err != nil {
+			common.Root(hex.MustToBytes(spec.BArtioValRoot))); err != nil {
 			return nil, err
 		}
 	} else if err = st.

mod/state-transition/pkg/core/state_processor_payload.go

@@ -23,6 +23,7 @@ package core
 import (
 	"context"
 
+	"github.com/berachain/beacon-kit/mod/config/pkg/spec"
 	engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives"
 	"github.com/berachain/beacon-kit/mod/errors"
 	"github.com/berachain/beacon-kit/mod/primitives/pkg/math"
@@ -46,6 +47,14 @@ func (sp *StateProcessor[
 		g, gCtx = errgroup.WithContext(context.Background())
 	)
 
+	sp.logger.Info("processExecutionPayload",
+		"consensus height", ctx.GetConsensusBlockHeight().Unwrap(),
+		"payload height", payload.GetNumber().Unwrap(),
+		"payload timestamp", payload.GetTimestamp().Unwrap(),
+		"bound timestamp", ctx.GetNextPayloadTimestamp().Unwrap(),
+		"skip payload verification", ctx.GetSkipPayloadVerification(),
+	)
+
 	// Skip payload verification if the context is configured as such.
 	if !ctx.GetSkipPayloadVerification() {
 		g.Go(func() error {
@@ -90,7 +99,10 @@ func (sp *StateProcessor[
 	nextPayloadTimestamp math.U64,
 	optimisticEngine bool,
 ) error {
-	if err := sp.validateStatelessPayload(blk, nextPayloadTimestamp); err != nil {
+	if err := sp.validateStatelessPayload(
+		blk,
+		nextPayloadTimestamp,
+	); err != nil {
 		return err
 	}
 	return sp.validateStatefulPayload(ctx, st, blk, optimisticEngine)
@@ -107,12 +119,16 @@ func (sp *StateProcessor[
 	body := blk.GetBody()
 	payload := body.GetExecutionPayload()
 
-	if pt := payload.GetTimestamp(); pt >= nextPayloadTimestamp {
-		return errors.Wrapf(
-			ErrTooFarInTheFuture,
-			"payload timestamp, max: %d, got: %d",
-			nextPayloadTimestamp, pt,
-		)
+	// We skip timestamp check on Bartio for backward compatibility reasons
+	// TODO: enforce the check when we drop other Bartio special cases.
+	if sp.cs.DepositEth1ChainID() != spec.BartioChainID {
+		if pt := payload.GetTimestamp(); pt >= nextPayloadTimestamp {
+			return errors.Wrapf(
+				ErrTooFarInTheFuture,
+				"payload timestamp, max: %d, got: %d",
+				nextPayloadTimestamp, pt,
+			)
+		}
 	}
 
 	// Verify the number of withdrawals.