10/n Remove BeaconBlockT and BeaconStateT generic types (#2297)

Co-authored-by: aBear <[email protected]>

beacon/blockchain/deposit.go

@@ -34,7 +34,7 @@ import (
 const defaultRetryInterval = 20 * time.Second
 
 func (s *Service[
-	_, _, ConsensusBlockT, _, _, _, _, _,
+	_, _, ConsensusBlockT, _, _, _,
 ]) depositFetcher(
 	ctx context.Context,
 	blockNum math.U64,
@@ -52,7 +52,7 @@ func (s *Service[
 }
 
 func (s *Service[
-	_, _, ConsensusBlockT, _, _, _, _, _,
+	_, _, ConsensusBlockT, _, _, _,
 ]) fetchAndStoreDeposits(
 	ctx context.Context,
 	blockNum math.U64,
@@ -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/execution_engine.go

@@ -25,6 +25,7 @@ import (
 
 	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 after a
@@ -33,10 +34,10 @@ import (
 // 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()

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,
+	_, _, 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](
-		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(),
@@ -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()

beacon/blockchain/init_chain.go

@@ -30,7 +30,7 @@ import (
 // ProcessGenesisData processes the genesis state and initializes the beacon
 // state.
 func (s *Service[
-	_, _, _, _, _, _, GenesisT, _,
+	_, _, _, _, GenesisT, _,
 ]) ProcessGenesisData(
 	ctx context.Context,
 	bytes []byte,

beacon/blockchain/payload.go

@@ -23,15 +23,17 @@ package blockchain
 import (
 	"context"
 
+	ctypes "github.com/berachain/beacon-kit/consensus-types/types"
 	"github.com/berachain/beacon-kit/primitives/math"
+	statedb "github.com/berachain/beacon-kit/state-transition/core/state"
 )
 
 // forceStartupHead sends a force head FCU to the execution client.
 func (s *Service[
-	_, _, _, _, BeaconStateT, _, _, _,
+	_, _, _, _, _, _,
 ]) forceStartupHead(
 	ctx context.Context,
-	st BeaconStateT,
+	st *statedb.StateDB,
 ) {
 	slot, err := st.GetSlot()
 	if err != nil {
@@ -56,10 +58,10 @@ 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, _, _, _,
+	_, _, _, _, _, _,
 ]) handleRebuildPayloadForRejectedBlock(
 	ctx context.Context,
-	st BeaconStateT,
+	st *statedb.StateDB,
 	nextPayloadTimestamp math.U64,
 ) {
 	if err := s.rebuildPayloadForRejectedBlock(
@@ -82,11 +84,11 @@ func (s *Service[
 // rejected the incoming block and it would be unsafe to use any
 // information from it.
 func (s *Service[
-	_, _, _, _, BeaconStateT, _,
+	_, _, _, _,
 	_, _,
 ]) rebuildPayloadForRejectedBlock(
 	ctx context.Context,
-	st BeaconStateT,
+	st *statedb.StateDB,
 	nextPayloadTimestamp math.U64,
 ) error {
 	s.logger.Info("Rebuilding payload for rejected block ⏳ ")
@@ -141,11 +143,11 @@ func (s *Service[
 // handleOptimisticPayloadBuild handles optimistically
 // building for the next slot.
 func (s *Service[
-	_, _, _, BeaconBlockT, BeaconStateT, _, _, _,
+	_, _, _, _, _, _,
 ]) handleOptimisticPayloadBuild(
 	ctx context.Context,
-	st BeaconStateT,
-	blk BeaconBlockT,
+	st *statedb.StateDB,
+	blk *ctypes.BeaconBlock,
 	nextPayloadTimestamp math.U64,
 ) {
 	if err := s.optimisticPayloadBuild(
@@ -164,11 +166,11 @@ func (s *Service[
 
 // optimisticPayloadBuild builds a payload for the next slot.
 func (s *Service[
-	_, _, _, BeaconBlockT, BeaconStateT, _, _, _,
+	_, _, _, _, _, _,
 ]) optimisticPayloadBuild(
 	ctx context.Context,
-	st BeaconStateT,
-	blk BeaconBlockT,
+	st *statedb.StateDB,
+	blk *ctypes.BeaconBlock,
 	nextPayloadTimestamp math.U64,
 ) error {
 	// We are building for the next slot, so we increment the slot relative

beacon/blockchain/process_proposal.go

@@ -32,6 +32,7 @@ import (
 	"github.com/berachain/beacon-kit/errors"
 	"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"
 )
@@ -46,19 +47,19 @@ const (
 )
 
 func (s *Service[
-	_, _, ConsensusBlockT, BeaconBlockT, _,
-	_, GenesisT, ConsensusSidecarsT,
+	_, _, ConsensusBlockT, _,
+	GenesisT, ConsensusSidecarsT,
 ]) ProcessProposal(
 	ctx sdk.Context,
 	req *cmtabci.ProcessProposalRequest,
 ) (*cmtabci.ProcessProposalResponse, error) {
 	// Decode the beacon block.
 	blk, err := encoding.
-		UnmarshalBeaconBlockFromABCIRequest[BeaconBlockT](
-		req,
-		BeaconBlockTxIndex,
-		s.chainSpec.ActiveForkVersionForSlot(math.U64(req.Height)),
-	)
+		UnmarshalBeaconBlockFromABCIRequest(
+			req,
+			BeaconBlockTxIndex,
+			s.chainSpec.ActiveForkVersionForSlot(math.U64(req.Height)),
+		)
 	if err != nil {
 		return createProcessProposalResponse(errors.WrapNonFatal(err))
 	}
@@ -124,7 +125,7 @@ func (s *Service[
 	}
 
 	// Process the block
-	var consensusBlk *types.ConsensusBlock[BeaconBlockT]
+	var consensusBlk *types.ConsensusBlock
 	consensusBlk = consensusBlk.New(
 		blk,
 		req.GetProposerAddress(),
@@ -147,11 +148,11 @@ func (s *Service[
 // VerifyIncomingBlock verifies the state root of an incoming block
 // and logs the process.
 func (s *Service[
-	_, _, ConsensusBlockT, BeaconBlockT, _, _,
+	_, _, ConsensusBlockT, _,
 	_, _,
 ]) VerifyIncomingBlock(
 	ctx context.Context,
-	beaconBlk BeaconBlockT,
+	beaconBlk *ctypes.BeaconBlock,
 	consensusTime math.U64,
 	proposerAddress []byte,
 ) error {
@@ -181,6 +182,7 @@ func (s *Service[
 	// to avoid modifying the underlying state, for the event in which
 	// we have to rebuild a payload for this slot again, if we do not agree
 	// with the incoming block.
+	//nolint:contextcheck // TODO: We should look at using the passed context
 	postState := preState.Copy()
 
 	// Verify the state root of the incoming block.
@@ -250,12 +252,12 @@ func (s *Service[
 
 // verifyStateRoot verifies the state root of an incoming block.
 func (s *Service[
-	_, _, ConsensusBlockT, BeaconBlockT, BeaconStateT,
+	_, _, ConsensusBlockT,
 	_, _, _,
 ]) verifyStateRoot(
 	ctx context.Context,
-	st BeaconStateT,
-	blk BeaconBlockT,
+	st *statedb.StateDB,
+	blk *ctypes.BeaconBlock,
 	consensusTime math.U64,
 	proposerAddress []byte,
 ) error {
@@ -290,7 +292,7 @@ func (s *Service[
 // shouldBuildOptimisticPayloads returns true if optimistic
 // payload builds are enabled.
 func (s *Service[
-	_, _, _, _, _, _, _, _,
+	_, _, _, _, _, _,
 ]) shouldBuildOptimisticPayloads() bool {
 	return s.optimisticPayloadBuilds && s.localBuilder.Enabled()
 }

beacon/blockchain/pruning.go

@@ -26,8 +26,8 @@ import (
 )
 
 func (s *Service[
-	_, _, ConsensusBlockT, BeaconBlockT, _, _, _, _,
-]) processPruning(beaconBlk BeaconBlockT) error {
+	_, _, ConsensusBlockT, _, _, _,
+]) processPruning(beaconBlk *ctypes.BeaconBlock) error {
 	// prune availability store
 	start, end := availabilityPruneRangeFn(
 		beaconBlk.GetSlot().Unwrap(), s.chainSpec)