status-im/status-go
2
0
Fork 0
mirror of https://github.com/status-im/status-go.git synced 2025-01-18 02:31:47 +00:00
Code Issues Projects Releases Wiki Activity

fix!: add forceRefresh parameter to FetchOrGetCachedWalletBalances endpoint (#6160)

Browse Source 
Signed-off-by: Brian Sztamfater <brian@status.im>
This commit is contained in:
Brian Sztamfater 2024-12-06 09:48:12 -03:00 committed by GitHub
parent 5d75731a6d
commit 9a94a82fd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 100 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protocol/messenger_wallet.go
View File

@ -50,7 +50,7 @@ func (m *Messenger) retrieveWalletBalances() error {
defer cancel()
// TODO: publish tokens as a signal
_, err = m.walletAPI.FetchOrGetCachedWalletBalances(ctx, ethAccounts)
_, err = m.walletAPI.FetchOrGetCachedWalletBalances(ctx, ethAccounts, false)
if err != nil {
return err
}

6
services/wallet/api.go
View File

@ -50,7 +50,7 @@ func NewAPI(s *Service) *API {
// API is class with methods available over RPC.
type API struct {
s *Service
reader *Reader
reader ReaderInterface
}
func (api *API) StartWallet(ctx context.Context) error {
@ -84,7 +84,7 @@ func (api *API) GetBalancesByChain(ctx context.Context, chainIDs []uint64, addre
return api.s.tokenManager.GetBalancesByChain(ctx, clients, addresses, tokens)
}
func (api *API) FetchOrGetCachedWalletBalances(ctx context.Context, addresses []common.Address) (map[common.Address][]token.StorageToken, error) {
func (api *API) FetchOrGetCachedWalletBalances(ctx context.Context, addresses []common.Address, forceRefresh bool) (map[common.Address][]token.StorageToken, error) {
activeNetworks, err := api.s.rpcClient.NetworkManager.GetActiveNetworks()
if err != nil {
return nil, err
@ -96,7 +96,7 @@ func (api *API) FetchOrGetCachedWalletBalances(ctx context.Context, addresses []
return nil, err
}
return api.reader.FetchOrGetCachedWalletBalances(ctx, clients, addresses, false)
return api.reader.FetchOrGetCachedWalletBalances(ctx, clients, addresses, forceRefresh)
}
type DerivedAddress struct {

84
services/wallet/api_test.go
View File

@ -9,6 +9,7 @@ import (
"testing"
"time"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/event"
"github.com/stretchr/testify/require"
@ -19,9 +20,11 @@ import (
"github.com/status-im/status-go/multiaccounts/accounts"
"github.com/status-im/status-go/params"
"github.com/status-im/status-go/rpc"
mock_reader "github.com/status-im/status-go/services/wallet/mock/reader"
"github.com/status-im/status-go/services/wallet/onramp"
mock_onramp "github.com/status-im/status-go/services/wallet/onramp/mock"
"github.com/status-im/status-go/services/wallet/requests"
"github.com/status-im/status-go/services/wallet/token"
"github.com/status-im/status-go/services/wallet/walletconnect"
"github.com/status-im/status-go/t/helpers"
"github.com/status-im/status-go/walletdatabase"
@ -201,3 +204,84 @@ func TestAPI_GetAddressDetails(t *testing.T) {
require.NoError(t, err)
require.Equal(t, true, details.HasActivity)
}
// TestAPI_FetchOrGetCachedWalletBalances
func TestAPI_FetchOrGetCachedWalletBalances(t *testing.T) {
appDB, err := helpers.SetupTestMemorySQLDB(appdatabase.DbInitializer{})
require.NoError(t, err)
defer appDB.Close()
mockCtrl := gomock.NewController(t)
defer mockCtrl.Finish()
mockReader := mock_reader.NewMockReaderInterface(mockCtrl)
providerConfig := params.ProviderConfig{
Enabled: true,
Name: rpc.ProviderStatusProxy,
User: "user1",
Password: "pass1",
}
providerConfigs := []params.ProviderConfig{providerConfig}
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Fprintln(w, `{"result": "0x10"}`)
}))
defer server.Close()
chainID := uint64(1)
networks := []params.Network{
{
ChainID: chainID,
DefaultRPCURL: server.URL + "/nodefleet/",
},
}
config := rpc.ClientConfig{
Client: nil,
UpstreamChainID: chainID,
Networks: networks,
DB: appDB,
WalletFeed: nil,
ProviderConfigs: providerConfigs,
}
c, err := rpc.NewClient(config)
require.NoError(t, err)
testTokenAddress1 := common.Address{0x34}
testAccAddress1 := common.Address{0x12}
storageToken := token.StorageToken{
Token: token.Token{
Name: "USD Tether",
Symbol: "USDT",
Decimals: 18,
},
BalancesPerChain: map[uint64]token.ChainBalance{
1: {
RawBalance: "1000000000000000000",
Balance: nil,
Address: testAccAddress1,
ChainID: 1,
HasError: false,
},
},
}
expectedTokens := map[common.Address][]token.StorageToken{
testAccAddress1: {storageToken},
}
mockReader.EXPECT().FetchOrGetCachedWalletBalances(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(expectedTokens, nil)
service := &Service{
rpcClient: c,
}
api := &API{
s: service,
reader: mockReader,
}
forceRefresh := true
balances, err := api.FetchOrGetCachedWalletBalances(context.Background(), []common.Address{testTokenAddress1}, forceRefresh)
require.NoError(t, err)
require.NotNil(t, balances)
}

12
services/wallet/reader.go
View File

@ -1,5 +1,7 @@
package wallet
//go:generate mockgen -package=mock_reader -source=reader.go -destination=mock/reader/reader.go
import (
"context"
"math"
@ -42,6 +44,16 @@ func belongsToMandatoryTokens(symbol string) bool {
return false
}
type ReaderInterface interface {
Start() error
Stop()
Restart() error
FetchOrGetCachedWalletBalances(ctx context.Context, clients map[uint64]chain.ClientInterface, addresses []common.Address, forceRefresh bool) (map[common.Address][]token.StorageToken, error)
FetchBalances(ctx context.Context, clients map[uint64]chain.ClientInterface, addresses []common.Address) (map[common.Address][]token.StorageToken, error)
GetCachedBalances(clients map[uint64]chain.ClientInterface, addresses []common.Address) (map[common.Address][]token.StorageToken, error)
GetLastTokenUpdateTimestamps() map[common.Address]int64
}
func NewReader(tokenManager token.ManagerInterface, marketManager *market.Manager, persistence token.TokenBalancesStorage, walletFeed *event.Feed) *Reader {
return &Reader{
tokenManager: tokenManager,