status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: Return only community tokens (#4249)

This commit is contained in:
Cuteivist 2023-11-03 13:08:32 +01:00 committed by GitHub
parent f36b943202
commit 05530f57bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/wallet/api.go
View File

@ -183,7 +183,7 @@ func (api *API) GetBalanceHistoryRange(ctx context.Context, chainIDs []uint64, a
func (api *API) GetTokens(ctx context.Context, chainID uint64) ([]*token.Token, error) { func (api *API) GetTokens(ctx context.Context, chainID uint64) ([]*token.Token, error) {
log.Debug("call to get tokens") log.Debug("call to get tokens")
rst, err := api.s.tokenManager.GetTokens(chainID) rst, err := api.s.tokenManager.GetTokens(chainID, true)
log.Debug("result from token store", "len", len(rst)) log.Debug("result from token store", "len", len(rst))
return rst, err return rst, err
} }

2
services/wallet/reader.go
View File

@ -192,7 +192,7 @@ func (r *Reader) GetWalletToken(ctx context.Context, addresses []common.Address)
} }
currencies = append(currencies, currency) currencies = append(currencies, currency)
currencies = append(currencies, getFixedCurrencies()...) currencies = append(currencies, getFixedCurrencies()...)
allTokens, err := r.tokenManager.GetTokensByChainIDs(chainIDs) allTokens, err := r.tokenManager.GetTokensByChainIDs(chainIDs, true)
if err != nil { if err != nil {
return nil, err return nil, err

31
services/wallet/token/token.go
View File

@ -197,12 +197,12 @@ func (tm *Manager) fetchTokens() {
} }
func (tm *Manager) getFullTokenList(chainID uint64) []*Token { func (tm *Manager) getFullTokenList(chainID uint64) []*Token {
tokens, err := tm.GetTokens(chainID) tokens, err := tm.GetTokens(chainID, false)
if err != nil { if err != nil {
return nil return nil
} }
customTokens, err := tm.GetCustomsByChainID(chainID) customTokens, err := tm.GetCustomsByChainID(chainID, false)
if err != nil { if err != nil {
return nil return nil
} }
@ -347,7 +347,7 @@ func (tm *Manager) discoverTokenCommunityID(ctx context.Context, token *Token, a
} }
func (tm *Manager) FindSNT(chainID uint64) *Token { func (tm *Manager) FindSNT(chainID uint64) *Token {
tokens, err := tm.GetTokens(chainID) tokens, err := tm.GetTokens(chainID, false)
if err != nil { if err != nil {
return nil return nil
} }
@ -396,10 +396,10 @@ func (tm *Manager) GetAllTokens() ([]*Token, error) {
return tokens, nil return tokens, nil
} }
func (tm *Manager) GetTokensByChainIDs(chainIDs []uint64) ([]*Token, error) { func (tm *Manager) GetTokensByChainIDs(chainIDs []uint64, onlyCommunityCustoms bool) ([]*Token, error) {
tokens := make([]*Token, 0) tokens := make([]*Token, 0)
for _, chainID := range chainIDs { for _, chainID := range chainIDs {
t, err := tm.GetTokens(chainID) t, err := tm.GetTokens(chainID, onlyCommunityCustoms)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -408,7 +408,7 @@ func (tm *Manager) GetTokensByChainIDs(chainIDs []uint64) ([]*Token, error) {
return tokens, nil return tokens, nil
} }
func (tm *Manager) GetTokens(chainID uint64) ([]*Token, error) { func (tm *Manager) GetDefaultTokens(chainID uint64) ([]*Token, error) {
if !tm.areTokensFetched { if !tm.areTokensFetched {
tm.fetchTokens() tm.fetchTokens()
} }
@ -423,8 +423,16 @@ func (tm *Manager) GetTokens(chainID uint64) ([]*Token, error) {
for _, token := range tokensMap { for _, token := range tokensMap {
res = append(res, token) res = append(res, token)
} }
return res, nil
}
tokens, err := tm.GetCustomsByChainID(chainID) func (tm *Manager) GetTokens(chainID uint64, onlyCommunityCustoms bool) ([]*Token, error) {
res, err := tm.GetDefaultTokens(chainID)
if err != nil {
return nil, err
}
tokens, err := tm.GetCustomsByChainID(chainID, onlyCommunityCustoms)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -498,8 +506,11 @@ func (tm *Manager) GetCustoms() ([]*Token, error) {
return tm.getTokens("SELECT address, name, symbol, decimals, color, network_id, community_id FROM tokens") return tm.getTokens("SELECT address, name, symbol, decimals, color, network_id, community_id FROM tokens")
} }
func (tm *Manager) GetCustomsByChainID(chainID uint64) ([]*Token, error) { func (tm *Manager) GetCustomsByChainID(chainID uint64, onlyCommunityCustoms bool) ([]*Token, error) {
return tm.getTokens("SELECT address, name, symbol, decimals, color, network_id, community_id FROM tokens where network_id=?", chainID) if onlyCommunityCustoms {
return tm.getTokens("SELECT address, name, symbol, decimals, color, network_id, community_id FROM tokens WHERE network_id=? AND community_id IS NOT NULL AND community_id != ''", chainID)
}
return tm.getTokens("SELECT address, name, symbol, decimals, color, network_id, community_id FROM tokens WHERE network_id=?", chainID)
} }
func (tm *Manager) IsTokenVisible(chainID uint64, address common.Address) (bool, error) { func (tm *Manager) IsTokenVisible(chainID uint64, address common.Address) (bool, error) {
@ -575,7 +586,7 @@ func (tm *Manager) GetVisible(chainIDs []uint64) (map[uint64][]*Token, error) {
} }
found := false found := false
tokens, err := tm.GetTokens(chainID) tokens, err := tm.GetTokens(chainID, false)
if err != nil { if err != nil {
continue continue
} }

2
services/wallet/transfer/commands_sequential.go
View File

@ -164,7 +164,7 @@ func (c *findBlocksCommand) ERC20ScanByBalance(parent context.Context, fromBlock
func (c *findBlocksCommand) checkERC20Tail(parent context.Context) ([]*DBHeader, error) { func (c *findBlocksCommand) checkERC20Tail(parent context.Context) ([]*DBHeader, error) {
log.Debug("checkERC20Tail", "account", c.account, "to block", c.startBlockNumber, "from", c.resFromBlock.Number) log.Debug("checkERC20Tail", "account", c.account, "to block", c.startBlockNumber, "from", c.resFromBlock.Number)
tokens, err := c.tokenManager.GetTokens(c.chainClient.NetworkID()) tokens, err := c.tokenManager.GetTokens(c.chainClient.NetworkID(), false)
if err != nil { if err != nil {
return nil, err return nil, err
} }