blockapi 2.5.0__tar.gz → 2.5.2__tar.gz

{blockapi-2.5.0 → blockapi-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blockapi
-Version: 2.5.0
+Version: 2.5.2
 Summary: BlockAPI library
 Home-page: https://github.com/crypkit/blockapi
 Author: Devmons s.r.o.

{blockapi-2.5.0 → blockapi-2.5.2}/blockapi/test/v2/api/perpetual/test_perpetual.py

@@ -16,11 +16,17 @@ def perp_api():
 test_address = '0x134089B387E22f52b1e06CC80d9a5F622032EF74'
 
 
+@pytest.mark.skip(
+    reason='metadata.perp.exchange/production.json returns 404 — upstream endpoint is offline'
+)
 def test_perp_contract_address():
     contract = perp_contract_address('PERP')
     assert contract == '0xbC396689893D065F41bc2C6EcbeE5e0085233447'
 
 
+@pytest.mark.skip(
+    reason='metadata.perp.exchange/production.json returns 404 — upstream endpoint is offline'
+)
 def test_perp_invalid_contract_raises():
     with pytest.raises(ValueError, match='Invalid contract name.'):
         perp_contract_address("abc")
@@ -37,6 +43,9 @@ def filter_infura_key(request):
 
 
 @pytest.mark.integration
+@pytest.mark.skip(
+    reason='metadata.perp.exchange/production.json returns 404 — upstream endpoint is offline'
+)
 def test_fetch():
     key = os.environ.get('INFURA_API_KEY')
     api = PerpetualApi(f'https://mainnet.infura.io/v3/{key}')
@@ -45,6 +54,9 @@ def test_fetch():
 
 
 @pytest.mark.integration
+@pytest.mark.skip(
+    reason='metadata.perp.exchange/production.json returns 404 — upstream endpoint is offline'
+)
 def test_fetch_error():
     api = PerpetualApi(f'https://mainnet.infura.io/v3/no-key')
     raw = api.fetch_balances(test_address)
@@ -55,6 +67,9 @@ def test_fetch_error():
     )
 
 
+@pytest.mark.skip(
+    reason='metadata.perp.exchange/production.json returns 404 — upstream endpoint is offline'
+)
 def test_fetch_error_raises_from_get_balances():
     api = PerpetualApi(f'https://mainnet.infura.io/v3/no-key')
     with pytest.raises(ApiException) as exc:

{blockapi-2.5.0 → blockapi-2.5.2}/blockapi/test/v2/api/test_solana.py

@@ -1,18 +1,11 @@
-import json
 from decimal import Decimal
+from unittest.mock import patch
 
 import pytest
 from requests_mock import ANY, Mocker
-from solders.pubkey import Pubkey
 
 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,
