fix: snapshot generation and deregistration queue check

- stakerShareSnapshots: Add '+ INTERVAL 1 day' to end_time calculation
  to include cutoff date snapshot (matches operatorShareSnapshots fix)

- 15_goldOperatorOperatorSetUniqueStakeRewards: Fix deregistration queue
  check to only flag the 14-day window AFTER deregistration, not the
  entire period from registration to slashable_until

Author: serichoi65

pkg/rewards/15_goldOperatorOperatorSetUniqueStakeRewards.go

@@ -102,12 +102,13 @@ distinct_operators AS (
     WHERE rn = 1
 ),
 
--- Step 3: Check if operators are in deregistration queue (between registration and slashable_until)
+-- Step 3: Check if operators are in deregistration queue (14-day window after deregistration)
 operators_with_deregistration_status AS (
     SELECT
         dop.*,
         CASE
-            WHEN dop.snapshot > dop.registration_snapshot
+            WHEN dop.slashable_until IS NOT NULL
+             AND dop.snapshot > (dop.slashable_until - INTERVAL '14 days')
              AND dop.snapshot <= dop.slashable_until
             THEN TRUE
             ELSE FALSE

pkg/rewards/stakerShareSnapshots.go

@@ -33,8 +33,8 @@ const stakerShareSnapshotsQuery = `
 	 SELECT
 		 staker, strategy, shares::numeric as shares, snapshot_time as start_time,
 		 CASE
-			 -- If the range does not have the end, use the current timestamp truncated to 0 UTC
-			 WHEN LEAD(snapshot_time) OVER (PARTITION BY staker, strategy ORDER BY snapshot_time) is null THEN date_trunc('day', TIMESTAMP '{{.cutoffDate}}')
+			 -- If the range does not have the end, use cutoff + 1 day to include cutoff date snapshot
+			 WHEN LEAD(snapshot_time) OVER (PARTITION BY staker, strategy ORDER BY snapshot_time) is null THEN date_trunc('day', TIMESTAMP '{{.cutoffDate}}') + INTERVAL '1' day
 			 ELSE LEAD(snapshot_time) OVER (PARTITION BY staker, strategy ORDER BY snapshot_time)
 			 END AS end_time
 	 FROM snapshotted_records

pkg/rewards/stakerShareSnapshots_test.go

@@ -1499,7 +1499,7 @@ func Test_StakerShareSnapshots_V22(t *testing.T) {
 		// (withdrawal at log 2 < slash at log 3, so withdrawal IS affected)
 		res = grm.Exec(`
 			INSERT INTO queued_withdrawal_slashing_adjustments (staker, strategy, operator, withdrawal_block_number, withdrawal_log_index, slash_block_number, slash_multiplier, block_number, transaction_hash, log_index)
-			VALUES (?, ?, ?, ?, 0, ?, ?, ?, ?, ?)
+			VALUES (?, ?, ?, ?, 2, ?, ?, ?, ?, ?)
 		`, "0xstaker13", "0xstrat13", "0xoperator13", block2, block2, 0.5, block2, "tx_1001_slash", 3)
 		assert.Nil(t, res.Error)