@d8x/perpetuals-sdk 2.1.28-alpha2 → 2.1.30-alpha2

package/doc/d8x-perpetuals-sdk.md

@@ -156,8 +156,7 @@ on-chain</p></dd>
     * [~excessMargin(tradeAmt, currentCashCC, currentPos, currentLockedInQC, limitPrice, Sm, S3)](#module_d8xMath..excessMargin) ⇒
     * [~pmGetDepositAmtForLvgTrade(tradeAmt, targetLvg, price, S3, S2Mark)](#module_d8xMath..pmGetDepositAmtForLvgTrade) ⇒
     * [~pmExcessCashAtLvg(tradeAmt, lvg, walletBalCC, currentCashCC, currentPosition, currentLockedInValue, slippage, S2, Sm, S3, totLong, totShort)](#module_d8xMath..pmExcessCashAtLvg) ⇒
-    * [~pmFindMaxPersonalTradeSizeAtLeverage(dir, lvg, walletBalCC, slippage, currentPosition, currentCashCC, currentLockedInValue, S2, Sm, S3, maxShort, maxLong)](#module_d8xMath..pmFindMaxPersonalTradeSizeAtLeverage) ⇒
-    * [~pmFindMaxTradeSize(dir, currentPosition, currentCashCC, currentLockedInValue, limitPrice, Sm, S3, totLong, totShort, maxShort, maxLong)](#module_d8xMath..pmFindMaxTradeSize) ⇒
+    * [~pmFindMaxPersonalTradeSizeAtLeverage(dir, lvg, walletBalCC, slippage, currentPosition, currentCashCC, currentLockedInValue, S2, Sm, S3, glblMaxTrade)](#module_d8xMath..pmFindMaxPersonalTradeSizeAtLeverage) ⇒
 
 <a name="module_d8xMath..ABDK29ToFloat"></a>
 
@@ -594,53 +593,28 @@ after a trade of size tradeAmt in prediction markets</p>
 
 <a name="module_d8xMath..pmFindMaxPersonalTradeSizeAtLeverage"></a>
 
-### d8xMath~pmFindMaxPersonalTradeSizeAtLeverage(dir, lvg, walletBalCC, slippage, currentPosition, currentCashCC, currentLockedInValue, S2, Sm, S3, maxShort, maxLong) ⇒
-<p>Find maximal trade size (short dir=-1 or long dir=1) for prediction
+### d8xMath~pmFindMaxPersonalTradeSizeAtLeverage(dir, lvg, walletBalCC, slippage, currentPosition, currentCashCC, currentLockedInValue, S2, Sm, S3, glblMaxTrade) ⇒
+<p>Find maximal <em>affordable</em> trade size (short dir=-1 or long dir=1) for prediction
 markets at provided leverage and incorporating the current position
 and wallet balance.
 Factors in lot size and global max short/long</p>
 
 **Kind**: inner method of [<code>d8xMath</code>](#module_d8xMath)  
-**Returns**: <p>max trade size</p>  
+**Returns**: <p>max <em>signed</em> trade size</p>  
 
 | Param | Description |
 | --- | --- |
-| dir |  |
-| lvg |  |
-| walletBalCC |  |
-| slippage | <p>slippage percent</p> |
-| currentPosition |  |
-| currentCashCC |  |
-| currentLockedInValue |  |
-| S2 |  |
-| Sm |  |
-| S3 |  |
-| maxShort | <p>global max short order size (sign irrelevant)</p> |
-| maxLong | <p>global max long order size (positive)</p> |
-
-<a name="module_d8xMath..pmFindMaxTradeSize"></a>
-
-### d8xMath~pmFindMaxTradeSize(dir, currentPosition, currentCashCC, currentLockedInValue, limitPrice, Sm, S3, totLong, totShort, maxShort, maxLong) ⇒
-<p>Find maximal trade size (short dir=-1 or long dir=1) for prediction
-markets at maximal leverage and incorporating the current position.
-Agnostic about wallet balance.</p>
-
-**Kind**: inner method of [<code>d8xMath</code>](#module_d8xMath)  
-**Returns**: <p>signed max trade size</p>  
-
-| Param |
-| --- |
-| dir | 
-| currentPosition | 
-| currentCashCC | 
-| currentLockedInValue | 
-| limitPrice | 
-| Sm | 
-| S3 | 
-| totLong | 
-| totShort | 
-| maxShort | 
-| maxLong | 
+| dir | <p>direction of trade (-1 sell, 1 buy)</p> |
+| lvg | <p>leverage of the trade</p> |
+| walletBalCC | <p>wallet balance of the trader (collateral currency)</p> |
+| slippage | <p>slippage percent used to estimate a traded price</p> |
+| currentPosition | <p>position in base currency of the trader</p> |
+| currentCashCC | <p>this is the cash available net of unpaid funding (often called available cash)</p> |
+| currentLockedInValue | <p>average entry price * signed position size in base currency, in margin account</p> |
+| S2 | <p>current index price of the form 1+p (regardless whether short or long)</p> |
+| Sm | <p>current mark price (not just the mark price index but including the ema-premium from the contract)</p> |
+| S3 | <p>current collateral to quote index price</p> |
+| glblMaxTrade | <p>global max short or long order size that we retreive, e.g., from position risk (sign irrelevant) based on  long: (<em>ℓ+n) * (1-p) - m (1-p) s = F → n = (F+m</em>(1-p)<em>s)/(1-p)-ℓ</em> short: (s+n)<em>p - m p <em>ℓ</em> = F →n = (F+m</em>p**ℓ*)/p-s</p> |
 
 <a name="module_utils"></a>
 
@@ -3741,7 +3715,8 @@ No gas required for the queries here.</p>
         * [.getShareTokenPrice(symbolOrId)](#MarketData+getShareTokenPrice) ⇒ <code>number</code>
         * [.getParticipationValue(address, symbolOrId)](#MarketData+getParticipationValue) ⇒
         * [.maxOrderSizeForTrader(traderAddr, symbol)](#MarketData+maxOrderSizeForTrader) ⇒
-        * [.getMaxShortLongPos(perpId, currentTraderPos, overrides)](#MarketData+getMaxShortLongPos) ⇒
+        * [.pmMaxOrderSizeForTrader(traderAddr, symbol, overrides)](#MarketData+pmMaxOrderSizeForTrader) ⇒
+        * [.getMaxShortLongTrade(perpId, currentTraderPos, overrides)](#MarketData+getMaxShortLongTrade) ⇒
         * [.maxSignedPosition(side, symbol)](#MarketData+maxSignedPosition) ⇒ <code>number</code>
         * [.getOraclePrice(base, quote)](#MarketData+getOraclePrice) ⇒ <code>number</code>
         * [.getOrderStatus(symbol, orderId, overrides)](#MarketData+getOrderStatus) ⇒
@@ -4145,7 +4120,7 @@ considering the existing position, state of the perpetual
 Accounts for user's wallet balance.</p>
 
 **Kind**: instance method of [<code>MarketData</code>](#MarketData)  
-**Returns**: <p>Maximal trade sizes</p>  
+**Returns**: <p>Maximal buy and sell trade sizes (positive)</p>  
 
 | Param | Type | Description |
 | --- | --- | --- |
@@ -4167,19 +4142,35 @@ async function main() {
 }
 main();
 ```
-<a name="MarketData+getMaxShortLongPos"></a>
+<a name="MarketData+pmMaxOrderSizeForTrader"></a>
 
-### marketData.getMaxShortLongPos(perpId, currentTraderPos, overrides) ⇒
-<p>Returns the maximal allowed short pos and long pos (signed) for a trader
-with given notional (in ABDK format) in the perpetual, ignoring the traders wallet balance</p>
+### marketData.pmMaxOrderSizeForTrader(traderAddr, symbol, overrides) ⇒
+<p>pmMaxOrderSizeForTrader returns the max order size for the
+trader that is possible from AMM perspective (agnostic about wallet
+balance and leverage)</p>
 
 **Kind**: instance method of [<code>MarketData</code>](#MarketData)  
-**Returns**: <p>[maxShortPos, maxLongPos] signed maximal position sizes</p>  
+**Returns**: <p>buy: number; sell: number absolute</p>  
+
+| Param | Description |
+| --- | --- |
+| traderAddr | <p>address of trader</p> |
+| symbol | <p>perp symbol</p> |
+| overrides | <p>optional</p> |
+
+<a name="MarketData+getMaxShortLongTrade"></a>
+
+### marketData.getMaxShortLongTrade(perpId, currentTraderPos, overrides) ⇒
+<p>Returns the maximal allowed short trade and long trade (signed) for a trader
+that has a given notional (in ABDK format) in the perpetual, ignoring the traders wallet balance</p>
+
+**Kind**: instance method of [<code>MarketData</code>](#MarketData)  
+**Returns**: <p>[maxShortPos, maxLongPos] signed maximal trade sizes</p>  
 
 | Param | Description |
 | --- | --- |
 | perpId |  |
-| currentTraderPos | <p>ABDK64x64 notional position of trader</p> |
+| currentTraderPos | <p>ABDK64x64 signed notional position of trader</p> |
 | overrides |  |
 
 <a name="MarketData+maxSignedPosition"></a>
@@ -7191,7 +7182,8 @@ so that signatures can be handled in frontend via wallet</p>
         * [.getShareTokenPrice(symbolOrId)](#MarketData+getShareTokenPrice) ⇒ <code>number</code>
         * [.getParticipationValue(address, symbolOrId)](#MarketData+getParticipationValue) ⇒
         * [.maxOrderSizeForTrader(traderAddr, symbol)](#MarketData+maxOrderSizeForTrader) ⇒
-        * [.getMaxShortLongPos(perpId, currentTraderPos, overrides)](#MarketData+getMaxShortLongPos) ⇒
+        * [.pmMaxOrderSizeForTrader(traderAddr, symbol, overrides)](#MarketData+pmMaxOrderSizeForTrader) ⇒
+        * [.getMaxShortLongTrade(perpId, currentTraderPos, overrides)](#MarketData+getMaxShortLongTrade) ⇒
         * [.maxSignedPosition(side, symbol)](#MarketData+maxSignedPosition) ⇒ <code>number</code>
         * [.getOraclePrice(base, quote)](#MarketData+getOraclePrice) ⇒ <code>number</code>
         * [.getOrderStatus(symbol, orderId, overrides)](#MarketData+getOrderStatus) ⇒
@@ -7848,7 +7840,7 @@ Accounts for user's wallet balance.</p>
 
 **Kind**: instance method of [<code>TraderInterface</code>](#TraderInterface)  
 **Overrides**: [<code>maxOrderSizeForTrader</code>](#MarketData+maxOrderSizeForTrader)  
-**Returns**: <p>Maximal trade sizes</p>  
+**Returns**: <p>Maximal buy and sell trade sizes (positive)</p>  
 
 | Param | Type | Description |
 | --- | --- | --- |
@@ -7870,20 +7862,37 @@ async function main() {
 }
 main();
 ```
-<a name="MarketData+getMaxShortLongPos"></a>
+<a name="MarketData+pmMaxOrderSizeForTrader"></a>
+
+### traderInterface.pmMaxOrderSizeForTrader(traderAddr, symbol, overrides) ⇒
+<p>pmMaxOrderSizeForTrader returns the max order size for the
+trader that is possible from AMM perspective (agnostic about wallet
+balance and leverage)</p>
+
+**Kind**: instance method of [<code>TraderInterface</code>](#TraderInterface)  
+**Overrides**: [<code>pmMaxOrderSizeForTrader</code>](#MarketData+pmMaxOrderSizeForTrader)  
+**Returns**: <p>buy: number; sell: number absolute</p>  
+
+| Param | Description |
+| --- | --- |
+| traderAddr | <p>address of trader</p> |
+| symbol | <p>perp symbol</p> |
+| overrides | <p>optional</p> |
+
+<a name="MarketData+getMaxShortLongTrade"></a>
 
-### traderInterface.getMaxShortLongPos(perpId, currentTraderPos, overrides) ⇒
-<p>Returns the maximal allowed short pos and long pos (signed) for a trader
-with given notional (in ABDK format) in the perpetual, ignoring the traders wallet balance</p>
+### traderInterface.getMaxShortLongTrade(perpId, currentTraderPos, overrides) ⇒
+<p>Returns the maximal allowed short trade and long trade (signed) for a trader
+that has a given notional (in ABDK format) in the perpetual, ignoring the traders wallet balance</p>
 
 **Kind**: instance method of [<code>TraderInterface</code>](#TraderInterface)  
-**Overrides**: [<code>getMaxShortLongPos</code>](#MarketData+getMaxShortLongPos)  
-**Returns**: <p>[maxShortPos, maxLongPos] signed maximal position sizes</p>  
+**Overrides**: [<code>getMaxShortLongTrade</code>](#MarketData+getMaxShortLongTrade)  
+**Returns**: <p>[maxShortPos, maxLongPos] signed maximal trade sizes</p>  
 
 | Param | Description |
 | --- | --- |
 | perpId |  |
-| currentTraderPos | <p>ABDK64x64 notional position of trader</p> |
+| currentTraderPos | <p>ABDK64x64 signed notional position of trader</p> |
 | overrides |  |
 
 <a name="MarketData+maxSignedPosition"></a>

package/doc/marketData.md

@@ -26,7 +26,8 @@ No gas required for the queries here.</p>
         * [.getShareTokenPrice(symbolOrId)](#MarketData+getShareTokenPrice) ⇒ <code>number</code>
         * [.getParticipationValue(address, symbolOrId)](#MarketData+getParticipationValue) ⇒
         * [.maxOrderSizeForTrader(traderAddr, symbol)](#MarketData+maxOrderSizeForTrader) ⇒
-        * [.getMaxShortLongPos(perpId, currentTraderPos, overrides)](#MarketData+getMaxShortLongPos) ⇒
+        * [.pmMaxOrderSizeForTrader(traderAddr, symbol, overrides)](#MarketData+pmMaxOrderSizeForTrader) ⇒
+        * [.getMaxShortLongTrade(perpId, currentTraderPos, overrides)](#MarketData+getMaxShortLongTrade) ⇒
         * [.maxSignedPosition(side, symbol)](#MarketData+maxSignedPosition) ⇒ <code>number</code>
         * [.getOraclePrice(base, quote)](#MarketData+getOraclePrice) ⇒ <code>number</code>
         * [.getOrderStatus(symbol, orderId, overrides)](#MarketData+getOrderStatus) ⇒
@@ -402,7 +403,7 @@ considering the existing position, state of the perpetual
 Accounts for user's wallet balance.</p>
 
 **Kind**: instance method of [<code>MarketData</code>](#MarketData)  
-**Returns**: <p>Maximal trade sizes</p>  
+**Returns**: <p>Maximal buy and sell trade sizes (positive)</p>  
 
 | Param | Type | Description |
 | --- | --- | --- |
@@ -424,19 +425,35 @@ async function main() {
 }
 main();
 ```
-<a name="MarketData+getMaxShortLongPos"></a>
+<a name="MarketData+pmMaxOrderSizeForTrader"></a>
 
-### marketData.getMaxShortLongPos(perpId, currentTraderPos, overrides) ⇒
-<p>Returns the maximal allowed short pos and long pos (signed) for a trader
-with given notional (in ABDK format) in the perpetual, ignoring the traders wallet balance</p>
+### marketData.pmMaxOrderSizeForTrader(traderAddr, symbol, overrides) ⇒
+<p>pmMaxOrderSizeForTrader returns the max order size for the
+trader that is possible from AMM perspective (agnostic about wallet
+balance and leverage)</p>
 
 **Kind**: instance method of [<code>MarketData</code>](#MarketData)  
-**Returns**: <p>[maxShortPos, maxLongPos] signed maximal position sizes</p>  
+**Returns**: <p>buy: number; sell: number absolute</p>  
+
+| Param | Description |
+| --- | --- |
+| traderAddr | <p>address of trader</p> |
+| symbol | <p>perp symbol</p> |
+| overrides | <p>optional</p> |
+
+<a name="MarketData+getMaxShortLongTrade"></a>
+
+### marketData.getMaxShortLongTrade(perpId, currentTraderPos, overrides) ⇒
+<p>Returns the maximal allowed short trade and long trade (signed) for a trader
+that has a given notional (in ABDK format) in the perpetual, ignoring the traders wallet balance</p>
+
+**Kind**: instance method of [<code>MarketData</code>](#MarketData)  
+**Returns**: <p>[maxShortPos, maxLongPos] signed maximal trade sizes</p>  
 
 | Param | Description |
 | --- | --- |
 | perpId |  |
-| currentTraderPos | <p>ABDK64x64 notional position of trader</p> |
+| currentTraderPos | <p>ABDK64x64 signed notional position of trader</p> |
 | overrides |  |
 
 <a name="MarketData+maxSignedPosition"></a>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d8x/perpetuals-sdk",
-  "version": "2.1.28-alpha2",
+  "version": "2.1.30-alpha2",
   "description": "Node TypeScript SDK for D8X Perpetual Futures",
   "author": "D8X",
   "homepage": "https://github.com/D8-X/d8x-futures-node-sdk#readme",

package/src/constants.ts

@@ -4,7 +4,7 @@ import { NodeSDKConfig } from "./nodeSDKTypes";
 export const ERC20_ABI = require("./abi/ERC20.json");
 export const MOCK_TOKEN_SWAP_ABI = require("./abi/MockTokenSwap.json");
 export const PROXY_ABI = require("./abi/IPerpetualManager.json");
-export const PROXY_ZKEVM_ABI = require("./abi-zkevm/IPerpetualManager.json");
+//export const PROXY_ZKEVM_ABI = require("./abi-zkevm/IPerpetualManager.json");
 export const LOB_FACTORY_ABI = require("./abi/LimitOrderBookFactory.json");
 export const LOB_ABI = require("./abi/LimitOrderBook.json");
 export const SHARE_TOKEN_ABI = require("./abi/ShareToken.json");
@@ -58,7 +58,8 @@ export const DEFAULT_CONFIG_TESTNET_NAME = "testnet";
 
 let defaultConfigs = require("./config/defaultConfig.json") as NodeSDKConfig[];
 defaultConfigs.map((config) => {
-  config.proxyABI = config.proxyABILocation.includes("abi-zkevm") ? PROXY_ZKEVM_ABI : PROXY_ABI;
+  //config.proxyABI = config.proxyABILocation.includes("abi-zkevm") ? PROXY_ZKEVM_ABI : PROXY_ABI;
+  config.proxyABI = PROXY_ABI;
   config.lobABI = LOB_ABI;
   config.lobFactoryABI = LOB_FACTORY_ABI;
   config.shareTokenABI = SHARE_TOKEN_ABI;

package/src/d8XMath.ts

@@ -896,80 +896,3 @@ export function pmFindMaxPersonalTradeSizeAtLeverage(
   sNew = Math.sign(sNew) * Math.floor(Math.abs(sNew) / lot) * lot;
   return sNew;
 }
-
-/**
- * Find maximal trade size (short dir=-1 or long dir=1) for prediction
- * markets at maximal leverage and incorporating the current position.
- * Agnostic about wallet balance.
- * @param dir
- * @param currentPosition
- * @param currentCashCC
- * @param currentLockedInValue
- * @param limitPrice
- * @param Sm
- * @param S3
- * @param totLong
- * @param totShort
- * @param maxShort
- * @param maxLong
- * @returns signed max trade size
- */
-export function pmFindMaxTradeSize(
-  dir: number,
-  currentPosition: number,
-  currentCashCC: number,
-  currentLockedInValue: number,
-  limitPrice: number,
-  Sm: number,
-  S3: number,
-  maxShort: number,
-  maxLong: number
-): number {
-  if (dir < 0) {
-    dir = -1;
-  } else {
-    dir = 1;
-  }
-  const lot = 10;
-  const deltaS = 1; //for derivative
-  const f0 = excessMargin(dir * deltaS, currentCashCC, currentPosition, currentLockedInValue, limitPrice, Sm, S3);
-  if (f0 < lot) {
-    // no trade possible
-    return 0;
-  }
-  // numerically find maximal trade size
-  let sNew = dir * lot * 10;
-  let s = 2 * sNew;
-  while (true) {
-    let count = 0;
-    while (Math.abs(sNew - s) > 1 && count < 100) {
-      s = sNew;
-      const f = excessMargin(s, currentCashCC, currentPosition, currentLockedInValue, limitPrice, Sm, S3) ** 2;
-      const f2 =
-        excessMargin(s + deltaS, currentCashCC, currentPosition, currentLockedInValue, limitPrice, Sm, S3) ** 2;
-      let ds = (f2 - f) / deltaS;
-      sNew = s - f / ds;
-      count += 1;
-    }
-    if (count < 100) {
-      break;
-    }
-    // Newton algorithm failed,
-    // choose new starting value
-    if (dir > 0) {
-      sNew = Math.random() * (maxLong - currentPosition);
-    } else {
-      sNew = -Math.random() * (Math.abs(maxShort) + currentPosition);
-    }
-  }
-  // ensure trade maximal trade sNew does not exceed
-  // the contract limits
-  if (currentPosition + sNew < maxShort) {
-    sNew = maxShort - currentPosition;
-  } else if (currentPosition + sNew > maxLong) {
-    sNew = maxLong - currentPosition;
-  }
-  // round trade size down to lot
-  sNew = Math.sign(sNew) * Math.floor(Math.abs(sNew) / lot) * lot;
-  return sNew;
-}

package/src/marketData.ts

@@ -38,7 +38,6 @@ import {
   entropy,
   expectedLoss,
   pmExchangeFee,
-  pmFindMaxTradeSize,
 } from "./d8XMath";
 import {
   type ExchangeInfo,
@@ -1160,7 +1159,7 @@ export default class MarketData extends PerpetualDataHandler {
    * Accounts for user's wallet balance.
    * @param {string} traderAddr Address of trader
    * @param {symbol} symbol Symbol of the form ETH-USD-MATIC
-   * @returns Maximal trade sizes
+   * @returns Maximal buy and sell trade sizes (positive)
    * @example
    * import { MarketData, PerpetualDataHandler } from '@d8x/perpetuals-sdk';
    * async function main() {
@@ -1191,6 +1190,15 @@ export default class MarketData extends PerpetualDataHandler {
     return this.rmMaxOrderSizeForTrader(traderAddr, symbol, overrides);
   }
 
+  /**
+   * pmMaxOrderSizeForTrader returns the max order size for the
+   * trader that is possible from AMM perspective (agnostic about wallet
+   * balance and leverage)
+   * @param traderAddr address of trader
+   * @param symbol perp symbol
+   * @param overrides optional
+   * @returns buy: number; sell: number absolute
+   */
   private async pmMaxOrderSizeForTrader(
     traderAddr: string,
     symbol: string,
@@ -1199,110 +1207,25 @@ export default class MarketData extends PerpetualDataHandler {
     if (!this.proxyContract || !this.multicall) {
       throw new Error("proxy contract not initialized");
     }
-    const IERC20 = new Interface(ERC20_ABI) as ERC20Interface;
     const perpId = PerpetualDataHandler.symbolToPerpetualId(symbol, this.symbolToPerpStaticInfo);
-    const poolInfo = this.poolStaticInfos[this.getPoolStaticInfoIndexFromSymbol(symbol)];
     const indexPriceInfo = await this.priceFeedGetter.fetchPricesForPerpetual(symbol);
-    const [fS2, fS3, fEma] = [indexPriceInfo.s2, indexPriceInfo.s3 ?? 0, indexPriceInfo.ema].map((x) =>
-      floatToABK64x64(x)
-    ) as [bigint, bigint, bigint];
-    const proxyCalls: Multicall3.Call3Struct[] = [
-      // 0: traderState
-      {
-        target: this.proxyContract.target,
-        allowFailure: false,
-        callData: this.proxyContract.interface.encodeFunctionData("getTraderState", [perpId, traderAddr, [fEma, fS3]]),
-      },
-
-      // 1: wallet balance
-      {
-        target: poolInfo.poolSettleTokenAddr,
-        allowFailure: false,
-        callData: IERC20.encodeFunctionData("balanceOf", [traderAddr]),
-      },
-      // 2: amm state
-      {
-        target: this.proxyContract.target,
-        allowFailure: false,
-        callData: this.proxyContract.interface.encodeFunctionData("getAMMState", [perpId, [fS2, fS3]]),
-      },
-    ];
+    const [fS3, fEma] = [indexPriceInfo.s3 ?? 0, indexPriceInfo.ema].map((x) => floatToABK64x64(x)) as [bigint, bigint];
 
-    // multicall
-    const encodedResults = await this.multicall.aggregate3.staticCall(proxyCalls, overrides || {});
-    const traderState = this.proxyContract.interface.decodeFunctionResult(
-      "getTraderState",
-      encodedResults[0].returnData
-    )[0];
-    const walletBalance = decNToFloat(
-      IERC20.decodeFunctionResult("balanceOf", encodedResults[1].returnData)[0],
-      poolInfo.poolSettleTokenDecimals
-    );
-    const ammState = this.proxyContract.interface.decodeFunctionResult("getAMMState", encodedResults[2].returnData)[0];
-
-    const account = MarketData.buildMarginAccountFromState(
-      symbol,
-      traderState,
-      this.symbolToPerpStaticInfo,
-      indexPriceInfo,
-      true //isPredMkt
-    );
-    const openInterestBC = ABK64x64ToFloat(ammState[11]);
-    const net = -ABK64x64ToFloat(ammState[1]);
-    let totLong, totShort;
-    if (net < 0) {
-      totLong = openInterestBC;
-      totShort = openInterestBC - Math.abs(net);
-    } else {
-      totLong = openInterestBC - net;
-      totShort = openInterestBC;
-    }
-
-    let currentPositionBC = (account.side == BUY_SIDE ? 1 : -1) * account.positionNotionalBaseCCY;
-    const Sm = ABK64x64ToFloat(traderState[8]);
-    // settlement token must be equal to collateral token for walletBalance to be correct
-    const availCashCC = account.collateralCC + walletBalance + account.unrealizedFundingCollateralCCY;
+    const traderState = await this.proxyContract.getTraderState(perpId, traderAddr, [fEma, fS3], overrides || {});
     const idxNotional = 4;
-    const [maxShortPosPerp, maxLongPosPerp] = await this.getMaxShortLongPos(
-      perpId,
-      traderState[idxNotional],
-      overrides
-    );
-
-    const maxShort = pmFindMaxTradeSize(
-      -1,
-      currentPositionBC,
-      availCashCC,
-      account.entryPrice * currentPositionBC,
-      Sm,
-      Sm,
-      indexPriceInfo.s3 ?? 0,
-      maxShortPosPerp,
-      maxLongPosPerp
-    );
-    const maxLong = pmFindMaxTradeSize(
-      1,
-      currentPositionBC,
-      availCashCC,
-      account.entryPrice * currentPositionBC,
-      Sm,
-      Sm,
-      indexPriceInfo.s3 ?? 0,
-      maxShortPosPerp,
-      maxLongPosPerp
-    );
-    return { buy: maxLong, sell: maxShort };
+    const [maxShortTrade, maxLongTrade] = await this.getMaxShortLongTrade(perpId, traderState[idxNotional], overrides);
+    return { buy: maxLongTrade, sell: Math.abs(maxShortTrade) };
   }
 
   /**
-   * Returns the maximal allowed short pos and long pos (signed) for a trader
-   * with given notional (in ABDK format) in the perpetual, ignoring the traders wallet balance
+   * Returns the maximal allowed short trade and long trade (signed) for a trader
+   * that has a given notional (in ABDK format) in the perpetual, ignoring the traders wallet balance
    * @param perpId
-   * @param currentTraderPos ABDK64x64 notional position of trader
+   * @param currentTraderPos ABDK64x64 signed notional position of trader
    * @param overrides
-   * @returns [maxShortPos, maxLongPos] signed maximal position sizes
+   * @returns [maxShortPos, maxLongPos] signed maximal trade sizes
    */
-  public async getMaxShortLongPos(
+  public async getMaxShortLongTrade(
     perpId: number,
     currentTraderPos: bigint,
     overrides?: Overrides
@@ -1338,22 +1261,29 @@ export default class MarketData extends PerpetualDataHandler {
 
     // Max based on perp:
     // max buy
-    const maxLongOrderPerp = ABK64x64ToFloat(
+    let maxLongOrderPerp = ABK64x64ToFloat(
       this.proxyContract.interface.decodeFunctionResult(
         "getMaxSignedOpenTradeSizeForPos",
         encodedResults2[0].returnData
       )[0] as bigint
     );
-    const maxLongPosPerp = maxLongOrderPerp + ABK64x64ToFloat(currentTraderPos);
+
     // max short
-    const maxShortOrderPerp = ABK64x64ToFloat(
+    let maxShortOrderPerp = ABK64x64ToFloat(
       this.proxyContract.interface.decodeFunctionResult(
         "getMaxSignedOpenTradeSizeForPos",
         encodedResults2[1].returnData
       )[0] as bigint
     );
-    const maxShortPosPerp = maxShortOrderPerp + ABK64x64ToFloat(currentTraderPos);
-    return [maxShortPosPerp, maxLongPosPerp];
+    // now we ensure that closing direction can at least close position (always possible in smart contract)
+    if (currentTraderPos > 0n) {
+      // pos > 0, so short is closing direction
+      maxShortOrderPerp = -Math.max(Math.abs(maxShortOrderPerp), ABK64x64ToFloat(currentTraderPos));
+    } else {
+      // pos <=0, so long is closing direction
+      maxLongOrderPerp = Math.max(maxLongOrderPerp, Math.abs(ABK64x64ToFloat(currentTraderPos)));
+    }
+    return [maxShortOrderPerp, maxLongOrderPerp];
   }
 
   private async rmMaxOrderSizeForTrader(
@@ -1432,11 +1362,7 @@ export default class MarketData extends PerpetualDataHandler {
       poolInfo.poolSettleTokenDecimals
     );
 
-    const [maxShortPosPerp, maxLongPosPerp] = await this.getMaxShortLongPos(
-      perpId,
-      traderState[idxNotional],
-      overrides
-    );
+    const [maxShortTrade, maxLongTrade] = await this.getMaxShortLongTrade(perpId, traderState[idxNotional], overrides);
     const curPos = (account.side == BUY_SIDE ? 1 : -1) * account.positionNotionalBaseCCY;
 
     const px: number = await coll2SettlePromise;
@@ -1466,22 +1392,22 @@ export default class MarketData extends PerpetualDataHandler {
       account.collToQuoteConversion
     );
 
-    // max long/short all accounted for
-    const maxLong = Math.min(Math.abs(maxLongPosPerp), Math.abs(maxLongPosAccount));
-    const maxShort = Math.min(Math.abs(maxShortPosPerp), Math.abs(maxShortPosAccount));
+    // max long/short position all accounted for
+    const maxShort = Math.min(Math.abs(curPos + maxShortTrade), Math.abs(maxShortPosAccount));
+    const maxLong = Math.min(Math.abs(curPos + maxLongTrade), Math.abs(maxLongPosAccount));
 
     // max long order
-    const maxLongTrade =
+    const maxAffordableLongTrade =
       account.side == BUY_SIDE
         ? Math.max(0, maxLong - account.positionNotionalBaseCCY)
         : maxLong + account.positionNotionalBaseCCY;
     // max short order
-    const maxShortTrade =
+    const maxAffordableShortTrade =
       account.side == SELL_SIDE
         ? Math.max(0, maxShort - account.positionNotionalBaseCCY)
         : maxShort + account.positionNotionalBaseCCY;
 
-    return { buy: maxLongTrade, sell: maxShortTrade };
+    return { buy: maxAffordableLongTrade, sell: maxAffordableShortTrade };
   }
 
   /**

package/src/version.ts

@@ -1 +1 @@
-export const D8X_SDK_VERSION = "2.1.28-alpha2";
+export const D8X_SDK_VERSION = "2.1.30-alpha2";