Skip to content

Commit d2795bc

Browse files
friofryfriofry
committed
chore(config)_: Integration of new RPC Provider configurations
* default_networks.go * explicit provider initialization with more granular config (rps limiter, order) * token overrides made more flexible, support not only infura and grove * get_status_node.go * override status-proxy auth instead of passing override config to rpc/client.go * config.go * ProviderConfig removed * client.go * Now any provider can be enabled/disabled (if user wants to use only his custom RPC urls) * Use bearer auth instead of URL auth * Provider order is defined by default_networks.go
1 parent 50ee868 commit d2795bc

23 files changed

+586
-747
lines changed

‎api/default_networks.go

+110-77
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package api
22

33
import (
44
"fmt"
5-
"strings"
65

76
"github.com/ethereum/go-ethereum/common"
87
"github.com/status-im/status-go/params"
8+
"github.com/status-im/status-go/params/networkhelper"
99
"github.com/status-im/status-go/protocol/requests"
1010
)
1111

@@ -22,15 +22,29 @@ const (
2222

2323
var ganacheTokenAddress = common.HexToAddress("0x8571Ddc46b10d31EF963aF49b6C7799Ea7eff818")
2424

25+
func proxyUrl(stageName, provider, chainName, networkName string) string {
26+
return fmt.Sprintf("https://%s.api.status.im/%s/%s/%s/", stageName, provider, chainName, networkName)
27+
}
28+
2529
func mainnet(stageName string) params.Network {
30+
chainID := mainnetChainID
31+
chainName := "ethereum"
32+
networkName := "mainnet"
33+
34+
rpcProviders := []params.RpcProvider{
35+
// Proxy providers
36+
*params.NewProxyProvider(chainID, "proxy-nodefleet", proxyUrl(stageName, "nodefleet", chainName, networkName), false),
37+
*params.NewProxyProvider(chainID, "proxy-infura", proxyUrl(stageName, "infura", chainName, networkName), false),
38+
*params.NewProxyProvider(chainID, "proxy-grove", proxyUrl(stageName, "grove", chainName, networkName), false),
39+
// Direct providers
40+
*params.NewDirectProvider(chainID, "direct-infura", "https://mainnet.infura.io/v3/", true),
41+
*params.NewDirectProvider(chainID, "direct-grove", "https://eth-archival.rpc.grove.city/v1/", false),
42+
}
43+
2644
return params.Network{
27-
ChainID: mainnetChainID,
45+
ChainID: chainID,
2846
ChainName: "Mainnet",
29-
DefaultRPCURL: fmt.Sprintf("https://%s.api.status.im/nodefleet/ethereum/mainnet/", stageName),
30-
DefaultFallbackURL: fmt.Sprintf("https://%s.api.status.im/infura/ethereum/mainnet/", stageName),
31-
DefaultFallbackURL2: fmt.Sprintf("https://%s.api.status.im/grove/ethereum/mainnet/", stageName),
32-
RPCURL: "https://mainnet.infura.io/v3/",
33-
FallbackURL: "https://eth-archival.rpc.grove.city/v1/",
47+
RpcProviders: rpcProviders,
3448
BlockExplorerURL: "https://etherscan.io/",
3549
IconURL: "network/Network=Ethereum",
3650
ChainColor: "#627EEA",
@@ -44,16 +58,25 @@ func mainnet(stageName string) params.Network {
4458
RelatedChainID: sepoliaChainID,
4559
}
4660
}
47-
4861
func sepolia(stageName string) params.Network {
62+
chainID := sepoliaChainID
63+
chainName := "ethereum"
64+
networkName := "sepolia"
65+
66+
rpcProviders := []params.RpcProvider{
67+
// Proxy providers
68+
*params.NewProxyProvider(chainID, "proxy-nodefleet", proxyUrl(stageName, "nodefleet", chainName, networkName), false),
69+
*params.NewProxyProvider(chainID, "proxy-infura", proxyUrl(stageName, "infura", chainName, networkName), false),
70+
*params.NewProxyProvider(chainID, "proxy-grove", proxyUrl(stageName, "grove", chainName, networkName), true),
71+
// Direct providers
72+
*params.NewDirectProvider(chainID, "direct-infura", "https://sepolia.infura.io/v3/", true),
73+
*params.NewDirectProvider(chainID, "direct-grove", "https://sepolia-archival.rpc.grove.city/v1/", false),
74+
}
75+
4976
return params.Network{
50-
ChainID: sepoliaChainID,
51-
ChainName: "Mainnet",
52-
DefaultRPCURL: fmt.Sprintf("https://%s.api.status.im/nodefleet/ethereum/sepolia/", stageName),
53-
DefaultFallbackURL: fmt.Sprintf("https://%s.api.status.im/infura/ethereum/sepolia/", stageName),
54-
DefaultFallbackURL2: fmt.Sprintf("https://%s.api.status.im/grove/ethereum/sepolia/", stageName),
55-
RPCURL: "https://sepolia.infura.io/v3/",
56-
FallbackURL: "https://sepolia-archival.rpc.grove.city/v1/",
77+
ChainID: chainID,
78+
ChainName: "Sepolia",
79+
RpcProviders: rpcProviders,
5780
BlockExplorerURL: "https://sepolia.etherscan.io/",
5881
IconURL: "network/Network=Ethereum",
5982
ChainColor: "#627EEA",
@@ -67,16 +90,25 @@ func sepolia(stageName string) params.Network {
6790
RelatedChainID: mainnetChainID,
6891
}
6992
}
70-
7193
func optimism(stageName string) params.Network {
94+
chainID := optimismChainID
95+
chainName := "optimism"
96+
networkName := "mainnet"
97+
98+
rpcProviders := []params.RpcProvider{
99+
// Proxy providers
100+
*params.NewProxyProvider(chainID, "proxy-nodefleet", proxyUrl(stageName, "nodefleet", chainName, networkName), false),
101+
*params.NewProxyProvider(chainID, "proxy-infura", proxyUrl(stageName, "infura", chainName, networkName), false),
102+
*params.NewProxyProvider(chainID, "proxy-grove", proxyUrl(stageName, "grove", chainName, networkName), true),
103+
// Direct providers
104+
*params.NewDirectProvider(chainID, "direct-infura", "https://optimism-mainnet.infura.io/v3/", true),
105+
*params.NewDirectProvider(chainID, "direct-grove", "https://optimism-archival.rpc.grove.city/v1/", false),
106+
}
107+
72108
return params.Network{
73-
ChainID: optimismChainID,
109+
ChainID: chainID,
74110
ChainName: "Optimism",
75-
DefaultRPCURL: fmt.Sprintf("https://%s.api.status.im/nodefleet/optimism/mainnet/", stageName),
76-
DefaultFallbackURL: fmt.Sprintf("https://%s.api.status.im/infura/optimism/mainnet/", stageName),
77-
DefaultFallbackURL2: fmt.Sprintf("https://%s.api.status.im/grove/optimism/mainnet/", stageName),
78-
RPCURL: "https://optimism-mainnet.infura.io/v3/",
79-
FallbackURL: "https://optimism-archival.rpc.grove.city/v1/",
111+
RpcProviders: rpcProviders,
80112
BlockExplorerURL: "https://optimistic.etherscan.io",
81113
IconURL: "network/Network=Optimism",
82114
ChainColor: "#E90101",
@@ -90,16 +122,25 @@ func optimism(stageName string) params.Network {
90122
RelatedChainID: optimismSepoliaChainID,
91123
}
92124
}
93-
94125
func optimismSepolia(stageName string) params.Network {
126+
chainID := optimismSepoliaChainID
127+
chainName := "optimism"
128+
networkName := "sepolia"
129+
130+
rpcProviders := []params.RpcProvider{
131+
// Proxy providers
132+
*params.NewProxyProvider(chainID, "proxy-nodefleet", proxyUrl(stageName, "nodefleet", chainName, networkName), false),
133+
*params.NewProxyProvider(chainID, "proxy-infura", proxyUrl(stageName, "infura", chainName, networkName), false),
134+
*params.NewProxyProvider(chainID, "proxy-grove", proxyUrl(stageName, "grove", chainName, networkName), true),
135+
// Direct providers
136+
*params.NewDirectProvider(chainID, "direct-infura", "https://optimism-sepolia.infura.io/v3/", true),
137+
*params.NewDirectProvider(chainID, "direct-grove", "https://optimism-sepolia-archival.rpc.grove.city/v1/", false),
138+
}
139+
95140
return params.Network{
96-
ChainID: optimismSepoliaChainID,
141+
ChainID: chainID,
97142
ChainName: "Optimism",
98-
DefaultRPCURL: fmt.Sprintf("https://%s.api.status.im/nodefleet/optimism/sepolia/", stageName),
99-
DefaultFallbackURL: fmt.Sprintf("https://%s.api.status.im/infura/optimism/sepolia/", stageName),
100-
DefaultFallbackURL2: fmt.Sprintf("https://%s.api.status.im/grove/optimism/sepolia/", stageName),
101-
RPCURL: "https://optimism-sepolia.infura.io/v3/",
102-
FallbackURL: "https://optimism-sepolia-archival.rpc.grove.city/v1/",
143+
RpcProviders: rpcProviders,
103144
BlockExplorerURL: "https://sepolia-optimism.etherscan.io/",
104145
IconURL: "network/Network=Optimism",
105146
ChainColor: "#E90101",
@@ -113,16 +154,25 @@ func optimismSepolia(stageName string) params.Network {
113154
RelatedChainID: optimismChainID,
114155
}
115156
}
116-
117157
func arbitrum(stageName string) params.Network {
158+
chainID := arbitrumChainID
159+
chainName := "arbitrum"
160+
networkName := "mainnet"
161+
162+
rpcProviders := []params.RpcProvider{
163+
// Proxy providers
164+
*params.NewProxyProvider(chainID, "proxy-nodefleet", proxyUrl(stageName, "nodefleet", chainName, networkName), false),
165+
*params.NewProxyProvider(chainID, "proxy-infura", proxyUrl(stageName, "infura", chainName, networkName), false),
166+
*params.NewProxyProvider(chainID, "proxy-grove", proxyUrl(stageName, "grove", chainName, networkName), true),
167+
// Direct providers
168+
*params.NewDirectProvider(chainID, "direct-infura", "https://arbitrum-mainnet.infura.io/v3/", true),
169+
*params.NewDirectProvider(chainID, "direct-grove", "https://arbitrum-one.rpc.grove.city/v1/", false),
170+
}
171+
118172
return params.Network{
119-
ChainID: arbitrumChainID,
173+
ChainID: chainID,
120174
ChainName: "Arbitrum",
121-
DefaultRPCURL: fmt.Sprintf("https://%s.api.status.im/nodefleet/arbitrum/mainnet/", stageName),
122-
DefaultFallbackURL: fmt.Sprintf("https://%s.api.status.im/infura/arbitrum/mainnet/", stageName),
123-
DefaultFallbackURL2: fmt.Sprintf("https://%s.api.status.im/grove/arbitrum/mainnet/", stageName),
124-
RPCURL: "https://arbitrum-mainnet.infura.io/v3/",
125-
FallbackURL: "https://arbitrum-one.rpc.grove.city/v1/",
175+
RpcProviders: rpcProviders,
126176
BlockExplorerURL: "https://arbiscan.io/",
127177
IconURL: "network/Network=Arbitrum",
128178
ChainColor: "#51D0F0",
@@ -136,16 +186,25 @@ func arbitrum(stageName string) params.Network {
136186
RelatedChainID: arbitrumSepoliaChainID,
137187
}
138188
}
139-
140189
func arbitrumSepolia(stageName string) params.Network {
190+
chainID := arbitrumSepoliaChainID
191+
chainName := "arbitrum"
192+
networkName := "sepolia"
193+
194+
rpcProviders := []params.RpcProvider{
195+
// Proxy providers
196+
*params.NewProxyProvider(chainID, "proxy-nodefleet", proxyUrl(stageName, "nodefleet", chainName, networkName), false),
197+
*params.NewProxyProvider(chainID, "proxy-infura", proxyUrl(stageName, "infura", chainName, networkName), false),
198+
*params.NewProxyProvider(chainID, "proxy-grove", proxyUrl(stageName, "grove", chainName, networkName), true),
199+
// Direct providers
200+
*params.NewDirectProvider(chainID, "direct-infura", "https://arbitrum-sepolia.infura.io/v3/", true),
201+
*params.NewDirectProvider(chainID, "direct-grove", "https://arbitrum-sepolia-archival.rpc.grove.city/v1/", false),
202+
}
203+
141204
return params.Network{
142-
ChainID: arbitrumSepoliaChainID,
205+
ChainID: chainID,
143206
ChainName: "Arbitrum",
144-
DefaultRPCURL: fmt.Sprintf("https://%s.api.status.im/nodefleet/arbitrum/sepolia/", stageName),
145-
DefaultFallbackURL: fmt.Sprintf("https://%s.api.status.im/infura/arbitrum/sepolia/", stageName),
146-
DefaultFallbackURL2: fmt.Sprintf("https://%s.api.status.im/grove/arbitrum/sepolia/", stageName),
147-
RPCURL: "https://arbitrum-sepolia.infura.io/v3/",
148-
FallbackURL: "https://arbitrum-sepolia-archival.rpc.grove.city/v1/",
207+
RpcProviders: rpcProviders,
149208
BlockExplorerURL: "https://sepolia-explorer.arbitrum.io/",
150209
IconURL: "network/Network=Arbitrum",
151210
ChainColor: "#51D0F0",
@@ -177,44 +236,18 @@ var mainnetGanacheTokenOverrides = params.TokenOverride{
177236
}
178237

179238
func setRPCs(networks []params.Network, request *requests.WalletSecretsConfig) []params.Network {
180-
181-
var networksWithRPC []params.Network
182-
183-
const (
184-
infura = "infura.io/"
185-
grove = "grove.city/"
186-
)
187-
188-
appendToken := func(url string) string {
189-
if strings.Contains(url, infura) && request.InfuraToken != "" {
190-
return url + request.InfuraToken
191-
} else if strings.Contains(url, grove) && request.PoktToken != "" {
192-
return url + request.PoktToken
193-
}
194-
return url
239+
authTokens := map[string]string{
240+
"infura.io": request.InfuraToken,
241+
"grove.city": request.PoktToken,
195242
}
196243

197-
for _, n := range networks {
198-
n.DefaultRPCURL = appendToken(n.DefaultRPCURL)
199-
n.DefaultFallbackURL = appendToken(n.DefaultFallbackURL)
200-
n.DefaultFallbackURL2 = appendToken(n.DefaultFallbackURL2)
201-
n.RPCURL = appendToken(n.RPCURL)
202-
n.FallbackURL = appendToken(n.FallbackURL)
203-
204-
if request.GanacheURL != "" {
205-
n.RPCURL = request.GanacheURL
206-
n.FallbackURL = request.GanacheURL
207-
if n.ChainID == mainnetChainID {
208-
n.TokenOverrides = []params.TokenOverride{
209-
mainnetGanacheTokenOverrides,
210-
}
211-
}
212-
}
213-
214-
networksWithRPC = append(networksWithRPC, n)
244+
updatedNetworks := networkhelper.OverrideDirectProvidersAuth(networks, authTokens)
245+
246+
if request.GanacheURL != "" {
247+
updatedNetworks = networkhelper.OverrideGanacheToken(updatedNetworks, request.GanacheURL, mainnetChainID, mainnetGanacheTokenOverrides)
215248
}
216249

217-
return networksWithRPC
250+
return updatedNetworks
218251
}
219252

220253
func BuildDefaultNetworks(walletSecretsConfig *requests.WalletSecretsConfig) []params.Network {

‎node/get_status_node.go

+10-11
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import (
1111
"reflect"
1212
"sync"
1313

14+
"github.com/status-im/status-go/params/networkhelper"
15+
1416
"github.com/syndtr/goleveldb/leveldb"
1517
"go.uber.org/zap"
1618

@@ -336,25 +338,22 @@ func (n *StatusNode) setupRPCClient() (err error) {
336338
return
337339
}
338340

339-
// ProviderConfigs should be passed not in wallet secrets config on login
341+
// Proxy AuthConfigs should be passed not in wallet secrets config on login
340342
// but some other way, as it's not wallet specific and should not be passed with login request
341343
// but currently there is no other way to pass it
342-
providerConfigs := []params.ProviderConfig{
343-
{
344-
Enabled: n.config.WalletConfig.StatusProxyEnabled,
345-
Name: rpc.ProviderStatusProxy,
346-
User: n.config.WalletConfig.StatusProxyBlockchainUser,
347-
Password: n.config.WalletConfig.StatusProxyBlockchainPassword,
348-
},
349-
}
344+
// (maybe move to default_networks.go)
345+
networks := networkhelper.OverrideEmbeddedProxyProviders(
346+
n.config.Networks,
347+
n.config.WalletConfig.StatusProxyEnabled,
348+
n.config.WalletConfig.StatusProxyBlockchainUser,
349+
n.config.WalletConfig.StatusProxyBlockchainPassword)
350350

351351
config := rpc.ClientConfig{
352352
Client: gethNodeClient,
353353
UpstreamChainID: n.config.NetworkID,
354-
Networks: n.config.Networks,
354+
Networks: networks,
355355
DB: n.appDB,
356356
WalletFeed: &n.walletFeed,
357-
ProviderConfigs: providerConfigs,
358357
}
359358
n.rpcClient, err = rpc.NewClient(config)
360359
n.rpcClient.Start(context.Background())

‎params/config.go

-15
Original file line numberDiff line numberDiff line change
@@ -293,21 +293,6 @@ func NewLimits(min, max int) Limits {
293293
}
294294
}
295295

296-
type ProviderConfig struct {
297-
// Enabled flag specifies whether feature is enabled
298-
Enabled bool `validate:"required"`
299-
300-
// To identify provider
301-
Name string `validate:"required"`
302-
303-
// URL sets the rpc upstream host address for communication with
304-
// a non-local infura endpoint.
305-
User string `json:",omitempty"`
306-
Password string `json:",omitempty"`
307-
APIKey string `json:"APIKey,omitempty"`
308-
APIKeySecret string `json:"APIKeySecret,omitempty"`
309-
}
310-
311296
// ----------
312297
// NodeConfig
313298
// ----------

0 commit comments

Comments
 (0)