update stakerOperator tables

serichoi65 · serichoi65 · commit d49be4824a77 · 2025-07-02T13:40:50.000-04:00
diff --git a/pkg/rewards/stakerOperators/10_stakerODOperatorSetStrategyPayouts.go b/pkg/rewards/stakerOperators/10_stakerODOperatorSetStrategyPayouts.go
@@ -44,17 +44,9 @@ func (sog *StakerOperatorsGenerator) GenerateAndInsert10StakerODOperatorSetStrat
 		return err
 	}
 
-	rewardsTables, err := sog.FindRewardsTableNamesForSearchPattersn(map[string]string{
-		rewardsUtils.Table_13_StakerODOperatorSetRewardAmounts: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_13_StakerODOperatorSetRewardAmounts],
-	}, cutoffDate)
-	if err != nil {
-		sog.logger.Sugar().Errorw("Failed to find staker operator table names", "error", err)
-		return err
-	}
-
 	query, err := rewardsUtils.RenderQueryTemplate(_10_stakerODOperatorSetStrategyPayoutQuery, map[string]interface{}{
 		"destTableName":                         destTableName,
-		"stakerODOperatorSetRewardAmountsTable": rewardsTables[rewardsUtils.Table_13_StakerODOperatorSetRewardAmounts],
+		"stakerODOperatorSetRewardAmountsTable": rewardsUtils.RewardsTable_13_StakerODOperatorSetRewardAmounts,
 	})
 	if err != nil {
 		sog.logger.Sugar().Errorw("Failed to render 10_stakerODOperatorSetStrategyPayouts query", "error", err)
diff --git a/pkg/rewards/stakerOperators/11_avsODOperatorSetStrategyPayouts.go b/pkg/rewards/stakerOperators/11_avsODOperatorSetStrategyPayouts.go
@@ -40,17 +40,9 @@ func (sog *StakerOperatorsGenerator) GenerateAndInsert11AvsODOperatorSetStrategy
 		return err
 	}
 
