Skip to content

Commit 4c7c8af

Browse files
friofryfriofry
committed
chore: remove CryptoCompare market provider
Drop CryptoCompare provider wiring and its tests, and remove market proxy credentials that were only used by the CryptoCompare proxy path.
1 parent ad9d583 commit 4c7c8af

13 files changed

Lines changed: 20 additions & 852 deletions

File tree

‎internal/logutils/callog/status_request_log.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ var sensitiveKeys = []string{
3838
"alchemyApiKey",
3939
"AlchemyApiKey",
4040
"openSeaApiKey",
41-
"statusProxyMarketUser",
42-
"statusProxyMarketPassword",
4341
"marketDataProxyUser",
4442
"marketDataProxyPassword",
4543
"statusProxyBlockchainUser",

‎params/config.go‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -221,21 +221,18 @@ type NodeConfig struct {
221221

222222
// WalletConfig extra configuration for wallet.Service.
223223
type WalletConfig struct {
224-
Enabled bool
225-
RaribleMainnetAPIKey security.SensitiveString `json:"RaribleMainnetAPIKey"`
226-
RaribleTestnetAPIKey security.SensitiveString `json:"RaribleTestnetAPIKey"`
227-
AlchemyAPIKey security.SensitiveString `json:"AlchemyAPIKey"`
228-
InfuraAPIKey security.SensitiveString `json:"InfuraAPIKey"`
229-
InfuraAPIKeySecret security.SensitiveString `json:"InfuraAPIKeySecret"`
230-
StatusProxyMarketUser security.SensitiveString `json:"StatusProxyMarketUser"`
231-
StatusProxyMarketPassword security.SensitiveString `json:"StatusProxyMarketPassword"`
232-
CoingeckoAPIKey security.SensitiveString `json:"CoingeckoAPIKey"`
233-
CoingeckoDemoAPIKey security.SensitiveString `json:"CoingeckoDemoAPIKey"`
234-
MarketDataProxyConfig MarketDataProxyConfig `json:"MarketDataProxyConfig"`
235-
NftProxyConfig NftProxyConfig `json:"NftProxyConfig"`
236-
237-
StatusProxyUser security.SensitiveString `json:"StatusProxyBlockchainUser"`
238-
StatusProxyPassword security.SensitiveString `json:"StatusProxyBlockchainPassword"`
224+
Enabled bool
225+
RaribleMainnetAPIKey security.SensitiveString `json:"RaribleMainnetAPIKey"`
226+
RaribleTestnetAPIKey security.SensitiveString `json:"RaribleTestnetAPIKey"`
227+
AlchemyAPIKey security.SensitiveString `json:"AlchemyAPIKey"`
228+
InfuraAPIKey security.SensitiveString `json:"InfuraAPIKey"`
229+
InfuraAPIKeySecret security.SensitiveString `json:"InfuraAPIKeySecret"`
230+
CoingeckoAPIKey security.SensitiveString `json:"CoingeckoAPIKey"`
231+
CoingeckoDemoAPIKey security.SensitiveString `json:"CoingeckoDemoAPIKey"`
232+
MarketDataProxyConfig MarketDataProxyConfig `json:"MarketDataProxyConfig"`
233+
NftProxyConfig NftProxyConfig `json:"NftProxyConfig"`
234+
StatusProxyUser security.SensitiveString `json:"StatusProxyBlockchainUser"`
235+
StatusProxyPassword security.SensitiveString `json:"StatusProxyBlockchainPassword"`
239236

240237
StatusProxyStageName string `json:"StatusProxyStageName"`
241238
EnableMercuryoProvider bool `json:"EnableMercuryoProvider"`

‎pkg/backend/defaults.go‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,6 @@ func buildWalletConfig(walletRequest *requests.WalletConfig, request *requests.W
185185
walletConfig.AlchemyAPIKey = request.AlchemyAPIKey
186186
}
187187

188-
if !request.StatusProxyMarketUser.Empty() {
189-
walletConfig.StatusProxyMarketUser = request.StatusProxyMarketUser
190-
}
191-
if !request.StatusProxyMarketPassword.Empty() {
192-
walletConfig.StatusProxyMarketPassword = request.StatusProxyMarketPassword
193-
}
194188
if !request.MarketDataProxyUser.Empty() {
195189
walletConfig.MarketDataProxyConfig.User = request.MarketDataProxyUser
196190
}
@@ -224,7 +218,6 @@ func buildWalletConfig(walletRequest *requests.WalletConfig, request *requests.W
224218
if len(walletRequest.CustomTokens) > 0 {
225219
walletConfig.CustomTokens = walletRequest.CustomTokens
226220
}
227-
228221
if !request.StatusProxyUser.Empty() {
229222
walletConfig.StatusProxyUser = request.StatusProxyUser
230223
}

‎pkg/backend/node/status_node_services.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func (b *StatusNode) initServices(config *params.NodeConfig, mediaServer *server
9292
// Wallet Service is used by wakuExtSrvc/wakuV2ExtSrvc
9393
// Keep this initialization before the other two
9494
if config.WalletConfig.Enabled {
95-
err := b.createWalletService(accDB, b.appDB, b.accountsPublisher, &b.walletFeed, config.WalletConfig.StatusProxyStageName)
95+
err := b.createWalletService(accDB, b.appDB, b.accountsPublisher, &b.walletFeed)
9696
if err != nil {
9797
return err
9898
}
@@ -322,7 +322,7 @@ func (b *StatusNode) SetWalletCommunityInfoProvider(provider thirdparty.Communit
322322
}
323323
}
324324

325-
func (b *StatusNode) createWalletService(accountsDB *accounts.Database, appDB *sql.DB, accountsPublisher *pubsub.Publisher, walletFeed *event.Feed, statusProxyStageName string) (err error) {
325+
func (b *StatusNode) createWalletService(accountsDB *accounts.Database, appDB *sql.DB, accountsPublisher *pubsub.Publisher, walletFeed *event.Feed) (err error) {
326326
if b.walletSrvc == nil {
327327
b.walletSrvc, err = wallet.NewService(
328328
b.walletDB, accountsDB, appDB, b.rpcClient, accountsPublisher, b.gethAccountsManager, b.transactor, b.config,
@@ -331,7 +331,6 @@ func (b *StatusNode) createWalletService(accountsDB *accounts.Database, appDB *s
331331
walletFeed,
332332
b.mediaServer,
333333
b.tokenManager,
334-
statusProxyStageName,
335334
)
336335
}
337336
return

‎protocol/requests/create_account.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,14 @@ type WalletSecretsConfig struct {
111111
RaribleTestnetAPIKey security.SensitiveString `json:"raribleTestnetApiKey"`
112112
AlchemyAPIKey security.SensitiveString `json:"alchemyApiKey"`
113113

114-
StatusProxyStageName string `json:"statusProxyStageName"`
115-
StatusProxyMarketUser security.SensitiveString `json:"statusProxyMarketUser"`
116-
StatusProxyMarketPassword security.SensitiveString `json:"statusProxyMarketPassword"`
114+
StatusProxyStageName string `json:"statusProxyStageName"`
117115

118116
MarketDataProxyUrl security.SensitiveString `json:"marketDataProxyUrl"`
119117
MarketDataProxyUser security.SensitiveString `json:"marketDataProxyUser"`
120118
MarketDataProxyPassword security.SensitiveString `json:"marketDataProxyPassword"`
121119

122120
CoingeckoAPIKey security.SensitiveString `json:"coingeckoApiKey"`
123121
CoingeckoDemoAPIKey security.SensitiveString `json:"coingeckoDemoApiKey"`
124-
125122
StatusProxyUser security.SensitiveString `json:"statusProxyBlockchainUser"`
126123
StatusProxyPassword security.SensitiveString `json:"statusProxyBlockchainPassword"`
127124

‎services/wallet/api_impl_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func TestAPI_GetAddressDetails(t *testing.T) {
9090
tokenManager, err := token.NewTokenManager(db, c, nil, mockNetworkManager, appDB, nil, nil, nil, accountsDb, 0, 0)
9191
require.NoError(t, err)
9292

93-
service, err := NewService(db, accountsDb, appDB, c, accountsPublisher, nil, nil, &params.NodeConfig{}, nil, nil, nil, nil, tokenManager, "")
93+
service, err := NewService(db, accountsDb, appDB, c, accountsPublisher, nil, nil, &params.NodeConfig{}, nil, nil, nil, nil, tokenManager)
9494
require.NoError(t, err)
9595

9696
tokenbalancesFetcher := mock_tokenbalances.NewMockFetcherIface(mockCtrl)

‎services/wallet/keycard_pairings_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestKeycardPairingsFile(t *testing.T) {
3333
})
3434
require.NoError(t, err)
3535

36-
service, err := NewService(db, accountsDb, appDB, rpcClient, accountsPublisher, nil, nil, &params.NodeConfig{}, nil, nil, nil, nil, nil, "")
36+
service, err := NewService(db, accountsDb, appDB, rpcClient, accountsPublisher, nil, nil, &params.NodeConfig{}, nil, nil, nil, nil, nil)
3737
require.NoError(t, err)
3838

3939
data, err := service.KeycardPairings().GetPairingsJSONFileContent()

‎services/wallet/service.go‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"database/sql"
66
"encoding/json"
77
"errors"
8-
"fmt"
98
"net/http"
109
"sync"
1110
"time"
@@ -21,7 +20,6 @@ import (
2120
"github.com/status-im/status-go/services/wallet/common"
2221
"github.com/status-im/status-go/services/wallet/multistandardbalance"
2322
"github.com/status-im/status-go/services/wallet/pendingtxtracker"
24-
"github.com/status-im/status-go/services/wallet/thirdparty/market/cryptocompare"
2523
"github.com/status-im/status-go/services/wallet/tokenbalances"
2624
"github.com/status-im/status-go/services/wallet/transferdetector"
2725

@@ -131,7 +129,6 @@ func NewService(
131129
feed *event.Feed,
132130
mediaServer *server.MediaServer,
133131
tokenManager *token.Manager,
134-
statusProxyStageName string,
135132
) (*Service, error) {
136133
signals := &walletevent.SignalsTransmitter{
137134
Publisher: feed,
@@ -159,20 +156,13 @@ func NewService(
159156
onramp.NewMoonPayProvider(),
160157
}
161158

162-
cryptoCompare := cryptocompare.NewClient()
163159
coingeckoClient := coingecko.NewClientWithParams(coingecko.Params{
164160
CoingeckoAPIKey: config.WalletConfig.CoingeckoAPIKey,
165161
CoingeckoDemoAPIKey: config.WalletConfig.CoingeckoDemoAPIKey,
166162
})
167163
coingeckoProxy := createCoingeckoProxyClient(config.WalletConfig.MarketDataProxyConfig)
168-
cryptoCompareProxy := cryptocompare.NewClientWithParams(cryptocompare.Params{
169-
ID: fmt.Sprintf("%s-proxy", cryptoCompare.ID()),
170-
URL: fmt.Sprintf("https://%s.api.status.im/cryptocompare/", statusProxyStageName),
171-
User: config.WalletConfig.StatusProxyMarketUser,
172-
Password: config.WalletConfig.StatusProxyMarketPassword,
173-
})
174164
marketProviders = []thirdparty.MarketDataProvider{
175-
coingeckoProxy, coingeckoClient, cryptoCompare, cryptoCompareProxy,
165+
coingeckoProxy, coingeckoClient,
176166
}
177167

178168
raribleClient := rarible.NewClient(config.WalletConfig.RaribleMainnetAPIKey, config.WalletConfig.RaribleTestnetAPIKey)

0 commit comments

Comments
 (0)