fix: remove Jupiter ban list logic from Solana API, clean up related tests and fixtures

Author: galvanizze

blockapi/test/v2/api/data/solana/ban-list-jup-ag.csv

@@ -6,7 +6,6 @@
 
 from blockapi.test.v2.api.conftest import read_file
 from blockapi.v2.api import SolanaApi, SolscanApi
-from blockapi.v2.api.solana import JUP_AG_BAN_LIST_URL
 from blockapi.v2.models import (
     AssetType,
     BalanceItem,
@@ -20,10 +19,8 @@
 @pytest.fixture(autouse=True)
 def _reset_caches():
     SolanaApi._das_cache = {}
-    SolanaApi._ban_list = set()
     yield
     SolanaApi._das_cache = {}
-    SolanaApi._ban_list = set()
 
 
 def test_merge_balances_with_different_coins(solana_api, balances_with_different_coins):
@@ -82,7 +79,6 @@ def test_use_base_url_in_post(
     token_accounts_response,
     das_asset_batch_response,
     staked_solana_response,
-    ban_list_jup_ag_response,
 ):
     test_addr = '5PjMxaijeVVQtuEzxK2NxyJeWwUbpTsi2uXuZ653WoHu'
     empty_token_accounts = '{"jsonrpc":"2.0","result":{"context":{"apiVersion":"1.17.34","slot":268207149},"value":[]},"id":1}'
@@ -103,7 +99,6 @@ def get_text(*args, **kwargs):
         return data
 
     with Mocker() as m:
-        m.get(JUP_AG_BAN_LIST_URL, text=ban_list_jup_ag_response)
         m.post(ANY, text=get_text),
         api = SolanaApi(base_url='https://proxy/solana/')
         api.get_balance(test_addr)
@@ -189,6 +184,74 @@ def test_nft_included_when_include_nfts_true():
     assert 'V1_NFT' in coin.standards
 
 
+def test_parse_staked_balance_skips_undelegated():
+    api = SolanaApi()
+    response = {
+        'result': [
+            # Delegated account with stake
+            {
+                'account': {
+                    'lamports': 2282880,
+                    'data': {
+                        'parsed': {
+                            'info': {
+                                'stake': {
+                                    'delegation': {
+                                        'stake': '1000000000',
+                                    }
+                                }
+                            }
+                        }
+                    },
+                }
+            },
+            # Undelegated account: stake key is null
+            {
+                'account': {
+                    'lamports': 2282880,
+                    'data': {
+                        'parsed': {
+                            'info': {
+                                'stake': None,
+                            }
+                        }
+                    },
+                }
+            },
+            # Undelegated account: stake key absent
+            {
+                'account': {
+                    'lamports': 2282880,
+                    'data': {
+                        'parsed': {
+                            'info': {},
+                        }
+                    },
+                }
+            },
+        ]
+    }
+    result = api._parse_staked_balance(response)
+    assert result is not None
+    assert result.balance_raw == 1000000000
+    assert result.asset_type == AssetType.STAKED
+
+
+def test_das_cache_stores_sentinel_for_unknown_mint():
+    api = SolanaApi()
+    unknown_mint = 'UnknownMint111111111111111111111111111111111'
+
+    with patch.object(
+        api,
+        '_request',
+        return_value={'result': []},
+    ):
+        api._fetch_das_assets([unknown_mint])
+
+    assert unknown_mint in api._das_cache
+    assert api._das_cache[unknown_mint] == {}
+
+
 def test_das_cache_prevents_refetch():
     api = SolanaApi()
     # Pre-populate cache
@@ -381,11 +444,6 @@ def staked_solana_response():
     return read_file('data/solana/staked_solana_response.json')
 
 
-@pytest.fixture
-def ban_list_jup_ag_response():
-    return read_file('data/solana/ban-list-jup-ag.csv')
-
-
 @pytest.fixture
 def solana_api():
     return SolanaApi()

blockapi/test/v2/api/test_solana.py

@@ -1,6 +1,5 @@
 import json
 import logging
-import os
 from typing import Optional, Union
 
 from cytoolz import reduceby
@@ -30,11 +29,6 @@
 
 logger = logging.getLogger(__name__)
 
-JUP_AG_BAN_LIST_URL = os.getenv(
-    'BLOCKAPI_JUP_AG_BAN_LIST_URL',
-    'https://raw.githubusercontent.com/jup-ag/token-list/main/banned-tokens.csv',
-)
-
 
 class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
     """Solana JSON-RPC client with DAS metadata integration.
@@ -59,11 +53,10 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
 
     Caching architecture
     --------------------
-    ``_das_cache`` and ``_ban_list`` are **class-level** attributes shared
-    across all instances.  This is intentional: DAS metadata and the Jupiter
-    ban list are global and rarely change. Sharing them avoids redundant RPC/HTTP calls
-    when multiple ``SolanaApi`` instances coexist (e.g. one per user request
-    in a web service).
+    ``_das_cache`` is a **class-level** attribute shared across all instances.
+    This is intentional: DAS metadata is global and rarely changes. Sharing it
+    avoids redundant RPC calls when multiple ``SolanaApi`` instances coexist
+    (e.g. one per user request in a web service).
     """
 
     # ── Configuration ──────────────────────────────────────────
@@ -90,9 +83,6 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
     # Class-level cache: shared across instances to avoid redundant DAS RPCs.
     _das_cache: dict[str, dict] = {}
 
-    # Class-level ban list: shared across instances
-    _ban_list: set = set()
-
     # ── Initialization ─────────────────────────────────────────
 
     def __init__(self, base_url: Optional[str] = None, include_nfts: bool = False):
@@ -175,15 +165,6 @@ def get_coin(self, fetch_params: tuple[str, int]) -> Coin:
         self._fetch_das_assets([contract])
         return self._resolve_coin(contract, decimals)
 
-    @property
-    def ban_list(self) -> set[str]:
-        """Return the set of banned token mints from Jupiter."""
-        if not self._ban_list:
-            if response := self._get_from_url(JUP_AG_BAN_LIST_URL):
-                ban_list = response.text.strip().split('\n')
-                SolanaApi._ban_list = set(i.split(',')[0] for i in ban_list[1:])
-        return self._ban_list
-
     @staticmethod
     def merge_balances_with_same_coin(
         token_balances: list[BalanceItem],
@@ -233,9 +214,6 @@ def _parse_token_balance(self, raw: dict) -> Optional[BalanceItem]:
             return None
 
         mint = info.get('mint')
-        if mint in self.ban_list:
-            return None
-
         decimals = int(token_amount.get('decimals', 0))
         coin = self._resolve_coin(mint, decimals)
 
@@ -262,16 +240,17 @@ def _extract_token_info(account: dict) -> dict:
 
     def _fetch_das_assets(self, mint_addresses: list[str]) -> None:
         """Batch-fetch token metadata via DAS and populate cache."""
-        uncached = [m for m in mint_addresses if m not in self._das_cache]
+        uncached = list(
+            dict.fromkeys(m for m in mint_addresses if m not in self._das_cache)
+        )
         if not uncached:
             return
 
         for i in range(0, len(uncached), self.DAS_BATCH_SIZE):
             chunk = uncached[i : i + self.DAS_BATCH_SIZE]
             try:
                 response = self._request(
-                    # 'getAssetBatch',
-                    'getAssets',
+                    'getAssetBatch',
                     {'ids': chunk, 'options': {'showFungible': True}},
                 )
             except (ApiException, RequestException) as e:
@@ -285,6 +264,11 @@ def _fetch_das_assets(self, mint_addresses: list[str]) -> None:
                 if mint := asset.get('id'):
                     self._das_cache[mint] = asset
 
+            returned = {asset['id'] for asset in results if asset and asset.get('id')}
+            for mint in chunk:
+                if mint not in self._das_cache:
+                    self._das_cache[mint] = {}
+
     def _build_coin_from_das_asset(self, asset: dict) -> Optional[Coin]:
         """Build a Coin from a DAS asset response."""
         content = asset.get('content', {})
@@ -364,7 +348,11 @@ def _parse_staked_balance(self, response: dict) -> Optional[BalanceItem]:
             return None
 
         balance_raw = sum(
-            int(r['account']['data']['parsed']['info']['stake']['delegation']['stake'])
+            int(
+                (r['account']['data']['parsed']['info'].get('stake') or {})
+                .get('delegation', {})
+                .get('stake', 0)
+            )
             for r in response['result']
         )
 
@@ -408,17 +396,6 @@ def _request(self, method: str, params: Union[list, dict]) -> dict:
         )
         return self.post(body=body, headers={'Content-Type': 'application/json'})
 
-    def _get_from_url(self, url: str) -> Optional[Response]:
-        """Perform a GET request to an external URL."""
-        try:
-            response = self._session.get(url)
-            response.raise_for_status()
-        except RequestException as e:
-            logger.error(e)
-            return None
-
-        return response
-
     def _opt_raise_on_other_error(self, response: Response) -> None:
         """Raise ApiException or InvalidAddressException on RPC errors."""
         json_response = response.json()