-	rewardsTables, err := sog.FindRewardsTableNamesForSearchPattersn(map[string]string{
-		rewardsUtils.Table_14_AvsODOperatorSetRewardAmounts: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_14_AvsODOperatorSetRewardAmounts],
-	}, cutoffDate)
-	if err != nil {
-		sog.logger.Sugar().Errorw("Failed to find staker operator table names", "error", err)
-		return err
-	}
-
 	query, err := rewardsUtils.RenderQueryTemplate(_11_avsODOperatorSetStrategyPayoutQuery, map[string]interface{}{
 		"destTableName":                      destTableName,
-		"avsODOperatorSetRewardAmountsTable": rewardsTables[rewardsUtils.Table_14_AvsODOperatorSetRewardAmounts],
+		"avsODOperatorSetRewardAmountsTable": rewardsUtils.RewardsTable_14_AvsODOperatorSetRewardAmounts,
 	})
 	if err != nil {
 		sog.logger.Sugar().Errorw("Failed to render 11_avsODOperatorSetStrategyPayouts query", "error", err)
diff --git a/pkg/rewards/stakerOperators/1_stakerStrategyPayouts.go b/pkg/rewards/stakerOperators/1_stakerStrategyPayouts.go
@@ -2,9 +2,10 @@ package stakerOperators
 
 import (
 	"database/sql"
+	"time"
+
 	"github.com/Layr-Labs/sidecar/internal/config"
 	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
-	"time"
 )
 
 const _1_stakerStrategyPayoutsQuery = `
@@ -137,19 +138,10 @@ func (sog *StakerOperatorsGenerator) GenerateAndInsert1StakerStrategyPayouts(cut
 		return err
 	}
 
-	rewardsTables, err := sog.FindRewardsTableNamesForSearchPattersn(map[string]string{
-		rewardsUtils.Table_1_ActiveRewards:       rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_1_ActiveRewards],
-		rewardsUtils.Table_2_StakerRewardAmounts: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_2_StakerRewardAmounts],
-	}, cutoffDate)
-	if err != nil {
-		sog.logger.Sugar().Errorw("Failed to find staker operator table names", "error", err)
-		return err
-	}
-
 	query, err := rewardsUtils.RenderQueryTemplate(_1_stakerStrategyPayoutsQuery, map[string]interface{}{
 		"destTableName":            destTableName,
-		"activeRewardsTable":       rewardsTables[rewardsUtils.Table_1_ActiveRewards],
-		"stakerRewardAmountsTable": rewardsTables[rewardsUtils.Table_2_StakerRewardAmounts],
+		"activeRewardsTable":       rewardsUtils.RewardsTable_1_ActiveRewards,
+		"stakerRewardAmountsTable": rewardsUtils.RewardsTable_2_StakerRewardAmounts,
 	})
 	if err != nil {
 		sog.logger.Sugar().Errorw("Failed to render 1_stakerStrategyPayouts query", "error", err)
diff --git a/pkg/rewards/stakerOperators/2_operatorStrategyRewards.go b/pkg/rewards/stakerOperators/2_operatorStrategyRewards.go
@@ -1,8 +1,9 @@
 package stakerOperators
 
 import (
-	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 	"time"
+
+	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 )
 
 const _2_operatorStrategyRewardsQuery = `
@@ -111,19 +112,10 @@ func (sog *StakerOperatorsGenerator) GenerateAndInsert2OperatorStrategyRewards(c
 		return err
 	}
 
-	rewardsTables, err := sog.FindRewardsTableNamesForSearchPattersn(map[string]string{
-		rewardsUtils.Table_1_ActiveRewards:         rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_1_ActiveRewards],
-		rewardsUtils.Table_3_OperatorRewardAmounts: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_3_OperatorRewardAmounts],
-	}, cutoffDate)
-	if err != nil {
-		sog.logger.Sugar().Errorw("Failed to find staker operator table names", "error", err)
-		return err
-	}
-
 	query, err := rewardsUtils.RenderQueryTemplate(_2_operatorStrategyRewardsQuery, map[string]interface{}{
 		"destTableName":              destTableName,
-		"activeRewardsTable":         rewardsTables[rewardsUtils.Table_1_ActiveRewards],
-		"operatorRewardAmountsTable": rewardsTables[rewardsUtils.Table_3_OperatorRewardAmounts],
+		"activeRewardsTable":         rewardsUtils.RewardsTable_1_ActiveRewards,
+		"operatorRewardAmountsTable": rewardsUtils.RewardsTable_3_OperatorRewardAmounts,
 	})
 	if err != nil {
 		sog.logger.Sugar().Errorw("Failed to render 2_operatorStrategyRewards query", "error", err)
diff --git a/pkg/rewards/stakerOperators/3_rewardsForAllStrategyPayouts.go b/pkg/rewards/stakerOperators/3_rewardsForAllStrategyPayouts.go
@@ -1,8 +1,9 @@
 package stakerOperators
 
 import (
-	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 	"time"
+
+	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 )
 
 const _3_rewardsForAllStrategyPayoutsQuery = `
@@ -81,17 +82,9 @@ func (sog *StakerOperatorsGenerator) GenerateAndInsert3RewardsForAllStrategyPayo
 		return err
 	}
 
-	rewardsTables, err := sog.FindRewardsTableNamesForSearchPattersn(map[string]string{
-		rewardsUtils.Table_1_ActiveRewards: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_1_ActiveRewards],
-	}, cutoffDate)
-	if err != nil {
-		sog.logger.Sugar().Errorw("Failed to find staker operator table names", "error", err)
-		return err
-	}
-
 	query, err := rewardsUtils.RenderQueryTemplate(_3_rewardsForAllStrategyPayoutsQuery, map[string]interface{}{
 		"destTableName":      destTableName,
-		"activeRewardsTable": rewardsTables[rewardsUtils.Table_1_ActiveRewards],
+		"activeRewardsTable": rewardsUtils.RewardsTable_1_ActiveRewards,
 	})
 	if err != nil {
 		sog.logger.Sugar().Errorw("Failed to render 3_rewardsForAllStrategyPayouts query", "error", err)
diff --git a/pkg/rewards/stakerOperators/4_rfaeStakerStrategyPayouts.go b/pkg/rewards/stakerOperators/4_rfaeStakerStrategyPayouts.go
@@ -1,9 +1,10 @@
 package stakerOperators
 
 import (
+	"time"
+
 	"github.com/Layr-Labs/sidecar/internal/config"
 	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
-	"time"
 )
 
 const _4_rfaeStakerStrategyPayoutsQuery = `
@@ -123,19 +124,10 @@ func (sog *StakerOperatorsGenerator) GenerateAndInsert4RfaeStakerStrategyPayout(
 		return err
 	}
 
-	rewardsTables, err := sog.FindRewardsTableNamesForSearchPattersn(map[string]string{
-		rewardsUtils.Table_1_ActiveRewards: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_1_ActiveRewards],
-		rewardsUtils.Table_5_RfaeStakers:   rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_5_RfaeStakers],
-	}, cutoffDate)
-	if err != nil {
-		sog.logger.Sugar().Errorw("Failed to find staker operator table names", "error", err)
-		return err
-	}
-
 	query, err := rewardsUtils.RenderQueryTemplate(_4_rfaeStakerStrategyPayoutsQuery, map[string]interface{}{
 		"destTableName":      destTableName,
-		"activeRewardsTable": rewardsTables[rewardsUtils.Table_1_ActiveRewards],
-		"rfaeStakersTable":   rewardsTables[rewardsUtils.Table_5_RfaeStakers],
+		"activeRewardsTable": rewardsUtils.RewardsTable_1_ActiveRewards,
+		"rfaeStakersTable":   rewardsUtils.RewardsTable_5_RfaeStakers,
 	})
 	if err != nil {
 		sog.logger.Sugar().Errorw("Failed to render 4_rfaeStakerStrategyPayouts query", "error", err)
diff --git a/pkg/rewards/stakerOperators/5_rfaeOperatorStrategyPayout.go b/pkg/rewards/stakerOperators/5_rfaeOperatorStrategyPayout.go
@@ -1,8 +1,9 @@
 package stakerOperators
 
 import (
-	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 	"time"
+
+	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 )
 
 const _5_rfaeOperatorStrategyPayoutsQuery = `
@@ -108,19 +109,10 @@ func (sog *StakerOperatorsGenerator) GenerateAndInsert5RfaeOperatorStrategyPayou
 		return err
 	}
 
-	rewardsTables, err := sog.FindRewardsTableNamesForSearchPattersn(map[string]string{
-		rewardsUtils.Table_1_ActiveRewards: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_1_ActiveRewards],
-		rewardsUtils.Table_6_RfaeOperators: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_6_RfaeOperators],
-	}, cutoffDate)
-	if err != nil {
-		sog.logger.Sugar().Errorw("Failed to find staker operator table names", "error", err)
-		return err
-	}
-
 	query, err := rewardsUtils.RenderQueryTemplate(_5_rfaeOperatorStrategyPayoutsQuery, map[string]interface{}{
 		"destTableName":      destTableName,
-		"activeRewardsTable": rewardsTables[rewardsUtils.Table_1_ActiveRewards],
-		"rfaeOperatorsTable": rewardsTables[rewardsUtils.Table_6_RfaeOperators],
+		"activeRewardsTable": rewardsUtils.RewardsTable_1_ActiveRewards,
+		"rfaeOperatorsTable": rewardsUtils.RewardsTable_6_RfaeOperators,
 	})
 	if err != nil {
 		sog.logger.Sugar().Errorw("Failed to render 5_rfaeOperatorStrategyPayouts query", "error", err)
diff --git a/pkg/rewards/stakerOperators/6_operatorODStrategyPayouts.go b/pkg/rewards/stakerOperators/6_operatorODStrategyPayouts.go
@@ -1,8 +1,9 @@
 package stakerOperators
 
 import (
-	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 	"time"
+
+	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 )
 
 // _6_operatorODStrategyPayoutQuery is the query that generates the operator OD strategy payouts.
@@ -61,17 +62,10 @@ func (sog *StakerOperatorsGenerator) GenerateAndInsert6OperatorODStrategyPayouts
 		return err
 	}
 
-	rewardsTables, err := sog.FindRewardsTableNamesForSearchPattersn(map[string]string{
-		rewardsUtils.Table_8_OperatorODRewardAmounts: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_8_OperatorODRewardAmounts],
-	}, cutoffDate)
-	if err != nil {
-		sog.logger.Sugar().Errorw("Failed to find staker operator table names", "error", err)
-		return err
-	}
-
 	query, err := rewardsUtils.RenderQueryTemplate(_6_operatorODStrategyPayoutQuery, map[string]interface{}{
 		"destTableName":                destTableName,
-		"operatorODRewardAmountsTable": rewardsTables[rewardsUtils.Table_8_OperatorODRewardAmounts],
+		"activeODRewardsTable":         rewardsUtils.RewardsTable_7_ActiveODRewards,
+		"operatorODRewardAmountsTable": rewardsUtils.RewardsTable_8_OperatorODRewardAmounts,
 	})
 	if err != nil {
 		sog.logger.Sugar().Errorw("Failed to render 6_operatorODStrategyPayouts query", "error", err)
diff --git a/pkg/rewards/stakerOperators/7_stakerODStrategyPayouts.go b/pkg/rewards/stakerOperators/7_stakerODStrategyPayouts.go
@@ -1,8 +1,9 @@
 package stakerOperators
 
 import (
-	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 	"time"
+
+	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 )
 
 // _7_stakerODStrategyPayoutQuery is a constant value that represents a query.
@@ -62,17 +63,10 @@ func (sog *StakerOperatorsGenerator) GenerateAndInsert7StakerODStrategyPayouts(c
 		return err
 	}
 
-	rewardsTables, err := sog.FindRewardsTableNamesForSearchPattersn(map[string]string{
-		rewardsUtils.Table_9_StakerODRewardAmounts: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_9_StakerODRewardAmounts],
-	}, cutoffDate)
-	if err != nil {
-		sog.logger.Sugar().Errorw("Failed to find staker operator table names", "error", err)
-		return err
-	}
-
 	query, err := rewardsUtils.RenderQueryTemplate(_7_stakerODStrategyPayoutQuery, map[string]interface{}{
 		"destTableName":              destTableName,
-		"stakerODRewardAmountsTable": rewardsTables[rewardsUtils.Table_9_StakerODRewardAmounts],
+		"activeODRewardsTable":       rewardsUtils.RewardsTable_7_ActiveODRewards,
+		"stakerODRewardAmountsTable": rewardsUtils.RewardsTable_9_StakerODRewardAmounts,
 	})
 	if err != nil {
 		sog.logger.Sugar().Errorw("Failed to render 7_stakerODStrategyPayouts query", "error", err)
diff --git a/pkg/rewards/stakerOperators/8_avsODStrategyPayouts.go b/pkg/rewards/stakerOperators/8_avsODStrategyPayouts.go
@@ -55,17 +55,9 @@ func (sog *StakerOperatorsGenerator) GenerateAndInsert8AvsODStrategyPayouts(cuto
 		return err
 	}
 
-	rewardsTables, err := sog.FindRewardsTableNamesForSearchPattersn(map[string]string{
-		rewardsUtils.Table_10_AvsODRewardAmounts: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_10_AvsODRewardAmounts],
-	}, cutoffDate)
-	if err != nil {
-		sog.logger.Sugar().Errorw("Failed to find staker operator table names", "error", err)
-		return err
-	}
-
 	query, err := rewardsUtils.RenderQueryTemplate(_8_avsODStrategyPayoutQuery, map[string]interface{}{
 		"destTableName":           destTableName,
-		"avsODRewardAmountsTable": rewardsTables[rewardsUtils.Table_10_AvsODRewardAmounts],
+		"avsODRewardAmountsTable": rewardsUtils.RewardsTable_10_AvsODRewardAmounts,
 	})
 	if err != nil {
 		sog.logger.Sugar().Errorw("Failed to render 8_avsODStrategyPayouts query", "error", err)
diff --git a/pkg/rewards/stakerOperators/9_operatorODOperatorSetStrategyPayouts.go b/pkg/rewards/stakerOperators/9_operatorODOperatorSetStrategyPayouts.go
@@ -44,17 +44,9 @@ func (sog *StakerOperatorsGenerator) GenerateAndInsert9OperatorODOperatorSetStra
 		return err
 	}
 
-	rewardsTables, err := sog.FindRewardsTableNamesForSearchPattersn(map[string]string{
-		rewardsUtils.Table_12_OperatorODOperatorSetRewardAmounts: rewardsUtils.GoldTableNameSearchPattern[rewardsUtils.Table_12_OperatorODOperatorSetRewardAmounts],
-	}, cutoffDate)
-	if err != nil {
-		sog.logger.Sugar().Errorw("Failed to find staker operator table names", "error", err)
-		return err
-	}
-
 	query, err := rewardsUtils.RenderQueryTemplate(_9_operatorODOperatorSetStrategyPayoutQuery, map[string]interface{}{
 		"destTableName": destTableName,
-		"operatorODOperatorSetRewardAmountsTable": rewardsTables[rewardsUtils.Table_12_OperatorODOperatorSetRewardAmounts],
+		"operatorODOperatorSetRewardAmountsTable": rewardsUtils.RewardsTable_12_OperatorODOperatorSetRewardAmounts,
 	})
 	if err != nil {
 		sog.logger.Sugar().Errorw("Failed to render 9_operatorODOperatorSetStrategyPayouts query", "error", err)
diff --git a/pkg/rewards/stakerOperators/stakerOperator.go b/pkg/rewards/stakerOperators/stakerOperator.go
@@ -2,7 +2,6 @@ package stakerOperators
 
 import (
 	"github.com/Layr-Labs/sidecar/internal/config"
-	"github.com/Layr-Labs/sidecar/pkg/rewardsUtils"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
 )
@@ -144,7 +143,3 @@ func (sog *StakerOperatorsGenerator) GenerateStakerOperatorsTable(cutoffDate str
 	}
 	return nil
 }
-
-func (sog *StakerOperatorsGenerator) FindRewardsTableNamesForSearchPattersn(patterns map[string]string, cutoffDate string) (map[string]string, error) {
-	return rewardsUtils.FindRewardsTableNamesForSearchPatterns(patterns, cutoffDate, sog.globalConfig.DatabaseConfig.SchemaName, sog.db)
-}
diff --git a/pkg/rewardsUtils/rewardsUtils.go b/pkg/rewardsUtils/rewardsUtils.go
@@ -2,7 +2,6 @@ package rewardsUtils
 
 import (
 	"bytes"
-	"database/sql"
 	"fmt"
 	"text/template"
 
@@ -175,48 +174,3 @@ func DropTableIfExists(grm *gorm.DB, tableName string, l *zap.Logger) error {
 	}
 	return nil
 }
-
-func FindTableByLikeName(likeName string, grm *gorm.DB, schemaName string) (string, error) {
-	if schemaName == "" {
-		schemaName = "public"
-	}
-	query := `
-			SELECT table_name
-			FROM information_schema.tables
-			WHERE table_schema = @schemaName
-				AND table_type='BASE TABLE'
-				and table_name like @pattern
-			limit 1
-		`
-	var tname string
-	res := grm.Debug().Raw(query,
-		sql.Named("schemaName", schemaName),
-		sql.Named("pattern", likeName)).
-		Scan(&tname)
-	if res.Error != nil {
-		return "", res.Error
-	}
-	if tname == "" {
-		return "", fmt.Errorf("table not found for key %s", likeName)
-	}
-	return tname, nil
-}
-
-// FindRewardsTableNamesForSearchPatterns finds the table names for the given search patterns
-//
-// As table names evolve over time due to adding more, the numerical index might change in the constants
-// in this file. This makes finding past table names difficult. This function helps to find the table names
-// using the base table name and the cutoff date with a wildcard at the front.
-func FindRewardsTableNamesForSearchPatterns(patterns map[string]string, cutoffDate string, schemaName string, grm *gorm.DB) (map[string]string, error) {
-	results := make(map[string]string)
-	for key, pattern := range patterns {
-		snakeCaseCutoffDate := utils.SnakeCase(cutoffDate)
-		p := fmt.Sprintf("%s_%s", pattern, snakeCaseCutoffDate)
-		tname, err := FindTableByLikeName(p, grm, schemaName)
-		if err != nil {
-			return nil, err
-		}
-		results[key] = tname
-	}
-	return results, nil
-}
