[DO NOT MERGE] working diff of latest changes against boonet

.github/workflows/pipeline.yml

@@ -43,18 +43,17 @@
   cancel-in-progress: ${{ !(github.base_ref == 'refs/heads/main' && github.event_name == 'merge_group') || github.ref != 'refs/heads/main' }}
 
 env:
-  GCP_ID_PROVIDER: 'projects/341806074811/locations/global/workloadIdentityPools/oidc-apps-automation-st-01-pool/providers/gh-apps-oidc-provider'
-  GCP_SERVICE_ACCOUNT: 'sa-apps-deployment@prj-berachain-automation-st-01.iam.gserviceaccount.com'
+  GCP_ID_PROVIDER: "projects/341806074811/locations/global/workloadIdentityPools/oidc-apps-automation-st-01-pool/providers/gh-apps-oidc-provider"
+  GCP_SERVICE_ACCOUNT: "sa-apps-deployment@prj-berachain-automation-st-01.iam.gserviceaccount.com"
   GCP_REGISTRY: northamerica-northeast1-docker.pkg.dev
   GHCR_REGISTRY: ghcr.io
   PUSH_DOCKER_IMAGE: ${{ (github.base_ref == github.head_ref && github.event_name == 'push') || github.ref == 'refs/tags/v*'}}
   VERSION: ${{ github.ref_name }}
 
 jobs:
-
-# -------------------------------------------------------------------------- #
-#                                Main Pipeline                               #
-# -------------------------------------------------------------------------- #
+  # -------------------------------------------------------------------------- #
+  #                                Main Pipeline                               #
+  # -------------------------------------------------------------------------- #
 
   ci:
     strategy:
@@ -90,7 +89,7 @@
       - name: Setup Golang
         uses: actions/setup-go@v5
         with:
-          go-version: "1.23.0"
+          go-version: "1.23.4"
           check-latest: true
           cache-dependency-path: "**/*.sum"
         if: ${{ !(matrix.args == 'test-forge-cover' || matrix.args == 'test-forge-fuzz') }}
@@ -106,10 +105,9 @@
           files: ./${{ matrix.args }}.txt
         if: ${{ matrix.args == 'test-unit-cover' || matrix.args == 'test-forge-cover'}}
 
-
-# -------------------------------------------------------------------------- #
-#                                 E2E Testing                                #
-# -------------------------------------------------------------------------- #
+  # -------------------------------------------------------------------------- #
+  #                                 E2E Testing                                #
+  # -------------------------------------------------------------------------- #
 
   ci-e2e:
     strategy:
@@ -155,9 +153,9 @@
         env:
           GOPATH: /home/runner/go
 
-# -------------------------------------------------------------------------- #
-#                       Docker Container Build and Push                      #
-# -------------------------------------------------------------------------- #
+  # -------------------------------------------------------------------------- #
+  #                       Docker Container Build and Push                      #
+  # -------------------------------------------------------------------------- #
 
   build-and-push-container:
     runs-on:
@@ -203,15 +201,15 @@
 
       - if: ${{ env.PUSH_DOCKER_IMAGE == 'true' }}
         name: Authenticate to Google Cloud
-        id: 'auth'
-        uses: 'google-github-actions/auth@v2'
+        id: "auth"
+        uses: "google-github-actions/auth@v2"
         with:
           workload_identity_provider: ${{ env.GCP_ID_PROVIDER }}
           service_account: ${{ env.GCP_SERVICE_ACCOUNT }}
 
       - if: ${{ env.PUSH_DOCKER_IMAGE == 'true' }}
-        name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v2'
+        name: "Set up Cloud SDK"
+        uses: "google-github-actions/setup-gcloud@v2"
 
       - if: ${{ env.PUSH_DOCKER_IMAGE == 'true' }}
         name: Setup Docker to use Google Cloud OIDC
@@ -221,4 +219,4 @@
       - if: ${{ env.PUSH_DOCKER_IMAGE == 'true' }}
         name: Push Docker image
         run: |
-            make push-docker-gcp push-docker-github
+          make push-docker-gcp push-docker-github

