fix(consensus, beacon): hardened proposer validation

mod/beacon/blockchain/process.go

@@ -128,6 +128,7 @@ func (s *Service[
 			// actually irrelevant at this point.
 			SkipPayloadVerification: false,
 
+			ProposerAddress:      blk.GetProposerAddress(),
 			NextPayloadTimestamp: blk.GetNextPayloadTimestamp(),
 		},
 		st,

mod/beacon/blockchain/receive.go

@@ -128,6 +128,7 @@ func (s *Service[
 			SkipPayloadVerification: false,
 			SkipValidateResult:      false,
 			SkipValidateRandao:      false,
+			ProposerAddress:         blk.GetProposerAddress(),
 			NextPayloadTimestamp:    blk.GetNextPayloadTimestamp(),
 		},
 		st, blk.GetBeaconBlock(),

mod/beacon/blockchain/types.go

@@ -45,6 +45,8 @@ type AvailabilityStore[BeaconBlockBodyT any] interface {
 type ConsensusBlock[BeaconBlockT any] interface {
 	GetBeaconBlock() BeaconBlockT
 
+	GetProposerAddress() []byte
+
 	// GetNextPayloadTimestamp returns the timestamp proposed by
 	// consensus for the next payload to be proposed. It is also
 	// used to bound current payload upon validation

mod/beacon/validator/block_builder.go

@@ -114,6 +114,7 @@ func (s *Service[
 	g.Go(func() error {
 		return s.computeAndSetStateRoot(
 			ctx,
+			slotData.GetProposerAddress(),
 			slotData.GetNextPayloadTimestamp(),
 			st,
 			blk,
@@ -336,11 +337,18 @@ func (s *Service[
 	_, BeaconBlockT, _, BeaconStateT, _, _, _, _, _, _, _, _, _,
 ]) computeAndSetStateRoot(
 	ctx context.Context,
+	proposerAddress []byte,
 	nextPayloadTimestamp math.U64,
 	st BeaconStateT,
 	blk BeaconBlockT,
 ) error {
-	stateRoot, err := s.computeStateRoot(ctx, nextPayloadTimestamp, st, blk)
+	stateRoot, err := s.computeStateRoot(
+		ctx,
+		proposerAddress,
+		nextPayloadTimestamp,
+		st,
+		blk,
+	)
 	if err != nil {
 		s.logger.Error(
 			"failed to compute state root while building block ❗️ ",
@@ -358,6 +366,7 @@ func (s *Service[
 	_, BeaconBlockT, _, BeaconStateT, _, _, _, _, _, _, _, _, _,
 ]) computeStateRoot(
 	ctx context.Context,
+	proposerAddress []byte,
 	nextPayloadTimestamp math.U64,
 	st BeaconStateT,
 	blk BeaconBlockT,
@@ -374,6 +383,7 @@ func (s *Service[
 			SkipPayloadVerification: true,
 			SkipValidateResult:      true,
 			SkipValidateRandao:      true,
+			ProposerAddress:         proposerAddress,
 			NextPayloadTimestamp:    nextPayloadTimestamp,
 		},
 		st, blk,

mod/beacon/validator/types.go

@@ -190,6 +190,7 @@ type SlotData[AttestationDataT, SlashingInfoT any] interface {
 	GetAttestationData() []AttestationDataT
 	// GetSlashingInfo returns the slashing info of the incoming slot.
 	GetSlashingInfo() []SlashingInfoT
+	GetProposerAddress() []byte
 	// GetNextPayloadTimestamp returns the timestamp proposed by
 	// consensus for the next payload to be proposed. It is also
 	// used to bound current payload upon validation

mod/consensus/pkg/cometbft/service/abci.go

@@ -212,6 +212,7 @@ func (s *Service[LoggerT]) PrepareProposal(
 		math.Slot(req.GetHeight()),
 		nil,
 		nil,
+		req.GetProposerAddress(),
 
 		// we do not add h.minPayloadDelay here since req.GetTime()
 		// is guaranteed to be strictly larger than

mod/consensus/pkg/cometbft/service/middleware/abci.go

@@ -224,6 +224,7 @@ func (h *ABCIMiddleware[
 	var enrichedBlk *types.ConsensusBlock[BeaconBlockT]
 	enrichedBlk = enrichedBlk.New(
 		blk,
+		req.GetProposerAddress(),
 		req.GetTime().Add(h.minPayloadDelay),
 	)
 	blkEvent := async.NewEvent(ctx, async.BeaconBlockReceived, enrichedBlk)
@@ -341,6 +342,7 @@ func (h *ABCIMiddleware[
 	var enrichedBlk *types.ConsensusBlock[BeaconBlockT]
 	enrichedBlk = enrichedBlk.New(
 		blk,
+		req.GetProposerAddress(),
 		req.GetTime().Add(h.minPayloadDelay),
 	)
 	blkEvent := async.NewEvent(ctx, async.FinalBeaconBlockReceived, enrichedBlk)

mod/consensus/pkg/types/common.go

@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: BUSL-1.1
+//
+// Copyright (C) 2024, Berachain Foundation. All rights reserved.
+// Use of this software is governed by the Business Source License included
+// in the LICENSE file of this repository and at www.mariadb.com/bsl11.
+//
+// ANY USE OF THE LICENSED WORK IN VIOLATION OF THIS LICENSE WILL AUTOMATICALLY
+// TERMINATE YOUR RIGHTS UNDER THIS LICENSE FOR THE CURRENT AND ALL OTHER
+// VERSIONS OF THE LICENSED WORK.
+//
+// THIS LICENSE DOES NOT GRANT YOU ANY RIGHT IN ANY TRADEMARK OR LOGO OF
+// LICENSOR OR ITS AFFILIATES (PROVIDED THAT YOU MAY USE A TRADEMARK OR LOGO OF
+// LICENSOR AS EXPRESSLY REQUIRED BY THIS LICENSE).
+//
+// TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
+// AN “AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
+// EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
+// TITLE.
+
+package types
+
+import "github.com/berachain/beacon-kit/mod/primitives/pkg/math"
+
+type commonConsensusData struct {
+	proposerAddress []byte
+
+	nextPayloadTimestamp math.U64
+}
+
+func (c *commonConsensusData) GetProposerAddress() []byte {
+	return c.proposerAddress
+}
+
+// GetNextPayloadTimestamp returns the timestamp proposed by consensus
+// for the next payload to be proposed. It is also used to bound
+// current payload upon validation.
+func (c *commonConsensusData) GetNextPayloadTimestamp() math.U64 {
+	return c.nextPayloadTimestamp
+}

mod/consensus/pkg/types/consensus_block.go

@@ -29,28 +29,25 @@ import (
 type ConsensusBlock[BeaconBlockT any] struct {
 	blk BeaconBlockT
 
-	nextPayloadTimestamp math.U64
+	*commonConsensusData
 }
 
 // New creates a new ConsensusBlock instance.
 func (b *ConsensusBlock[BeaconBlockT]) New(
 	beaconBlock BeaconBlockT,
+	proposerAddress []byte,
 	nextPayloadTimestamp time.Time,
 ) *ConsensusBlock[BeaconBlockT] {
 	b = &ConsensusBlock[BeaconBlockT]{
-		blk:                  beaconBlock,
-		nextPayloadTimestamp: math.U64(nextPayloadTimestamp.Unix()),
+		blk: beaconBlock,
+		commonConsensusData: &commonConsensusData{
+			proposerAddress:      proposerAddress,
+			nextPayloadTimestamp: math.U64(nextPayloadTimestamp.Unix()),
+		},
 	}
 	return b
 }
 
 func (b *ConsensusBlock[BeaconBlockT]) GetBeaconBlock() BeaconBlockT {
 	return b.blk
 }
-
-// GetNextPayloadTimestamp returns the timestamp proposed by consensus
-// for the next payload to be proposed. It is also used to bound
-// current payload upon validation.
-func (b *ConsensusBlock[_]) GetNextPayloadTimestamp() math.U64 {
-	return b.nextPayloadTimestamp
-}

mod/consensus/pkg/types/slot_data.go

@@ -34,24 +34,26 @@ type SlotData[AttestationDataT, SlashingInfoT any] struct {
 	attestationData []AttestationDataT
 	// slashingInfo is the slashing info of the incoming slot.
 	slashingInfo []SlashingInfoT
-	// nextPayloadTimestamp is the timestamp proposed by
-	// consensus for the next payload to be proposed. It is also
-	// used to bound current payload upon validation
-	nextPayloadTimestamp math.U64
+
+	*commonConsensusData
 }
 
 // New creates a new SlotData instance.
 func (b *SlotData[AttestationDataT, SlashingInfoT]) New(
 	slot math.Slot,
 	attestationData []AttestationDataT,
 	slashingInfo []SlashingInfoT,
+	proposerAddress []byte,
 	nextPayloadTimestamp time.Time,
 ) *SlotData[AttestationDataT, SlashingInfoT] {
 	b = &SlotData[AttestationDataT, SlashingInfoT]{
-		slot:                 slot,
-		attestationData:      attestationData,
-		slashingInfo:         slashingInfo,
-		nextPayloadTimestamp: math.U64(nextPayloadTimestamp.Unix()),
+		slot:            slot,
+		attestationData: attestationData,
+		slashingInfo:    slashingInfo,
+		commonConsensusData: &commonConsensusData{
+			proposerAddress:      proposerAddress,
+			nextPayloadTimestamp: math.U64(nextPayloadTimestamp.Unix()),
+		},
 	}
 	return b
 }
@@ -77,14 +79,6 @@ func (b *SlotData[
 	return b.slashingInfo
 }
 
-// GetNextPayloadTimestamp retrieves the proposed next payload timestamp.
-func (b *SlotData[
-	AttestationDataT,
-	SlashingInfoT,
-]) GetNextPayloadTimestamp() math.U64 {
-	return b.nextPayloadTimestamp
-}
-
 // SetAttestationData sets the attestation data of the SlotData.
 func (b *SlotData[AttestationDataT, SlashingInfoT]) SetAttestationData(
 	attestationData []AttestationDataT,

mod/node-core/pkg/components/interfaces.go

@@ -83,6 +83,8 @@ type (
 	ConsensusBlock[BeaconBlockT any] interface {
 		GetBeaconBlock() BeaconBlockT
 
+		GetProposerAddress() []byte
+
 		// GetNextPayloadTimestamp returns the timestamp proposed by
 		// consensus for the next payload to be proposed. It is also
 		// used to bound current payload upon validation

mod/primitives/pkg/crypto/bls.go

@@ -20,19 +20,17 @@
 
 package crypto
 
-import "github.com/berachain/beacon-kit/mod/primitives/pkg/bytes"
+import (
+	"fmt"
 
-const (
-	// CometBLSType is the BLS curve type used in the Comet BFT consensus
-	// algorithm.
-	CometBLSType = "bls12_381"
-
-	// CometBLSPower is the voting power given to a validator when they
-	// are in the active set.
-	// TODO: Move this, it doesn't really belong here.
-	CometBLSPower = 1e10
+	"github.com/berachain/beacon-kit/mod/primitives/pkg/bytes"
+	cometencoding "github.com/cometbft/cometbft/crypto/encoding"
 )
 
+// CometBLSType is the BLS curve type used in the Comet BFT consensus
+// algorithm.
+const CometBLSType = "bls12_381"
+
 //nolint:lll // link.
 type (
 	// BLSPubkey as per the Ethereum 2.0 Specification:
@@ -44,6 +42,14 @@ type (
 	BLSSignature = bytes.B96
 )
 
+func GetAddressFromPubKey(pubKey BLSPubkey) ([]byte, error) {
+	pk, err := cometencoding.PubKeyFromTypeAndBytes(CometBLSType, pubKey[:])
+	if err != nil {
+		return nil, fmt.Errorf("failed retrieving pubKey from bytes: %w", err)
+	}
+	return pk.Address(), nil
+}
+
 // BLSSigner defines an interface for cryptographic signing operations.
 // It uses generic type parameters Signature and Pubkey, both of which are
 // slices of bytes.

mod/primitives/pkg/transition/context.go

@@ -42,6 +42,8 @@ type Context struct {
 	// SkipValidateResult indicates whether to validate the result of
 	// the state transition.
 	SkipValidateResult bool
+	// Address of current block proposer
+	ProposerAddress []byte
 	// NextPayloadTimestamp is the timestamp proposed by
 	// consensus for the next payload to be proposed. It is also
 	// used to bound current payload upon validation
@@ -73,6 +75,10 @@ func (c *Context) GetSkipValidateResult() bool {
 	return c.SkipValidateResult
 }
 
+func (c *Context) GetProposerAddress() []byte {
+	return c.ProposerAddress
+}
+
 // GetNextPayloadTimestamp returns the timestamp proposed by consensus
 // for the next payload to be proposed. It is also used to bound
 // current payload upon validation.

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

@@ -30,6 +30,8 @@ var (
 	// match the expected value.
 	ErrSlotMismatch = errors.New("slot mismatch")
 
+	ErrProposerMismatch = errors.New("proposer key mismatch")
+
 	// ErrParentRootMismatch is returned when the parent root in an execution
 	// payload does not match the expected value.
 	ErrParentRootMismatch = errors.New("parent root mismatch")