blockapi 1.3.0__tar.gz → 1.3.2__tar.gz

{blockapi-1.3.0 → blockapi-1.3.2}/PKG-INFO

@@ -1,13 +1,37 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: blockapi
-Version: 1.3.0
+Version: 1.3.2
 Summary: BlockAPI library
 Home-page: https://github.com/crypkit/blockapi
 Author: Devmons s.r.o.
 License: MIT
-Platform: UNKNOWN
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
+Requires-Dist: requests==2.32.4
+Requires-Dist: pytz>=2019.2
+Requires-Dist: python-dateutil>=2.8.0
+Requires-Dist: coinaddrng==1.1.1
+Requires-Dist: cfscrape>=2.0.8
+Requires-Dist: ethereum_input_decoder>=0.2.2
+Requires-Dist: web3<6.0.0,>=5.2.2
+Requires-Dist: bs4>=0.0.1
+Requires-Dist: lxml>=4.4.1
+Requires-Dist: pydantic>=1.10.2
+Requires-Dist: marko==1.3.0
+Requires-Dist: fake_useragent>=1.1.3
+Requires-Dist: pytest
+Requires-Dist: pytest-vcr
+Requires-Dist: requests_mock>=1.9.3
+Requires-Dist: attrs<=22.1.0,>=17.4.0
+Requires-Dist: solders==0.22.0
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # blockapi
 
