materialized + backward compatibility

serichoi65 · serichoi65 · commit cc6120e70bb4 · 2025-12-07T22:27:08.000+09:00
diff --git a/pkg/postgres/migrations/202512021500_stakerSharesView/down.go b/pkg/postgres/migrations/202512021500_stakerSharesView/down.go
diff --git a/pkg/postgres/migrations/202512021500_stakerSharesView/up.go b/pkg/postgres/migrations/202512021500_stakerSharesView/up.go
diff --git a/pkg/postgres/migrations/migrator.go b/pkg/postgres/migrations/migrator.go
@@ -84,7 +84,6 @@ 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.
@@ -231,7 +230,6 @@ func (m *Migrator) MigrateAll() error {
 		&_202511051502_keyRotationScheduled.Migration{},
 		&_202511141700_withdrawalQueueAndAllocationRounding.Migration{},
 		&_202511171438_withdrawalAndDeallocationQueues.Migration{},
-		&_202512021500_stakerSharesView.Migration{},
 	}
 
 	for _, migration := range migrations {
diff --git a/pkg/rewards/13_goldStakerODOperatorSetRewardAmounts.go b/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_final sss
+    JOIN staker_share_snapshots sss
         ON sdo.staker = sss.staker 
        AND sdo.snapshot = sss.snapshot 
        AND sdo.strategy = sss.strategy
diff --git a/pkg/rewards/2_goldStakerRewardAmounts.go b/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_final sss
+  JOIN staker_share_snapshots sss
   ON
     sdo.staker = sss.staker AND
     sdo.snapshot = sss.snapshot AND
diff --git a/pkg/rewards/4_goldRewardsForAll.go b/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_final as sss
+  JOIN staker_share_snapshots 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
diff --git a/pkg/rewards/5_goldRfaeStakers.go b/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_final sss
+  JOIN staker_share_snapshots sss
   ON
     sdo.staker = sss.staker AND
     sdo.snapshot = sss.snapshot AND
diff --git a/pkg/rewards/9_goldStakerODRewardAmounts.go b/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_final sss
+    JOIN staker_share_snapshots sss
         ON sdo.staker = sss.staker 
        AND sdo.snapshot = sss.snapshot 
        AND sdo.strategy = sss.strategy
diff --git a/pkg/rewards/operatorAllocationSnapshots.go b/pkg/rewards/operatorAllocationSnapshots.go
@@ -1,6 +1,7 @@
 package rewards
 
 import (
+	"github.com/Layr-Labs/sidecar/internal/config"
 	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 	"go.uber.org/zap"
 )
@@ -11,7 +12,8 @@ const operatorAllocationSnapshotsQuery = `
 		SELECT *,
 			   ROW_NUMBER() OVER (PARTITION BY operator, avs, strategy, operator_set_id, cast(block_time AS DATE) ORDER BY block_time DESC, log_index DESC) AS rn
 		FROM operator_allocations oa
-		INNER JOIN blocks b ON oa.effective_block = b.number
+		-- Backward compatibility: use effective_block if available, fall back to block_number for old records
+		INNER JOIN blocks b ON COALESCE(oa.effective_block, oa.block_number) = b.number
 		WHERE b.block_time < TIMESTAMP '{{.cutoffDate}}'
 	),
 	-- Get the latest record for each day
@@ -38,9 +40,12 @@ const operatorAllocationSnapshotsQuery = `
 			magnitude,
 			block_time,
 			LAG(magnitude) OVER (PARTITION BY operator, avs, strategy, operator_set_id ORDER BY block_time, block_number, log_index) as previous_magnitude,
-			-- Allocation (increase): Round UP to next day
-			-- Deallocation (decrease or no change): Round DOWN to current day
+			-- Backward compatibility: Apply new rounding logic only after Sabine fork
+			-- Pre-Sabine: Always round down to current day (old behavior)
+			-- Post-Sabine: Allocation (increase) rounds UP, deallocation rounds DOWN
 			CASE
+				{{ if .useSabineRounding }}
+				-- Post-Sabine fork rounding logic
 				WHEN LAG(magnitude) OVER (PARTITION BY operator, avs, strategy, operator_set_id ORDER BY block_time, block_number, log_index) IS NULL THEN
 					-- First allocation: round up to next day
 					date_trunc('day', block_time) + INTERVAL '1' day
@@ -50,6 +55,15 @@ const operatorAllocationSnapshotsQuery = `
 				ELSE
 					-- Decrease or no change: round down to current day
 					date_trunc('day', block_time)
+				{{ else }}
+				-- Pre-Sabine fork rounding logic (backward compatibility)
+				WHEN LAG(magnitude) OVER (PARTITION BY operator, avs, strategy, operator_set_id ORDER BY block_time, block_number, log_index) IS NULL THEN
+					-- First allocation: round down to current day (old behavior)
+					date_trunc('day', block_time)
+				ELSE
+					-- All other cases: round down to current day
+					date_trunc('day', block_time)
+				{{ end }}
 			END AS snapshot_time
 		FROM daily_records
 	),
@@ -88,14 +102,33 @@ const operatorAllocationSnapshotsQuery = `
 `
 
 func (r *RewardsCalculator) GenerateAndInsertOperatorAllocationSnapshots(snapshotDate string) error {
+	// Determine if we should use Sabine fork rounding logic based on snapshot date
+	forks, err := r.globalConfig.GetRewardsSqlForkDates()
+	if err != nil {
+		r.logger.Sugar().Errorw("Failed to get rewards fork dates", "error", err)
+		return err
+	}
+
+	useSabineRounding := false
+	if sabineFork, exists := forks[config.RewardsFork_Sabine]; exists {
+		// Use new rounding logic if snapshot date is on or after Sabine fork
+		useSabineRounding = snapshotDate >= sabineFork.Date
+	}
+
 	query, err := rewardsUtils.RenderQueryTemplate(operatorAllocationSnapshotsQuery, map[string]interface{}{
-		"cutoffDate": snapshotDate,
+		"cutoffDate":        snapshotDate,
+		"useSabineRounding": useSabineRounding,
 	})
 	if err != nil {
 		r.logger.Sugar().Errorw("Failed to render query template", "error", err)
 		return err
 	}
 
+	r.logger.Sugar().Debugw("Generating operator allocation snapshots",
+		zap.String("snapshotDate", snapshotDate),
+		zap.Bool("useSabineRounding", useSabineRounding),
+	)
+
 	res := r.grm.Exec(query)
 	if res.Error != nil {
 		r.logger.Sugar().Errorw("Failed to generate operator_allocation_snapshots",
diff --git a/pkg/rewards/stakerOperators/1_stakerStrategyPayouts.go b/pkg/rewards/stakerOperators/1_stakerStrategyPayouts.go
@@ -56,7 +56,7 @@ staker_avs_strategy_shares AS (
     sdo.*,
     sss.shares
   FROM staker_delegated_operators sdo
-  JOIN staker_share_snapshots_final sss
+  JOIN staker_share_snapshots sss
   ON
     sdo.staker = sss.staker AND
     sdo.snapshot = sss.snapshot AND
diff --git a/pkg/rewards/stakerOperators/3_rewardsForAllStrategyPayouts.go b/pkg/rewards/stakerOperators/3_rewardsForAllStrategyPayouts.go
@@ -20,7 +20,7 @@ WITH reward_snapshot_stakers AS (
     sss.staker,
     sss.shares
   FROM {{.activeRewardsTable}} ap
-  JOIN staker_share_snapshots_final as sss
+  JOIN staker_share_snapshots 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
diff --git a/pkg/rewards/stakerOperators/4_rfaeStakerStrategyPayouts.go b/pkg/rewards/stakerOperators/4_rfaeStakerStrategyPayouts.go
@@ -48,7 +48,7 @@ staker_strategy_shares AS (
     sdo.*,
     sss.shares
   FROM staker_delegated_operators sdo
-  JOIN staker_share_snapshots_final sss
+  JOIN staker_share_snapshots sss
   ON
     sdo.staker = sss.staker AND
     sdo.snapshot = sss.snapshot AND
diff --git a/pkg/rewards/stakerShareSnapshots.go b/pkg/rewards/stakerShareSnapshots.go
@@ -39,22 +39,50 @@ const stakerShareSnapshotsQuery = `
 	cleaned_records as (
 	  SELECT * FROM staker_share_windows
 	  WHERE start_time < end_time
+	),
+	base_snapshots as (
+		SELECT
+			staker,
+			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
+	),
+	-- 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
+	withdrawal_queue_adjustments as (
+		SELECT
+			wqs.staker,
+			wqs.strategy,
+			wqs.shares,
+			wqs.snapshot
+		FROM withdrawal_queue_share_snapshots wqs
+		WHERE wqs.snapshot = DATE '{{.snapshotDate}}'
+	),
+	combined_snapshots 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 base_snapshots base
+		FULL OUTER JOIN withdrawal_queue_adjustments wq
+			ON base.staker = wq.staker
+			AND base.strategy = wq.strategy
+			AND base.snapshot = wq.snapshot
 	)
