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

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

@@ -4,9 +4,11 @@ MAINNET_ADDRESSES = {
     "PairInfos": "0x81F22d0Cc22977c91bEfE648C9fddf1f2bd977e5",
     "PriceAggregator": "0x64e2625621970F8cfA17B294670d61CB883dA511",
     "USDC": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
-    "Trading": "0x5FF292d70bA9cD9e7CCb313782811b3D7120535f",
-    "Multicall": "0xD4693314460d6fb598C1124aeC40C03e2Aa0A8a4",
-    "Referral": "0xA96f577821933d127B491D0F91202405B0dbB1bd",
+    "Trading": "0x44914408af82bC9983bbb330e3578E1105e11d4e",
+    "Multicall": "0x7A829c5C97A2Bf8BeFB4b01d96A282E4763848d8",
+    "Referral": "0x1A110bBA13A1f16cCa4b79758BD39290f29De82D",
 }
 
+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/asset_parameters.py

@@ -161,21 +161,21 @@ class AssetParametersRPC:
                             PairInfos.address,
                             PairInfos.encodeABI(
                                 fn_name="getPriceImpactSpread",
-                                args=[pair_index, True, position_size],
+                                args=[pair_index, True, position_size, False],
                             ),
                         ),
                         (
                             PairInfos.address,
                             PairInfos.encodeABI(
                                 fn_name="getPriceImpactSpread",
-                                args=[pair_index, False, position_size],
+                                args=[pair_index, False, position_size, False],
                             ),
                         ),
                     ]
                 )
             else:
                 response = await PairInfos.functions.getPriceImpactSpread(
-                    pair_index, is_long, position_size
+                    pair_index, is_long, position_size, False
                 ).call()
         else:
             pairs_info = await self.client.pairs_cache.get_pairs_info()
@@ -189,14 +189,14 @@ class AssetParametersRPC:
                                 PairInfos.address,
                                 PairInfos.encodeABI(
                                     fn_name="getPriceImpactSpread",
-                                    args=[pair_index, True, position_size],
+                                    args=[pair_index, True, position_size, False],
                                 ),
                             ),
                             (
                                 PairInfos.address,
                                 PairInfos.encodeABI(
                                     fn_name="getPriceImpactSpread",
-                                    args=[pair_index, False, position_size],
+                                    args=[pair_index, False, position_size, False],
                                 ),
                             ),
                         ]
@@ -207,7 +207,7 @@ class AssetParametersRPC:
                             PairInfos.address,
                             PairInfos.encodeABI(
                                 fn_name="getPriceImpactSpread",
-                                args=[pair_index, is_long, position_size],
+                                args=[pair_index, is_long, position_size, False],
                             ),
                         )
                     )
@@ -295,21 +295,21 @@ class AssetParametersRPC:
                             PairInfos.address,
                             PairInfos.encodeABI(
                                 fn_name="getSkewImpactSpread",
-                                args=[pair_index, True, position_size],
+                                args=[pair_index, True, position_size, False],
                             ),
                         ),
                         (
                             PairInfos.address,
                             PairInfos.encodeABI(
                                 fn_name="getSkewImpactSpread",
-                                args=[pair_index, False, position_size],
+                                args=[pair_index, False, position_size, False],
                             ),
                         ),
                     ]
                 )
             else:
                 response = await PairInfos.functions.getSkewImpactSpread(
-                    pair_index, is_long, position_size
+                    pair_index, is_long, position_size, False
                 ).call()
         else:
             pairs_info = await self.client.pairs_cache.get_pairs_info()
@@ -322,14 +322,14 @@ class AssetParametersRPC:
                                 PairInfos.address,
                                 PairInfos.encodeABI(
                                     fn_name="getSkewImpactSpread",
-                                    args=[pair_index, True, position_size],
+                                    args=[pair_index, True, position_size, False],
                                 ),
                             ),
                             (
                                 PairInfos.address,
                                 PairInfos.encodeABI(
                                     fn_name="getSkewImpactSpread",
-                                    args=[pair_index, False, position_size],
+                                    args=[pair_index, False, position_size, False],
                                 ),
                             ),
                         ]