@@ -157,5 +181,3 @@ See also the list of [contributors](https://github.com/crypkit/blockapi/contribu
 
 This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details
 
-
-

blockapi-1.3.2/blockapi/test/v2/api/test_subscan_polkadot.py

@@ -0,0 +1,93 @@
+from decimal import Decimal
+
+import pytest
+
+from blockapi.test.v2.api.conftest import read_file
+from blockapi.v2.api import PolkadotSubscanApi
+from blockapi.v2.models import AssetType
+
+
+@pytest.fixture
+def api():
+    """Create a PolkadotSubscanApi instance for testing."""
+    return PolkadotSubscanApi()
+
+
+@pytest.mark.parametrize(
+    'address, response_path, expected_balance',
+    [
+        (
+            '1NjjK81oA9is7eWhFJ7n7kQhaPT3pnxLFH5MkwDfduAiWE9',
+            'data/subscan_polkadot_response_WE9.json',
+            Decimal('4649.9139999889'),
+        ),
+        (
+            '15j4dg5GzsL1bw2U2AWgeyAk6QTxq43V7ZPbXdAmbVLjvDCK',
+            'data/subscan_polkadot_response_DCK.json',
+            Decimal('17970279.0085871699'),
+        ),
+    ],
+)
+def test_fetch_balances(requests_mock, address, response_path, expected_balance, api):
+    requests_mock.post(
+        'https://polkadot.api.subscan.io/api/v2/scan/search',
+        text=read_file(response_path),
+    )
+
+    balances = api.get_balance(address)
+    assert sum(b.balance for b in balances) == expected_balance
+    assert all(isinstance(balance.raw, dict) for balance in balances)
+
+
+def test_real_problematic_address_overlap(requests_mock, api):
+    """
+    Test the real problematic address that exhibits balance overlap.
+    """
+    requests_mock.post(
+        'https://polkadot.api.subscan.io/api/v2/scan/search',
+        text=read_file('data/subscan_polkadot_balance_overlap_1567z.json'),
+    )
+
+    balances = list(api.get_balance("1567zYrTN6G1YXoF47KyC5Lyto8MhJjzDB8dY8ZvudMAAEet"))
+    available_balances = [b for b in balances if b.asset_type == AssetType.AVAILABLE]
+
+    assert len(available_balances) == 1, "Expected 1 available balance item"
+    available_balance = available_balances[0]
+
+    # Correct calculation: 69.1806120067 - 64.5655723106 = 4.6150396961 DOT
+    expected_balance = Decimal("4.6150396961")
+    assert (
+        available_balance.balance == expected_balance
+    ), f"Expected {expected_balance}, got {available_balance.balance}"
+
+
+def test_second_problematic_address_overlap(requests_mock, api):
+    """
+    Test another problematic address with reserved > locked scenario.
+
+    Address 15gT3MY2oVDqi1WPFnpkhPKVNUXAUPscMagaJeW8dqmLzfJ6 has large reserved
+    amount (154.31 DOT) but no staking locks, demonstrating reserved > locked case.
+    """
+    requests_mock.post(
+        'https://polkadot.api.subscan.io/api/v2/scan/search',
+        text=read_file('data/subscan_polkadot_balance_overlap_15gT3.json'),
+    )
+
+    balances = list(api.get_balance("15gT3MY2oVDqi1WPFnpkhPKVNUXAUPscMagaJeW8dqmLzfJ6"))
+
+    available_balances = [b for b in balances if b.asset_type == AssetType.AVAILABLE]
+    assert len(available_balances) == 1
+    available_balance = available_balances[0]
+
+    # 162.469 total, 154.307 locked
+    expected_balance = Decimal('8.1611794137')
+    assert (
+        available_balance.balance == expected_balance
+    ), f"Expected {expected_balance}, got {available_balance.balance}"
+
+    other_balances = [b for b in balances if b.asset_type != AssetType.AVAILABLE]
+    assert len(other_balances) == 1
+
+    other_balance = other_balances[0]
+    assert other_balance.balance == Decimal('154.3078601187')
+    assert other_balance.asset_type == AssetType.LOCKED

{blockapi-1.3.0 → blockapi-1.3.2}/blockapi/v2/api/subscan.py

@@ -43,7 +43,7 @@ class SubscanApi(BlockchainApi, BalanceMixin, ABC):
         return FetchResult(data=response)
 
     def parse_balances(self, fetch_result: FetchResult) -> ParseResult:
-        balances = list(self._yield_native_balances(fetch_result.data))
+        balances = list(self._yield_native_balances_zero_zum(fetch_result.data))
 
         # add staking rewards (and slashes) too? it's a lot of requests
         # per single address
@@ -52,34 +52,15 @@ class SubscanApi(BlockchainApi, BalanceMixin, ABC):
 
         return ParseResult(data=balances)
 
-    def _yield_native_balances(self, response: dict) -> Iterable[BalanceItem]:
+    def _yield_native_balances_zero_zum(self, response: dict) -> Iterable[BalanceItem]:
         data = response['data']['account']
         b_total = decimals_to_raw(data['balance'], self.coin.decimals)
         if b_total == 0:
             return []
 
-        b_total_locked = decimals_to_raw(data['balance_lock'], self.coin.decimals)
-
-        b_staked = Decimal(0)
-        if data['staking_info']:
-            b_staked = b_total_locked
-
-        # ignore data['unbonding'] - it's still staked
-
-        b_reserved = safe_opt_decimal(data['reserved'])
-        b_vesting = (
-            to_decimal(data['vesting']['total_locked'])
-            if data['vesting']
-            else Decimal(0)
-        )
-
-        # do we want to include these?
-        # b_democracy = safe_opt_decimal(data['democracy_lock'])
-        # b_election = safe_opt_decimal(data['election_lock'])
-
-        b_available = b_total - b_total_locked - b_reserved
-        b_locked = b_reserved
+        b_reserved = safe_opt_decimal(data.get('reserved'))
 
+        b_available = b_total - b_reserved
         if b_available:
             yield BalanceItem.from_api(
                 balance_raw=int(b_available),
@@ -88,25 +69,20 @@ class SubscanApi(BlockchainApi, BalanceMixin, ABC):
                 raw=data,
             )
 
-        if b_staked:
+        b_bonded = safe_opt_decimal(data.get('bonded'))
+        if b_bonded:
             yield BalanceItem.from_api(
-                balance_raw=int(b_staked),
+                balance_raw=int(b_bonded),
                 coin=self.coin,
                 asset_type=AssetType.STAKED,
                 raw=data,
             )
 
-        if b_vesting:
-            yield BalanceItem.from_api(
-                balance_raw=int(b_vesting),
-                coin=self.coin,
-                asset_type=AssetType.VESTING,
-                raw=data['vesting'],
-            )
-
-        if b_locked:
+        # Others: reserved - bonded (includes unbonding + other reserves)
+        b_others = b_reserved - b_bonded
+        if b_others > 0:
             yield BalanceItem.from_api(
-                balance_raw=int(b_locked),
+                balance_raw=int(b_others),
                 coin=self.coin,
                 asset_type=AssetType.LOCKED,
                 raw=data,

{blockapi-1.3.0 → blockapi-1.3.2}/blockapi.egg-info/PKG-INFO

@@ -1,13 +1,37 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: blockapi
-Version: 1.3.0
+Version: 1.3.2
 Summary: BlockAPI library
 Home-page: https://github.com/crypkit/blockapi
 Author: Devmons s.r.o.
 License: MIT
-Platform: UNKNOWN
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
+Requires-Dist: requests==2.32.4
+Requires-Dist: pytz>=2019.2
+Requires-Dist: python-dateutil>=2.8.0
+Requires-Dist: coinaddrng==1.1.1
+Requires-Dist: cfscrape>=2.0.8
+Requires-Dist: ethereum_input_decoder>=0.2.2
+Requires-Dist: web3<6.0.0,>=5.2.2
+Requires-Dist: bs4>=0.0.1
+Requires-Dist: lxml>=4.4.1
+Requires-Dist: pydantic>=1.10.2
+Requires-Dist: marko==1.3.0
+Requires-Dist: fake_useragent>=1.1.3
+Requires-Dist: pytest
+Requires-Dist: pytest-vcr
+Requires-Dist: requests_mock>=1.9.3
+Requires-Dist: attrs<=22.1.0,>=17.4.0
+Requires-Dist: solders==0.22.0
+Dynamic: author
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # blockapi
 
@@ -157,5 +181,3 @@ See also the list of [contributors](https://github.com/crypkit/blockapi/contribu
 
 This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details
 
-
-

{blockapi-1.3.0 → blockapi-1.3.2}/blockapi.egg-info/requires.txt

@@ -1,4 +1,4 @@
-requests==2.32.0
+requests==2.32.4
 pytz>=2019.2
 python-dateutil>=2.8.0
 coinaddrng==1.1.1

{blockapi-1.3.0 → blockapi-1.3.2}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as f:
 
 PACKAGES = find_packages(where='.')
 
-__version__ = "1.3.0"
+__version__ = "1.3.2"
 
 setuptools.setup(
     name='blockapi',
@@ -18,7 +18,7 @@ setuptools.setup(
     long_description_content_type='text/markdown',
     packages=PACKAGES,
     install_requires=[
-        'requests==2.32.0',
+        'requests==2.32.4',
         'pytz>=2019.2',
         'python-dateutil>=2.8.0',
         'coinaddrng==1.1.1',

blockapi-1.3.0/blockapi/test/v2/api/test_subscan_polkadot.py

@@ -1,32 +0,0 @@
-from decimal import Decimal
-
-import pytest
-
-from blockapi.test.v2.api.conftest import read_file
-from blockapi.v2.api import PolkadotSubscanApi
-
-
-@pytest.mark.parametrize(
-    'address, response_path, expected_balance',
-    [
-        (
-            '1NjjK81oA9is7eWhFJ7n7kQhaPT3pnxLFH5MkwDfduAiWE9',
-            'data/subscan_polkadot_response_WE9.json',
-            Decimal('4649.9139999889'),
-        ),
-        (
-            '15j4dg5GzsL1bw2U2AWgeyAk6QTxq43V7ZPbXdAmbVLjvDCK',
-            'data/subscan_polkadot_response_DCK.json',
-            Decimal('49296244.7887007465'),
-        ),
-    ],
-)
-def test_fetch_balances(requests_mock, address, response_path, expected_balance):
-    requests_mock.post(
-        'https://polkadot.api.subscan.io/api/v2/scan/search',
-        text=read_file(response_path),
-    )
-
-    api = PolkadotSubscanApi()
-    balances = api.get_balance(address)
-    assert sum(b.balance for b in balances) == expected_balance