add deallocation to rewards

Author: serichoi65

pkg/postgres/migrations/202511171438_withdrawalAndDeallocationQueues/up.go

@@ -83,7 +83,6 @@ import (
 	_202507301421_crossChainRegistryTables "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202507301421_crossChainRegistryTables"
 	_202511051502_keyRotationScheduled "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202511051502_keyRotationScheduled"
 	_202511141700_withdrawalQueueAndAllocationRounding "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202511141700_withdrawalQueueAndAllocationRounding"
-	_202511171438_withdrawalAndDeallocationQueues "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202511171438_withdrawalAndDeallocationQueues"
 )
 
 // Migration interface defines the contract for database migrations.
@@ -229,7 +228,6 @@ func (m *Migrator) MigrateAll() error {
 		&_202507301346_taskMailboxTables.Migration{},
 		&_202511051502_keyRotationScheduled.Migration{},
 		&_202511141700_withdrawalQueueAndAllocationRounding.Migration{},
-		&_202511171438_withdrawalAndDeallocationQueues.Migration{},
 	}
 
 	for _, migration := range migrations {

pkg/postgres/migrations/migrator.go

@@ -39,22 +39,49 @@ operator_share_windows as (
 cleaned_records as (
 	SELECT * FROM operator_share_windows
 	WHERE start_time < end_time
+),
+base_snapshots as (
+	SELECT
+		operator,
+		strategy,
+		shares,
+		cast(day AS DATE) AS snapshot
+	FROM
+		cleaned_records
+	CROSS JOIN
+		generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS day
+),
+-- Add operator allocations (deallocation delay handled via effective_block)
+allocation_adjustments as (
+	SELECT
+		oas.operator,
+		oas.strategy,
+		SUM(oas.magnitude) as total_magnitude,
+		oas.snapshot
+	FROM operator_allocation_snapshots oas
+	WHERE oas.snapshot = DATE '{{.snapshotDate}}'
+	GROUP BY oas.operator, oas.strategy, oas.snapshot
+),
+combined_snapshots as (
+	SELECT
+		coalesce(base.operator, alloc.operator) as operator,
+		coalesce(base.strategy, alloc.strategy) as strategy,
+		coalesce(alloc.total_magnitude::text, base.shares) as shares,
+		coalesce(base.snapshot, alloc.snapshot) as snapshot
+	FROM base_snapshots base
+	FULL OUTER JOIN allocation_adjustments alloc
+		ON base.operator = alloc.operator
+		AND base.strategy = alloc.strategy
+		AND base.snapshot = alloc.snapshot
 )
-SELECT
-    operator,
-    strategy,
-    shares,
-    cast(day AS DATE) AS snapshot
-FROM
-    cleaned_records
-        CROSS JOIN
-    generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS day
+SELECT * FROM combined_snapshots
 on conflict on constraint uniq_operator_share_snapshots do nothing;
 `
 
 func (r *RewardsCalculator) GenerateAndInsertOperatorShareSnapshots(snapshotDate string) error {
 	query, err := rewardsUtils.RenderQueryTemplate(operatorShareSnapshotsQuery, map[string]interface{}{
-		"cutoffDate": snapshotDate,
+		"cutoffDate":   snapshotDate,
+		"snapshotDate": snapshotDate,
 	})
 	if err != nil {
 		r.logger.Sugar().Errorw("Failed to render operator share snapshots query", "error", err)

pkg/rewards/operatorShareSnapshots.go

@@ -644,12 +644,7 @@ func (rc *RewardsCalculator) generateSnapshotData(snapshotDate string) error {
 	}
 	rc.logger.Sugar().Debugw("Generated staker shares")
 
-	// Generate withdrawal queue shares - stakers continue earning while in 14-day queue
-	if err = rc.GenerateAndInsertWithdrawalQueueShares(snapshotDate); err != nil {
-		rc.logger.Sugar().Errorw("Failed to generate withdrawal queue shares", "error", err)
-		return err
-	}
-	rc.logger.Sugar().Debugw("Generated withdrawal queue shares")
+	// Withdrawal queue adjustments queried directly in staker_share_snapshots generation
 
 	if err = rc.GenerateAndInsertOperatorShares(snapshotDate); err != nil {
 		rc.logger.Sugar().Errorw("Failed to generate operator shares", "error", err)

pkg/rewards/rewards.go

@@ -51,17 +51,18 @@ const stakerShareSnapshotsQuery = `
 		CROSS JOIN
 			generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS day
 	),
-	-- Materialize withdrawal queue adjustments into final snapshots
-	-- Per Sean's feedback: "Why not adjust the query that populates the staker_share_snapshots table to account for this case?"
-	-- This materializes the combined result (base + withdrawal queue) into staker_share_snapshots
+	-- Add shares in withdrawal queue (still earning during 14-day period)
 	withdrawal_queue_adjustments as (
 		SELECT
-			wqs.staker,
-			wqs.strategy,
-			wqs.shares,
-			wqs.snapshot
-		FROM withdrawal_queue_share_snapshots wqs
-		WHERE wqs.snapshot = DATE '{{.snapshotDate}}'
+			qsw.staker,
+			qsw.strategy,
+			qsw.shares_to_withdraw as shares,
+			DATE '{{.snapshotDate}}' as snapshot
+		FROM queued_slashing_withdrawals qsw
+		INNER JOIN blocks b_queued ON qsw.block_number = b_queued.number
+		WHERE
+			DATE(b_queued.block_time) <= '{{.snapshotDate}}'
+			AND DATE(b_queued.block_time) + INTERVAL '14 days' > '{{.snapshotDate}}'
 	),
 	combined_snapshots as (
 		SELECT