blockapi 0.31.2__tar.gz → 0.32.0__tar.gz

{blockapi-0.31.2 → blockapi-0.32.0}/PKG-INFO

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

{blockapi-0.31.2 → blockapi-0.32.0}/blockapi/test/v2/api/nft/test_opensea.py

@@ -54,6 +54,11 @@ def listings_response():
     return read_file('data/opensea/listings.json')
 
 
+@pytest.fixture
+def locked_listings_response():
+    return read_file('data/opensea/listings-locked.json')
+
+
 @pytest.fixture
 def collection_stats_response():
     return read_file('data/opensea/collection-stats.json')
@@ -134,6 +139,9 @@ def test_parse_nfts(requests_mock, api, nfts_response, nfts_next_response):
 
     nfts = api.fetch_nfts(nfts_test_address)
     parsed = api.parse_nfts(nfts)
+
+    assert not parsed.cursor
+
     assert len(parsed.data) == 2
     data = parsed.data[1]
     assert data.ident == '550885'
@@ -162,6 +170,25 @@ def test_parse_nfts(requests_mock, api, nfts_response, nfts_next_response):
     assert data.amount == 1
 
 
+def test_fetch_nfts_with_limit(
+    requests_mock, api_w_limit, nfts_response, nfts_next_response
+):
+    requests_mock.get(
+        f'https://api.opensea.io/api/v2/chain/ethereum/account/{nfts_test_address}/nfts',
+        text=nfts_response,
+    )
+    requests_mock.get(
+        f'https://api.opensea.io/api/v2/chain/ethereum/account/{nfts_test_address}/nfts?next=LXBrPTE0MDMyMTEyOTU=',
+        text=nfts_next_response,
+    )
+
+    nfts = api_w_limit.fetch_nfts(nfts_test_address)
+    parsed = api_w_limit.parse_nfts(nfts)
+
+    assert nfts.cursor == 'LXBrPTE0MDMyMTEyOTU='
+    assert parsed.cursor == 'LXBrPTE0MDMyMTEyOTU='
+
+
 def test_parse_offers(requests_mock, api, offers_response, offers_next_response):
     requests_mock.get(
         f'https://api.opensea.io/api/v2/offers/collection/ever-fragments-of-civitas/all',
@@ -261,6 +288,19 @@ def test_parse_listings(requests_mock, api, listings_response):
     assert data.pay_amount == Decimal('0.02')
 
 
+def test_ignore_locked_listings(requests_mock, api, locked_listings_response):
+    requests_mock.get(
+        f'https://api.opensea.io/api/v2/listings/collection/ever-fragments-of-civitas/all',
+        text=locked_listings_response,
+    )
+
+    listings = api.fetch_listings(test_collection_slug)
+    parsed = api.parse_listings(listings)
+
+    assert not parsed.errors
+    assert not parsed.data
+
+
 def test_parse_collection(
     requests_mock, api, collection_response, collection_stats_response
 ):
@@ -300,7 +340,11 @@ def test_parse_collection(
     assert data.total_stats.floor_price == Decimal('0.008')
     assert data.total_stats.coin == COIN_ETH
     assert data.blockchain == Blockchain.ETHEREUM
-    assert data.contract == '0x8acb0bc7f6c77e4e2aef83ea928d5a6c2a0b7fcd'
+    assert len(data.contracts) == 2
+    assert data.contracts[0].blockchain == Blockchain.ETHEREUM
+    assert data.contracts[0].address == '0x8acb0bc7f6c77e4e2aef83ea928d5a6c2a0b7fcd'
+    assert data.contracts[1].blockchain == Blockchain.ETHEREUM
+    assert data.contracts[1].address == '0x9acb0bc7f6c77e4e2aef83ea928d5a6c2a0b7fcd'
 
 
 def test_create_with_unsupported_blockchain():

{blockapi-0.31.2 → blockapi-0.32.0}/blockapi/v2/api/nft/opensea.py

@@ -19,6 +19,7 @@ from blockapi.v2.models import (
     AssetType,
     Blockchain,
     Coin,
+    ContractInfo,
     FetchResult,
     NftCollection,
     NftCollectionIntervalStats,
@@ -68,6 +69,8 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
         Blockchain.ZORA: 'zora',
     }
 
+    opensea_blockchains = {n: b for b, n in supported_blockchains.items()}
+
     coin = COIN_ETH
     api_options = ApiOptions(
         blockchain=Blockchain.ETHEREUM,
@@ -106,9 +109,9 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
         self._sleep_provider = sleep_provider or SleepProvider()
         self._limit = limit
 
-    def fetch_nfts(self, address: str) -> FetchResult:
-        logger.info(f'Fetch nfts from {address}')
-        return self._coalesce(self._yield_nfts(address))
+    def fetch_nfts(self, address: str, cursor: Optional[str] = None) -> FetchResult:
+        logger.info(f'Fetch nfts from {address}, cursor={cursor}')
+        return self._coalesce(self._yield_nfts(address, cursor))
 
     def parse_nfts(self, fetch_result: FetchResult) -> ParseResult:
         logger.info(f'Parse nfts')
@@ -174,12 +177,16 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
             headers=self._headers,
             collection=collection,
             chain=self._opensea_chain,
-            extra=dict(stats=stats.data, stats_errors=stats.errors),
+            extra=dict(
+                collection=collection, stats=stats.data, stats_errors=stats.errors
+            ),
         )
 
     def parse_collection(self, fetch_result: FetchResult) -> ParseResult:
         parsed, error = self._parse_collection(
-            fetch_result.data, fetch_result.extra.get('stats')
+            fetch_result.extra.get('collection'),
+            fetch_result.data,
+            fetch_result.extra.get('stats'),
         )
         errors = []
         if error:
@@ -192,9 +199,13 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
             data=[parsed] if parsed else None, errors=errors if errors else None
         )
 
-    def _yield_nfts(self, address: str) -> Iterable[Tuple[FetchResult, Optional[str]]]:
+    def _yield_nfts(
+        self, address: str, cursor: Optional[str] = None
+    ) -> Iterable[Tuple[FetchResult, Optional[str]]]:
         try:
-            yield from self._yield_fetch_data(self._fetch_nfts_page, key=address)
+            yield from self._yield_fetch_data(
+                self._fetch_nfts_page, key=address, cursor=cursor
+            )
         except Exception as e:
             logger.error(f'Error fetching OpenSea NFTs from {address}')
             logger.exception(e)
@@ -318,9 +329,10 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
                 )
 
     def _parse_collection(
-        self, data: dict, stat_data: dict
+        self, collection_ident: str, data: dict, stat_data: dict
     ) -> tuple[Optional[NftCollection], Optional[str]]:
         if not stat_data or not data:
