fix(api): added CL consolidations slot

Author: remoterami

backend/pkg/api/data_access/vdb_consolidations.go

@@ -130,7 +130,7 @@ func (d *DataAccessService) GetValidatorDashboardExecutionLayerConsolidations(ct
 	}
 
 	defaultSlotSortDesc := true
-	if colSort.Column == enums.VDBConsolidationsElColumns.BlockProcessed {
+	if colSort.Column == enums.VDBConsolidationsElColumns.BlockQueued {
 		// this implements a form of multicolumn sort which we don't want to support atm, but for a time-sensitive sort it should be justified
 		defaultSlotSortDesc = colSort.Desc
 	}
@@ -156,11 +156,11 @@ func (d *DataAccessService) GetValidatorDashboardExecutionLayerConsolidations(ct
 		TargetIndex        uint64        `db:"target_index"`
 		BlockQueued        uint64        `db:"block_queued"`
 		BlockQueuedTime    time.Time     `db:"block_queued_ts"`
-		TxIndex            uint64        `db:"tx_index"`           // for cursor only
-		ITxIndex           uint64        `db:"itx_index"`          // for cursor only
-		BlockProcessed     sql.NullInt64 `db:"block_processed"`    // need CL queued events from BEDS-1399
-		BlockProcessedTime sql.NullInt64 `db:"block_processed_ts"` // need CL queued events from BEDS-1399
-		From               []byte        `db:"from_address"`       // BEDS-1405 (might get from BT for now)
+		TxIndex            uint64        `db:"tx_index"`  // for cursor only
+		ITxIndex           uint64        `db:"itx_index"` // for cursor only
+		BlockProcessed     sql.NullInt64 `db:"block_processed"`
+		BlockProcessedTime sql.NullInt64 `db:"block_processed_ts"`
+		From               []byte        `db:"from_address"` // BEDS-1405 (might get from BT for now)
 		Consolidator       []byte        `db:"consolidator"`
 		TxHash             []byte        `db:"tx_hash"`
 		Fee                uint64        `db:"fee"`
@@ -416,10 +416,12 @@ func (d *DataAccessService) GetValidatorDashboardConsensusLayerConsolidations(ct
 
 	for _, r := range res {
 		row := t.VDBConsolidationsClTableRow{
-			Source: r.Source,
-			Target: r.Target,
-			Status: r.Status,
-			Id:     r.Id,
+			Source:    r.Source,
+			Target:    r.Target,
+			Status:    r.Status,
+			Id:        r.Id,
+			Slot:      r.Slot,
+			SlotIndex: r.SlotIndex,
 		}
 
 		// some data integrity checks TODO add more

backend/pkg/api/enums/validator_dashboard_enums.go

@@ -298,7 +298,7 @@ type VDBConsolidationsElColumn int
 var _ EnumFactory[VDBConsolidationsElColumn] = VDBConsolidationsElColumn(0)
 
 const (
-	VDBConsolidationElBlockProcessed VDBConsolidationsElColumn = iota
+	VDBConsolidationElBlockQueued VDBConsolidationsElColumn = iota
 )
 
 func (c VDBConsolidationsElColumn) Int() int {
@@ -307,26 +307,26 @@ func (c VDBConsolidationsElColumn) Int() int {
 
 func (VDBConsolidationsElColumn) NewFromString(s string) VDBConsolidationsElColumn {
 	switch s {
-	case "", "block_processed", "timestamp":
-		return VDBConsolidationElBlockProcessed
+	case "", "block_queued", "timestamp":
+		return VDBConsolidationElBlockQueued
 	default:
 		return VDBConsolidationsElColumn(-1)
 	}
 }
 
 func (c VDBConsolidationsElColumn) ToExpr() OrderableSortable {
 	switch c {
-	case VDBConsolidationElBlockProcessed:
+	case VDBConsolidationElBlockQueued:
 		return goqu.I("el_cr.block_number")
 	default:
 		return nil
 	}
 }
 
 var VDBConsolidationsElColumns = struct {
-	BlockProcessed VDBConsolidationsElColumn
+	BlockQueued VDBConsolidationsElColumn
 }{
-	VDBConsolidationElBlockProcessed,
+	VDBConsolidationElBlockQueued,
 }
 
 // ----------------

backend/pkg/api/types/validator_dashboard.go

@@ -353,6 +353,8 @@ type VDBConsolidationsClTableRow struct {
 	RejectReason  *string          `json:"reject_reason,omitempty" tstype:"'source_equals_target' | 'full_queue' | 'insufficient_consolidation_churn' | 'source_unknown_pubkey' | 'target_unknown_pubkey' | 'source_no_execution_withdrawal_credentials' | 'source_address_mismatch' | 'target_not_compounding' | 'source_inactive' | 'target_inactive' | 'source_exiting' | 'target_exiting' | 'source_too_young' | 'source_pending_withdrawals' | 'source_slashed'" faker:"oneof: source_equals_target, full_queue, insufficient_consolidation_churn, source_unknown_pubkey, target_unknown_pubkey, source_no_execution_withdrawal_credentials, source_address_mismatch, target_not_compounding, source_inactive, target_inactive, source_exiting, target_exiting, source_too_young, source_pending_withdrawals, source_slashed"`
 	Amount        *decimal.Decimal `json:"amount,omitempty" faker:"eth"`
 	Id            uint64           `json:"id"`
+	Slot          uint64           `json:"slot"`
+	SlotIndex     uint64           `json:"slot_index"`
 }
 type GetValidatorDashboardConsensusLayerConsolidationsResponse ApiPagingResponse[VDBConsolidationsClTableRow]
 

frontend/types/api/validator_dashboard.ts

@@ -313,6 +313,8 @@ export interface VDBConsolidationsClTableRow {
   reject_reason?: 'source_equals_target' | 'full_queue' | 'insufficient_consolidation_churn' | 'source_unknown_pubkey' | 'target_unknown_pubkey' | 'source_no_execution_withdrawal_credentials' | 'source_address_mismatch' | 'target_not_compounding' | 'source_inactive' | 'target_inactive' | 'source_exiting' | 'target_exiting' | 'source_too_young' | 'source_pending_withdrawals' | 'source_slashed';
   amount?: string /* decimal.Decimal */;
   id: number /* uint64 */;
+  slot: number /* uint64 */;
+  slot_index: number /* uint64 */;
 }
 export type GetValidatorDashboardConsensusLayerConsolidationsResponse = ApiPagingResponse<VDBConsolidationsClTableRow>;
 /**