blockapi 2.11.1__tar.gz → 2.11.3__tar.gz

{blockapi-2.11.1 → blockapi-2.11.3}/PKG-INFO

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

{blockapi-2.11.1 → blockapi-2.11.3}/blockapi/test/v2/api/test_cosmos.py

@@ -228,7 +228,7 @@ def test_cosmos_get_balance():
 def test_osmosis_get_balance():
     api = CosmosOsmosisApi()
     balances = api.get_balance('osmo1aff76avnwpnk02wxkc6n5xnwasjkgekazvl8xj')
-    assert len(balances) == 2
+    assert len(balances) == 4
     assert all([balance.coin != UNKNOWN for balance in balances])
 
 
@@ -237,7 +237,7 @@ def test_osmosis_get_balance():
 def test_dydx_get_balance():
     api = CosmosDydxApi()
     balances = api.get_balance('dydx1aff76avnwpnk02wxkc6n5xnwasjkgekarwznsh')
-    assert len(balances) == 4
+    assert len(balances) == 1
     assert all([balance.coin != UNKNOWN for balance in balances])
 
 

{blockapi-2.11.1 → blockapi-2.11.3}/blockapi/test/v2/api/test_solana.py

@@ -1,11 +1,13 @@
+import json
 from decimal import Decimal
-from unittest.mock import patch
+from unittest.mock import call, patch
 
 import pytest
 from requests_mock import ANY, Mocker
 
 from blockapi.test.v2.api.conftest import read_file
 from blockapi.v2.api import SolanaApi, SolscanApi
