blockapi 0.49.2__tar.gz → 0.49.4__tar.gz

{blockapi-0.49.2 → blockapi-0.49.4}/PKG-INFO

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

{blockapi-0.49.2 → blockapi-0.49.4}/blockapi/test/v2/api/test_solana.py

@@ -13,7 +13,14 @@ from blockapi.v2.api.solana import (
     SOL_TOKEN_LIST_URL,
     SONAR_TOKEN_LIST_URL,
 )
-from blockapi.v2.models import AssetType, BalanceItem, Blockchain, Coin, CoinInfo
+from blockapi.v2.models import (
+    AssetType,
+    BalanceItem,
+    Blockchain,
+    Coin,
+    CoinContract,
+    CoinInfo,
+)
 
 
 def test_merge_balances_with_different_coins(solana_api, balances_with_different_coins):
@@ -544,3 +551,52 @@ def metaplex_content():
         'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
         'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=='
     )
+
+
+def test_merge_balances_contract_merge(solana_api):
+    balances = [
+        BalanceItem(
+            **{
+                'balance': Decimal('1'),
+                'balance_raw': Decimal('1'),
+                'coin': None,
+                'coin_contract': CoinContract(
+                    **{
+                        'blockchain': 'solana',
+                        'contract': 'HEL6KGUEvwYgTtcjenf9qeAb2Zg9Yr77usWPY9UZvoQj',
+                        'decimals': 0,
+                    }
+                ),
+                'raw': {},
+                'asset_type': 'available',
+                'last_updated': None,
+                'protocol': None,
+                'is_wallet': True,
+                'pool_info': None,
+            }
+        ),
+        BalanceItem(
+            **{
+                'balance': Decimal('11'),
+                'balance_raw': Decimal('11'),
+                'coin': None,
+                'coin_contract': CoinContract(
+                    **{
+                        'blockchain': 'solana',
+                        'contract': 'HEL6KGUEvwYgTtcjenf9qeAb2Zg9Yr77usWPY9UZvoQj',
+                        'decimals': 0,
+                    }
+                ),
+                'raw': {},
+                'asset_type': 'available',
+                'last_updated': None,
+                'protocol': None,
+                'is_wallet': True,
+                'pool_info': None,
+            }
+        ),
+    ]
+
+    merged = solana_api.merge_balances_with_same_coin(balances)
+    assert len(merged) == 1
+    assert merged[0].coin_contract is not None

{blockapi-0.49.2 → blockapi-0.49.4}/blockapi/v2/api/solana.py

@@ -23,6 +23,7 @@ from blockapi.v2.models import (
     BalanceItem,
     Blockchain,
     Coin,
+    CoinContract,
     CoinInfo,
     FetchResult,
     ParseResult,
@@ -154,6 +155,13 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
             ),
         )
 
+    def get_coin(self, fetch_params: tuple[str, int]) -> Coin:
+        contract, decimals = fetch_params
+        if contract not in self.tokens_map:
+            self.update_token_from_metaplex(contract, decimals=decimals, force=True)
+
+        return self.get_token_data(contract)
+
     def _fetch_staked_sol(self, address: str) -> dict:
         return self._request(
             method='getProgramAccounts',
@@ -218,7 +226,7 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
     ) -> list[BalanceItem]:
         return list(
             reduceby(
-                key=lambda b: b.coin.address,
+                key=lambda b: b.coin.address if b.coin else b.coin_contract.contract,
                 binop=lambda v1, v2: v1 + v2,
                 seq=token_balances,
             ).values()
@@ -288,19 +296,31 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
         #  token account
         # TODO move fetching tokens_map to fetch
         if address not in self.tokens_map:
-            if not self.update_token_from_metaplex(
+            self.update_token_from_metaplex(
                 address, decimals=info['tokenAmount']['decimals']
-            ):
-                return
+            )
+
+        coin = self.get_token_data(address)
+        contract = None
+        if not coin:
+            contract = CoinContract.from_api(
+                blockchain=Blockchain.SOLANA,
+                contract=address,
+                decimals=int(info['tokenAmount']['decimals']),
+            )
 
         return BalanceItem.from_api(
             balance_raw=info['tokenAmount']['amount'],
-            coin=self.get_token_data(address),
+            coin=coin,
+            coin_contract=contract,
             raw=raw,
         )
 
-    def get_token_data(self, address: str) -> Coin:
-        raw_token = self.tokens_map[address]
+    def get_token_data(self, address: str) -> Optional[Coin]:
+        raw_token = self.tokens_map.get(address)
+        if not raw_token:
+            return None
+
         extensions = raw_token.get('extensions', {})
 
         return Coin(
@@ -319,8 +339,10 @@ class SolanaApi(CustomizableBlockchainApi, BalanceMixin):
             ),
         )
 
