chore(engine): Add previous proposer public key to engine API and validate (#2836)

Co-authored-by: Cal Bera <calbera@berachain.com>
Co-authored-by: Rez <rez@berachain.com>

Author: 3 people

.gitignore

@@ -51,6 +51,9 @@ go.work.sum
 # .nfs files are created when an open file is removed but is still being accessed
 .nfs*
 
+# Version files created during code generation
+v*.*.*
+
 ###########
 # Windows #
 ###########

beacon/blockchain/finalize_block.go

@@ -28,6 +28,7 @@ import (
 	ctypes "github.com/berachain/beacon-kit/consensus-types/types"
 	"github.com/berachain/beacon-kit/consensus/types"
 	datypes "github.com/berachain/beacon-kit/da/types"
+	"github.com/berachain/beacon-kit/primitives/crypto"
 	"github.com/berachain/beacon-kit/primitives/math"
 	"github.com/berachain/beacon-kit/primitives/transition"
 	statedb "github.com/berachain/beacon-kit/state-transition/core/state"
@@ -46,11 +47,18 @@ func (s *Service) FinalizeBlock(
 		return nil, fmt.Errorf("failed to decode block and blobs: %w", err)
 	}
 	blk := signedBlk.GetBeaconBlock()
+	st := s.storageBackend.StateFromContext(ctx)
 
 	// Send an FCU to force the HEAD of the chain on the EL on startup.
 	var finalizeErr error
 	s.forceStartupSyncOnce.Do(func() {
-		finalizeErr = s.forceSyncUponFinalize(ctx, blk)
+		var parentProposerPubkey *crypto.BLSPubkey
+		parentProposerPubkey, finalizeErr = st.ParentProposerPubkey(blk.GetTimestamp())
+		if finalizeErr != nil {
+			finalizeErr = fmt.Errorf("force sync upon finalize: failed retrieving parent proposer pubkey: %w", finalizeErr)
+		} else {
+			finalizeErr = s.forceSyncUponFinalize(ctx, blk, parentProposerPubkey)
+		}
 	})
 	if finalizeErr != nil {
 		return nil, finalizeErr
@@ -63,7 +71,6 @@ func (s *Service) FinalizeBlock(
 
 	// STEP 3: Finalize the block.
 	consensusBlk := types.NewConsensusBlock(blk, req.GetProposerAddress(), req.GetTime())
-	st := s.storageBackend.StateFromContext(ctx)
 	valUpdates, err := s.finalizeBeaconBlock(ctx, st, consensusBlk)
 	if err != nil {
 		s.logger.Error("Failed to process verified beacon block",

beacon/blockchain/payload.go

@@ -30,6 +30,7 @@ import (
 	engineerrors "github.com/berachain/beacon-kit/engine-primitives/errors"
 	"github.com/berachain/beacon-kit/errors"
 	"github.com/berachain/beacon-kit/payload/builder"
+	"github.com/berachain/beacon-kit/primitives/crypto"
 	"github.com/berachain/beacon-kit/primitives/math"
 	statedb "github.com/berachain/beacon-kit/state-transition/core/state"
 )
@@ -79,10 +80,11 @@ func (s *Service) forceSyncUponProcess(
 func (s *Service) forceSyncUponFinalize(
 	ctx context.Context,
 	beaconBlock *ctypes.BeaconBlock,
+	parentProposerPubkey *crypto.BLSPubkey,
 ) error {
 	// NewPayload call first to load payload into EL client.
 	executionPayload := beaconBlock.GetBody().GetExecutionPayload()
-	payloadReq, err := ctypes.BuildNewPayloadRequestFromFork(beaconBlock)
+	payloadReq, err := ctypes.BuildNewPayloadRequestFromFork(beaconBlock, parentProposerPubkey)
 	if err != nil {
 		return err
 	}
@@ -178,6 +180,11 @@ func (s *Service) preFetchBuildData(st *statedb.StateDB, currentTime math.U64) (
 		return nil, err
 	}
 
+	parentProposerPubkey, err := st.ParentProposerPubkey(nextPayloadTimestamp)
+	if err != nil {
+		return nil, fmt.Errorf("failed retrieving previous proposer public key: %w", err)
+	}
+
 	return &builder.RequestPayloadData{
 		Slot:               blkSlot,
 		Timestamp:          nextPayloadTimestamp,
@@ -191,6 +198,8 @@ func (s *Service) preFetchBuildData(st *statedb.StateDB, currentTime math.U64) (
 		// Assumuming consensus guarantees single slot finality, the parent
 		// of the latest block we verified must be final already.
 		FinalEth1BlockHash: lph.GetParentHash(),
+
+		ParentProposerPubkey: parentProposerPubkey,
 	}, nil
 }
 

beacon/blockchain/payload_test.go

@@ -371,13 +371,13 @@ func buildNextBlock(
 		noExecReq = &ctypes.ExecutionRequests{}
 	)
 	if version.IsBefore(fv, version.Electra()) {
-		ethBlk, _, err = ctypes.MakeEthBlock(payload, &parentBeaconBlockRoot)
+		ethBlk, _, err = ctypes.MakeEthBlock(payload, parentBeaconBlockRoot, nil, nil)
 		require.NoError(t, err)
 	} else {
 		encodedER, erErr := ctypes.GetExecutionRequestsList(noExecReq)
 		require.NoError(t, erErr)
 		require.NotNil(t, encodedER)
-		ethBlk, _, err = ctypes.MakeEthBlockWithExecutionRequests(payload, &parentBeaconBlockRoot, encodedER)
+		ethBlk, _, err = ctypes.MakeEthBlock(payload, parentBeaconBlockRoot, encodedER, nil)
 		require.NoError(t, err)
 	}
 	payload.BlockHash = common.ExecutionHash(ethBlk.Hash())

beacon/validator/block_builder.go

@@ -273,14 +273,20 @@ func (s *Service) retrieveExecutionPayload(
 		return nil, err
 	}
 
+	parentProposerPubkey, err := st.ParentProposerPubkey(nextPayloadTimestamp)
+	if err != nil {
+		return nil, fmt.Errorf("failed retrieving previous proposer public key: %w", err)
+	}
+
 	r := &builder.RequestPayloadData{
-		Slot:               slot,
-		Timestamp:          nextPayloadTimestamp,
-		PayloadWithdrawals: payloadWithdrawals,
-		PrevRandao:         prevRandao,
-		ParentBlockRoot:    parentBlockRoot,
-		HeadEth1BlockHash:  lph.GetBlockHash(),
-		FinalEth1BlockHash: lph.GetParentHash(),
+		Slot:                 slot,
+		Timestamp:            nextPayloadTimestamp,
+		PayloadWithdrawals:   payloadWithdrawals,
+		PrevRandao:           prevRandao,
+		ParentBlockRoot:      parentBlockRoot,
+		HeadEth1BlockHash:    lph.GetBlockHash(),
+		FinalEth1BlockHash:   lph.GetParentHash(),
+		ParentProposerPubkey: parentProposerPubkey,
 	}
 	return s.localPayloadBuilder.RequestPayloadSync(ctx, r)
 }