Skip to content

Commit 502dc7b

Browse files
raymondjacobsonraymondjacobson
authored
Fix staging wallets (#48)
1 parent 59210a2 commit 502dc7b

4 files changed

Lines changed: 113 additions & 96 deletions

File tree

‎api/dbv1/full_connected_wallets.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ func (q *Queries) FullConnectedWallets(ctx context.Context, userId int32) (*Full
1313
return nil, err
1414
}
1515

16-
fullConnectedWallets := FullConnectedWallets{}
16+
fullConnectedWallets := FullConnectedWallets{
17+
ErcWallets: []string{},
18+
SplWallets: []string{},
19+
}
1720
for _, row := range rows {
1821
if row.Chain == WalletChainEth {
1922
fullConnectedWallets.ErcWallets = append(fullConnectedWallets.ErcWallets, row.Wallet)

‎api/v1_users_connected_wallets_test.go‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package api
22

33
import (
4-
"strings"
54
"testing"
65

76
"bridgerton.audius.co/trashid"
@@ -24,6 +23,17 @@ func TestGetUserConnectedWalletsQuery(t *testing.T) {
2423
func TestGetUserConnectedWallets(t *testing.T) {
2524
status, body := testGet(t, "/v1/users/"+trashid.MustEncodeHashID(2)+"/connected_wallets")
2625
assert.Equal(t, 200, status)
27-
assert.True(t, strings.Contains(string(body), `spl_wallets`))
28-
assert.True(t, strings.Contains(string(body), `erc_wallets`))
26+
jsonAssert(t, body, map[string]string{
27+
"data.erc_wallets": `["0x1111111111111111111111111111111111111111","0x2222222222222222222222222222222222222222"]`,
28+
"data.spl_wallets": `["sol44444444444444444444444444444444444444444","sol55555555555555555555555555555555555555555"]`,
29+
})
30+
}
31+
32+
func TestGetUserConnectedWalletsEmpty(t *testing.T) {
33+
status, body := testGet(t, "/v1/users/"+trashid.MustEncodeHashID(4)+"/connected_wallets")
34+
assert.Equal(t, 200, status)
35+
jsonAssert(t, body, map[string]string{
36+
"data.spl_wallets": "[]",
37+
"data.erc_wallets": "[]",
38+
})
2939
}

‎config/config.go‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import (
1010
type Config struct {
1111
Env string
1212
DbUrl string
13+
Nodes []string
14+
DeadNodes []string
1315
DelegatePrivateKey string
1416
AxiomToken string
1517
AxiomDataset string
@@ -52,6 +54,15 @@ func init() {
5254
"https://discoveryprovider3.staging.audius.co",
5355
"https://discoveryprovider5.staging.audius.co",
5456
}
57+
Cfg.Nodes = []string{
58+
"https://creatornode11.staging.audius.co",
59+
"https://creatornode12.staging.audius.co",
60+
"https://creatornode5.staging.audius.co",
61+
"https://creatornode6.staging.audius.co",
62+
"https://creatornode7.staging.audius.co",
63+
"https://creatornode9.staging.audius.co",
64+
}
65+
Cfg.DeadNodes = []string{}
5566
case "prod":
5667
fallthrough
5768
case "production":
@@ -64,6 +75,87 @@ func init() {
6475
"https://discoveryprovider2.audius.co",
6576
"https://discoveryprovider3.audius.co",
6677
}
78+
Cfg.Nodes = []string{
79+
"https://creatornode.audius.co",
80+
"https://creatornode2.audius.co",
81+
"https://creatornode3.audius.co",
82+
"https://audius-content-1.figment.io",
83+
"https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud",
84+
"https://audius-content-2.figment.io",
85+
"https://audius-content-3.figment.io",
86+
"https://audius-content-4.figment.io",
87+
"https://audius-content-5.figment.io",
88+
"https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud",
89+
"https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud",
90+
"https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
91+
"https://audius-content-6.figment.io",
92+
"https://audius-content-7.figment.io",
93+
"https://audius-content-8.figment.io",
94+
"https://audius-content-9.figment.io",
95+
"https://audius-content-10.figment.io",
96+
"https://audius-content-11.figment.io",
97+
"https://content.grassfed.network",
98+
"https://blockdaemon-audius-content-01.bdnodes.net",
99+
"https://audius-content-1.cultur3stake.com",
100+
"https://audius-content-2.cultur3stake.com",
101+
"https://audius-content-3.cultur3stake.com",
102+
"https://audius-content-4.cultur3stake.com",
103+
"https://audius-content-5.cultur3stake.com",
104+
"https://audius-content-6.cultur3stake.com",
105+
"https://audius-content-7.cultur3stake.com",
106+
"https://blockdaemon-audius-content-02.bdnodes.net",
107+
"https://blockdaemon-audius-content-03.bdnodes.net",
108+
"https://blockdaemon-audius-content-04.bdnodes.net",
109+
"https://blockdaemon-audius-content-05.bdnodes.net",
110+
"https://blockdaemon-audius-content-06.bdnodes.net",
111+
"https://blockdaemon-audius-content-07.bdnodes.net",
112+
"https://blockdaemon-audius-content-08.bdnodes.net",
113+
"https://blockdaemon-audius-content-09.bdnodes.net",
114+
"https://audius-content-8.cultur3stake.com",
115+
"https://blockchange-audius-content-01.bdnodes.net",
116+
"https://blockchange-audius-content-02.bdnodes.net",
117+
"https://blockchange-audius-content-03.bdnodes.net",
118+
"https://audius-content-9.cultur3stake.com",
119+
"https://audius-content-10.cultur3stake.com",
120+
"https://audius-content-11.cultur3stake.com",
121+
"https://audius-content-12.cultur3stake.com",
122+
"https://audius-content-13.cultur3stake.com",
123+
"https://audius-content-14.cultur3stake.com",
124+
"https://audius-content-15.cultur3stake.com",
125+
"https://audius-content-16.cultur3stake.com",
126+
"https://audius-content-17.cultur3stake.com",
127+
"https://audius-content-18.cultur3stake.com",
128+
"https://audius-content-12.figment.io",
129+
"https://cn0.mainnet.audiusindex.org",
130+
"https://cn1.mainnet.audiusindex.org",
131+
"https://cn2.mainnet.audiusindex.org",
132+
"https://cn3.mainnet.audiusindex.org",
133+
"https://audius-content-13.figment.io",
134+
"https://audius-content-14.figment.io",
135+
"https://cn4.mainnet.audiusindex.org",
136+
"https://audius-creator-1.theblueprint.xyz",
137+
"https://audius-creator-2.theblueprint.xyz",
138+
"https://audius-creator-3.theblueprint.xyz",
139+
"https://audius-creator-4.theblueprint.xyz",
140+
"https://audius-creator-5.theblueprint.xyz",
141+
"https://audius-creator-6.theblueprint.xyz",
142+
"https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud",
143+
"https://cn1.stuffisup.com",
144+
"https://audius-cn1.tikilabs.com",
145+
"https://audius-creator-7.theblueprint.xyz",
146+
"https://cn1.shakespearetech.com",
147+
"https://cn2.shakespearetech.com",
148+
"https://cn3.shakespearetech.com",
149+
"https://audius-creator-8.theblueprint.xyz",
150+
"https://audius-creator-9.theblueprint.xyz",
151+
"https://audius-creator-10.theblueprint.xyz",
152+
"https://audius-creator-11.theblueprint.xyz",
153+
"https://audius-creator-12.theblueprint.xyz",
154+
"https://audius-creator-13.theblueprint.xyz",
155+
}
156+
Cfg.DeadNodes = []string{
157+
"https://content.grassfed.network",
158+
}
67159
default:
68160
log.Fatalf("Unknown environment: %s", env)
69161
}

‎rendezvous/rendezvous.go‎

Lines changed: 4 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -8,105 +8,17 @@ import (
88
"io"
99
"math/rand"
1010
"net/url"
11-
"os"
1211
"slices"
1312
"sort"
1413
"strings"
14+
15+
"bridgerton.audius.co/config"
1516
)
1617

1718
var GlobalHasher *RendezvousHasher
1819

1920
func init() {
20-
hostList := []string{
21-
"https://creatornode.audius.co",
22-
"https://creatornode2.audius.co",
23-
"https://creatornode3.audius.co",
24-
"https://audius-content-1.figment.io",
25-
"https://creatornode.audius.prod-eks-ap-northeast-1.staked.cloud",
26-
"https://audius-content-2.figment.io",
27-
"https://audius-content-3.figment.io",
28-
"https://audius-content-4.figment.io",
29-
"https://audius-content-5.figment.io",
30-
"https://creatornode.audius1.prod-eks-ap-northeast-1.staked.cloud",
31-
"https://creatornode.audius2.prod-eks-ap-northeast-1.staked.cloud",
32-
"https://creatornode.audius3.prod-eks-ap-northeast-1.staked.cloud",
33-
"https://audius-content-6.figment.io",
34-
"https://audius-content-7.figment.io",
35-
"https://audius-content-8.figment.io",
36-
"https://audius-content-9.figment.io",
37-
"https://audius-content-10.figment.io",
38-
"https://audius-content-11.figment.io",
39-
"https://content.grassfed.network",
40-
"https://blockdaemon-audius-content-01.bdnodes.net",
41-
"https://audius-content-1.cultur3stake.com",
42-
"https://audius-content-2.cultur3stake.com",
43-
"https://audius-content-3.cultur3stake.com",
44-
"https://audius-content-4.cultur3stake.com",
45-
"https://audius-content-5.cultur3stake.com",
46-
"https://audius-content-6.cultur3stake.com",
47-
"https://audius-content-7.cultur3stake.com",
48-
"https://blockdaemon-audius-content-02.bdnodes.net",
49-
"https://blockdaemon-audius-content-03.bdnodes.net",
50-
"https://blockdaemon-audius-content-04.bdnodes.net",
51-
"https://blockdaemon-audius-content-05.bdnodes.net",
52-
"https://blockdaemon-audius-content-06.bdnodes.net",
53-
"https://blockdaemon-audius-content-07.bdnodes.net",
54-
"https://blockdaemon-audius-content-08.bdnodes.net",
55-
"https://blockdaemon-audius-content-09.bdnodes.net",
56-
"https://audius-content-8.cultur3stake.com",
57-
"https://blockchange-audius-content-01.bdnodes.net",
58-
"https://blockchange-audius-content-02.bdnodes.net",
59-
"https://blockchange-audius-content-03.bdnodes.net",
60-
"https://audius-content-9.cultur3stake.com",
61-
"https://audius-content-10.cultur3stake.com",
62-
"https://audius-content-11.cultur3stake.com",
63-
"https://audius-content-12.cultur3stake.com",
64-
"https://audius-content-13.cultur3stake.com",
65-
"https://audius-content-14.cultur3stake.com",
66-
"https://audius-content-15.cultur3stake.com",
67-
"https://audius-content-16.cultur3stake.com",
68-
"https://audius-content-17.cultur3stake.com",
69-
"https://audius-content-18.cultur3stake.com",
70-
"https://audius-content-12.figment.io",
71-
"https://cn0.mainnet.audiusindex.org",
72-
"https://cn1.mainnet.audiusindex.org",
73-
"https://cn2.mainnet.audiusindex.org",
74-
"https://cn3.mainnet.audiusindex.org",
75-
"https://audius-content-13.figment.io",
76-
"https://audius-content-14.figment.io",
77-
"https://cn4.mainnet.audiusindex.org",
78-
"https://audius-creator-1.theblueprint.xyz",
79-
"https://audius-creator-2.theblueprint.xyz",
80-
"https://audius-creator-3.theblueprint.xyz",
81-
"https://audius-creator-4.theblueprint.xyz",
82-
"https://audius-creator-5.theblueprint.xyz",
83-
"https://audius-creator-6.theblueprint.xyz",
84-
"https://creatornode.audius8.prod-eks-ap-northeast-1.staked.cloud",
85-
"https://cn1.stuffisup.com",
86-
"https://audius-cn1.tikilabs.com",
87-
"https://audius-creator-7.theblueprint.xyz",
88-
"https://cn1.shakespearetech.com",
89-
"https://cn2.shakespearetech.com",
90-
"https://cn3.shakespearetech.com",
91-
"https://audius-creator-8.theblueprint.xyz",
92-
"https://audius-creator-9.theblueprint.xyz",
93-
"https://audius-creator-10.theblueprint.xyz",
94-
"https://audius-creator-11.theblueprint.xyz",
95-
"https://audius-creator-12.theblueprint.xyz",
96-
"https://audius-creator-13.theblueprint.xyz",
97-
}
98-
if os.Getenv("ENV") == "stage" {
99-
hostList = []string{
100-
"https://creatornode11.staging.audius.co",
101-
"https://creatornode12.staging.audius.co",
102-
"https://creatornode5.staging.audius.co",
103-
"https://creatornode6.staging.audius.co",
104-
"https://creatornode7.staging.audius.co",
105-
"https://creatornode9.staging.audius.co",
106-
}
107-
}
108-
109-
GlobalHasher = NewRendezvousHasher(hostList)
21+
GlobalHasher = NewRendezvousHasher(config.Cfg.Nodes)
11022
}
11123

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

12941
func NewRendezvousHasher(hosts []string) *RendezvousHasher {
130-
deadHosts := "https://content.grassfed.network/"
42+
deadHosts := strings.Join(config.Cfg.DeadNodes, ",")
13143
liveHosts := make([]string, 0, len(hosts))
13244
for _, h := range hosts {
13345
// dead host

0 commit comments

Comments
 (0)