feat(deposits): Migration to EIP-6110 style processing

beacon/blockchain/finalize_block.go

@@ -25,6 +25,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/berachain/beacon-kit/beacon/deposits"
 	ctypes "github.com/berachain/beacon-kit/consensus-types/types"
 	"github.com/berachain/beacon-kit/consensus/types"
 	datypes "github.com/berachain/beacon-kit/da/types"
@@ -126,9 +127,10 @@ func (s *Service) PostFinalizeBlockOps(ctx sdk.Context, blk *ctypes.BeaconBlock)
 	// TODO: consider extracting LatestExecutionPayloadHeader instead of using state here
 	st := s.storageBackend.StateFromContext(ctx)
 
-	// Fetch and store the deposit for the block.
-	blockNum := blk.GetBody().GetExecutionPayload().GetNumber()
-	s.depositFetcher(ctx, blockNum)
+	// Before Fulu, deposits must be fetched from the EL (at the eth1 follow distance).
+	deposits.FetchPreviousDepositsPreFulu(
+		ctx, s.depositContract, blk, s.eth1FollowDistance, s.storageBackend.DepositStore(), s.logger,
+	)
 
 	// Store the finalized block in the KVStore.
 	slot := blk.GetSlot()
@@ -169,6 +171,13 @@ func (s *Service) finalizeBeaconBlock(
 		return nil, ErrNilBlk
 	}
 
+	// If on the first block of Fulu, catchup the previous block's deposits.
+	if err := deposits.CatchupFuluDeposits(
+		ctx, s.depositContract, st, beaconBlk, s.chainSpec, s.storageBackend.DepositStore(), s.logger,
+	); err != nil {
+		return nil, err
+	}
+
 	valUpdates, err := s.executeStateTransition(ctx, st, blk)
 	if err != nil {
 		return nil, err

beacon/blockchain/interfaces.go

@@ -198,4 +198,5 @@ type ServiceChainSpec interface {
 	EpochsPerHistoricalVector() uint64
 	SlotToEpoch(slot math.Slot) math.Epoch
 	Eth1FollowDistance() uint64
+	MaxDepositsPerBlock() uint64
 }

beacon/blockchain/process_proposal.go

@@ -28,6 +28,7 @@ import (
 	"slices"
 	"time"
 
+	"github.com/berachain/beacon-kit/beacon/deposits"
 	ctypes "github.com/berachain/beacon-kit/consensus-types/types"
 	"github.com/berachain/beacon-kit/consensus/cometbft/service/cache"
 	"github.com/berachain/beacon-kit/consensus/types"
@@ -328,6 +329,13 @@ func (s *Service) VerifyIncomingBlock(
 		}
 	}
 
+	// If on the first block of Fulu, catchup the previous block's deposits.
+	if err = deposits.CatchupFuluDeposits(
+		ctx, s.depositContract, state, beaconBlk, s.chainSpec, s.storageBackend.DepositStore(), s.logger,
+	); err != nil {
+		return nil, err
+	}
+
 	// Verify the state root of the incoming block.
 	valUpdates, err := s.verifyStateRoot(ctx, state, blk)
 	if err != nil {

beacon/blockchain/service.go

@@ -43,17 +43,11 @@ type Service struct {
 	depositContract deposit.Contract
 	// eth1FollowDistance is the follow distance for Ethereum 1.0 blocks.
 	eth1FollowDistance math.U64
-	// failedBlocksMu protects failedBlocks for concurrent access.
-	failedBlocksMu sync.RWMutex
-	// failedBlocks is a map of blocks that failed to be processed
-	// and should be retried.
-	failedBlocks map[math.U64]struct{}
 	// logger is used for logging messages in the service.
 	logger log.Logger
 	// chainSpec holds the chain specifications.
 	chainSpec ServiceChainSpec
 	// executionEngine is the execution engine responsible for processing
-	//
 	// execution payloads.
 	executionEngine ExecutionEngine
 	// localBuilder is a local builder for constructing new beacon states.
@@ -64,7 +58,6 @@ type Service struct {
 	metrics *chainMetrics
 	// forceStartupSyncOnce is used to force a sync of the startup head.
 	forceStartupSyncOnce *sync.Once
-
 	// latestFcuReq holds a copy of the latest FCU sent to the execution layer.
 	// It helps avoid resending the same FCU data (and spares a network call)
 	// in case optimistic block building is active
@@ -88,7 +81,6 @@ func NewService(
 		blobProcessor:        blobProcessor,
 		depositContract:      depositContract,
 		eth1FollowDistance:   math.U64(chainSpec.Eth1FollowDistance()),
-		failedBlocks:         make(map[math.Slot]struct{}),
 		logger:               logger,
 		chainSpec:            chainSpec,
 		executionEngine:      executionEngine,
@@ -105,10 +97,7 @@ func (s *Service) Name() string {
 }
 
 // Start starts the blockchain service.
-func (s *Service) Start(ctx context.Context) error {
-	// Catchup deposits for failed blocks. TODO: remove.
-	go s.depositCatchupFetcher(ctx)
-
+func (s *Service) Start(context.Context) error {
 	return nil
 }