avantis-trader-sdk 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

avantis_trader_sdk/__init__.py

@@ -2,25 +2,25 @@ from .client import TraderClient
 from .feed.feed_client import FeedClient
 from .signers.base import BaseSigner
 
-__version__ = "0.6.0"
+__version__ = "0.7.0"
 
-# print(
-#     f"""
-# ---------------------------------------------------------------------------------
-# ⚠️ IMPORTANT: Avantis Contracts v1.5 Upgrade
+print(
+    f"""
+---------------------------------------------------------------------------------
+⚠️ IMPORTANT: Avantis Contracts v1.5 Upgrade
 
-# Breaking changes are being introduced as part of the v1.5 Contracts Upgrade.
-# If you're using this SDK, please review the details to ensure compatibility.
+Breaking changes are being introduced as part of the v1.5 Contracts Upgrade.
+If you're using this SDK, please review the details to ensure compatibility.
 
-# Details: https://avantisfi.notion.site/avantis-contracts-v1-5-upgrade
+Details: https://avantisfi.notion.site/avantis-contracts-v1-5-upgrade
 
-# Milestone 1: Scheduled for 24th January 2025
-# - Updates to PairStorage, PairInfos, and Multicall contracts.
+Milestone 1: Completed on 24th January 2025
+- Updates to PairStorage, PairInfos, and Multicall contracts.
 
-# Milestone 2: Date TBD
-# - Updates to Trading, Referral, TradingStorage, TradingCallbacks, and more.
+Milestone 2: Scheduled for 21th February 2025
+- Updates to Trading, Referral, TradingStorage, TradingCallbacks, and more.
 
-# Ensure your integration is updated to avoid disruptions.
-# ---------------------------------------------------------------------------------
-# """
-# )
+Ensure your integration is updated to avoid disruptions.
+---------------------------------------------------------------------------------
+"""
+)

avantis_trader_sdk/client.py

@@ -150,9 +150,8 @@ class TraderClient:
         if not self.has_signer():
             return transaction
 
-        signed_txn = await self.sign_transaction(transaction)
-        tx_hash = await self.send_and_get_transaction_hash(signed_txn)
-        return tx_hash
+        receipt = await self.sign_and_get_receipt(transaction)
+        return receipt
 
     def set_signer(self, signer: BaseSigner):
         """
@@ -290,7 +289,8 @@ class TraderClient:
         """
         if address is None:
             address = self.get_signer().get_ethereum_address()
-        return await self.async_web3.eth.get_balance(address)
+        balance = await self.async_web3.eth.get_balance(address)
+        return balance / 10**18
 
     async def get_usdc_balance(self, address=None):
         """

avantis_trader_sdk/config.py

@@ -9,4 +9,6 @@ MAINNET_ADDRESSES = {
     "Referral": "0xA96f577821933d127B491D0F91202405B0dbB1bd",
 }
 
+AVANTIS_SOCKET_API = "https://socket-api.avantisfi.com/v1/data"
+
 CONTRACT_ADDRESSES = MAINNET_ADDRESSES

avantis_trader_sdk/feed/feed_client.py

@@ -1,9 +1,12 @@
 import json
 import websockets
-from pathlib import Path
-from ..types import PriceFeedResponse, PriceFeedUpdatesResponse
-from typing import List
+from ..types import PriceFeedResponse, PriceFeedUpdatesResponse, PairInfoFeed
+from typing import List, Callable
 import requests
+from pydantic import ValidationError
+from ..config import AVANTIS_SOCKET_API
+import asyncio
+from concurrent.futures import ThreadPoolExecutor
 
 
 class FeedClient:
@@ -17,6 +20,7 @@ class FeedClient:
         on_error=None,
         on_close=None,
         hermes_url="https://hermes.pyth.network/v2/updates/price/latest",
+        pair_fetcher: Callable = None,
     ):
         """
         Constructor for the FeedClient class.
@@ -42,6 +46,7 @@ class FeedClient:
         self._connected = False
         self._on_error = on_error
         self._on_close = on_close
+        self.pair_fetcher = pair_fetcher or self.default_pair_fetcher
         self._load_pair_feeds()
 
     async def listen_for_price_updates(self):
@@ -95,14 +100,65 @@ class FeedClient:
             else:
                 raise e
 
+    async def default_pair_fetcher(self) -> List[dict]:
+        """
+        Default pair fetcher that retrieves data from the Avantis API.
+        Returns:
+            A list of validated trading pairs.
+        Raises:
+            ValueError if API response is invalid.
+        """
+        if not AVANTIS_SOCKET_API:
+            raise ValueError("AVANTIS_SOCKET_API is not set")
+        try:
+            response = requests.get(AVANTIS_SOCKET_API)
+            response.raise_for_status()
+
+            result = response.json()
+            pairs = result["data"]["pairInfos"].values()
+
+            return pairs
+        except (requests.RequestException, ValidationError) as e:
+            print(f"Error fetching pair feeds: {e}")
+            return []
+
     def _load_pair_feeds(self):
         """