+from blockapi.v2.base import ApiException
 from blockapi.v2.models import (
     AssetType,
     BalanceItem,
@@ -74,14 +76,26 @@ def test_use_base_url():
     assert api.base_url == 'https://api.mainnet-beta.solana.com/'
 
 
-def test_use_base_url_in_post(
+@pytest.mark.parametrize(
+    ('rpc_url', 'uses_v2_staking'),
+    [
+        ('https://mainnet.helius-rpc.com/', True),
+        ('https://proxy/solana/', False),
+    ],
+)
+def test_get_balance_supports_helius_and_legacy_staking_responses(
     sol_balance_response,
     token_accounts_response,
     das_asset_batch_response,
     staked_solana_response,
+    rpc_url,
+    uses_v2_staking,
 ):
     test_addr = '5PjMxaijeVVQtuEzxK2NxyJeWwUbpTsi2uXuZ653WoHu'
     empty_token_accounts = '{"jsonrpc":"2.0","result":{"context":{"apiVersion":"1.17.34","slot":268207149},"value":[]},"id":1}'
+    staking_response = json.loads(staked_solana_response)
+    if not uses_v2_staking:
+        staking_response['result'] = staking_response['result']['accounts']
 
     iterator = iter(
         [
@@ -89,19 +103,29 @@ def test_use_base_url_in_post(
             token_accounts_response,
             empty_token_accounts,
             das_asset_batch_response,
-            staked_solana_response,
+            json.dumps(staking_response),
         ]
     )
 
     def get_text(*args, **kwargs):
-        assert args[0].url == 'https://proxy/solana/'
+        assert args[0].url == rpc_url
         data = next(iterator)
         return data
 
     with Mocker() as m:
-        m.post(ANY, text=get_text),
-        api = SolanaApi(base_url='https://proxy/solana/')
-        api.get_balance(test_addr)
+        m.post(ANY, text=get_text)
+        api = SolanaApi(base_url=rpc_url)
+        balances = api.get_balance(test_addr)
+
+    staking_balances = {
+        balance.asset_type: balance.balance_raw
+        for balance in balances
+        if balance.asset_type in {AssetType.STAKED, AssetType.LOCKED}
+    }
+    assert staking_balances == {
+        AssetType.STAKED: Decimal('179062913955311'),
+        AssetType.LOCKED: Decimal('424045085255'),
+    }
 
 
 def test_build_coin_from_das_asset():
@@ -237,6 +261,123 @@ def test_parse_staked_balance_skips_undelegated():
     assert result.asset_type == AssetType.STAKED
 
 
+def test_fetch_staked_sol_uses_v2_pagination():
+    api = SolanaApi(base_url='https://mainnet.helius-rpc.com/')
+    address = '5PjMxaijeVVQtuEzxK2NxyJeWwUbpTsi2uXuZ653WoHu'
+    first_account = {'pubkey': 'first'}
+    second_account = {'pubkey': 'second'}
+
+    with patch.object(
+        api,
+        '_request',
+        side_effect=[
+            {
+                'jsonrpc': '2.0',
+                'id': 1,
+                'result': {
+                    'accounts': [first_account],
+                    'paginationKey': 'next-page',
+                },
+            },
+            {
+                'jsonrpc': '2.0',
+                'id': 2,
+                'result': {
+                    'accounts': [],
+                    'paginationKey': 'last-page',
+                },
+            },
+            {
+                'jsonrpc': '2.0',
+                'id': 3,
+                'result': {
+                    'accounts': [second_account],
+                    'paginationKey': None,
+                },
+            },
+        ],
+    ) as request:
+        response = api._fetch_staked_sol(address)
+
+    config = {
+        'filters': [
+            {
+                'memcmp': {
+                    'offset': api.STAKE_AUTHORITY_OFFSET,
+                    'bytes': address,
+                    'encoding': 'base58',
+                }
+            }
+        ],
+        'encoding': 'jsonParsed',
+        'commitment': 'finalized',
+        'limit': api.HELIUS_PROGRAM_ACCOUNTS_PAGE_SIZE,
+    }
+    assert request.call_args_list == [
+        call(
+            method='getProgramAccountsV2',
+            params=[api.STAKE_PROGRAM_ID, config],
+        ),
+        call(
+            method='getProgramAccountsV2',
+            params=[
+                api.STAKE_PROGRAM_ID,
+                {**config, 'paginationKey': 'next-page'},
+            ],
+        ),
+        call(
+            method='getProgramAccountsV2',
+            params=[
+                api.STAKE_PROGRAM_ID,
+                {**config, 'paginationKey': 'last-page'},
+            ],
+        ),
+    ]
+    assert response == {
+        'jsonrpc': '2.0',
+        'id': 3,
+        'result': [first_account, second_account],
+    }
+
+
+def test_fetch_staked_sol_rejects_repeated_pagination_key():
+    api = SolanaApi(base_url='https://mainnet.helius-rpc.com/')
+    repeated_page = {
+        'result': {
+            'accounts': [],
+            'paginationKey': 'same-page',
+        }
+    }
+    terminal_page = {
+        'result': {
+            'accounts': [],
+            'paginationKey': None,
+        }
+    }
+
+    with patch.object(
+        api,
+        '_request',
+        side_effect=[repeated_page, repeated_page, terminal_page],
+    ) as request:
+        with pytest.raises(ApiException, match='repeated pagination key'):
+            api._fetch_staked_sol('address')
+
+    assert request.call_count == 2
+
+
+def test_fetch_staked_sol_uses_legacy_method_for_non_helius_rpc():
+    api = SolanaApi()
+
+    with patch.object(api, '_request', return_value={'result': []}) as request:
+        response = api._fetch_staked_sol('address')
+
+    request.assert_called_once()
+    assert request.call_args.kwargs['method'] == 'getProgramAccounts'
+    assert 'limit' not in request.call_args.kwargs['params'][1]
+    assert response == {'result': []}
+
+
 def test_das_cache_stores_sentinel_for_unknown_mint():
     api = SolanaApi()
     unknown_mint = 'UnknownMint111111111111111111111111111111111'

{blockapi-2.11.1 → blockapi-2.11.3}/blockapi/v2/api/cosmos.py

@@ -252,7 +252,7 @@ class CosmosOsmosisApi(CosmosApiBase):
     TOKENS_MAP_BLOCKCHAIN_KEY = "osmosis"
     api_options = ApiOptions(
         blockchain=Blockchain.OSMOSIS,
-        base_url='https://lcd-osmosis.cosmostation.io/',
+        base_url='https://osmosis-mainnet-api.itrocket.net/',
         rate_limit=CosmosApiBase.API_BASE_RATE_LIMIT,
     )
 
@@ -262,7 +262,7 @@ class CosmosDydxApi(CosmosApiBase):
     TOKENS_MAP_BLOCKCHAIN_KEY = "dydx"
     api_options = ApiOptions(
         blockchain=Blockchain.DYDX,
-        base_url='https://lcd-dydx.cosmostation.io/',
+        base_url='https://dydx-rest.publicnode.com/',
         rate_limit=CosmosApiBase.API_BASE_RATE_LIMIT,
     )
 
@@ -272,6 +272,6 @@ class CosmosCelestiaApi(CosmosApiBase):
     TOKENS_MAP_BLOCKCHAIN_KEY = "celestia"
     api_options = ApiOptions(
         blockchain=Blockchain.CELESTIA,
-        base_url='https://lcd-celestia.cosmostation.io/',
+        base_url='https://celestia-mainnet-api.itrocket.net/',
         rate_limit=CosmosApiBase.API_BASE_RATE_LIMIT,
     )

{blockapi-2.11.1 → blockapi-2.11.3}/blockapi/v2/api/solana.py

@@ -1,6 +1,7 @@
 import json
 import logging
 from typing import Optional, Union
+from urllib.parse import urlparse
 
 from cytoolz import reduceby
 from requests import Response
@@ -79,6 +80,8 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
     TOKEN_2022_PROGRAM_ID = 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb'
     STAKE_PROGRAM_ID = 'Stake11111111111111111111111111111111111111'
     STAKE_AUTHORITY_OFFSET = 44
+    HELIUS_RPC_DOMAIN = 'helius-rpc.com'
+    HELIUS_PROGRAM_ACCOUNTS_PAGE_SIZE = 5000
     DAS_BATCH_SIZE = 1000
     _JSONRPC_INVALID_PARAMS = -32602
 
@@ -314,25 +317,51 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
 
     def _fetch_staked_sol(self, address: str) -> dict:
         """Fetch staked SOL accounts for a given address."""
-        return self._request(
-            method='getProgramAccounts',
-            params=[
-                self.STAKE_PROGRAM_ID,
+        config = {
+            'filters': [
                 {
-                    'filters': [
-                        {
-                            'memcmp': {
-                                'offset': self.STAKE_AUTHORITY_OFFSET,
-                                'bytes': address,
-                                'encoding': 'base58',
-                            }
-                        }
-                    ],
-                    'encoding': 'jsonParsed',
-                    'commitment': 'finalized',
-                },
+                    'memcmp': {
+                        'offset': self.STAKE_AUTHORITY_OFFSET,
+                        'bytes': address,
+                        'encoding': 'base58',
+                    }
+                }
             ],
+            'encoding': 'jsonParsed',
+            'commitment': 'finalized',
+        }
+
+        hostname = urlparse(self.base_url).hostname or ''
+        is_helius_rpc = hostname == self.HELIUS_RPC_DOMAIN or hostname.endswith(
+            f'.{self.HELIUS_RPC_DOMAIN}'
         )
+        if not is_helius_rpc:
+            return self._request(
+                method='getProgramAccounts',
+                params=[self.STAKE_PROGRAM_ID, config],
+            )
+
+        config['limit'] = self.HELIUS_PROGRAM_ACCOUNTS_PAGE_SIZE
+        accounts = []
+        seen_pagination_keys = set()
+
+        while True:
+            response = self._request(
+                method='getProgramAccountsV2',
+                params=[self.STAKE_PROGRAM_ID, config],
+            )
+            page = response['result']
+            accounts.extend(page['accounts'])
+
+            pagination_key = page.get('paginationKey')
+            if pagination_key is None:
+                response['result'] = accounts
+                return response
+            if pagination_key in seen_pagination_keys:
+                raise ApiException('Solana RPC returned a repeated pagination key')
+
+            seen_pagination_keys.add(pagination_key)
+            config = {**config, 'paginationKey': pagination_key}
 
     # ── Balance parsing ────────────────────────────────────────
 
@@ -373,7 +402,7 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
     def _parse_rent_reserve(
         self, staked_sol: BalanceItem, raw_staked_sol: dict
     ) -> BalanceItem:
-        """Parse rent reserve from getProgramAccounts response.
+        """Parse rent reserve from a program accounts response.
 
         Uses result[].account.lamports already returned by _fetch_staked_sol,
         avoiding a separate getMultipleAccounts call.

{blockapi-2.11.1 → blockapi-2.11.3}/blockapi.egg-info/PKG-INFO

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

{blockapi-2.11.1 → blockapi-2.11.3}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as f:
 
 PACKAGES = find_packages(where='.')
 
-__version__ = "2.11.1"
+__version__ = "2.11.3"
 
 setuptools.setup(
     name='blockapi',