Merge branch 'feature-flag-timestamp-verification' into withdrawals-b…

…ackward-compatibility-with-bartio

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

@@ -22,6 +22,7 @@ package core
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/berachain/beacon-kit/mod/config/pkg/spec"
 	engineprimitives "github.com/berachain/beacon-kit/mod/engine-primitives/pkg/engine-primitives"
@@ -47,12 +48,19 @@ func (sp *StateProcessor[
 		g, gCtx = errgroup.WithContext(context.Background())
 	)
 
+	sp.logger.Info("processExecutionPayload",
+		fmt.Sprintf("consensus height %d", ctx.GetConsensusBlockHeight()),
+		fmt.Sprintf("payload height %d", payload.GetNumber()),
+		fmt.Sprintf("payload timestamp %d", payload.GetTimestamp()),
+		fmt.Sprintf("bound timestamp %d", payload.GetTimestamp()),
+		fmt.Sprintf("skip verification %t", ctx.GetSkipPayloadVerification()),
+	)
+
 	// Skip payload verification if the context is configured as such.
 	if !ctx.GetSkipPayloadVerification() {
 		g.Go(func() error {
 			return sp.validateExecutionPayload(
 				gCtx, st, blk,
-				ctx.GetConsensusBlockHeight(),
 				ctx.GetNextPayloadTimestamp(),
 				ctx.GetOptimisticEngine(),
 			)
@@ -89,13 +97,11 @@ func (sp *StateProcessor[
 	ctx context.Context,
 	st BeaconStateT,
 	blk BeaconBlockT,
-	consensusBlockHeight math.U64,
 	nextPayloadTimestamp math.U64,
 	optimisticEngine bool,
 ) error {
 	if err := sp.validateStatelessPayload(
 		blk,
-		consensusBlockHeight,
 		nextPayloadTimestamp,
 	); err != nil {
 		return err
@@ -109,19 +115,11 @@ func (sp *StateProcessor[
 	_, _, _, _, _, _, _, _, _, _, _, _, _,
 ]) validateStatelessPayload(
 	blk BeaconBlockT,
-	consensusBlockHeight math.U64,
 	nextPayloadTimestamp math.U64,
 ) error {
 	body := blk.GetBody()
 	payload := body.GetExecutionPayload()
 
-	sp.logger.Info("validateStatelessPayload",
-		"consensus height", consensusBlockHeight,
-		"payload height", payload.GetNumber(),
-		"payload timestamp", payload.GetTimestamp(),
-		"bound timestamp", nextPayloadTimestamp,
-	)
-
 	// 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 {