fork override and more tests

Author: serichoi65

internal/config/config.go

@@ -119,6 +119,7 @@ type RewardsConfig struct {
 	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
+	ForkOverrides                map[ForkName]Fork // Test-only: override fork dates/blocks
 }
 
 type StatsdConfig struct {
@@ -555,6 +556,22 @@ type Fork struct {
 type ForkMap map[ForkName]Fork
 
 func (c *Config) GetRewardsSqlForkDates() (ForkMap, error) {
+	forkMap, err := c.getBaseForkMap()
+	if err != nil {
+		return nil, err
+	}
+
+	// Apply fork overrides (for testing)
+	if c.Rewards.ForkOverrides != nil {
+		for forkName, override := range c.Rewards.ForkOverrides {
+			forkMap[forkName] = override
+		}
+	}
+
+	return forkMap, nil
+}
+
+func (c *Config) getBaseForkMap() (ForkMap, error) {
 	switch c.Chain {
 	case Chain_Preprod:
 		return ForkMap{
@@ -786,6 +803,18 @@ func (c *Config) GetRewardsSqlForkDates() (ForkMap, error) {
 	return nil, errors.New("unsupported chain")
 }
 
+// SetForkOverride sets a fork override for testing purposes.
+// This allows tests to override fork block numbers to enable/disable fork-specific logic.
+func (c *Config) SetForkOverride(forkName ForkName, blockNumber uint64, date string) {
+	if c.Rewards.ForkOverrides == nil {
+		c.Rewards.ForkOverrides = make(map[ForkName]Fork)
+	}
+	c.Rewards.ForkOverrides[forkName] = Fork{
+		Date:        date,
+		BlockNumber: blockNumber,
+	}
+}
+
 type ModelForkMap map[ForkName]uint64
 
 // Model forks, named after US capitols

internal/tests/utils.go

@@ -273,6 +273,17 @@ func LargeTestsEnabled() bool {
 	return os.Getenv("TEST_REWARDS") == "true" || os.Getenv("TEST_LARGE") == "true"
 }
 
+// GetConfigWithSabineForkEnabled returns a config with Sabine fork enabled at block 0.
+// This is useful for testing withdrawal queue add-back logic.
+func GetConfigWithSabineForkEnabled(chain config.Chain) *config.Config {
+	cfg := GetConfig()
+	cfg.Chain = chain
+	cfg.Rewards.WithdrawalQueueWindow = 14.0 // 14 days for mainnet
+	// Enable Sabine fork at block 0 so it's always active
+	cfg.SetForkOverride(config.RewardsFork_Sabine, 0, "1970-01-01")
+	return cfg
+}
+
 // ----------------------------------------------------------------------------
 // Rewards V2
 // ----------------------------------------------------------------------------

pkg/rewards/e2e_anvil_test.go

@@ -85,6 +85,8 @@ func setupE2ETestContext(t *testing.T) *E2ETestContext {
 	cfg.Rewards.RewardsV2_2Enabled = true
 	cfg.Rewards.WithdrawalQueueWindow = 14.0 // 14 days for mainnet
 	cfg.DatabaseConfig = *tests.GetDbConfigFromEnv()
+	// Enable Sabine fork at block 0 so withdrawal queue add-back logic is always active
+	cfg.SetForkOverride(config.RewardsFork_Sabine, 0, "1970-01-01")
 
 	sink, err := metrics.NewMetricsSink(&metrics.MetricsSinkConfig{}, nil)
 	require.NoError(t, err, "Failed to create metrics sink")

pkg/rewards/rewardsV2_2_anvil_test.go

@@ -64,6 +64,8 @@ func setupV22TestContext(t *testing.T) *V22TestContext {
 	cfg.Rewards.RewardsV2_2Enabled = true
 	cfg.Rewards.WithdrawalQueueWindow = 14.0 // 14 days for mainnet
 	cfg.DatabaseConfig = *tests.GetDbConfigFromEnv()
+	// Enable Sabine fork at block 0 so withdrawal queue add-back logic is always active
+	cfg.SetForkOverride(config.RewardsFork_Sabine, 0, "1970-01-01")
 
 	sink, err := metrics.NewMetricsSink(&metrics.MetricsSinkConfig{}, nil)
 	require.NoError(t, err, "Failed to create metrics sink")

pkg/rewards/stakerShareSnapshots_anvil_test.go

@@ -464,6 +464,8 @@ func setupSSS_SidecarForAnvil(t *testing.T, anvilURL string) (string, *config.Co
 	cfg.DatabaseConfig.User = os.Getenv("POSTGRES_USER")
 	cfg.DatabaseConfig.Password = os.Getenv("POSTGRES_PASSWORD")
 	cfg.Rewards.WithdrawalQueueWindow = 14 // 14 days
+	// Enable Sabine fork at block 0 so withdrawal queue add-back logic is always active
+	cfg.SetForkOverride(config.RewardsFork_Sabine, 0, "1970-01-01")
 
 	l, _ := logger.NewLogger(&logger.LoggerConfig{Debug: cfg.Debug})