.gitignore

@@ -10,6 +10,7 @@ site/
 contracts/cache
 contracts/out
 tmp/
+cscope.files
 
 ##########
 # Golang #

Dockerfile

@@ -18,7 +18,7 @@
 ###           Stage 0 - Build Arguments             ###
 #######################################################
 
-ARG GO_VERSION=1.23.0
+ARG GO_VERSION=1.23.4
 ARG RUNNER_IMAGE=alpine:3.20
 ARG BUILD_TAGS="netgo,muslc,blst,bls12381,pebbledb"
 ARG NAME=beacond

beacon/blockchain/deposit.go

@@ -34,12 +34,12 @@ import (
 const defaultRetryInterval = 20 * time.Second
 
 func (s *Service[
-	_, _, ConsensusBlockT, _, _, _, _, _, _, _, _, _, _, _,
+	_, _, ConsensusBlockT, _, _, _,
 ]) depositFetcher(
 	ctx context.Context,
 	blockNum math.U64,
 ) {
-	if blockNum < s.eth1FollowDistance {
+	if blockNum <= s.eth1FollowDistance {
 		s.logger.Info(
 			"depositFetcher, nothing to fetch",
 			"block num", blockNum,
@@ -52,7 +52,7 @@ func (s *Service[
 }
 
 func (s *Service[
-	_, _, ConsensusBlockT, _, _, _, _, _, _, _, _, _, _, _,
+	_, _, ConsensusBlockT, _, _, _,
 ]) fetchAndStoreDeposits(
 	ctx context.Context,
 	blockNum math.U64,
@@ -78,7 +78,7 @@ func (s *Service[
 		)
 	}
 
-	if err = s.depositStore.EnqueueDeposits(deposits); err != nil {
+	if err = s.storageBackend.DepositStore().EnqueueDeposits(deposits); err != nil {
 		s.logger.Error("Failed to store deposits", "error", err)
 		s.failedBlocksMu.Lock()
 		s.failedBlocks[blockNum] = struct{}{}
@@ -92,7 +92,7 @@ func (s *Service[
 }
 
 func (s *Service[
-	_, _, ConsensusBlockT, _, _, _, _, _, _, _, _, _, _, _,
+	_, _, ConsensusBlockT, _, _, _,
 ]) depositCatchupFetcher(ctx context.Context) {
 	ticker := time.NewTicker(defaultRetryInterval)
 	defer ticker.Stop()

beacon/blockchain/errors.go

@@ -25,6 +25,8 @@ import "github.com/berachain/beacon-kit/errors"
 var (
 	// ErrNilBlk is an error for when the beacon block is nil.
 	ErrNilBlk = errors.New("nil beacon block")
+	// ErrNilBlob is an error for when the BlobSidecars is nil.
+	ErrNilBlob = errors.New("nil blob")
 	// ErrDataNotAvailable indicates that the required data is not available.
 	ErrDataNotAvailable = errors.New("data not available")
 )

beacon/blockchain/execution_engine.go

@@ -22,19 +22,22 @@ package blockchain
 
 import (
 	"context"
-	"time"
 
-	payloadtime "github.com/berachain/beacon-kit/beacon/payload-time"
-	"github.com/berachain/beacon-kit/config/spec"
+	ctypes "github.com/berachain/beacon-kit/consensus-types/types"
 	engineprimitives "github.com/berachain/beacon-kit/engine-primitives/engine-primitives"
+	statedb "github.com/berachain/beacon-kit/state-transition/core/state"
 )
 
-// sendPostBlockFCU sends a forkchoice update to the execution client.
+// sendPostBlockFCU sends a forkchoice update to the execution client after a
+// block is finalized.This function should only be used to notify
+// the EL client of the new head and should not request optimistic builds, as:
+// Optimistic clients already request builds in handleOptimisticPayloadBuild()
+// Non-optimistic clients should never request optimistic builds.
 func (s *Service[
-	_, _, ConsensusBlockT, _, _, BeaconStateT, _, _, _, _, _, _, _, _,
+	_, _, ConsensusBlockT, _, _, _,
 ]) sendPostBlockFCU(
 	ctx context.Context,
-	st BeaconStateT,
+	st *statedb.StateDB,
 	blk ConsensusBlockT,
 ) {
 	lph, err := st.GetLatestExecutionPayloadHeader()
@@ -46,95 +49,21 @@ func (s *Service[
 		return
 	}
 
-	if !s.shouldBuildOptimisticPayloads() && s.localBuilder.Enabled() {
-		s.sendNextFCUWithAttributes(ctx, st, blk, lph)
-	} else {
-		s.sendNextFCUWithoutAttributes(ctx, blk, lph)
-	}
-}
-
-// sendNextFCUWithAttributes sends a forkchoice update to the execution
-// client with attributes.
-func (s *Service[
-	_, _, ConsensusBlockT, _, _, BeaconStateT, _,
-	_, _, ExecutionPayloadHeaderT, _, _, _, _,
-]) sendNextFCUWithAttributes(
-	ctx context.Context,
-	st BeaconStateT,
-	blk ConsensusBlockT,
-	lph ExecutionPayloadHeaderT,
-) {
-	beaconBlk := blk.GetBeaconBlock()
-
-	stCopy := st.Copy()
-	if _, err := s.stateProcessor.ProcessSlots(
-		stCopy, beaconBlk.GetSlot()+1,
-	); err != nil {
-		s.logger.Error(
-			"failed to process slots in non-optimistic payload",
-			"error", err,
-		)
-		return
-	}
-
-	nextPayloadTime := payloadtime.Next(
-		blk.GetConsensusTime(),
-		lph.GetTimestamp(),
-		true, // buildOptimistically
-	).Unwrap()
-
-	// We set timestamp check on Bartio for backward compatibility reasons
-	// TODO: drop this we drop other Bartio special cases.
-	if s.chainSpec.DepositEth1ChainID() == spec.BartioChainID {
-		nextPayloadTime = max(
-			//#nosec:G701
-			uint64(time.Now().Unix()+1),
-			uint64((lph.GetTimestamp() + 1)),
-		)
-	}
-
-	prevBlockRoot := beaconBlk.HashTreeRoot()
-	if _, err := s.localBuilder.RequestPayloadAsync(
-		ctx,
-		stCopy,
-		beaconBlk.GetSlot()+1,
-		nextPayloadTime,
-		prevBlockRoot,
-		lph.GetBlockHash(),
-		lph.GetParentHash(),
-	); err != nil {
-		s.logger.Error(
-			"failed to send forkchoice update with attributes in non-optimistic payload",
-			"error",
-			err,
-		)
-	}
-}
-
-// sendNextFCUWithoutAttributes sends a forkchoice update to the
-// execution client without attributes.
-func (s *Service[
-	_, _, ConsensusBlockT, _, _, _, _, _, _,
-	ExecutionPayloadHeaderT, _, _, _, PayloadAttributesT,
-]) sendNextFCUWithoutAttributes(
-	ctx context.Context,
-	blk ConsensusBlockT,
-	lph ExecutionPayloadHeaderT,
-) {
+	// Send a forkchoice update without payload attributes to notify
+	// EL of the new head.
 	beaconBlk := blk.GetBeaconBlock()
-
-	if _, _, err := s.executionEngine.NotifyForkchoiceUpdate(
+	if _, _, err = s.executionEngine.NotifyForkchoiceUpdate(
 		ctx,
 		// TODO: Switch to New().
-		engineprimitives.
-			BuildForkchoiceUpdateRequestNoAttrs[PayloadAttributesT](
-			&engineprimitives.ForkchoiceStateV1{
-				HeadBlockHash:      lph.GetBlockHash(),
-				SafeBlockHash:      lph.GetParentHash(),
-				FinalizedBlockHash: lph.GetParentHash(),
-			},
-			s.chainSpec.ActiveForkVersionForSlot(beaconBlk.GetSlot()),
-		),
+		ctypes.
+			BuildForkchoiceUpdateRequestNoAttrs(
+				&engineprimitives.ForkchoiceStateV1{
+					HeadBlockHash:      lph.GetBlockHash(),
+					SafeBlockHash:      lph.GetParentHash(),
+					FinalizedBlockHash: lph.GetParentHash(),
+				},
+				s.chainSpec.ActiveForkVersionForSlot(beaconBlk.GetSlot()),
+			),
 	); err != nil {
 		s.logger.Error(
 			"failed to send forkchoice update without attributes",

beacon/blockchain/finalize_block.go

@@ -28,13 +28,14 @@ import (
 	"github.com/berachain/beacon-kit/consensus/types"
 	"github.com/berachain/beacon-kit/primitives/math"
 	"github.com/berachain/beacon-kit/primitives/transition"
+	statedb "github.com/berachain/beacon-kit/state-transition/core/state"
 	cmtabci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 func (s *Service[
-	_, _, ConsensusBlockT, BeaconBlockT, _, _, _,
-	_, _, _, GenesisT, ConsensusSidecarsT, BlobSidecarsT, _,
+	_, _, ConsensusBlockT, _,
+	GenesisT, ConsensusSidecarsT,
 ]) FinalizeBlock(
 	ctx sdk.Context,
 	req *cmtabci.FinalizeBlockRequest,
@@ -46,13 +47,13 @@ func (s *Service[
 
 	// STEP 1: Decode blok and blobs
 	blk, blobs, err := encoding.
-		ExtractBlobsAndBlockFromRequest[BeaconBlockT, BlobSidecarsT](
-		req,
-		BeaconBlockTxIndex,
-		BlobSidecarsTxIndex,
-		s.chainSpec.ActiveForkVersionForSlot(
-			math.Slot(req.Height),
-		))
+		ExtractBlobsAndBlockFromRequest(
+			req,
+			BeaconBlockTxIndex,
+			BlobSidecarsTxIndex,
+			s.chainSpec.ActiveForkVersionForSlot(
+				math.Slot(req.Height),
+			))
 	if err != nil {
 		//nolint:nilerr // If we don't have a block, we can't do anything.
 		return nil, nil
@@ -69,7 +70,7 @@ func (s *Service[
 	}
 
 	// STEP 3: finalize the block
-	var consensusBlk *types.ConsensusBlock[BeaconBlockT]
+	var consensusBlk *types.ConsensusBlock
 	consensusBlk = consensusBlk.New(
 		blk,
 		req.GetProposerAddress(),
@@ -97,7 +98,7 @@ func (s *Service[
 
 	// store the finalized block in the KVStore.
 	slot := blk.GetSlot()
-	if err = s.blockStore.Set(blk); err != nil {
+	if err = s.storageBackend.BlockStore().Set(blk); err != nil {
 		s.logger.Error(
 			"failed to store block", "slot", slot, "error", err,
 		)
@@ -117,10 +118,10 @@ func (s *Service[
 // finalizeBeaconBlock receives an incoming beacon block, it first validates
 // and then processes the block.
 func (s *Service[
-	_, _, ConsensusBlockT, _, _, BeaconStateT, _, _, _, _, _, _, _, _,
+	_, _, ConsensusBlockT, _, _, _,
 ]) finalizeBeaconBlock(
 	ctx context.Context,
-	st BeaconStateT,
+	st *statedb.StateDB,
 	blk ConsensusBlockT,
 ) (transition.ValidatorUpdates, error) {
 	beaconBlk := blk.GetBeaconBlock()
@@ -148,10 +149,10 @@ func (s *Service[
 
 // executeStateTransition runs the stf.
 func (s *Service[
-	_, _, ConsensusBlockT, _, _, BeaconStateT, _, _, _, _, _, _, _, _,
+	_, _, ConsensusBlockT, _, _, _,
 ]) executeStateTransition(
 	ctx context.Context,
-	st BeaconStateT,
+	st *statedb.StateDB,
 	blk ConsensusBlockT,
 ) (transition.ValidatorUpdates, error) {
 	startTime := time.Now()