+            logger.warning(f'No data for collection: {collection_ident}')
             return None, None
 
         total = stat_data.get('total')
@@ -329,7 +341,10 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
         if not coin:
             coin = COIN_ETH
             if symbol:
-                return None, f'There is no mapping for opensea symbol {symbol}'
+                return (
+                    None,
+                    f'There is no mapping for opensea symbol {symbol} (collection={collection_ident})',
+                )
 
         total_stats = NftCollectionTotalStats.from_api(
             volume=total.get('volume'),
@@ -346,19 +361,12 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
         week_stats = self._parse_collection_stats(intervals, 'one_week')
         month_stats = self._parse_collection_stats(intervals, 'one_month')
 
-        contract = data.get('collection')
-        if contracts := data.get('contracts'):
-            if contract_filtered := [
-                c.get('address')
-                for c in contracts
-                if c.get('chain') == self._opensea_chain
-            ]:
-                contract = contract_filtered[0].lower()
+        contracts = list(self._yield_contracts(collection_ident, data.get('contracts')))
 
         collection = NftCollection.from_api(
             ident=data.get('collection'),
             name=data.get('name'),
-            contract=contract,
+            contracts=contracts,
             image=data.get('image_url'),
             is_disabled=data.get('is_disabled'),
             is_nsfw=data.get('is_nsfw'),
@@ -445,6 +453,11 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
             _,
         ) = self._parse_offer_item(offer[0])
 
+        offer_key = item.get('order_hash')
+        if self._is_locked(params.get('consideration'), direction, offerer):
+            logger.info(f'Locked {direction} skipped: offer_key={offer_key}')
+            return None
+
         price = item.get('price', dict()).get('current')
         if direction == NftOfferDirection.LISTING and price:
             pay_amount = Decimal(price.get('value'))
@@ -458,7 +471,7 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
             )
 
         return NftOffer.from_api(
-            offer_key=item.get('order_hash'),
+            offer_key=offer_key,
             direction=direction,
             collection=collection,
             contract=contract,
@@ -476,6 +489,15 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
             pay_amount=pay_amount,
         )
 