@@ -340,7 +340,7 @@ class AssetParametersRPC:
                             PairInfos.address,
                             PairInfos.encodeABI(
                                 fn_name="getSkewImpactSpread",
-                                args=[pair_index, is_long, position_size],
+                                args=[pair_index, is_long, position_size, False],
                             ),
                         )
                     )
@@ -423,21 +423,21 @@ class AssetParametersRPC:
                         PairInfos.address,
                         PairInfos.encodeABI(
                             fn_name="getTradePriceImpact",
-                            args=[open_price, pair_index, True, position_size],
+                            args=[open_price, pair_index, True, position_size, False],
                         ),
                     ),
                     (
                         PairInfos.address,
                         PairInfos.encodeABI(
                             fn_name="getTradePriceImpact",
-                            args=[open_price, pair_index, False, position_size],
+                            args=[open_price, pair_index, False, position_size, False],
                         ),
                     ),
                 ]
             )
         else:
             response = await PairInfos.functions.getTradePriceImpact(
-                open_price, pair_index, is_long, position_size
+                open_price, pair_index, is_long, position_size, False
             ).call()
 
         if response is None:

avantis_trader_sdk/rpc/trade.py

@@ -60,9 +60,10 @@ class TradeRPC:
 
         if (
             trade_input_order_type == TradeInputOrderType.MARKET
-            and not trade_input.openPrice
-        ):
+            or trade_input_order_type == TradeInputOrderType.MARKET_PNL
+        ) and not trade_input.openPrice:
             feed_client = self.FeedClient()
+
             pair_name = await self.client.pairs_cache.get_pair_name_from_index(
                 trade_input.pairIndex
             )
@@ -80,7 +81,6 @@ class TradeRPC:
             trade_input.model_dump(),
             trade_input_order_type.value,
             slippage_percentage * 10**10,
