@d8x/perpetuals-sdk 2.1.12-alpha2 → 2.1.24-alpha2

package/doc/marketData.md

@@ -44,7 +44,7 @@ No gas required for the queries here.</p>
         * [.fetchPricesForPerpetual(symbol)](#MarketData+fetchPricesForPerpetual) ⇒
         * [.fetchPrdMktMetaData(symbol)](#MarketData+fetchPrdMktMetaData) ⇒
     * _static_
-        * [.exchangeFeePrdMkts(state, maxMaintMgnRate, Sm, tradeAmtBC, tradeMgnRate)](#MarketData.exchangeFeePrdMkts) ⇒
+        * [.exchangeFeePrdMkts(maxMaintMgnRate, Sm, tradeAmtBC, tradeMgnRate)](#MarketData.exchangeFeePrdMkts) ⇒
 
 <a name="new_MarketData_new"></a>
 
@@ -810,7 +810,7 @@ main();
 
 <a name="MarketData.exchangeFeePrdMkts"></a>
 
-### MarketData.exchangeFeePrdMkts(state, maxMaintMgnRate, Sm, tradeAmtBC, tradeMgnRate) ⇒
+### MarketData.exchangeFeePrdMkts(maxMaintMgnRate, Sm, tradeAmtBC, tradeMgnRate) ⇒
 <p>Fee is relative to base-currency amount (=trade amount)</p>
 
 **Kind**: static method of [<code>MarketData</code>](#MarketData)  
@@ -818,7 +818,6 @@ main();
 
 | Param | Description |
 | --- | --- |
-| state | <p>current perpetual state (need longBC and shortBC)</p> |
 | maxMaintMgnRate | <p>maintenance margin rate param for pred mkts</p> |
 | Sm | <p>Mark price</p> |
 | tradeAmtBC | <p>signed trade amount</p> |

package/package.json

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

package/src/d8XMath.ts

@@ -505,6 +505,7 @@ export function pmInitialMarginRate(posSign: number, sm: number, m: number | und
  * @param totShort total short
  * @param tradeAmt signed trade amount, can be zero
  * @param tradeMgnRate margin rate of the trader
+ * @returns expected loss in dollars
  */
 export function expectedLoss(
   p: number,
@@ -532,7 +533,18 @@ export function expectedLoss(
   return p * (1 - p) * Math.max(0, a + b);
 }
 
-function newFee(p: number, m: number, tradeAmt: number, tradeMgnRate: number) {
+/**
+ * Equivalent to
+ * const el0 = expectedLoss(prob, m, totLong, totShort, 0, 0);
+ * const el1 = expectedLoss(prob, m, totLong, totShort, tradeAmt, tradeMgnRate)
+ * const fee = (el1 - el0) / Math.abs(tradeAmt);
+ * @param p prob long probability
+ * @param m max maintenance margin rate (0.18)
+ * @param tradeAmt trade amount in base currency
+ * @param tradeMgnRate margin rate for this trade
+ * @returns dollar fee
+ */
+function expectedLossImpact(p: number, m: number, tradeAmt: number, tradeMgnRate: number) {
   m = (0.4 - m) * entropy(p) + m;
   let dlm = 0;
   let dl = 0;
@@ -556,26 +568,18 @@ function newFee(p: number, m: number, tradeAmt: number, tradeMgnRate: number) {
  * For opening trades only
  * @param prob long probability
  * @param m max maintenance margin rate (0.18)
- * @param totShort
- * @param totLong
  * @param tradeAmt trade amount in base currency
  * @param tradeMgnRate margin rate for this trade
- * @returns fee relative to tradeAmt
+ * @returns dollar fee relative to tradeAmt
  */
-export function pmExchangeFee(
-  prob: number,
-  m: number,
-  totShort: number,
-  totLong: number,
-  tradeAmt: number,
-  tradeMgnRate: number
-): number {
-  const el0 = expectedLoss(prob, m, totLong, totShort, 0, 0);
-  const el1 = expectedLoss(prob, m, totLong, totShort, tradeAmt, tradeMgnRate);
-  console.log("el0=", el0);
-  console.log("el1=", el1);
-  const fee = (el1 - el0) / Math.abs(tradeAmt);
-  console.log("diff=", el1 - el0);
+export function pmExchangeFee(prob: number, m: number, tradeAmt: number, tradeMgnRate: number): number {
+  /*
+  equivalent:
+    const el0 = expectedLoss(prob, m, totLong, totShort, 0, 0);
+    const el1 = expectedLoss(prob, m, totLong, totShort, tradeAmt, tradeMgnRate);
+    const fee = (el1 - el0) / Math.abs(tradeAmt);
+  */
+  let fee = expectedLossImpact(prob, m, tradeAmt, tradeMgnRate) / Math.abs(tradeAmt);
   return Math.max(fee, 0.001);
 }
 
@@ -644,8 +648,6 @@ export function pmFindLiquidationPrice(
  * @param limitPrice
  * @param Sm
  * @param S3
- * @param totLong
- * @param totShort
  * @returns excess margin as defined above
  */
 function excessMargin(
@@ -655,9 +657,7 @@ function excessMargin(
   currentLockedInQC: number,
   limitPrice: number,
   Sm: number,
-  S3: number,
-  totLong: number,
-  totShort: number
+  S3: number
 ): number {
   const m = 0.18; //max maintenance margin rate
   const m0 = 0.2; //max initial margin rate
@@ -672,7 +672,7 @@ function excessMargin(
   const b0 = currentCashCC + Math.abs(currentPos) * Sm - currentLockedInQC + Math.max(0, tradeAmt * (Sm - limitPrice));
   // b0 + margin - fee > threshold
   // margin = threshold - b0 + fee
-  const fee_cc = pmExchangeFee(p, m, totShort, totLong, tradeAmt, tau) / S3;
+  const fee_cc = pmExchangeFee(p, m, tradeAmt, tau) / S3;
 
   // missing: referral rebate
   return b0 / S3 - thresh / S3 - fee_cc;
@@ -737,9 +737,7 @@ function pmExcessCashAtLvg(
   slippage: number,
   S2: number,
   Sm: number,
-  S3: number,
-  totLong: number,
-  totShort: number
+  S3: number
 ): number {
   //determine deposit amount for given leverage
   const limitPrice = S2 * (1 + Math.sign(tradeAmt) * slippage);
@@ -750,10 +748,10 @@ function pmExcessCashAtLvg(
   if (tradeAmt < 0) {
     p0 = 2 - Sm; //=1-(Sm-1)
   }
-  const feeCc = pmExchangeFee(p0, m0, totShort, totLong, tradeAmt, 1 / lvg) / S3;
+  const feeCc = (tradeAmt * pmExchangeFee(p0, m0, tradeAmt, 1 / lvg)) / S3;
 
   //excess cash
-  let exc = walletBalCC - depositFromWallet - feeCc;
+  let exc = walletBalCC - depositFromWallet;
 
   // margin balance
   let pos = currentPosition + tradeAmt;
@@ -794,10 +792,8 @@ function pmExcessCashAtLvg(
  * @param S2
  * @param Sm
  * @param S3
- * @param totLong
- * @param totShort
- * @param maxShort
- * @param maxLong
+ * @param maxShort global max short order size (sign irrelevant)
+ * @param maxLong global max long order size (positive)
  * @returns max trade size
  */
 export function pmFindMaxPersonalTradeSizeAtLeverage(
@@ -811,8 +807,6 @@ export function pmFindMaxPersonalTradeSizeAtLeverage(
   S2: number,
   Sm: number,
   S3: number,
-  totLong: number,
-  totShort: number,
   maxShort: number,
   maxLong: number
 ): number {
@@ -833,9 +827,7 @@ export function pmFindMaxPersonalTradeSizeAtLeverage(
     slippage,
     S2,
     Sm,
-    S3,
-    totLong,
-    totShort
+    S3
   );
   if (f0 < lot) {
     // no trade possible
@@ -859,9 +851,7 @@ export function pmFindMaxPersonalTradeSizeAtLeverage(
           slippage,
           S2,
           Sm,
-          S3,
-          totLong,
-          totShort
+          S3
         ) ** 2;
       const f2 =
         pmExcessCashAtLvg(
@@ -874,9 +864,7 @@ export function pmFindMaxPersonalTradeSizeAtLeverage(
           slippage,
           S2,
           Sm,
-          S3,
-          totLong,
-          totShort
+          S3
         ) ** 2;
       let ds = (f2 - f) / deltaS;
       if (ds == 0) {
@@ -899,10 +887,10 @@ export function pmFindMaxPersonalTradeSizeAtLeverage(
   }
   // 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;
+  if (sNew < -Math.abs(maxShort)) {
+    sNew = -Math.abs(maxShort);
+  } else if (sNew > maxLong) {
+    sNew = maxLong;
   }
   // round trade size down to lot
   sNew = Math.sign(sNew) * Math.floor(Math.abs(sNew) / lot) * lot;
@@ -934,8 +922,6 @@ export function pmFindMaxTradeSize(
   limitPrice: number,
   Sm: number,
   S3: number,
-  totLong: number,
-  totShort: number,
   maxShort: number,
   maxLong: number
 ): number {
@@ -946,17 +932,7 @@ export function pmFindMaxTradeSize(
   }
   const lot = 10;
   const deltaS = 1; //for derivative
-  const f0 = excessMargin(
-    dir * deltaS,
-    currentCashCC,
-    currentPosition,
-    currentLockedInValue,
-    limitPrice,
-    Sm,
-    S3,
-    totLong,
-    totShort
-  );
+  const f0 = excessMargin(dir * deltaS, currentCashCC, currentPosition, currentLockedInValue, limitPrice, Sm, S3);
   if (f0 < lot) {
     // no trade possible
     return 0;
@@ -968,21 +944,9 @@ export function pmFindMaxTradeSize(
     let count = 0;
     while (Math.abs(sNew - s) > 1 && count < 100) {
       s = sNew;
-      const f =
-        excessMargin(s, currentCashCC, currentPosition, currentLockedInValue, limitPrice, Sm, S3, totLong, totShort) **
-        2;
+      const f = excessMargin(s, currentCashCC, currentPosition, currentLockedInValue, limitPrice, Sm, S3) ** 2;
       const f2 =
-        excessMargin(
-          s + deltaS,
-          currentCashCC,
-          currentPosition,
-          currentLockedInValue,
-          limitPrice,
-          Sm,
-          S3,
-          totLong,
-          totShort
-        ) ** 2;
+        excessMargin(s + deltaS, currentCashCC, currentPosition, currentLockedInValue, limitPrice, Sm, S3) ** 2;
       let ds = (f2 - f) / deltaS;
       sNew = s - f / ds;
       count += 1;

package/src/liquidatorTool.ts

@@ -1,4 +1,11 @@
-import { ContractTransactionResponse, JsonRpcProvider, Overrides, Signer, TransactionResponse } from "ethers";
+import {
+  BigNumberish,
+  ContractTransactionResponse,
+  JsonRpcProvider,
+  Overrides,
+  Signer,
+  TransactionResponse,
+} from "ethers";
 import { PayableOverrides } from "./contracts/common";
 import { IPyth__factory } from "./contracts/factories";
 import { ABK64x64ToFloat, floatToABK64x64, entropy } from "./d8XMath";
@@ -98,7 +105,7 @@ export default class LiquidatorTool extends WriteAccessHandler {
     traderAddr: string,
     liquidatorAddr: string = "",
     submission?: PriceFeedSubmission,
-    overrides?: PayableOverrides & { rpcURL?: string; splitTx?: boolean }
+    overrides?: PayableOverrides & { rpcURL?: string; splitTx?: boolean; maxGasLimit?: BigNumberish }
   ): Promise<TransactionResponse> {
     // this operation spends gas, so signer is required
     if (this.proxyContract == null || this.signer == null) {
@@ -110,20 +117,17 @@ export default class LiquidatorTool extends WriteAccessHandler {
     }
     let rpcURL: string | undefined;
     let splitTx: boolean | undefined;
+    let maxGasLimit: BigNumberish | undefined;
     if (overrides) {
-      ({ rpcURL, splitTx, ...overrides } = overrides);
+      ({ rpcURL, splitTx, maxGasLimit, ...overrides } = overrides);
     }
+
     const provider = new JsonRpcProvider(rpcURL ?? this.nodeURL, this.network, { staticNetwork: true });
     let perpID = LiquidatorTool.symbolToPerpetualId(symbol, this.symbolToPerpStaticInfo);
     if (submission == undefined) {
       submission = await this.fetchLatestFeedPriceInfo(symbol);
     }
-    if (!overrides || overrides.gasLimit == undefined) {
-      overrides = {
-        gasLimit: overrides?.gasLimit ?? this.gasLimit,
-        ...overrides,
-      } as PayableOverrides;
-    }
+
     // update first
     let nonceInc = 0;
     let txData: string;
@@ -139,7 +143,7 @@ export default class LiquidatorTool extends WriteAccessHandler {
           {
             value: this.PRICE_UPDATE_FEE_GWEI * submission.timestamps.length,
             gasLimit: overrides?.gasLimit ?? this.gasLimit,
-            nonce: overrides.nonce,
+            nonce: overrides?.nonce,
           }
         );
         nonceInc += 1;
@@ -164,21 +168,50 @@ export default class LiquidatorTool extends WriteAccessHandler {
       ]);
       value = this.PRICE_UPDATE_FEE_GWEI * submission.timestamps.length;
     }
-    if (!!overrides?.nonce) {
+    if (overrides?.nonce != undefined) {
       overrides.nonce = overrides.nonce + nonceInc;
     }
+
+    if (overrides?.gasLimit !== undefined) {
+      overrides.gasLimit = await overrides.gasLimit;
+    }
+
+    if (overrides?.gasPrice !== undefined) {
+      overrides.gasPrice = await overrides.gasPrice;
+    }
     let unsignedTx = {
       to: this.proxyAddr,
       from: this.traderAddr,
-      nonce: overrides.nonce,
+      nonce: overrides?.nonce,
       data: txData,
       value: value,
-      gasLimit: overrides.gasLimit,
+      gasLimit: overrides?.gasLimit,
       // gas price is populated by the provider if undefined
-      gasPrice: overrides.gasPrice,
+      gasPrice: overrides?.gasPrice,
       chainId: this.chainId,
     };
-    return await this.signer.sendTransaction(unsignedTx);
+    // no gas limit was specified, explicitly estimate
+    if (!overrides?.gasLimit) {
+      let gasLimit = await this.signer
+        .estimateGas(unsignedTx)
+        .then((gas) => (gas * 1500n) / 1000n)
+        .catch((_e) => undefined);
+      if (!gasLimit) {
+        // gas estimate failed - txn would probably revert, double check (and possibly re-throw):
+        overrides = { gasLimit: maxGasLimit ?? this.gasLimit, value: unsignedTx.value, ...overrides };
+        await this.proxyContract.liquidateByAMM.staticCall(
+          perpID,
+          liquidatorAddr,
+          traderAddr,
+          submission.priceFeedVaas,
+          submission.timestamps,
+          overrides
+        );
+        gasLimit = BigInt(maxGasLimit ?? this.gasLimit);
+      }
+      unsignedTx.gasLimit = gasLimit;
+    }
+    return await this.signer.connect(provider).sendTransaction(unsignedTx);
   }
 
   /**

package/src/marketData.ts

@@ -804,7 +804,6 @@ export default class MarketData extends PerpetualDataHandler {
 
   /**
    * Fee is relative to base-currency amount (=trade amount)
-   * @param state current perpetual state (need longBC and shortBC)
    * @param maxMaintMgnRate maintenance margin rate param for pred mkts
    * @param Sm Mark price
    * @param tradeAmtBC signed trade amount
@@ -812,7 +811,6 @@ export default class MarketData extends PerpetualDataHandler {
    * @returns relative exchange fee in decimals
    */
   public static exchangeFeePrdMkts(
-    state: PerpetualState,
     maxMaintMgnRate: number,
     Sm: number,
     tradeAmtBC: number,
@@ -826,7 +824,7 @@ export default class MarketData extends PerpetualDataHandler {
       // 0.1cents if is close
       return 0.001;
     }
-    return pmExchangeFee(Sm - 1, maxMaintMgnRate, state.shortBC, state.longBC, tradeAmtBC, tradeMgnRate);
+    return pmExchangeFee(Sm - 1, maxMaintMgnRate, tradeAmtBC, tradeMgnRate);
   }
 
   /**
@@ -1279,8 +1277,6 @@ export default class MarketData extends PerpetualDataHandler {
       Sm,
       Sm,
       indexPriceInfo.s3 ?? 0,
-      totLong,
-      totShort,
       maxShortPosPerp,
       maxLongPosPerp
     );
@@ -1292,8 +1288,6 @@ export default class MarketData extends PerpetualDataHandler {
       Sm,
       Sm,
       indexPriceInfo.s3 ?? 0,
-      totLong,
-      totShort,
       maxShortPosPerp,
       maxLongPosPerp
     );

package/src/version.ts

@@ -1 +1 @@
-export const D8X_SDK_VERSION = "2.1.12-alpha2";
+export const D8X_SDK_VERSION = "2.1.24-alpha2";