-    def update_token_from_metaplex(self, address: str, decimals: int) -> bool:
-        if not self.fetch_metaplex:
+    def update_token_from_metaplex(
+        self, address: str, decimals: int, force: bool = False
+    ) -> bool:
+        if not self.fetch_metaplex and not force:
             return False
 
         pda = self.get_metadata_pda(address)
@@ -455,3 +477,12 @@ class SolscanApi(BlockchainApi):
             last_updated=None,
             raw=response['data'],
         )
+
+
+if __name__ == "__main__":
+    api = SolanaApi(
+        base_url="https://solemn-practical-tree.solana-mainnet.quiknode.pro/00205ae683fa5c6aab1bc6a47b9d6aa28c47e0fc/",
+        fetch_metaplex=False,
+    )
+    api.get_balance("FEeSRuEDk8ENZbpzXjn4uHPz3LQijbeKRzhqVr5zPSJ9")
+    x = 1

{blockapi-0.49.2 → blockapi-0.49.4}/blockapi/v2/models.py

@@ -470,6 +470,17 @@ class CoinInfo:
         )
 
 
+@attr.s(auto_attribs=True, slots=True, frozen=True)
+class CoinContract:
+    blockchain: Blockchain
+    contract: str
+    decimals: int
+
+    @classmethod
+    def from_api(cls, *, blockchain: Blockchain, contract: str, decimals: int):
+        return cls(blockchain=blockchain, contract=contract, decimals=decimals)
+
+
 @attr.s(auto_attribs=True, slots=True, frozen=True)
 class Coin:
     symbol: str
@@ -583,7 +594,8 @@ class BalanceItem:
     balance: Decimal
     balance_raw: Decimal
     raw: Dict
-    coin: Coin
+    coin: Optional[Coin] = attr.ib(default=None)
+    coin_contract: Optional[CoinContract] = attr.ib(default=None)
     asset_type: AssetType = AssetType.AVAILABLE
     last_updated: Optional[datetime] = attr.ib(default=None)
     protocol: Optional[Protocol] = attr.ib(default=None)
@@ -595,7 +607,8 @@ class BalanceItem:
         cls,
         *,
         balance_raw: Union[int, float, str, Decimal],
-        coin: Coin,
+        coin: Optional[Coin] = None,
+        coin_contract: Optional[CoinContract] = None,
         asset_type: AssetType = AssetType.AVAILABLE,
         raw: Union[Dict, List[Dict]],
         last_updated: Optional[Union[int, str]] = None,
@@ -603,10 +616,16 @@ class BalanceItem:
         is_wallet: bool = True,
         pool_info: Optional[PoolInfo] = None,
     ) -> 'BalanceItem':
+        if coin is None and coin_contract is None:
+            raise ValueError('Either coin or coin_contract must be set')
+
         return cls(
             balance_raw=to_decimal(balance_raw),
-            balance=raw_to_decimals(balance_raw, coin.decimals),
+            balance=raw_to_decimals(
+                balance_raw, coin.decimals if coin else coin_contract.decimals
+            ),
             coin=coin,
+            coin_contract=coin_contract,
             asset_type=asset_type,
             raw=raw,
             last_updated=(parse_dt(last_updated) if last_updated is not None else None),
@@ -623,6 +642,7 @@ class BalanceItem:
             balance_raw=self.balance_raw + other.balance_raw,
             balance=self.balance + other.balance,
             coin=self.coin,
+            coin_contract=self.coin_contract,
             asset_type=self.asset_type,
             raw=self._add_raw(other),
             last_updated=self.last_updated,

{blockapi-0.49.2 → blockapi-0.49.4}/blockapi.egg-info/PKG-INFO

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

{blockapi-0.49.2 → blockapi-0.49.4}/setup.py

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