-        Loads the pair feeds from the json file.
+        Loads the pair feeds dynamically using the provided pair_fetcher function.
         """
-        feed_path = Path(__file__).parent / "feedIds.json"
-        with open(feed_path) as feed_file:
-            self.pair_feeds = json.load(feed_file)
-            self.feed_pairs = {v["id"]: k for k, v in self.pair_feeds.items()}
+
+        try:
+            try:
+                asyncio.get_running_loop()
+            except RuntimeError:
+                asyncio.set_event_loop(asyncio.new_event_loop())
+
+            with ThreadPoolExecutor() as executor:
+                future = executor.submit(lambda: asyncio.run(self.pair_fetcher()))
+                pairs = future.result()
+
+            if not pairs:
+                raise ValueError("Fetched pair feed data is empty or invalid.")
+
+            if isinstance(pairs, dict):
+                pairs = list(pairs.values())
+            else:
+                pairs = list(pairs)
+
+            if hasattr(pairs[0], "model_dump_json"):
+                pairs = [json.loads(pair.model_dump_json()) for pair in pairs]
+
+            validated_pairs = [PairInfoFeed.model_validate(pair) for pair in pairs]
+
+            self.pair_feeds = {
+                f"{pair.from_}/{pair.to}": {"id": pair.feed.feed_id}
+                for pair in validated_pairs
+            }
+            self.feed_pairs = {
+                pair.feed.feed_id: f"{pair.from_}/{pair.to}" for pair in validated_pairs
+            }
+        except Exception as e:
+            print(f"Failed to load pair feeds: {e}")
 
     def get_pair_from_feed_id(self, feed_id):
         """

avantis_trader_sdk/types.py

@@ -36,6 +36,9 @@ class PairInfoBackupFeed(BaseModel):
     def convert_max_deviation(cls, v):
         return v / 10**10
 
+    class Config:
+        populate_by_name = True
+
 
 class PairInfoLeverages(BaseModel):
     min_leverage: float = Field(..., alias="minLeverage")
@@ -110,8 +113,19 @@ class PairInfoWithData(PairInfo, PairData):
         from_attributes = True
 
 
+class PairInfoFeed(BaseModel):
+    from_: str = Field(..., alias="from")
+    to: str
+    feed: PairInfoFeed
+    backup_feed: PairInfoBackupFeed = Field(..., alias="backupFeed")
+
+    class Config:
+        populate_by_name = True
+
+
 class OpenInterest(BaseModel):
     long: Dict[str, float]
+
     short: Dict[str, float]
 
 

