diff --git a/pkg/postgres/postgres.go b/pkg/postgres/postgres.go index 44df42d4..7cf0832c 100644 --- a/pkg/postgres/postgres.go +++ b/pkg/postgres/postgres.go @@ -3,6 +3,8 @@ package postgres import ( "database/sql" "fmt" + "regexp" + "github.com/Layr-Labs/sidecar/internal/config" "github.com/Layr-Labs/sidecar/internal/tests" "github.com/Layr-Labs/sidecar/pkg/postgres/migrations" @@ -11,7 +13,6 @@ import ( "gorm.io/driver/postgres" "gorm.io/gorm" "gorm.io/gorm/logger" - "regexp" ) type PostgresConfig struct { diff --git a/pkg/rewards/8_goldOperatorODRewardAmounts.go b/pkg/rewards/8_goldOperatorODRewardAmounts.go index 52d3684b..f3ec3c7c 100644 --- a/pkg/rewards/8_goldOperatorODRewardAmounts.go +++ b/pkg/rewards/8_goldOperatorODRewardAmounts.go @@ -14,7 +14,6 @@ WITH reward_snapshot_operators AS ( ap.reward_hash, ap.snapshot AS snapshot, ap.token, - ap.tokens_per_registered_snapshot, ap.tokens_per_registered_snapshot_decimal, ap.avs AS avs, ap.operator AS operator, diff --git a/pkg/rewards/rewardsV2_test.go b/pkg/rewards/rewardsV2_test.go index e1316013..599c990a 100644 --- a/pkg/rewards/rewardsV2_test.go +++ b/pkg/rewards/rewardsV2_test.go @@ -212,7 +212,8 @@ func Test_RewardsV2(t *testing.T) { t.Logf("Gold staging rows for snapshot %s: %d", snapshotDate, len(goldRows)) for i, row := range goldRows { - if strings.EqualFold(row.RewardHash, strings.ToLower("0xB38AB57E8E858F197C07D0CDF61F34EB07C3D0FC58390417DDAD0BF528681909")) { + if strings.EqualFold(row.RewardHash, strings.ToLower("0xB38AB57E8E858F197C07D0CDF61F34EB07C3D0FC58390417DDAD0BF528681909")) && + strings.EqualFold(row.Earner, strings.ToLower("0xaFF71569D30ED876987088a62E0EA881EBc761E6")) { t.Logf("%d: %s %s %s %s %s", i, row.Earner, row.Snapshot.String(), row.RewardHash, row.Token, row.Amount) } // t.Logf("%d: %s %s %s %s %s", i, row.Earner, row.Snapshot.String(), row.RewardHash, row.Token, row.Amount) diff --git a/scripts/downloadTestData.sh b/scripts/downloadTestData.sh index 2b82e230..0951bfbb 100755 --- a/scripts/downloadTestData.sh +++ b/scripts/downloadTestData.sh @@ -16,4 +16,5 @@ if [[ -z $version ]]; then exit 1 fi echo "Downloading testdata version $dataUrl" + curl -L $dataUrl | tar xvz -C ./