blockapi 0.44.0__tar.gz → 0.45.0__tar.gz

{blockapi-0.44.0 → blockapi-0.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blockapi
-Version: 0.44.0
+Version: 0.45.0
 Summary: BlockAPI library
 Home-page: UNKNOWN
 Author: Devmons s.r.o.

{blockapi-0.44.0 → blockapi-0.45.0}/blockapi/test/v2/api/test_solana.py

@@ -70,6 +70,7 @@ def test_use_base_url_in_post(
     solana_value_response,
     solana_response,
     staked_solana_response,
+    rent_reserve_solana_response,
     token_list_sol_response,
     token_list_jup_ag_response,
     token_list_sonar_response,
@@ -83,6 +84,7 @@ def test_use_base_url_in_post(
             solana_response,
             '{"result": {"value": []}}',
             staked_solana_response,
+            rent_reserve_solana_response,
         ]
     )
 
@@ -312,6 +314,11 @@ 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')

{blockapi-0.44.0 → blockapi-0.45.0}/blockapi/v2/api/solana.py

@@ -31,7 +31,10 @@ JUP_AG_TOKEN_LIST_URL = (
 JUP_AG_BAN_LIST_URL = (
     'https://raw.githubusercontent.com/jup-ag/token-list/main/banned-tokens.csv'
 )
-SONAR_TOKEN_LIST_URL = 'https://cdn.jsdelivr.net/npm/@sonarwatch/token-lists/build/sonarwatch.solana.tokenlist.json'
+SONAR_TOKEN_LIST_URL = (
+    'https://cdn.jsdelivr.net/npm/@sonarwatch'
+    '/token-lists/build/sonarwatch.solana.tokenlist.json'
+)
 
 
 class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
@@ -127,7 +130,21 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
                 {'encoding': 'jsonParsed'},
             ],
         )
-        raw_staked_sol = self._request(
+        raw_staked_sol = self._fetch_staked_sol(address)
+        raw_rent_reserve = self._fetch_stake_rent_reserve(raw_staked_sol)
+
+        return FetchResult(
+            data=data,
+            extra=dict(
+                raw_token_balances=raw_token_balances,
+                raw_token2022_balances=raw_token2022_balances,
+                raw_staked_sol=raw_staked_sol,
+                raw_rent_reserve=raw_rent_reserve,
+            ),
+        )
+
+    def _fetch_staked_sol(self, address: str) -> dict:
+        return self._request(
             method='getProgramAccounts',
             params=[
                 'Stake11111111111111111111111111111111111111',
@@ -150,19 +167,19 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
             ],
         )
 
-        return FetchResult(
-            data=data,
-            extra=dict(
-                raw_token_balances=raw_token_balances,
-                raw_token2022_balances=raw_token2022_balances,
-                raw_staked_sol=raw_staked_sol,
-            ),
-        )
+    def _fetch_stake_rent_reserve(self, raw_staked_sol: dict) -> list[dict]:
+        stake_accounts = [r['pubkey'] for r in raw_staked_sol['result']]
+        results = []
+        for a in stake_accounts:
+            results.append(self._request(method='getBalance', params=[a]))
+
+        return results
 
     def parse_balances(self, fetch_result: FetchResult) -> ParseResult:
         raw_token_balances = fetch_result.extra['raw_token_balances']
         raw_token2022_balances = fetch_result.extra['raw_token2022_balances']
         raw_staked_sol = fetch_result.extra['raw_staked_sol']
+        raw_rent_reserve = fetch_result.extra['raw_rent_reserve']
 
         balances = []
         if sol_balance := self._get_sol_balance(fetch_result.data):
@@ -170,6 +187,10 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
 
         if staked_sol_balance := self._get_staked_sol_balance(raw_staked_sol):
             balances.append(staked_sol_balance)
+            rent_reserve_balance = self._get_stake_rent_reserve(
+                staked_sol_balance, raw_rent_reserve
+            )
+            balances.append(rent_reserve_balance)
 
         token_balances = list(self._yield_token_balances(raw_token_balances))
         token_balances.extend(self._yield_token_balances(raw_token2022_balances))
@@ -222,6 +243,19 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
             raw=response['result'],
         )
 
+    def _get_stake_rent_reserve(
+        self, staked_sol: BalanceItem, responses: list[dict]
+    ) -> BalanceItem:
+        total_raw = sum(r['result']['value'] for r in responses)
+        available_raw = total_raw - int(staked_sol.balance_raw)
+
+        return BalanceItem.from_api(
+            balance_raw=available_raw,
+            coin=self.coin,
+            asset_type=AssetType.RENT_RESERVE,
+            raw=responses,
+        )
+
     def _yield_token_balances(self, response: dict) -> Iterable[BalanceItem]:
         for raw_balance in response['result']['value']:
             balance = self._parse_token_balance(raw_balance)

{blockapi-0.44.0 → blockapi-0.45.0}/blockapi/v2/base.py

@@ -113,7 +113,8 @@ class CustomizableBlockchainApi(ABC):
                         seconds = 60
 
                     logger.warning(
-                        f'Too Many Requests: Will retry after {seconds}s sleep. Remaining attempts {retries}.'
+                        f'Too Many Requests: Will retry after {seconds}s sleep.'
+                        f' Remaining attempts {retries}.'
                     )
                     self.sleep_provider.sleep(self.base_url, seconds=seconds)
                     continue

{blockapi-0.44.0 → blockapi-0.45.0}/blockapi/v2/models.py

@@ -280,6 +280,7 @@ class AssetType(str, Enum):
     NFT = 'nft'
     PENDING_TRANSACTION = 'pending_transaction'
     PRICED_VESTING = 'priced_vesting'
+    RENT_RESERVE = 'rent_reserve'
     REWARDS = 'rewards'
     STAKED = 'staked'
     UNREALIZED_AVAILABLE = 'unrealized_available'
@@ -539,7 +540,7 @@ class BalanceItem:
         balance_raw: Union[int, float, str, Decimal],
         coin: Coin,
         asset_type: AssetType = AssetType.AVAILABLE,
-        raw: Dict,
+        raw: Union[Dict, List[Dict]],
         last_updated: Optional[Union[int, str]] = None,
         protocol: Optional[Protocol] = None,
         is_wallet: bool = True,

{blockapi-0.44.0 → blockapi-0.45.0}/blockapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blockapi
-Version: 0.44.0
+Version: 0.45.0
 Summary: BlockAPI library
 Home-page: UNKNOWN
 Author: Devmons s.r.o.

{blockapi-0.44.0 → blockapi-0.45.0}/setup.py

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