feat(node-api): use timestamp ID instead of execution ID for proof namespace

mod/consensus-types/pkg/types/block.go

@@ -233,8 +233,8 @@ func (b *BeaconBlock) GetHeader() *BeaconBlockHeader {
 	}
 }
 
-// GetExecutionNumber retrieves the execution number of the BeaconBlock from
+// GetTimestamp retrieves the timestamp of the BeaconBlock from
 // the ExecutionPayload.
-func (b *BeaconBlock) GetExecutionNumber() math.U64 {
-	return b.Body.ExecutionPayload.Number
+func (b *BeaconBlock) GetTimestamp() math.U64 {
+	return b.Body.ExecutionPayload.Timestamp
 }

mod/consensus-types/pkg/types/block_test.go

@@ -43,6 +43,7 @@ func generateValidBeaconBlock() *types.BeaconBlock {
 		Body: &types.BeaconBlockBody{
 			ExecutionPayload: &types.ExecutionPayload{
 				Number:    10,
+				Timestamp: 10,
 				ExtraData: []byte("dummy extra data for testing"),
 				Transactions: [][]byte{
 					[]byte("tx1"),
@@ -101,7 +102,7 @@ func TestBeaconBlock(t *testing.T) {
 	block := generateValidBeaconBlock()
 
 	require.NotNil(t, block.Body)
-	require.Equal(t, math.U64(10), block.GetExecutionNumber())
+	require.Equal(t, math.U64(10), block.GetTimestamp())
 	require.Equal(t, version.Deneb, block.Version())
 	require.False(t, block.IsNil())
 

mod/node-api/backend/backend.go

@@ -150,12 +150,12 @@ func (b *Backend[
 	return b.sb.BlockStore().GetSlotByStateRoot(root)
 }
 
-// GetSlotByExecutionNumber retrieves the slot by a given execution number from
+// GetParentSlotByTimestamp retrieves the parent slot by a given timestamp from
 // the block store.
 func (b *Backend[
 	_, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _,
-]) GetSlotByExecutionNumber(executionNumber math.U64) (math.Slot, error) {
-	return b.sb.BlockStore().GetSlotByExecutionNumber(executionNumber)
+]) GetParentSlotByTimestamp(timestamp math.U64) (math.Slot, error) {
+	return b.sb.BlockStore().GetParentSlotByTimestamp(timestamp)
 }
 
 // stateFromSlot returns the state at the given slot, after also processing the

mod/node-api/backend/types.go

@@ -82,8 +82,8 @@ type BlockStore[BeaconBlockT any] interface {
 	GetSlotByBlockRoot(root common.Root) (math.Slot, error)
 	// GetSlotByStateRoot retrieves the slot by a given state root.
 	GetSlotByStateRoot(root common.Root) (math.Slot, error)
-	// GetSlotByExecutionNumber retrieves the slot by a given execution number.
-	GetSlotByExecutionNumber(executionNumber math.U64) (math.Slot, error)
+	// GetParentSlotByTimestamp retrieves the parent slot by a given timestamp.
+	GetParentSlotByTimestamp(timestamp math.U64) (math.Slot, error)
 }
 
 // DepositStore defines the interface for deposit storage.

mod/node-api/engines/echo/vaildator.go

@@ -62,7 +62,7 @@ func ConstructValidator() *validator.Validate {
 	validators := map[string](func(fl validator.FieldLevel) bool){
 		"state_id":     ValidateStateID,
 		"block_id":     ValidateBlockID,
-		"execution_id": ValidateExecutionID,
+		"timestamp_id": ValidateTimestampID,
 		"validator_id": ValidateValidatorID,
 		"epoch":        ValidateUint64,
 		"slot":         ValidateUint64,
@@ -96,7 +96,7 @@ func ValidateBlockID(fl validator.FieldLevel) bool {
 	return validateStateBlockIDs(fl.Field().String(), allowedValues)
 }
 
-func ValidateExecutionID(fl validator.FieldLevel) bool {
+func ValidateTimestampID(fl validator.FieldLevel) bool {
 	allowedValues := map[string]bool{
 		utils.StateIDHead:      true,
 		utils.StateIDGenesis:   true,
@@ -105,7 +105,7 @@ func ValidateExecutionID(fl validator.FieldLevel) bool {
 	}
 
 	value := fl.Field().String()
-	if utils.IsExecutionNumberPrefix(value) {
+	if utils.IsTimestampIDPrefix(value) {
 		return ValidateUint64Dec(value[1:])
 	}
 

mod/node-api/handlers/proof/backend.go

@@ -28,7 +28,7 @@ import (
 type Backend[BeaconBlockHeaderT, BeaconStateT, ValidatorT any] interface {
 	BlockBackend[BeaconBlockHeaderT]
 	StateBackend[BeaconStateT]
-	GetSlotByExecutionNumber(executionNumber math.U64) (math.Slot, error)
+	GetParentSlotByTimestamp(timestamp math.U64) (math.Slot, error)
 }
 
 type BlockBackend[BeaconBlockHeaderT any] interface {

mod/node-api/handlers/proof/block_proposer.go

@@ -26,8 +26,9 @@ import (
 	"github.com/berachain/beacon-kit/mod/node-api/handlers/utils"
 )
 
-// GetBlockProposer returns the block proposer pubkey for the given block id
-// along with a merkle proof that can be verified against the beacon block root.
+// GetBlockProposer returns the block proposer pubkey for the given timestamp
+// id along with a merkle proof that can be verified against the beacon block
+// root.
 func (h *Handler[
 	BeaconBlockHeaderT, _, _, ContextT, _, _,
 ]) GetBlockProposer(c ContextT) (any, error) {
@@ -37,8 +38,8 @@ func (h *Handler[
 	if err != nil {
 		return nil, err
 	}
-	slot, beaconState, blockHeader, err := h.resolveExecutionID(
-		params.ExecutionID,
+	slot, beaconState, blockHeader, err := h.resolveTimestampID(
+		params.TimestampID,
 	)
 	if err != nil {
 		return nil, err

mod/node-api/handlers/proof/execution_fee_recipient.go

@@ -27,7 +27,7 @@ import (
 )
 
 // GetExecutionFeeRecipient returns the fee recipient from the latest execution
-// payload header for the given block id, along with the proof that can be
+// payload header for the given timestamp id, along with the proof that can be
 // verified against the beacon block root.
 func (h *Handler[
 	BeaconBlockHeaderT, _, _, ContextT, _, _,
@@ -38,8 +38,8 @@ func (h *Handler[
 	if err != nil {
 		return nil, err
 	}
-	slot, beaconState, blockHeader, err := h.resolveExecutionID(
-		params.ExecutionID,
+	slot, beaconState, blockHeader, err := h.resolveTimestampID(
+		params.TimestampID,
 	)
 	if err != nil {
 		return nil, err

mod/node-api/handlers/proof/execution_number.go

@@ -27,7 +27,7 @@ import (
 )
 
 // GetExecutionNumber returns the block number from the latest execution
-// payload header for the given block id, along with the proof that can be
+// payload header for the given timestamp id, along with the proof that can be
 // verified against the beacon block root.
 func (h *Handler[
 	BeaconBlockHeaderT, _, _, ContextT, _, _,
@@ -38,8 +38,8 @@ func (h *Handler[
 	if err != nil {
 		return nil, err
 	}
-	slot, beaconState, blockHeader, err := h.resolveExecutionID(
-		params.ExecutionID,
+	slot, beaconState, blockHeader, err := h.resolveTimestampID(
+		params.TimestampID,
 	)
 	if err != nil {
 		return nil, err

mod/node-api/handlers/proof/handler.go

@@ -71,19 +71,19 @@ func NewHandler[
 	return h
 }
 
-// Get the slot from the given input of execution id, beacon state, and beacon
+// Get the slot from the given input of timestamp id, beacon state, and beacon
 // block header for the resolved slot.
 func (h *Handler[
 	BeaconBlockHeaderT, BeaconStateT, _, _, _, _,
-]) resolveExecutionID(executionID string) (
+]) resolveTimestampID(timestampID string) (
 	math.Slot, BeaconStateT, BeaconBlockHeaderT, error,
 ) {
 	var (
 		beaconState BeaconStateT
 		blockHeader BeaconBlockHeaderT
 	)
 
-	slot, err := utils.SlotFromExecutionID(executionID, h.backend)
+	slot, err := utils.ParentSlotFromTimestampID(timestampID, h.backend)
 	if err != nil {
 		return 0, beaconState, blockHeader, err
 	}

mod/node-api/handlers/proof/types/request.go

@@ -23,19 +23,19 @@ package types
 import "github.com/berachain/beacon-kit/mod/node-api/handlers/types"
 
 // BlockProposerRequest is the request for the
-// `/proof/block_proposer/{execution_id}` endpoint.
+// `/proof/block_proposer/{timestamp_id}` endpoint.
 type BlockProposerRequest struct {
-	types.ExecutionIDRequest
+	types.TimestampIDRequest
 }
 
 // ExecutionNumberRequest is the request for the
-// `/proof/execution_number/{execution_id}` endpoint.
+// `/proof/execution_number/{timestamp_id}` endpoint.
 type ExecutionNumberRequest struct {
-	types.ExecutionIDRequest
+	types.TimestampIDRequest
 }
 
 // ExecutionFeeRecipientRequest is the request for the
-// `/proof/execution_fee_recipient/{execution_id}` endpoint.
+// `/proof/execution_fee_recipient/{timestamp_id}` endpoint.
 type ExecutionFeeRecipientRequest struct {
-	types.ExecutionIDRequest
+	types.TimestampIDRequest
 }

mod/node-api/handlers/types/request.go

@@ -28,6 +28,6 @@ type BlockIDRequest struct {
 	BlockID string `param:"block_id" validate:"required,block_id"`
 }
 
-type ExecutionIDRequest struct {
-	ExecutionID string `param:"execution_id" validate:"required,execution_id"`
+type TimestampIDRequest struct {
+	TimestampID string `param:"timestamp_id" validate:"required,timestamp_id"`
 }

mod/node-api/handlers/utils/constants.go

@@ -27,7 +27,7 @@ const (
 	StateIDFinalized  = "finalized"
 	StateIDJustified  = "justified"
 	StateIDHead       = "head"
-	ExecutionIDPrefix = "n"
+	TimestampIDPrefix = "t"
 )
 
 const (