implement VIEW-Based Withdrawal Queue Adjustment

Author: serichoi65

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

@@ -12,14 +12,10 @@ type Migration struct {
 }
 
 func (m *Migration) Up(db *sql.DB, grm *gorm.DB, cfg *config.Config) error {
-	queries := []string{
-
-		// =============================================================================
-		// PART 1: Create withdrawal_queue_share_snapshots table for rewards calculation
-		// =============================================================================
+	// NOTE: Deallocation queue removed - delays handled by operator_allocation_snapshots (PR #474) rounding logic
 
-		// Table to track shares in withdrawal queue that should still earn rewards
-		// Stakers continue earning while in 14-day queue because they're still taking slashing risk
+	queries := []string{
+		// Tracks shares in withdrawal queue earning rewards during 14-day period
 		`create table if not exists withdrawal_queue_share_snapshots (
 			staker varchar not null,
 			strategy varchar not null,
@@ -30,41 +26,8 @@ func (m *Migration) Up(db *sql.DB, grm *gorm.DB, cfg *config.Config) error {
 			primary key (staker, strategy, snapshot),
 			constraint uniq_withdrawal_queue_share_snapshots unique (staker, strategy, snapshot)
 		)`,
-
-		// Index for querying withdrawal queue share snapshots by snapshot date
 		`create index if not exists idx_withdrawal_queue_share_snapshots_snapshot on withdrawal_queue_share_snapshots(snapshot)`,
-
-		// Index for staker lookups
 		`create index if not exists idx_withdrawal_queue_share_snapshots_staker on withdrawal_queue_share_snapshots(staker, snapshot)`,
-
-		// =============================================================================
-		// PART 2: Create deallocation_queue_snapshots table for operator allocation tracking
-		// =============================================================================
-
-		// Table to track operator allocation decreases that haven't reached effective_date yet
-		// Operators continue earning on old (higher) allocation until effective_date
-		// Similar concept to withdrawal queue but for operator deallocations
-		`create table if not exists deallocation_queue_snapshots (
-			operator varchar not null,
-			avs varchar not null,
-			operator_set_id bigint not null,
-			strategy varchar not null,
-			magnitude_decrease numeric not null,
-			block_date date not null,
-			effective_date date not null,
-			snapshot date not null,
-			primary key (operator, avs, operator_set_id, strategy, snapshot),
-			constraint uniq_deallocation_queue_snapshots unique (operator, avs, operator_set_id, strategy, snapshot)
-		)`,
-
-		// Index for querying deallocation queue snapshots by snapshot date
-		`create index if not exists idx_deallocation_queue_snapshots_snapshot on deallocation_queue_snapshots(snapshot)`,
-
-		// Index for operator lookups
-		`create index if not exists idx_deallocation_queue_snapshots_operator on deallocation_queue_snapshots(operator, snapshot)`,
-
-		// Index for AVS lookups
-		`create index if not exists idx_deallocation_queue_snapshots_avs on deallocation_queue_snapshots(avs, snapshot)`,
 	}
 
 	for _, query := range queries {

pkg/postgres/migrations/202512021500_stakerSharesView/down.go

@@ -0,0 +1,24 @@
+package _202512021500_stakerSharesView
+
+import (
+	"database/sql"
+	"fmt"
+
+	"github.com/Layr-Labs/sidecar/internal/config"
+	"gorm.io/gorm"
+)
+
+func (m *Migration) Down(db *sql.DB, grm *gorm.DB, cfg *config.Config) error {
+	queries := []string{
+		`drop view if exists staker_share_snapshots_final`,
+	}
+
+	for _, query := range queries {
+		res := grm.Exec(query)
+		if res.Error != nil {
+			fmt.Printf("Error executing query: %s\n", query)
+			return res.Error
+		}
+	}
+	return nil
+}

pkg/postgres/migrations/202512021500_stakerSharesView/up.go

@@ -0,0 +1,42 @@
+package _202512021500_stakerSharesView
+
+import (
+	"database/sql"
+	"fmt"
+
+	"github.com/Layr-Labs/sidecar/internal/config"
+	"gorm.io/gorm"
+)
+
+type Migration struct {
+}
+
+func (m *Migration) Up(db *sql.DB, grm *gorm.DB, cfg *config.Config) error {
+	queries := []string{
+		// VIEW combines base shares + withdrawal queue adjustments
+		`create view if not exists staker_share_snapshots_final as
+		select
+			coalesce(base.staker, wq.staker) as staker,
+			coalesce(base.strategy, wq.strategy) as strategy,
+			(coalesce(base.shares::numeric, 0) + coalesce(wq.shares::numeric, 0))::text as shares,
+			coalesce(base.snapshot, wq.snapshot) as snapshot
+		from staker_share_snapshots base
+		full outer join withdrawal_queue_share_snapshots wq
+			on base.staker = wq.staker
+			and base.strategy = wq.strategy
+			and base.snapshot = wq.snapshot`,
+	}
+
+	for _, query := range queries {
+		res := grm.Exec(query)
+		if res.Error != nil {
+			fmt.Printf("Error executing query: %s\n", query)
+			return res.Error
+		}
+	}
+	return nil
+}
+
+func (m *Migration) GetName() string {
+	return "202512021500_stakerSharesView"
+}

pkg/postgres/migrations/migrator.go

@@ -84,6 +84,7 @@ import (
 	_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"
+	_202512021500_stakerSharesView "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202512021500_stakerSharesView"
 )
 
 // Migration interface defines the contract for database migrations.
@@ -230,6 +231,7 @@ func (m *Migrator) MigrateAll() error {
 		&_202511051502_keyRotationScheduled.Migration{},
 		&_202511141700_withdrawalQueueAndAllocationRounding.Migration{},
 		&_202511171438_withdrawalAndDeallocationQueues.Migration{},
+		&_202512021500_stakerSharesView.Migration{},
 	}
 
 	for _, migration := range migrations {

pkg/rewards/13_goldStakerODOperatorSetRewardAmounts.go

@@ -73,7 +73,7 @@ staker_strategy_shares AS (
         sdo.*,
         sss.shares
     FROM staker_delegated_operators sdo
-    JOIN staker_share_snapshots sss
+    JOIN staker_share_snapshots_final sss
         ON sdo.staker = sss.staker 
        AND sdo.snapshot = sss.snapshot 
        AND sdo.strategy = sss.strategy

pkg/rewards/2_goldStakerRewardAmounts.go

@@ -56,7 +56,7 @@ staker_avs_strategy_shares AS (
     sdo.*,
     sss.shares
   FROM staker_delegated_operators sdo
-  JOIN staker_share_snapshots sss
+  JOIN staker_share_snapshots_final sss
   ON
     sdo.staker = sss.staker AND
     sdo.snapshot = sss.snapshot AND

pkg/rewards/4_goldRewardsForAll.go

@@ -20,7 +20,7 @@ WITH reward_snapshot_stakers AS (
     sss.staker,
     sss.shares
   FROM {{.activeRewardsTable}} ap
-  JOIN staker_share_snapshots as sss
+  JOIN staker_share_snapshots_final as sss
   ON ap.strategy = sss.strategy and ap.snapshot = sss.snapshot
   WHERE ap.reward_type = 'all_stakers'
   -- Parse out negative shares and zero multiplier so there is no division by zero case

pkg/rewards/5_goldRfaeStakers.go

@@ -66,7 +66,7 @@ staker_strategy_shares AS (
     sdo.*,
     sss.shares
   FROM staker_delegated_operators sdo
-  JOIN staker_share_snapshots sss
+  JOIN staker_share_snapshots_final sss
   ON
     sdo.staker = sss.staker AND
     sdo.snapshot = sss.snapshot AND

pkg/rewards/9_goldStakerODRewardAmounts.go

@@ -65,7 +65,7 @@ staker_avs_strategy_shares AS (
         sdo.*,
         sss.shares
     FROM staker_delegated_operators sdo
-    JOIN staker_share_snapshots sss
+    JOIN staker_share_snapshots_final sss
         ON sdo.staker = sss.staker 
        AND sdo.snapshot = sss.snapshot 
        AND sdo.strategy = sss.strategy