Skip to content

chore: remove CryptoCompare market provider #7490

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

Open
friofry wants to merge 1 commit into
base: release/10.34.x
Choose a base branch
from
Open

chore: remove CryptoCompare market provider #7490

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
2 changes: 0 additions & 2 deletions internal/logutils/callog/status_request_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ var sensitiveKeys = []string{
"alchemyApiKey",
"AlchemyApiKey",
"openSeaApiKey",
"statusProxyMarketUser",
"statusProxyMarketPassword",
"marketDataProxyUser",
"marketDataProxyPassword",
"statusProxyBlockchainUser",
Expand Down
27 changes: 12 additions & 15 deletions params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,21 +221,18 @@ type NodeConfig struct {

// WalletConfig extra configuration for wallet.Service.
type WalletConfig struct {
Enabled bool
RaribleMainnetAPIKey security.SensitiveString `json:"RaribleMainnetAPIKey"`
RaribleTestnetAPIKey security.SensitiveString `json:"RaribleTestnetAPIKey"`
AlchemyAPIKey security.SensitiveString `json:"AlchemyAPIKey"`
InfuraAPIKey security.SensitiveString `json:"InfuraAPIKey"`
InfuraAPIKeySecret security.SensitiveString `json:"InfuraAPIKeySecret"`
StatusProxyMarketUser security.SensitiveString `json:"StatusProxyMarketUser"`
StatusProxyMarketPassword security.SensitiveString `json:"StatusProxyMarketPassword"`
CoingeckoAPIKey security.SensitiveString `json:"CoingeckoAPIKey"`
CoingeckoDemoAPIKey security.SensitiveString `json:"CoingeckoDemoAPIKey"`
MarketDataProxyConfig MarketDataProxyConfig `json:"MarketDataProxyConfig"`
NftProxyConfig NftProxyConfig `json:"NftProxyConfig"`

StatusProxyUser security.SensitiveString `json:"StatusProxyBlockchainUser"`
StatusProxyPassword security.SensitiveString `json:"StatusProxyBlockchainPassword"`
Enabled bool
RaribleMainnetAPIKey security.SensitiveString `json:"RaribleMainnetAPIKey"`
RaribleTestnetAPIKey security.SensitiveString `json:"RaribleTestnetAPIKey"`
AlchemyAPIKey security.SensitiveString `json:"AlchemyAPIKey"`
InfuraAPIKey security.SensitiveString `json:"InfuraAPIKey"`
InfuraAPIKeySecret security.SensitiveString `json:"InfuraAPIKeySecret"`
CoingeckoAPIKey security.SensitiveString `json:"CoingeckoAPIKey"`
CoingeckoDemoAPIKey security.SensitiveString `json:"CoingeckoDemoAPIKey"`
MarketDataProxyConfig MarketDataProxyConfig `json:"MarketDataProxyConfig"`
NftProxyConfig NftProxyConfig `json:"NftProxyConfig"`
StatusProxyUser security.SensitiveString `json:"StatusProxyBlockchainUser"`
StatusProxyPassword security.SensitiveString `json:"StatusProxyBlockchainPassword"`

StatusProxyStageName string `json:"StatusProxyStageName"`
EnableMercuryoProvider bool `json:"EnableMercuryoProvider"`
Expand Down
7 changes: 0 additions & 7 deletions pkg/backend/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,6 @@ func buildWalletConfig(walletRequest *requests.WalletConfig, request *requests.W
walletConfig.AlchemyAPIKey = request.AlchemyAPIKey
}

if !request.StatusProxyMarketUser.Empty() {
walletConfig.StatusProxyMarketUser = request.StatusProxyMarketUser
}
if !request.StatusProxyMarketPassword.Empty() {
walletConfig.StatusProxyMarketPassword = request.StatusProxyMarketPassword
}
if !request.MarketDataProxyUser.Empty() {
walletConfig.MarketDataProxyConfig.User = request.MarketDataProxyUser
}
Expand Down Expand Up @@ -224,7 +218,6 @@ func buildWalletConfig(walletRequest *requests.WalletConfig, request *requests.W
if len(walletRequest.CustomTokens) > 0 {
walletConfig.CustomTokens = walletRequest.CustomTokens
}

if !request.StatusProxyUser.Empty() {
walletConfig.StatusProxyUser = request.StatusProxyUser
}
Expand Down
5 changes: 2 additions & 3 deletions pkg/backend/node/status_node_services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func (b *StatusNode) initServices(config *params.NodeConfig, mediaServer *server
// Wallet Service is used by wakuExtSrvc/wakuV2ExtSrvc
// Keep this initialization before the other two
if config.WalletConfig.Enabled {
err := b.createWalletService(accDB, b.appDB, b.accountsPublisher, &b.walletFeed, config.WalletConfig.StatusProxyStageName)
err := b.createWalletService(accDB, b.appDB, b.accountsPublisher, &b.walletFeed)
if err != nil {
return err
}
Expand Down Expand Up @@ -322,7 +322,7 @@ func (b *StatusNode) SetWalletCommunityInfoProvider(provider thirdparty.Communit
}
}

func (b *StatusNode) createWalletService(accountsDB *accounts.Database, appDB *sql.DB, accountsPublisher *pubsub.Publisher, walletFeed *event.Feed, statusProxyStageName string) (err error) {
func (b *StatusNode) createWalletService(accountsDB *accounts.Database, appDB *sql.DB, accountsPublisher *pubsub.Publisher, walletFeed *event.Feed) (err error) {
if b.walletSrvc == nil {
b.walletSrvc, err = wallet.NewService(
b.walletDB, accountsDB, appDB, b.rpcClient, accountsPublisher, b.gethAccountsManager, b.transactor, b.config,
Expand All @@ -331,7 +331,6 @@ func (b *StatusNode) createWalletService(accountsDB *accounts.Database, appDB *s
walletFeed,
b.mediaServer,
b.tokenManager,
statusProxyStageName,
)
}
return
Expand Down
5 changes: 1 addition & 4 deletions protocol/requests/create_account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,14 @@ type WalletSecretsConfig struct {
RaribleTestnetAPIKey security.SensitiveString `json:"raribleTestnetApiKey"`
AlchemyAPIKey security.SensitiveString `json:"alchemyApiKey"`

StatusProxyStageName string `json:"statusProxyStageName"`
StatusProxyMarketUser security.SensitiveString `json:"statusProxyMarketUser"`
StatusProxyMarketPassword security.SensitiveString `json:"statusProxyMarketPassword"`
StatusProxyStageName string `json:"statusProxyStageName"`

MarketDataProxyUrl security.SensitiveString `json:"marketDataProxyUrl"`
MarketDataProxyUser security.SensitiveString `json:"marketDataProxyUser"`
MarketDataProxyPassword security.SensitiveString `json:"marketDataProxyPassword"`

CoingeckoAPIKey security.SensitiveString `json:"coingeckoApiKey"`
CoingeckoDemoAPIKey security.SensitiveString `json:"coingeckoDemoApiKey"`

StatusProxyUser security.SensitiveString `json:"statusProxyBlockchainUser"`
StatusProxyPassword security.SensitiveString `json:"statusProxyBlockchainPassword"`

Expand Down
2 changes: 1 addition & 1 deletion services/wallet/api_impl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func TestAPI_GetAddressDetails(t *testing.T) {
tokenManager, err := token.NewTokenManager(db, c, nil, mockNetworkManager, appDB, nil, nil, nil, accountsDb, 0, 0)
require.NoError(t, err)

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

tokenbalancesFetcher := mock_tokenbalances.NewMockFetcherIface(mockCtrl)
Expand Down
2 changes: 1 addition & 1 deletion services/wallet/keycard_pairings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func TestKeycardPairingsFile(t *testing.T) {
})
require.NoError(t, err)

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

data, err := service.KeycardPairings().GetPairingsJSONFileContent()
Expand Down
12 changes: 1 addition & 11 deletions services/wallet/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"database/sql"
"encoding/json"
"errors"
"fmt"
"net/http"
"sync"
"time"
Expand All @@ -21,7 +20,6 @@ import (
"github.com/status-im/status-go/services/wallet/common"
"github.com/status-im/status-go/services/wallet/multistandardbalance"
"github.com/status-im/status-go/services/wallet/pendingtxtracker"
"github.com/status-im/status-go/services/wallet/thirdparty/market/cryptocompare"
"github.com/status-im/status-go/services/wallet/tokenbalances"
"github.com/status-im/status-go/services/wallet/transferdetector"

Expand Down Expand Up @@ -131,7 +129,6 @@ func NewService(
feed *event.Feed,
mediaServer *server.MediaServer,
tokenManager *token.Manager,
statusProxyStageName string,
) (*Service, error) {
signals := &walletevent.SignalsTransmitter{
Publisher: feed,
Expand Down Expand Up @@ -159,20 +156,13 @@ func NewService(
onramp.NewMoonPayProvider(),
}

cryptoCompare := cryptocompare.NewClient()
coingeckoClient := coingecko.NewClientWithParams(coingecko.Params{
CoingeckoAPIKey: config.WalletConfig.CoingeckoAPIKey,
CoingeckoDemoAPIKey: config.WalletConfig.CoingeckoDemoAPIKey,
})
coingeckoProxy := createCoingeckoProxyClient(config.WalletConfig.MarketDataProxyConfig)
cryptoCompareProxy := cryptocompare.NewClientWithParams(cryptocompare.Params{
ID: fmt.Sprintf("%s-proxy", cryptoCompare.ID()),
URL: fmt.Sprintf("https://%s.api.status.im/cryptocompare/", statusProxyStageName),
User: config.WalletConfig.StatusProxyMarketUser,
Password: config.WalletConfig.StatusProxyMarketPassword,
})
marketProviders = []thirdparty.MarketDataProvider{
coingeckoProxy, coingeckoClient, cryptoCompare, cryptoCompareProxy,
coingeckoProxy, coingeckoClient,
}

raribleClient := rarible.NewClient(config.WalletConfig.RaribleMainnetAPIKey, config.WalletConfig.RaribleTestnetAPIKey)
Expand Down
Loading
Loading