clean

Author: serichoi65

internal/config/config.go

@@ -105,7 +105,6 @@ type RewardsConfig struct {
 	ValidateRewardsRoot          bool
 	GenerateStakerOperatorsTable bool
 	CalculateRewardsDaily        bool
-	WithdrawalQueueWindow        float64 // Duration in days for withdrawal queue period (14.0 for mainnet, 0.0069 for testnet/preprod ~10 min)
 	RewardsV2_2Enabled           bool
 }
 
@@ -215,7 +214,6 @@ var (
 	RewardsValidateRewardsRoot          = "rewards.validate_rewards_root"
 	RewardsGenerateStakerOperatorsTable = "rewards.generate_staker_operators_table"
 	RewardsCalculateRewardsDaily        = "rewards.calculate_rewards_daily"
-	RewardsWithdrawalQueueWindow        = "rewards.withdrawal_queue_window"
 	RewardsV2_2Enabled                  = "rewards.v2_2_enabled"
 
 	EthereumRpcBaseUrl               = "ethereum.rpc_url"
@@ -251,18 +249,6 @@ var (
 	CoingeckoApiKey = "coingecko.api-key"
 )
 
-// getDefaultWithdrawalQueueDuration returns the default withdrawal queue duration in days based on chain
-func getDefaultWithdrawalQueueDuration(chain Chain) float64 {
-	switch chain {
-	case Chain_Mainnet:
-		return 14.0 // Mainnet uses 14-day withdrawal queue
-	case Chain_Preprod, Chain_Holesky, Chain_Sepolia, Chain_Hoodi, Chain_PreprodHoodi:
-		return 10.0 / (24.0 * 60.0) // Testnet/preprod uses 10 minutes = ~0.0069 days
-	default:
-		return 14.0 // Default to mainnet behavior
-	}
-}
-
 func FloatWithDefault(value, defaultValue float64) float64 {
 	if value == 0.0 {
 		return defaultValue
@@ -271,11 +257,9 @@ func FloatWithDefault(value, defaultValue float64) float64 {
 }
 
 func NewConfig() *Config {
-	chain := Chain(StringWithDefault(viper.GetString(normalizeFlagName("chain")), "holesky"))
-
 	return &Config{
 		Debug: viper.GetBool(normalizeFlagName("debug")),
-		Chain: chain,
+		Chain: Chain(StringWithDefault(viper.GetString(normalizeFlagName("chain")), "holesky")),
 
 		EthereumRpcConfig: EthereumRpcConfig{
 			BaseUrl:               viper.GetString(normalizeFlagName(EthereumRpcBaseUrl)),
@@ -323,7 +307,6 @@ func NewConfig() *Config {
 			ValidateRewardsRoot:          viper.GetBool(normalizeFlagName(RewardsValidateRewardsRoot)),
 			GenerateStakerOperatorsTable: viper.GetBool(normalizeFlagName(RewardsGenerateStakerOperatorsTable)),
 			CalculateRewardsDaily:        viper.GetBool(normalizeFlagName(RewardsCalculateRewardsDaily)),
-			WithdrawalQueueWindow:        FloatWithDefault(viper.GetFloat64(normalizeFlagName(RewardsWithdrawalQueueWindow)), getDefaultWithdrawalQueueDuration(chain)),
 			RewardsV2_2Enabled:           viper.GetBool(normalizeFlagName(RewardsV2_2Enabled)),
 		},
 

pkg/postgres/migrations/202512150000_operatorAllocationSnapshotsTable/up.go

@@ -12,13 +12,14 @@ type Migration struct{}
 func (m *Migration) Up(db *sql.DB, grm *gorm.DB, cfg *config.Config) error {
 	queries := []string{
 		// Create operator_allocation_snapshots table for unique stake calculations
-		// Stores daily snapshots of operator allocations (magnitude) per operator set
+		// Stores daily snapshots of operator allocations (magnitude and max_magnitude) per operator set
 		`CREATE TABLE IF NOT EXISTS operator_allocation_snapshots (
 			operator varchar not null,
 			avs varchar not null,
 			strategy varchar not null,
 			operator_set_id bigint not null,
 			magnitude numeric not null,
+			max_magnitude numeric not null default 0,
 			snapshot date not null,
 			primary key (operator, avs, strategy, operator_set_id, snapshot)
 		)`,
@@ -30,6 +31,11 @@ func (m *Migration) Up(db *sql.DB, grm *gorm.DB, cfg *config.Config) error {
 		// Index for efficient allocation queries
 		`CREATE INDEX IF NOT EXISTS idx_operator_allocations_effective_date 
 		 ON operator_allocations(operator, avs, strategy, operator_set_id, effective_date)`,
+
+		// Create index for max_magnitude queries for performance
+		`CREATE INDEX IF NOT EXISTS idx_operator_allocation_snapshots_max_magnitude
+		 ON operator_allocation_snapshots(operator, strategy, snapshot)
+		 WHERE max_magnitude > 0`,
 	}
 
 	for _, query := range queries {

pkg/postgres/migrations/202512160000_addSlashableUntilToOperatorRegistrationSnapshots/up.go

@@ -83,8 +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"
 	_202512150000_operatorAllocationSnapshotsTable "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202512150000_operatorAllocationSnapshotsTable"
-	_202512160000_addSlashableUntilToOperatorRegistrationSnapshots "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202512160000_addSlashableUntilToOperatorRegistrationSnapshots"
-	_202512161200_addMaxMagnitudeToAllocationSnapshots "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202512161200_addMaxMagnitudeToAllocationSnapshots"
 	_202601260000_uniqueAndTotalStakeRewardSubmissions "github.com/Layr-Labs/sidecar/pkg/postgres/migrations/202601260000_uniqueAndTotalStakeRewardSubmissions"
 )
 
@@ -231,8 +229,6 @@ func (m *Migrator) MigrateAll() error {
 		&_202507301346_taskMailboxTables.Migration{},
 		&_202511051502_keyRotationScheduled.Migration{},
 		&_202512150000_operatorAllocationSnapshotsTable.Migration{},
-		&_202512160000_addSlashableUntilToOperatorRegistrationSnapshots.Migration{},
-		&_202512161200_addMaxMagnitudeToAllocationSnapshots.Migration{},
 		&_202601260000_uniqueAndTotalStakeRewardSubmissions.Migration{},
 	}
 

pkg/postgres/migrations/202512161200_addMaxMagnitudeToAllocationSnapshots/up.go

@@ -20,7 +20,7 @@ import (
 // Entry        Exit
 // Since exits (deregistrations) are rounded down, we must only look at the day 2 snapshot on a pipeline run on day 3.
 const operatorSetOperatorRegistrationSnapshotsQuery = `
-insert into operator_set_operator_registration_snapshots (operator, avs, operator_set_id, snapshot, slashable_until)
+insert into operator_set_operator_registration_snapshots (operator, avs, operator_set_id, snapshot)
 WITH state_changes as (
 	select
 		osor.*,
@@ -74,26 +74,7 @@ marked_statuses AS (
 		block_time AS start_time,
 		-- Mark the next_block_time as the end_time for the range
 		-- Use coalesce because if the next_block_time for a registration is not closed, then we use cutoff_date
-		COALESCE(next_block_time, '{{.cutoffDate}}')::timestamp AS end_time,
-		-- Calculate slashable_until based on deregistration
-		-- Deregistrations: slashability queue for unique stake rewards
-		-- NULL = still active (no deregistration)
-		--
-		-- NOTE: Design Decision - Time vs Blocks
-		-- - Sidecar uses TIME: adds configurable days (14 days on mainnet, ~10 minutes on testnets)
-		-- - Contracts use BLOCKS: adds ~100,800 blocks (14 days * 24 * 60 * 60 / 12 sec/block)
-		-- - This matches withdrawal queue behavior (stakerShareSnapshots.go:63)
-		-- - Time is continuous; blocks can be missed on-chain (acceptable edge case)
-		-- - Daily snapshot granularity makes minute-level precision differences insignificant
-		CASE
-			WHEN next_is_active = FALSE THEN
-				-- Deregistration with slashability period (environment-specific)
-				DATE(COALESCE(next_block_time, '{{.cutoffDate}}')::timestamp) + ({{.withdrawalQueueWindow}} * INTERVAL '1 day')
-			WHEN next_is_active IS NULL THEN
-				-- Still active (no deregistration event): NULL
-				NULL
-		END AS slashable_until_date,
-		is_active
+		COALESCE(next_block_time, '{{.cutoffDate}}')::timestamp AS end_time
 	FROM removed_same_day_deregistrations
 	WHERE is_active = TRUE
  ),
@@ -105,8 +86,7 @@ registration_windows_extra as (
 		operator_set_id,
 		date_trunc('day', start_time) + interval '1' day as start_time,
 		-- End time is non-inclusive because the operator is not registered to the operator set at the end time OR it is current timestamp rounded down
-		date_trunc('day', end_time) as end_time,
-		slashable_until_date
+		date_trunc('day', end_time) as end_time
 	FROM registration_periods
 ),
 -- Ignore start_time and end_time that last less than a day
@@ -122,18 +102,15 @@ SELECT
 	operator,
 	avs,
 	operator_set_id,
-	d AS snapshot,
-	slashable_until_date AS slashable_until
+	d AS snapshot
 FROM cleaned_records
 CROSS JOIN generate_series(DATE(start_time), DATE(end_time) - interval '1' day, interval '1' day) AS d
-on conflict on constraint uniq_operator_set_operator_registration_snapshots
-DO UPDATE SET slashable_until = EXCLUDED.slashable_until;
+on conflict on constraint uniq_operator_set_operator_registration_snapshots do nothing;
 `
 
 func (r *RewardsCalculator) GenerateAndInsertOperatorSetOperatorRegistrationSnapshots(snapshotDate string) error {
 	query, err := rewardsUtils.RenderQueryTemplate(operatorSetOperatorRegistrationSnapshotsQuery, map[string]interface{}{
-		"cutoffDate":            snapshotDate,
-		"withdrawalQueueWindow": r.globalConfig.Rewards.WithdrawalQueueWindow,
+		"cutoffDate": snapshotDate,
 	})
 	if err != nil {
 		r.logger.Sugar().Errorw("Failed to render operator set operator registration snapshots query", "error", err)