-            0,
         ).build_transaction(
             {
                 "from": trade_input.trader,
@@ -92,6 +92,86 @@ class TradeRPC:
 
         return transaction
 
+    async def build_trade_open_tx_delegate(
+        self,
+        trade_input: TradeInput,
+        trade_input_order_type: TradeInputOrderType,
+        slippage_percentage: int,
+        execution_fee: Optional[float] = None,
+    ):
+        """
+        Builds a transaction to open a trade.
+
+        Args:
+            trade: The trade input object.
+            trade_input_order_type: The trade input order type.
+            slippage_percentage: The slippage percentage.
+
+        Returns:
+            A transaction object.
+        """
+        Trading = self.client.contracts.get("Trading")
+
+        if (
+            trade_input.trader == "0x1234567890123456789012345678901234567890"
+            and self.client.get_signer() is not None
+        ):
+            trade_input.trader = await self.client.get_signer().get_ethereum_address()
+
+        if execution_fee is not None:
+            execution_fee_wei = int(execution_fee * 10**18)
+        else:
+            execution_fee_wei = await self.get_trade_execution_fee()
+
+        if (
+            trade_input_order_type == TradeInputOrderType.MARKET
+            or trade_input_order_type == TradeInputOrderType.MARKET_PNL
+        ) and not trade_input.openPrice:
+            feed_client = self.FeedClient()
+
+            pair_name = await self.client.pairs_cache.get_pair_name_from_index(
+                trade_input.pairIndex
+            )
+            price_data = await feed_client.get_latest_price_updates([pair_name])
+            price = int(price_data.parsed[0].converted_price * 10**10)
+            trade_input.openPrice = price
+
+        if (
+            trade_input_order_type == TradeInputOrderType.LIMIT
+            or trade_input_order_type == TradeInputOrderType.STOP_LIMIT
+        ) and not trade_input.openPrice:
+            raise Exception("Open price is required for LIMIT/STOP LIMIT order type")
+
+        transaction = await Trading.functions.openTrade(
+            trade_input.model_dump(),
+            trade_input_order_type.value,
+            slippage_percentage * 10**10,
+        ).build_transaction(
+            {
+                "from": trade_input.trader,
+                "value": 0,
+                "chainId": self.client.chain_id,
+                "nonce": await self.client.get_transaction_count(trade_input.trader),
+            }
+        )
+
+        print("transaction: ", trade_input.trader)
+
+        delegate_transaction = await Trading.functions.delegatedAction(
+            trade_input.trader, transaction["data"]
+        ).build_transaction(
+            {
+                "from": self.client.get_signer().get_ethereum_address(),
+                "value": execution_fee_wei,
+                "chainId": self.client.chain_id,
+                "nonce": await self.client.get_transaction_count(
+                    self.client.get_signer().get_ethereum_address()
+                ),
+            }
+        )
+
+        return delegate_transaction
+
     async def get_trade_execution_fee(self):
         """
         Gets the correct trade execution fee.
@@ -241,7 +321,9 @@ class TradeRPC:
         execution_fee = await self.get_trade_execution_fee()
 
         transaction = await Trading.functions.closeTradeMarket(
-            pair_index, trade_index, collateral_to_close, 0
+            pair_index,
+            trade_index,
+            collateral_to_close,
         ).build_transaction(
             {
                 "from": trader,
@@ -253,6 +335,62 @@ class TradeRPC:
 
         return transaction
 
+    async def build_trade_close_tx_delegate(
+        self,
+        pair_index: int,
+        trade_index: int,
+        collateral_to_close: float,
+        trader: Optional[str] = None,
+    ):
+        """
+        Builds a transaction to close a trade.
+
+        Args:
+            pair_index: The pair index.
+            trade_index: The trade index.
+            collateral_to_close: The collateral to close.
+            trader (optional): The trader's wallet address.
+
+        Returns:
+            A transaction object.
+        """
+        Trading = self.client.contracts.get("Trading")
+
+        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(
+            pair_index,
+            trade_index,
+            collateral_to_close,
+        ).build_transaction(
+            {
+                "from": trader,
+                "chainId": self.client.chain_id,
+                "nonce": await self.client.get_transaction_count(trader),
+                "value": 0,
+            }
+        )
+
+        delegate_transaction = await Trading.functions.delegatedAction(
+            trader, transaction["data"]
+        ).build_transaction(
+            {
+                "from": self.client.get_signer().get_ethereum_address(),
+                "value": execution_fee,
+                "chainId": self.client.chain_id,
+                "nonce": await self.client.get_transaction_count(
+                    self.client.get_signer().get_ethereum_address()
+                ),
+            }
+        )
+
+        return delegate_transaction
+
     async def build_order_cancel_tx(
         self, pair_index: int, trade_index: int, trader: Optional[str] = None
     ):
@@ -284,6 +422,49 @@ class TradeRPC:
 
         return transaction
 
+    async def build_order_cancel_tx_delegate(
+        self, pair_index: int, trade_index: int, trader: Optional[str] = None
+    ):
+        """
+        Builds a transaction to cancel an order.
+
+        Args:
+            pair_index: The pair index.
+            trade_index: The trade/order index.
+            trader (optional): The trader's wallet address.
+
+        Returns:
+            A transaction object.
+        """
+        Trading = self.client.contracts.get("Trading")
+
+        if trader is None:
+            trader = self.client.get_signer().get_ethereum_address()
+
+        transaction = await Trading.functions.cancelOpenLimitOrder(
+            pair_index, trade_index
+        ).build_transaction(
+            {
+                "from": trader,
+                "chainId": self.client.chain_id,
+                "nonce": await self.client.get_transaction_count(trader),
+            }
+        )
+
+        delegate_transaction = await Trading.functions.delegatedAction(
+            trader, transaction["data"]
+        ).build_transaction(
+            {
+                "from": self.client.get_signer().get_ethereum_address(),
+                "chainId": self.client.chain_id,
+                "nonce": await self.client.get_transaction_count(
+                    self.client.get_signer().get_ethereum_address()
+                ),
+            }
+        )
+
+        return delegate_transaction
+
     async def build_trade_margin_update_tx(
         self,
         pair_index: int,
@@ -336,6 +517,71 @@ class TradeRPC:
 
         return transaction
 
+    async def build_trade_margin_update_tx_delegate(
+        self,
+        pair_index: int,
+        trade_index: int,
+        margin_update_type: MarginUpdateType,
+        collateral_change: float,
+        trader: Optional[str] = None,
+    ):
+        """
+        Builds a transaction to update the margin of a trade.
+
+        Args:
+            pair_index: The pair index.
+            trade_index: The trade index.
+            margin_update_type: The margin update type.
+            collateral_change: The collateral change.
+            trader (optional): The trader's wallet address.
+        Returns:
+            A transaction object.
+        """
+        Trading = self.client.contracts.get("Trading")
+
+        if trader is None:
+            trader = self.client.get_signer().get_ethereum_address()
+
+        collateral_change = int(collateral_change * 10**6)
+
+        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]
+
+        transaction = await Trading.functions.updateMargin(
+            pair_index,
+            trade_index,
+            margin_update_type.value,
+            collateral_change,
+            [price_update_data],
+        ).build_transaction(
+            {
+                "from": trader,
+                "chainId": self.client.chain_id,
+                "value": 0,
+                "nonce": await self.client.get_transaction_count(trader),
+            }
+        )
+
+        delegate_transaction = await Trading.functions.delegatedAction(
+            trader, transaction["data"]
+        ).build_transaction(
+            {
+                "from": self.client.get_signer().get_ethereum_address(),
+                "chainId": self.client.chain_id,
+                "nonce": await self.client.get_transaction_count(
+                    self.client.get_signer().get_ethereum_address()
+                ),
+                "value": 1,
+            }
+        )
+
+        return delegate_transaction
+
     async def build_trade_tp_sl_update_tx(
         self,
         pair_index: int,
@@ -392,3 +638,73 @@ class TradeRPC:
         )
 
         return transaction
+
+    async def build_trade_tp_sl_update_tx_delegate(
+        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": 0,
+                "nonce": await self.client.get_transaction_count(trader),
+                "gas": 1_000_000,
+            }
+        )
+
+        delegate_transaction = await Trading.functions.delegatedAction(
+            trader, transaction["data"]
+        ).build_transaction(
+            {
+                "from": self.client.get_signer().get_ethereum_address(),
+                "chainId": self.client.chain_id,
+                "nonce": await self.client.get_transaction_count(
+                    self.client.get_signer().get_ethereum_address()
+                ),
+                "value": 1,
+                "gas": 1_000_000,
+            }
+        )
+        return delegate_transaction

avantis_trader_sdk/rpc/trading_parameters.py

@@ -16,7 +16,7 @@ class TradingParametersRPC:
         """
         self.client = client
 
-    async def get_loss_protection_tier(self, trade: TradeInput):
+    async def get_loss_protection_tier(self, trade: TradeInput, is_pnl: bool = False):
         """
         Retrieves the loss protection tier for a trade. Read more about loss protection tiers here: https://docs.avantisfi.com/rewards/loss-protection
 
@@ -33,7 +33,7 @@ class TradingParametersRPC:
                 trade.trader,
                 trade.pairIndex,
                 trade.index,
-                trade.initialPosToken,
+                trade.positionSizeUSDC,
                 trade.positionSizeUSDC,
                 trade.openPrice,
                 trade.buy,
@@ -41,7 +41,8 @@ class TradingParametersRPC:
                 trade.tp,
                 trade.sl,
                 trade.timestamp,
-            )
+            ),
+            is_pnl,
         ).call()
         return response
 
@@ -131,6 +132,8 @@ class TradingParametersRPC:
         referrer_tier = await Referral.functions.referrerTiers(
             trader_referral_info[1]
         ).call()  # trader_referral_info[1] is the referrer address
-        tier_info = await self.client.read_contract("Referral", "tiers", referrer_tier)
+        tier_info = await self.client.read_contract(
+            "Referral", "referralTiers", referrer_tier
+        )
         discount_percentage = tier_info["feeDiscountPct"] / 100
         return discount_percentage