u3

Author: saledjenic

.gitignore

@@ -132,6 +132,3 @@ pkg/sentry/SENTRY_PRODUCTION
 # Don't ignore generated files in the vendor/ directory
 !vendor/**/*.pb.go
 !vendor/**/migrations.go
-services/wallet/token/local-token-lists/default-lists/status.go
-services/wallet/token/local-token-lists/default-lists/coingecko_*.go
-services/wallet/token/local-token-lists/default-lists/uniswap.go

Makefile

@@ -323,20 +323,14 @@ generate: export GO_GENERATE_FAST_DEBUG ?= false
 generate: export GO_GENERATE_FAST_RECACHE ?= false
 generate:  ##@ Run generate for all given packages using go-generate-fast, fallback to `go generate` (e.g. for docker)
 	@GOROOT=$$(go env GOROOT) $(GO_GENERATE_CMD) $(PACKAGES)
-	make download-tokens
 
 generate-contracts:
 	go generate ./contracts
 
 download-tokens:
-	@if [ ! -f services/wallet/token/local-token-lists/default-lists/status.go ] || \
-	   [ ! -f services/wallet/token/local-token-lists/default-lists/uniswap.go ]; then \
-		echo "Downloading token lists..."; \
-		GOROOT=$$(go env GOROOT) GOFLAGS="-mod=mod" go run ./services/wallet/token/local-token-lists/default-lists/downloader/main.go; \
-		echo "token list downloaded successfully"; \
-	else \
-		echo "Token lists are already downloaded, skipping download"; \
-	fi
+	echo "Downloading token lists..."; \
+	GOROOT=$$(go env GOROOT) GOFLAGS="-mod=mod" go run ./services/wallet/token/local-token-lists/default-lists/downloader/main.go; \
+	echo "token list downloaded successfully"; \
 
 analyze-token-stores:
 	go run ./services/wallet/token/local-token-lists/analyzer/main.go

services/wallet/token/community_token.go

@@ -137,19 +137,7 @@ func (tm *Manager) GetCustoms(onlyCommunityCustoms bool) ([]*tokentypes.Token, e
 		processedToken = make(map[string]struct{})
 	)
 
-	discoveredTokens, err := tm.getDiscoveredTokens(onlyCommunityCustoms)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, discoveredToken := range discoveredTokens {
-		if _, ok := processedToken[discoveredToken.Key()]; ok {
-			continue
-		}
-		processedToken[discoveredToken.Key()] = struct{}{}
-		result = append(result, discoveredToken)
-	}
-
+	// It's important to process community tokens first, cause we rely to community tokens stored to community_tokens table, then discovered tokens.
 	if onlyCommunityCustoms {
 		communityTokens, err := tm.communityTokensDB.GetTokens()
 		if err != nil {
@@ -176,6 +164,19 @@ func (tm *Manager) GetCustoms(onlyCommunityCustoms bool) ([]*tokentypes.Token, e
 		}
 	}
 
+	discoveredTokens, err := tm.getDiscoveredTokens(onlyCommunityCustoms)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, discoveredToken := range discoveredTokens {
+		if _, ok := processedToken[discoveredToken.Key()]; ok {
+			continue
+		}
+		processedToken[discoveredToken.Key()] = struct{}{}
+		result = append(result, discoveredToken)
+	}
+
 	return result, nil
 }