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

avantis_trader_sdk/client.py

@@ -137,6 +137,12 @@ class TraderClient:
         if self.has_signer() and "from" not in kwargs:
             kwargs["from"] = self.get_signer().get_ethereum_address()
 
+        if "chainId" not in kwargs:
+            kwargs["chainId"] = self.chain_id
+
+        if "nonce" not in kwargs:
+            kwargs["nonce"] = await self.get_transaction_count(kwargs["from"])
+
         transaction = await contract.functions[function_name](*args).build_transaction(
             kwargs
         )
@@ -144,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):
         """
@@ -284,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

@@ -1,12 +1,14 @@
 MAINNET_ADDRESSES = {
     "TradingStorage": "0x8a311D7048c35985aa31C131B9A13e03a5f7422d",
-    "PairStorage": "0x92Ed158d5e423CFdc9eed5Bd7328FFF7CeD6fF94",
+    "PairStorage": "0x5db3772136e5557EFE028Db05EE95C84D76faEC4",
     "PairInfos": "0x81F22d0Cc22977c91bEfE648C9fddf1f2bd977e5",
     "PriceAggregator": "0x64e2625621970F8cfA17B294670d61CB883dA511",
     "USDC": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
     "Trading": "0x5FF292d70bA9cD9e7CCb313782811b3D7120535f",
-    "Multicall": "0x06B145b672dc04BBA9821e2172728FEEa0D12Ec5",
+    "Multicall": "0xD4693314460d6fb598C1124aeC40C03e2Aa0A8a4",
     "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/rpc/pairs_cache.py

@@ -1,4 +1,4 @@
-from ..types import PairInfo
+from ..types import PairInfoWithData
 
 
 class PairsCache:
@@ -35,15 +35,31 @@ class PairsCache:
 
             calls = []
             for pair_index in range(pairs_count):
-                call_data = PairStorage.encodeABI(fn_name="pairs", args=[pair_index])
-                calls.append((PairStorage.address, call_data))
+                core_call_data = PairStorage.encodeABI(
+                    fn_name="pairs", args=[pair_index]
+                )
+                pair_data_call_data = PairStorage.encodeABI(
+                    fn_name="getPairData", args=[pair_index]
+                )
+                calls.extend(
+                    [
+                        (PairStorage.address, core_call_data),
+                        (PairStorage.address, pair_data_call_data),
+                    ]
+                )
 
             _, raw_data = await Multicall.functions.aggregate(calls).call()
 
             decoded_data = []
-            for data in raw_data:
-                decoded = self.client.utils["decoder"](PairStorage, "pairs", data)
-                decoded_data.append(PairInfo(**decoded))
+            for i in range(0, len(raw_data), 2):
+                pair_info = self.client.utils["decoder"](
+                    PairStorage, "pairs", raw_data[i]
+                )
+                pair_data = self.client.utils["decoder"](
+                    PairStorage, "getPairData", raw_data[i + 1]
+                )
+                pair_info.update(pair_data)
+                decoded_data.append(PairInfoWithData(**pair_info))
 
             for index, pair_info in enumerate(decoded_data):
                 if not pair_info.from_:

avantis_trader_sdk/rpc/trade.py

@@ -236,6 +236,8 @@ class TradeRPC:
         if trader is None:
             trader = self.client.get_signer().get_ethereum_address()
 
+        collateral_to_close = int(collateral_to_close * 10**6)
+
         execution_fee = await self.get_trade_execution_fee()
 
         transaction = await Trading.functions.closeTradeMarket(
@@ -308,7 +310,6 @@ class TradeRPC:
             trader = self.client.get_signer().get_ethereum_address()
 
         collateral_change = int(collateral_change * 10**6)
-        fee_in_wei = 1 * 10**18
 
         feed_client = self.FeedClient()
 
@@ -328,8 +329,65 @@ class TradeRPC:
             {
                 "from": trader,
                 "chainId": self.client.chain_id,
-                "value": fee_in_wei,
+                "value": 1,
+                "nonce": await self.client.get_transaction_count(trader),
+            }
+        )
+
+        return transaction
+
+    async def build_trade_tp_sl_update_tx(
+        self,
+        pair_index: int,
+        trade_index: int,
+        take_profit_price: float,
+        stop_loss_price: float,
+        trader: str = None,
+    ):
+        """
+        Builds a transaction to update the stop loss and take profit of a trade.
+
+        Args:
+            pair_index: The pair index.
+            trade_index: The trade index.
+            take_profit_price: The take profit price.
+            stop_loss_price: The stop loss price. Pass 0 if you want to remove the stop loss.
+            trader (optional): The trader's wallet address.
+        Returns:
+            A transaction object.
+        """
+        Trading = self.client.contracts.get("Trading")
+
+        if take_profit_price == 0:
+            raise ValueError("Take profit price cannot be 0")
+
+        if trader is None:
+            trader = self.client.get_signer().get_ethereum_address()
+
+        feed_client = self.FeedClient()
+
+        pair_name = await self.client.pairs_cache.get_pair_name_from_index(pair_index)
+
+        price_data = await feed_client.get_latest_price_updates([pair_name])
+
+        price_update_data = "0x" + price_data.binary.data[0]
+
+        take_profit_price = int(take_profit_price * 10**10)
+        stop_loss_price = int(stop_loss_price * 10**10)
+
+        transaction = await Trading.functions.updateTpAndSl(
+            pair_index,
+            trade_index,
+            stop_loss_price,
+            take_profit_price,
+            [price_update_data],
+        ).build_transaction(
+            {
+                "from": trader,
+                "chainId": self.client.chain_id,
+                "value": 1,
                 "nonce": await self.client.get_transaction_count(trader),
+                "gas": 1_000_000,
             }
         )
 

avantis_trader_sdk/types.py

@@ -13,6 +13,22 @@ import re
 
 
 class PairInfoFeed(BaseModel):
+    max_open_deviation_percentage: float = Field(..., alias="maxOpenDeviationP")
+    max_close_deviation_percentage: float = Field(..., alias="maxCloseDeviationP")
+
+    feed_id: str = Field(..., alias="feedId")
+
+    @field_validator(
+        "max_open_deviation_percentage", "max_close_deviation_percentage", mode="before"
+    )
+    def convert_max_deviation(cls, v):
+        return v / 10**10
+
+    class Config:
+        populate_by_name = True
+
+
+class PairInfoBackupFeed(BaseModel):
     max_deviation_percentage: float = Field(..., alias="maxDeviationP")
     feed_id: str = Field(..., alias="feedId")
 
@@ -20,27 +36,56 @@ class PairInfoFeed(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")
+    max_leverage: float = Field(..., alias="maxLeverage")
+    pnl_min_leverage: float = Field(..., alias="pnlMinLeverage")
+    pnl_max_leverage: float = Field(..., alias="pnlMaxLeverage")
+
+    @field_validator(
+        "min_leverage",
+        "max_leverage",
+        "pnl_min_leverage",
+        "pnl_max_leverage",
+        mode="before",
+    )
+    def convert_max_deviation(cls, v):
+        return v / 10**10
+
+
+class PairInfoValues(BaseModel):
+    max_gain_percentage: float = Field(..., alias="maxGainP")
+    max_sl_percentage: float = Field(..., alias="maxSlP")
+    max_long_oi_percentage: float = Field(..., alias="maxLongOiP")
+    max_short_oi_percentage: float = Field(..., alias="maxShortOiP")
+    group_open_interest_percentage: float = Field(
+        ..., alias="groupOpenInterestPecentage"
+    )
+    max_wallet_oi_percentage: float = Field(..., alias="maxWalletOI")
+    is_usdc_aligned: bool = Field(..., alias="isUSDCAligned")
+
 
 class PairInfo(BaseModel):
-    from_: str = Field(..., alias="from")
-    to: str
     feed: PairInfoFeed
-    backup_feed: PairInfoFeed = Field(..., alias="backupFeed")
+    backup_feed: PairInfoBackupFeed = Field(..., alias="backupFeed")
     constant_spread_bps: float = Field(..., alias="spreadP")
+    constant_pnl_spread_bps: float = Field(..., alias="pnlSpreadP")
+    leverages: PairInfoLeverages = Field(..., alias="leverages")
     price_impact_parameter: float = Field(..., alias="priceImpactMultiplier")
     skew_impact_parameter: float = Field(..., alias="skewImpactMultiplier")
     group_index: int = Field(..., alias="groupIndex")
     fee_index: int = Field(..., alias="feeIndex")
-    group_open_interest_percentage: float = Field(
-        ..., alias="groupOpenInterestPecentage"
-    )
-    max_wallet_oi: float = Field(..., alias="maxWalletOI")
+    values: PairInfoValues = Field(..., alias="values")
 
     @field_validator("price_impact_parameter", "skew_impact_parameter", mode="before")
     def convert_to_float_10(cls, v):
         return v / 10**10
 
-    @field_validator("constant_spread_bps", mode="before")
+    @field_validator("constant_spread_bps", "constant_pnl_spread_bps", mode="before")
     def convert_to_float_10_bps(cls, v):
         return v / 10**10 * 100
 
@@ -48,8 +93,39 @@ class PairInfo(BaseModel):
         populate_by_name = True
 
 
+class PairData(BaseModel):
+    from_: str = Field(..., alias="from")
+    to: str
+    num_tiers: int = Field(..., alias="numTiers")
+    tier_thresholds: Dict[str, float] = Field(..., alias="tierThresholds")
+    tier_timers: Dict[str, float] = Field(..., alias="timer")
+
+    @field_validator("tier_thresholds", "tier_timers", mode="before")
+    def convert_tuple_to_dict(cls, v):
+        if isinstance(v, tuple):
+            return {str(i): j for i, j in enumerate(v)}
+        return v
+
+
+class PairInfoWithData(PairInfo, PairData):
+    class Config:
+        populate_by_name = True
+        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]
 
 
@@ -82,7 +158,7 @@ class DepthSingle(BaseModel):
     below: float
 
 
-class PairInfoExtended(PairInfo):
+class PairInfoExtended(PairInfoWithData):
     asset_open_interest_limit: float
     asset_open_interest: Dict[str, float]
     asset_utilization: float

{avantis_trader_sdk-0.4.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.4.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.4.0.dist-info → avantis_trader_sdk-0.7.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-avantis_trader_sdk/__init__.py,sha256=XfcfMCSlyYvs5_uVHDGSOxLxOpaHLclcjsirqmcXLS4,139
-avantis_trader_sdk/client.py,sha256=QfljOKja32K89bl0_PTvcT0QrF2WX2yS3lIxNjU5mAA,11068
-avantis_trader_sdk/config.py,sha256=ieqm9dAcbdmarBp7UfIHQQYSDx5KlVZ6OmZvxjacPeE,585
-avantis_trader_sdk/types.py,sha256=6B4t21ohWiyB9yZEfTC7ckznzgFFIW93z_J2m6_azPU,11754
+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
@@ -88,7 +88,7 @@ avantis_trader_sdk/abis/Multicall.t.sol/MulticallGroup.json,sha256=AZVoGuVs__JE-
 avantis_trader_sdk/abis/Multicall3.sol/Multicall3.json,sha256=7-38-beNTW3Jo9ZHvpgp8JzI5ylN6llcV_fzw9syF_s,176224
 avantis_trader_sdk/abis/Ownable.sol/Ownable.json,sha256=aBFacbduOM9MRjoTB71SNiMWIytBc2t0BRcU7u-GrNk,31008
 avantis_trader_sdk/abis/PairInfos.sol/PairInfos.json,sha256=i9sWFDHIDJAlwuC0M0Y9w7Z2rhOcWDGyKYUrobI2SdI,712989
-avantis_trader_sdk/abis/PairStorage.sol/PairStorage.json,sha256=4PhXTV7g9JMg8tBJRn5lxnn053_lkV8EzztHDlU-cE4,504985
+avantis_trader_sdk/abis/PairStorage.sol/PairStorage.json,sha256=Lcrh8PfZusTQr_ZWpSU96PBEKebb0rQrMhzge6BsjoA,305493
 avantis_trader_sdk/abis/PausableUpgradeable.sol/PausableUpgradeable.json,sha256=_STYbJg_yX9kU7He-sQjkwVo8uHTs0jotpHoi-8DYWY,31799
 avantis_trader_sdk/abis/PositionMath.sol/PositionMath.json,sha256=WouZkR-00Avs16LvtMUdWitehNKKiuiQUWr4O0I6DJM,11823
 avantis_trader_sdk/abis/PriceAggregator.sol/PriceAggregator.json,sha256=_IhAyWO2pzFu-TJg0OJRxnF8s9xE_w9khrkq7R3ztdc,393087
@@ -195,16 +195,16 @@ 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
 avantis_trader_sdk/rpc/category_parameters.py,sha256=yw-6Ib1kS25JTmZQzH7Xyn1dehUqGYBoZM_bO7G4lEE,8181
 avantis_trader_sdk/rpc/fee_parameters.py,sha256=EhJY7I66MAP_sClVhSy6KBiicpeEip5EXrIlpfbVSDM,9369
-avantis_trader_sdk/rpc/pairs_cache.py,sha256=CxaZKNv38AW90oINcJdG7QVGfOVYEiTWSV_vtdQ570M,4066
+avantis_trader_sdk/rpc/pairs_cache.py,sha256=gjdfdIr8BGhGDIBv-PZQnJZEKeDHSt1DJZVzecCN7yY,4689
 avantis_trader_sdk/rpc/rpc_helpers.py,sha256=d3dzwEaAUVo700qK7S-bBSVX3UtrOKbPEGPqgxHS5sk,292
 avantis_trader_sdk/rpc/snapshot.py,sha256=2EMtNqfeB37dr4EsuSMBm0CAYbwWMv9evML8MZocNFw,5494
-avantis_trader_sdk/rpc/trade.py,sha256=Zvtj2WbDv_uuR0l8SKQ99mL1BDv9vVAP_xOUy9VRIUU,11250
+avantis_trader_sdk/rpc/trade.py,sha256=jq3bYWPZqAaFjDlbs42mhbQFb8dKiGLxGYyDAsqNv8Y,13154
 avantis_trader_sdk/rpc/trading_parameters.py,sha256=ZvEJ-kjrogENIhPsETRIp-FdVaIdd2mT2fyM84SuFJk,4702
 avantis_trader_sdk/signers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 avantis_trader_sdk/signers/base.py,sha256=QaOu0CxFq60oR4LegCp1XwONMQx8ZShXyiLZvfcbCPM,260
@@ -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.4.0.dist-info/METADATA,sha256=IViGMWDcSs2vZHlLbhA9bk72mpdqaUSBkX0oQK1eflI,4916
-avantis_trader_sdk-0.4.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-avantis_trader_sdk-0.4.0.dist-info/top_level.txt,sha256=XffaQJ68SGT1KUz2HHXSGSEsmNy8-AGjgtO127xhzQA,25
-avantis_trader_sdk-0.4.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,,