Skip to content

Fix staging issues #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raymondjacobson merged 1 commit into from
Apr 24, 2025
Merged

Fix staging issues #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion api/dbv1/full_connected_wallets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ func (q *Queries) FullConnectedWallets(ctx context.Context, userId int32) (*Full
return nil, err
}

fullConnectedWallets := FullConnectedWallets{}
fullConnectedWallets := FullConnectedWallets{
ErcWallets: []string{},
SplWallets: []string{},
}
for _, row := range rows {
if row.Chain == WalletChainEth {
fullConnectedWallets.ErcWallets = append(fullConnectedWallets.ErcWallets, row.Wallet)
Expand Down
16 changes: 13 additions & 3 deletions api/v1_users_connected_wallets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package api

import (
"strings"
"testing"

"bridgerton.audius.co/trashid"
Expand All @@ -24,6 +23,17 @@ func TestGetUserConnectedWalletsQuery(t *testing.T) {
func TestGetUserConnectedWallets(t *testing.T) {
status, body := testGet(t, "/v1/users/"+trashid.MustEncodeHashID(2)+"/connected_wallets")
assert.Equal(t, 200, status)
assert.True(t, strings.Contains(string(body), `spl_wallets`))
assert.True(t, strings.Contains(string(body), `erc_wallets`))
jsonAssert(t, body, map[string]string{
"data.erc_wallets": `["0x1111111111111111111111111111111111111111","0x2222222222222222222222222222222222222222"]`,
"data.spl_wallets": `["sol44444444444444444444444444444444444444444","sol55555555555555555555555555555555555555555"]`,
})
}

func TestGetUserConnectedWalletsEmpty(t *testing.T) {
status, body := testGet(t, "/v1/users/"+trashid.MustEncodeHashID(4)+"/connected_wallets")
assert.Equal(t, 200, status)
jsonAssert(t, body, map[string]string{
"data.spl_wallets": "[]",
"data.erc_wallets": "[]",
})
}
92 changes: 92 additions & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import (
type Config struct {
Env string
DbUrl string
Nodes []string
DeadNodes []string
DelegatePrivateKey string
AxiomToken string
AxiomDataset string
Expand Down Expand Up @@ -52,6 +54,15 @@ func init() {
"https://discoveryprovider3.staging.audius.co",
"https://discoveryprovider5.staging.audius.co",
}
Cfg.Nodes = []string{
"https://creatornode11.staging.audius.co",
"https://creatornode12.staging.audius.co",
"https://creatornode5.staging.audius.co",
"https://creatornode6.staging.audius.co",
"https://creatornode7.staging.audius.co",
"https://creatornode9.staging.audius.co",
}
Cfg.DeadNodes = []string{}
case "prod":
fallthrough
case "production":
Expand All @@ -64,6 +75,87 @@ func init() {
"https://discoveryprovider2.audius.co",
"https://discoveryprovider3.audius.co",
}
Cfg.Nodes = []string{
"https://creatornode.audius.co",
"https://creatornode2.audius.co",
"https://creatornode3.audius.co",
"https://audius-content-1.figment.io",
"https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud",
"https://audius-content-2.figment.io",
"https://audius-content-3.figment.io",
"https://audius-content-4.figment.io",
"https://audius-content-5.figment.io",
"https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud",
"https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud",
"https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
"https://audius-content-6.figment.io",
"https://audius-content-7.figment.io",
"https://audius-content-8.figment.io",
"https://audius-content-9.figment.io",
"https://audius-content-10.figment.io",
"https://audius-content-11.figment.io",
"https://content.grassfed.network",
"https://blockdaemon-audius-content-01.bdnodes.net",
"https://audius-content-1.cultur3stake.com",
"https://audius-content-2.cultur3stake.com",
"https://audius-content-3.cultur3stake.com",
"https://audius-content-4.cultur3stake.com",
"https://audius-content-5.cultur3stake.com",
"https://audius-content-6.cultur3stake.com",
"https://audius-content-7.cultur3stake.com",
"https://blockdaemon-audius-content-02.bdnodes.net",
"https://blockdaemon-audius-content-03.bdnodes.net",
"https://blockdaemon-audius-content-04.bdnodes.net",
"https://blockdaemon-audius-content-05.bdnodes.net",
"https://blockdaemon-audius-content-06.bdnodes.net",
"https://blockdaemon-audius-content-07.bdnodes.net",
"https://blockdaemon-audius-content-08.bdnodes.net",
"https://blockdaemon-audius-content-09.bdnodes.net",
"https://audius-content-8.cultur3stake.com",
"https://blockchange-audius-content-01.bdnodes.net",
"https://blockchange-audius-content-02.bdnodes.net",
"https://blockchange-audius-content-03.bdnodes.net",
"https://audius-content-9.cultur3stake.com",
"https://audius-content-10.cultur3stake.com",
"https://audius-content-11.cultur3stake.com",
"https://audius-content-12.cultur3stake.com",
"https://audius-content-13.cultur3stake.com",
"https://audius-content-14.cultur3stake.com",
"https://audius-content-15.cultur3stake.com",
"https://audius-content-16.cultur3stake.com",
"https://audius-content-17.cultur3stake.com",
"https://audius-content-18.cultur3stake.com",
"https://audius-content-12.figment.io",
"https://cn0.mainnet.audiusindex.org",
"https://cn1.mainnet.audiusindex.org",
"https://cn2.mainnet.audiusindex.org",
"https://cn3.mainnet.audiusindex.org",
"https://audius-content-13.figment.io",
"https://audius-content-14.figment.io",
"https://cn4.mainnet.audiusindex.org",
"https://audius-creator-1.theblueprint.xyz",
"https://audius-creator-2.theblueprint.xyz",
"https://audius-creator-3.theblueprint.xyz",
"https://audius-creator-4.theblueprint.xyz",
"https://audius-creator-5.theblueprint.xyz",
"https://audius-creator-6.theblueprint.xyz",
"https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud",
"https://cn1.stuffisup.com",
"https://audius-cn1.tikilabs.com",
"https://audius-creator-7.theblueprint.xyz",
"https://cn1.shakespearetech.com",
"https://cn2.shakespearetech.com",
"https://cn3.shakespearetech.com",
"https://audius-creator-8.theblueprint.xyz",
"https://audius-creator-9.theblueprint.xyz",
"https://audius-creator-10.theblueprint.xyz",
"https://audius-creator-11.theblueprint.xyz",
"https://audius-creator-12.theblueprint.xyz",
"https://audius-creator-13.theblueprint.xyz",
}
Cfg.DeadNodes = []string{
"https://content.grassfed.network",
}
default:
log.Fatalf("Unknown environment: %s", env)
}
Expand Down
96 changes: 4 additions & 92 deletions rendezvous/rendezvous.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,105 +8,17 @@ import (
"io"
"math/rand"
"net/url"
"os"
"slices"
"sort"
"strings"

"bridgerton.audius.co/config"
)

var GlobalHasher *RendezvousHasher

func init() {
hostList := []string{
"https://creatornode.audius.co",
"https://creatornode2.audius.co",
"https://creatornode3.audius.co",
"https://audius-content-1.figment.io",
"https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud",
"https://audius-content-2.figment.io",
"https://audius-content-3.figment.io",
"https://audius-content-4.figment.io",
"https://audius-content-5.figment.io",
"https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud",
"https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud",
"https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
"https://audius-content-6.figment.io",
"https://audius-content-7.figment.io",
"https://audius-content-8.figment.io",
"https://audius-content-9.figment.io",
"https://audius-content-10.figment.io",
"https://audius-content-11.figment.io",
"https://content.grassfed.network",
"https://blockdaemon-audius-content-01.bdnodes.net",
"https://audius-content-1.cultur3stake.com",
"https://audius-content-2.cultur3stake.com",
"https://audius-content-3.cultur3stake.com",
"https://audius-content-4.cultur3stake.com",
"https://audius-content-5.cultur3stake.com",
"https://audius-content-6.cultur3stake.com",
"https://audius-content-7.cultur3stake.com",
"https://blockdaemon-audius-content-02.bdnodes.net",
"https://blockdaemon-audius-content-03.bdnodes.net",
"https://blockdaemon-audius-content-04.bdnodes.net",
"https://blockdaemon-audius-content-05.bdnodes.net",
"https://blockdaemon-audius-content-06.bdnodes.net",
"https://blockdaemon-audius-content-07.bdnodes.net",
"https://blockdaemon-audius-content-08.bdnodes.net",
"https://blockdaemon-audius-content-09.bdnodes.net",
"https://audius-content-8.cultur3stake.com",
"https://blockchange-audius-content-01.bdnodes.net",
"https://blockchange-audius-content-02.bdnodes.net",
"https://blockchange-audius-content-03.bdnodes.net",
"https://audius-content-9.cultur3stake.com",
"https://audius-content-10.cultur3stake.com",
"https://audius-content-11.cultur3stake.com",
"https://audius-content-12.cultur3stake.com",
"https://audius-content-13.cultur3stake.com",
"https://audius-content-14.cultur3stake.com",
"https://audius-content-15.cultur3stake.com",
"https://audius-content-16.cultur3stake.com",
"https://audius-content-17.cultur3stake.com",
"https://audius-content-18.cultur3stake.com",
"https://audius-content-12.figment.io",
"https://cn0.mainnet.audiusindex.org",
"https://cn1.mainnet.audiusindex.org",
"https://cn2.mainnet.audiusindex.org",
"https://cn3.mainnet.audiusindex.org",
"https://audius-content-13.figment.io",
"https://audius-content-14.figment.io",
"https://cn4.mainnet.audiusindex.org",
"https://audius-creator-1.theblueprint.xyz",
"https://audius-creator-2.theblueprint.xyz",
"https://audius-creator-3.theblueprint.xyz",
"https://audius-creator-4.theblueprint.xyz",
"https://audius-creator-5.theblueprint.xyz",
"https://audius-creator-6.theblueprint.xyz",
"https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud",
"https://cn1.stuffisup.com",
"https://audius-cn1.tikilabs.com",
"https://audius-creator-7.theblueprint.xyz",
"https://cn1.shakespearetech.com",
"https://cn2.shakespearetech.com",
"https://cn3.shakespearetech.com",
"https://audius-creator-8.theblueprint.xyz",
"https://audius-creator-9.theblueprint.xyz",
"https://audius-creator-10.theblueprint.xyz",
"https://audius-creator-11.theblueprint.xyz",
"https://audius-creator-12.theblueprint.xyz",
"https://audius-creator-13.theblueprint.xyz",
}
if os.Getenv("ENV") == "stage" {
hostList = []string{
"https://creatornode11.staging.audius.co",
"https://creatornode12.staging.audius.co",
"https://creatornode5.staging.audius.co",
"https://creatornode6.staging.audius.co",
"https://creatornode7.staging.audius.co",
"https://creatornode9.staging.audius.co",
}
}

GlobalHasher = NewRendezvousHasher(hostList)
GlobalHasher = NewRendezvousHasher(config.Cfg.Nodes)
}

type HostTuple struct {
Expand All @@ -127,7 +39,7 @@ func (s HostTuples) Less(i, j int) bool {
}

func NewRendezvousHasher(hosts []string) *RendezvousHasher {
deadHosts := "https://content.grassfed.network/"
deadHosts := strings.Join(config.Cfg.DeadNodes, ",")
liveHosts := make([]string, 0, len(hosts))
for _, h := range hosts {
// dead host
Expand Down
Loading