{avantis_trader_sdk-0.6.0.dist-info → avantis_trader_sdk-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: avantis-trader-sdk
-Version: 0.6.0
+Version: 0.7.0
 Summary: SDK for interacting with Avantis trading contracts.
 Home-page: https://avantisfi.com/
 Author: Avantis Labs

{avantis_trader_sdk-0.6.0.dist-info → avantis_trader_sdk-0.7.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-avantis_trader_sdk/__init__.py,sha256=JUFO-X_UKaXCpgw3D34f1vlKoiykNf3eRBkYkeb9slg,917
-avantis_trader_sdk/client.py,sha256=OPyVhE6g41_Uek1C95PT6h1YJRjDnsQ6cGZZ-1XV2XM,11271
-avantis_trader_sdk/config.py,sha256=3nubC4ClH15JJ71Z3MJuvEwkBP5R-paIhHOEfQ9WFnM,585
-avantis_trader_sdk/types.py,sha256=aJRfFESmcqcgSRQ8B_9zzXalOChSlsC5K5HfkZvwzlg,13958
+avantis_trader_sdk/__init__.py,sha256=QSySCM3stHw3scigwfo2rG29XXKDFGiklzq9ZPTbRww,910
+avantis_trader_sdk/client.py,sha256=dYGrSH5m1QesyMXEGvoLQihBQTRm_nJF22t46JeZirk,11236
+avantis_trader_sdk/config.py,sha256=jFLspHAWgLWVv5VdyS25aBtiQLLcHqJJ11jkT6ubSgY,652
+avantis_trader_sdk/types.py,sha256=9PNDt4nhEDxDEGsN_bYC7MOHK0w9UYwI6BSwvpFVdxY,14254
 avantis_trader_sdk/utils.py,sha256=JE3hiDA8a9KHW08u0lVsuXi6Npl8GcuUdvrSkwohvDc,2909
 avantis_trader_sdk/abis/AggregatorV3Interface.json,sha256=0sTEMeK5PfVfJM0ZoLkWkxme_PgcOKoYhxz5cQNo728,26850
 avantis_trader_sdk/abis/Sanctions.json,sha256=2FFgtlHZEXTOYtFWNjPlV56b7WSiwuY92VR9Jkik1uc,4047
@@ -195,7 +195,7 @@ avantis_trader_sdk/crypto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 avantis_trader_sdk/crypto/spki.py,sha256=CNy7A8TTwBHiNSzIj7uqiHKAeLcn1Q9MbszW_2mdXgI,3080
 avantis_trader_sdk/feed/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 avantis_trader_sdk/feed/feedIds.json,sha256=T77nww3eRiQt8rqZBDpdxA49USGyfI0dQBPnzo-H1dE,6697
-avantis_trader_sdk/feed/feed_client.py,sha256=fnATL8bCNzteZZolMgrycXHNK25_TI4Lg_Y4oVN9ep8,7423
+avantis_trader_sdk/feed/feed_client.py,sha256=kzn3XSbYU68R18JUB2GUN70SuyuILyGVSd65onJLsPk,9473
 avantis_trader_sdk/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 avantis_trader_sdk/rpc/asset_parameters.py,sha256=OkGyfSmiCUl7fgJaUJFQekpQ8o2_JbbSwh1gWAXdZKY,19717
 avantis_trader_sdk/rpc/blended.py,sha256=UHgrPEvkJwQJRxTrVG03Ir8IjJRGenQFov1bJvbuGi4,2512
@@ -212,7 +212,7 @@ avantis_trader_sdk/signers/kms_signer.py,sha256=lxK3f9KQsdCDAvOE1SHleKjI8zD_3PTv
 avantis_trader_sdk/signers/local_signer.py,sha256=kUx5vExiBfvFGmoMCFR6b7_4cXx2mvYOJNqZQDIEcG8,505
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_client.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avantis_trader_sdk-0.6.0.dist-info/METADATA,sha256=T5o1GDxF_mjZE3_N77alBZ9QbRQGg6U6YGqozkPbVmw,4916
-avantis_trader_sdk-0.6.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-avantis_trader_sdk-0.6.0.dist-info/top_level.txt,sha256=XffaQJ68SGT1KUz2HHXSGSEsmNy8-AGjgtO127xhzQA,25
-avantis_trader_sdk-0.6.0.dist-info/RECORD,,
+avantis_trader_sdk-0.7.0.dist-info/METADATA,sha256=SWtPCpMJXC0pR7QNTT9PmxLGFB16WmH1QKnGo5ZSwOI,4916
+avantis_trader_sdk-0.7.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+avantis_trader_sdk-0.7.0.dist-info/top_level.txt,sha256=XffaQJ68SGT1KUz2HHXSGSEsmNy8-AGjgtO127xhzQA,25
+avantis_trader_sdk-0.7.0.dist-info/RECORD,,