-	SELECT
-		staker,
-		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_staker_share_snapshots do nothing;
 `
 
 func (r *RewardsCalculator) GenerateAndInsertStakerShareSnapshots(snapshotDate string) error {
 	query, err := rewardsUtils.RenderQueryTemplate(stakerShareSnapshotsQuery, map[string]interface{}{
-		"cutoffDate": snapshotDate,
+		"cutoffDate":   snapshotDate,
+		"snapshotDate": snapshotDate,
 	})
 	if err != nil {
 		r.logger.Sugar().Errorw("Failed to render query template", "error", err)
diff --git a/pkg/rewards/withdrawalQueueShareSnapshots.go b/pkg/rewards/withdrawalQueueShareSnapshots.go
@@ -114,4 +114,5 @@ func (r *RewardsCalculator) GenerateAndInsertWithdrawalQueueShares(snapshotDate
 	return nil
 }
 
-// NOTE: Adjustments handled by staker_share_snapshots_final VIEW
+// NOTE: Adjustments are materialized into staker_share_snapshots during generation
+// The withdrawal_queue_share_snapshots table serves as an audit trail and source data

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ import (`
`84`	`84`	`_202511051502_keyRotationScheduled "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202511051502_keyRotationScheduled"`
`85`	`85`	`_202511141700_withdrawalQueueAndAllocationRounding "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202511141700_withdrawalQueueAndAllocationRounding"`
`86`	`86`	`_202511171438_withdrawalAndDeallocationQueues "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202511171438_withdrawalAndDeallocationQueues"`
`87`		`- _202512021500_stakerSharesView "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202512021500_stakerSharesView"`
`88`	`87`	`)`
`89`	`88`
`90`	`89`	`// Migration interface defines the contract for database migrations.`
`@@ -231,7 +230,6 @@ func (m *Migrator) MigrateAll() error {`
`231`	`230`	`&_202511051502_keyRotationScheduled.Migration{},`
`232`	`231`	`&_202511141700_withdrawalQueueAndAllocationRounding.Migration{},`
`233`	`232`	`&_202511171438_withdrawalAndDeallocationQueues.Migration{},`
`234`		`- &_202512021500_stakerSharesView.Migration{},`
`235`	`233`	`}`
`236`	`234`
`237`	`235`	`for _, migration := range migrations {`