-    JUP_AG_TOKEN_LIST_URL,
-    SOL_TOKEN_LIST_URL,
-    SONAR_TOKEN_LIST_URL,
-)
 from blockapi.v2.models import (
     AssetType,
     BalanceItem,
@@ -23,6 +16,13 @@ from blockapi.v2.models import (
 )
 
 
+@pytest.fixture(autouse=True)
+def _reset_caches():
+    SolanaApi._das_cache = {}
+    yield
+    SolanaApi._das_cache = {}
+
+
 def test_merge_balances_with_different_coins(solana_api, balances_with_different_coins):
     merged = solana_api.merge_balances_with_same_coin(balances_with_different_coins)
     assert len(merged) == 2
@@ -75,24 +75,21 @@ def test_use_base_url():
 
 
 def test_use_base_url_in_post(
-    solana_value_response,
-    solana_response,
+    sol_balance_response,
+    token_accounts_response,
+    das_asset_batch_response,
     staked_solana_response,
-    rent_reserve_solana_response,
-    token_list_sol_response,
-    token_list_jup_ag_response,
-    token_list_sonar_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}'
 
     iterator = iter(
         [
-            solana_value_response,
-            solana_response,
-            '{"result": {"value": []}}',
+            sol_balance_response,
+            token_accounts_response,
+            empty_token_accounts,
+            das_asset_batch_response,
             staked_solana_response,
-            rent_reserve_solana_response,
         ]
     )
 
@@ -102,52 +99,172 @@ def test_use_base_url_in_post(
         return data
 
     with Mocker() as m:
-        m.get(SOL_TOKEN_LIST_URL, text=token_list_sol_response)
-        m.get(JUP_AG_TOKEN_LIST_URL, text=token_list_jup_ag_response)
-        m.get(SONAR_TOKEN_LIST_URL, text=token_list_sonar_response)
-        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/', fetch_metaplex=False)
+        api = SolanaApi(base_url='https://proxy/solana/')
         api.get_balance(test_addr)
 
 
-def test_create_token(
-    requests_mock,
-    token_list_sol_response,
-    token_list_jup_ag_response,
-    token_list_sonar_response,
-    ban_list_jup_ag_response,
-):
-    requests_mock.get(SOL_TOKEN_LIST_URL, text=token_list_sol_response)
-    requests_mock.get(JUP_AG_TOKEN_LIST_URL, text=token_list_jup_ag_response)
-    requests_mock.get(SONAR_TOKEN_LIST_URL, text=token_list_sonar_response)
-    requests_mock.get(JUP_AG_BAN_LIST_URL, text=ban_list_jup_ag_response)
+def test_build_coin_from_das_asset():
+    api = SolanaApi()
+    asset = {
+        'id': 'J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn',
+        'interface': 'FungibleToken',
+        'content': {
+            'metadata': {
+                'name': 'Jito Staked SOL',
+                'symbol': 'JITOSOL',
+            },
+            'links': {
+                'image': 'https://example.com/jitosol.png',
+            },
+        },
+        'token_info': {
+            'decimals': 9,
+            'symbol': 'JITOSOL',
+        },
+    }
 
-    coin = SolanaApi().get_token_data('J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn')
+    coin = api._build_coin_from_das_asset(asset)
     assert coin.symbol == 'JITOSOL'
     assert coin.name == 'Jito Staked SOL'
     assert coin.decimals == 9
     assert coin.blockchain == Blockchain.SOLANA
     assert coin.address == 'J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn'
+    assert coin.info.logo_url == 'https://example.com/jitosol.png'
+    assert coin.is_nft is False
+    assert 'FungibleToken' in coin.standards
+
+
+def test_nft_skipped_when_include_nfts_false():
+    api = SolanaApi(include_nfts=False)
+    asset = {
+        'id': 'NFTmint123',
+        'interface': 'V1_NFT',
+        'content': {
+            'metadata': {
+                'name': 'Cool NFT',
+                'symbol': 'CNFT',
+            },
+            'links': {},
+        },
+        'token_info': {
+            'decimals': 0,
+        },
+    }
 
+    coin = api._build_coin_from_das_asset(asset)
+    assert coin is not None
+    assert coin.is_nft is True
 
-def test_map_mplx_token(
-    requests_mock,
-    token_list_sol_response,
-    token_list_jup_ag_response,
-    token_list_sonar_response,
-    ban_list_jup_ag_response,
-):
-    requests_mock.get(SOL_TOKEN_LIST_URL, text=token_list_sol_response)
-    requests_mock.get(JUP_AG_TOKEN_LIST_URL, text=token_list_jup_ag_response)
-    requests_mock.get(SONAR_TOKEN_LIST_URL, text=token_list_sonar_response)
-    requests_mock.get(JUP_AG_BAN_LIST_URL, text=ban_list_jup_ag_response)
-
-    coin = SolanaApi().get_token_data('METAewgxyPbgwsseH8T16a39CQ5VyVxZi9zXiDPY18m')
-    assert coin.symbol == 'MPLX'
-    assert coin.decimals == 6
-    assert coin.blockchain == Blockchain.SOLANA
-    assert coin.address == 'METAewgxyPbgwsseH8T16a39CQ5VyVxZi9zXiDPY18m'
+
+def test_nft_included_when_include_nfts_true():
+    api = SolanaApi(include_nfts=True)
+    asset = {
+        'id': 'NFTmint123',
+        'interface': 'V1_NFT',
+        'content': {
+            'metadata': {
+                'name': 'Cool NFT',
+                'symbol': 'CNFT',
+            },
+            'links': {
+                'image': 'https://example.com/nft.png',
+            },
+        },
+        'token_info': {
+            'decimals': 0,
+        },
+    }
+
+    coin = api._build_coin_from_das_asset(asset)
+    assert coin is not None
+    assert coin.symbol == 'CNFT'
+    assert coin.name == 'Cool NFT'
+    assert coin.is_nft is 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
+    api._das_cache['mint1'] = {
+        'id': 'mint1',
+        'interface': 'FungibleToken',
+        'content': {'metadata': {'name': 'Token1', 'symbol': 'TK1'}, 'links': {}},
+        'token_info': {'decimals': 6},
+    }
+    # _fetch_das_assets should skip cached mint
+    with patch.object(api, '_request') as mock_request:
+        api._fetch_das_assets(['mint1'])
+        mock_request.assert_not_called()
 
 
 def test_solscan_get_staked_balance(requests_mock, solscan_staked_response):
@@ -308,43 +425,23 @@ def balances_with_mixed_coins():
 
 
 @pytest.fixture
-def solana_response():
-    return read_file('data/solana/solana_response.json')
-
-
-@pytest.fixture
-def solana_value_response():
-    return json.dumps(dict(result=dict(value=0)))
-
-
-@pytest.fixture
-def staked_solana_response():
-    return read_file('data/solana/staked_solana_response.json')
-
-
-@pytest.fixture
-def rent_reserve_solana_response():
-    return read_file('data/solana/rent_reserve_solana_response.json')
-
-
-@pytest.fixture
-def token_list_sol_response():
-    return read_file('data/solana/token-list-solana.json')
+def sol_balance_response():
+    return '{"jsonrpc":"2.0","result":{"context":{"apiVersion":"1.17.34","slot":268207149},"value":0},"id":1}'
 
 
 @pytest.fixture
-def token_list_jup_ag_response():
-    return read_file('data/solana/token-list-jup-ag.csv')
+def token_accounts_response():
+    return read_file('data/solana/token_accounts_response.json')
 
 
 @pytest.fixture
-def token_list_sonar_response():
-    return read_file('data/solana/token-list-sonar.json')
+def das_asset_batch_response():
+    return read_file('data/solana/das_get_asset_batch_response.json')
 
 
 @pytest.fixture
-def ban_list_jup_ag_response():
-    return read_file('data/solana/ban-list-jup-ag.csv')
+def staked_solana_response():
+    return read_file('data/solana/staked_solana_response.json')
 
 
 @pytest.fixture
@@ -506,53 +603,6 @@ def balances_with_different_coins():
     ]
 
 
-def test_derive_metaplex_account_address_from_mint(solana_api):
-    mint = 'C2PxCHLeDkp1BsG1uueu7aGEfXQkKoXxzTgMPQ5DA6QW'
-    metadata = solana_api.get_metadata_pda(mint)
-
-    assert metadata == '3G5bT5bgpdwiUbYHfoBSe6SDAwiQaTKc3TFGks7bA3Qw'
-
-
-@pytest.mark.vcr()
-def test_fetch_metaplex_account(solana_api, metaplex_content):
-    data = solana_api.fetch_metaplex_account(
-        '3G5bT5bgpdwiUbYHfoBSe6SDAwiQaTKc3TFGks7bA3Qw'
-    )
-    assert data == metaplex_content
-
-
-@pytest.mark.vcr()
-def test_parse_metaplex_account(solana_api, metaplex_content):
-    token = solana_api.parse_metaplex_account(metaplex_content, decimals=9)
-    assert token['symbol'] == 'ACT'
-    assert token['name'] == 'Act I : The AI Prophecy'
-    assert token['decimals'] == 9
-    assert token['chainId'] == 101
-    assert token['tags'] == ['SOLANA', 'MEME']
-    assert (
-        token['logoURI']
-        == 'https://gateway.pinata.cloud/ipfs/QmS4m4cBjukg7YhimqhfRUb2pUE4bBPXbrbMBb5hzxNbUA'
-    )
-
-
-@pytest.fixture
-def metaplex_content():
-    return (
-        'BJ5okXRntUEewuGiuQOIMWt8+YkvFnY7/DoghPyz5qwNo8wWpzohlcKPjWIDCl3nggGst3'
-        'CeFvU+P1wA6yNMhm8gAAAAQWN0IEkgOiBUaGUgQUkgUHJvcGhlY3kAAAAAAAAAAAAKAAAA'
-        'QUNUAAAAAAAAAMgAAABodHRwczovL2dhdGV3YXkucGluYXRhLmNsb3VkL2lwZnMvUW1WZk'
-        '1QQ1VQczVWMW9tYUR2b25pMzh3OGFFSnBGVGpFWlJOUm1vVnlleFhXZQAAAAAAAAAAAAAA'
-        'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
-        'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
-        'AAAAAAAAAAAAAf4BAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
-        'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
-        'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
-        'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
-        'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
-        'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=='
-    )
-
-
 def test_merge_balances_contract_merge(solana_api):
     balances = [
         BalanceItem(