Merge pull request #98 from skynetcap/feature/srm-124-fix-token-symbo…

…l-permalinking [SRM-124] Fix token symbol permalinking
skynetcap · Jul 31, 2022 · 8cf3ee1 · 8cf3ee1
2 parents 2f082e0 + 0277c02
commit 8cf3ee1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/com/mmorrell/serumdata/controller/IndexController.java b/src/main/java/com/mmorrell/serumdata/controller/IndexController.java
@@ -127,8 +127,12 @@ public String market(Model model, @PathVariable String market) {
             for (Token baseToken : possibleBaseTokens) {
                 // compile list of markets, return one with most fees accrued.
                 Optional<Market> optionalMarket = marketRankManager.getMostActiveMarket(baseToken.getPublicKey());
-                optionalMarket.ifPresent(activeMarkets::add);
-
+                if (optionalMarket.isPresent()) {
+                    Market foundMarket = optionalMarket.get();
+                    if (foundMarket.getBaseMint().equals(baseToken.getPublicKey())) {
+                        activeMarkets.add(foundMarket);
+                    }
+                }
             }
             activeMarkets.sort(Comparator.comparingLong(Market::getQuoteFeesAccrued).reversed());
 

diff --git a/src/main/java/com/mmorrell/serumdata/manager/MarketManager.java b/src/main/java/com/mmorrell/serumdata/manager/MarketManager.java
@@ -171,6 +171,11 @@ public List<Market> getMarketCache() {
         return new ArrayList<>(marketCache.values());
     }
 
+    public List<Market> getMarketsByBaseMint(PublicKey tokenMint) {
+        final Set<Market> result = new HashSet<>(marketMapCache.getOrDefault(tokenMint, new ArrayList<>()));
+        return new ArrayList<>(result);
+    }
+
     public List<Market> getMarketsByTokenMint(PublicKey tokenMint) {
         final Set<Market> result = new HashSet<>();
 

diff --git a/src/main/java/com/mmorrell/serumdata/manager/MarketRankManager.java b/src/main/java/com/mmorrell/serumdata/manager/MarketRankManager.java
@@ -85,7 +85,7 @@ public String getImage(String tokenMint) {
     }
 
     public Optional<Market> getMostActiveMarket(PublicKey baseMint) {
-        List<Market> markets = marketManager.getMarketsByTokenMint(baseMint);
+        List<Market> markets = marketManager.getMarketsByBaseMint(baseMint);
         if (markets.size() < 1) {
             return Optional.empty();
         }