+    @staticmethod
+    def _is_locked(items: list[dict], direction: NftOfferDirection, offerer: str):
+        locks = [t for t in items if t.get('itemType') not in ['0', '1']]
+        if direction == NftOfferDirection.LISTING:
+            return any(locks)
+
+        locks = [t for t in locks if t.get('recipient').lower() != offerer]
+        return any(locks)
+
     @staticmethod
     def _parse_contract(item) -> Optional[str]:
         criteria = item.get('criteria')
@@ -559,3 +581,26 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
             cursor=last_cursor,
             time=last.time,
         )
+
+    def _yield_contracts(self, ident: str, contracts: dict) -> Iterable[ContractInfo]:
+        if not contracts:
+            return
+
+        for item in contracts:
+            chain = item.get('chain')
+            blockchain = self.opensea_blockchains.get(chain)
+            address = item.get('address')
+
+            if not blockchain:
+                logger.warning(
+                    f'Could not map {chain} to known blockchains for collection {ident}'
+                )
+                continue
+
+            if not address:
+                logger.warning(
+                    f'No address available for item with chain {chain} for collection {ident}'
+                )
+                continue
+
+            yield ContractInfo.from_api(blockchain=blockchain, address=address)

{blockapi-0.31.2 → blockapi-0.32.0}/blockapi/v2/coin_mapping.py

@@ -1,10 +1,11 @@
-from blockapi.v2.coins import COIN_ETH, COIN_PRIME, COIN_USDC, COIN_WETH
+from blockapi.v2.coins import COIN_DAI, COIN_ETH, COIN_PRIME, COIN_USDC, COIN_WETH
 from blockapi.v2.models import Blockchain, Coin
 
 OPENSEA_COINS: dict[str, Coin] = {
     'ETH': COIN_ETH,
     'USDC': COIN_USDC,
     'PRIME': COIN_PRIME,
+    'DAI': COIN_DAI,
 }
 
 OPENSEA_CONTRACTS = {

{blockapi-0.31.2 → blockapi-0.32.0}/blockapi/v2/coins.py

@@ -243,6 +243,14 @@ COIN_XDAI = Coin(
     info=CoinInfo(coingecko_id=CoingeckoId.XDAI),
 )
 
+COIN_DAI = Coin(
+    symbol='DAI',
+    name='Dai',
+    decimals=18,
+    blockchain=Blockchain.ETHEREUM,
+    info=CoinInfo(coingecko_id=CoingeckoId.DAI),
+)
+
 COIN_OKT = Coin(
     symbol='OKT',
     name='OKC',

{blockapi-0.31.2 → blockapi-0.32.0}/blockapi/v2/models.py

@@ -270,6 +270,7 @@ class CoingeckoId(str, Enum):
     CELO = 'celo'
     COSMOS = 'cosmos'
     CRONOS = 'crypto-com-chain'
+    DAI = 'dai'
     DOGECOIN = 'dogecoin'
     ETHEREUM = 'ethereum'
     EVMOS = 'evmos'
@@ -716,11 +717,21 @@ class NftCollectionTotalStats:
         )
 
 
+@attr.s(auto_attribs=True, slots=True, frozen=True)
+class ContractInfo:
+    blockchain: Blockchain
+    address: str
+
+    @classmethod
+    def from_api(cls, *, blockchain: Blockchain, address: str):
+        return cls(blockchain=blockchain, address=address)
+
+
 @attr.s(auto_attribs=True, slots=True, frozen=True)
 class NftCollection:
     ident: str
     name: str
-    contract: str
+    contracts: list[ContractInfo]
     image: Optional[str]
     is_disabled: bool
     is_nsfw: bool
@@ -736,7 +747,7 @@ class NftCollection:
         *,
         ident: str,
         name: str,
-        contract: str,
+        contracts: list[ContractInfo],
         image: Optional[str],
         is_disabled: bool,
         is_nsfw: bool,
@@ -749,7 +760,7 @@ class NftCollection:
         return cls(
             ident=ident,
             name=name,
-            contract=contract,
+            contracts=contracts,
             image=image,
             is_disabled=is_disabled,
             is_nsfw=is_nsfw,

{blockapi-0.31.2 → blockapi-0.32.0}/blockapi.egg-info/PKG-INFO

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

{blockapi-0.31.2 → blockapi-0.32.0}/setup.py

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