@drift-labs/sdk 0.2.0-master.3 → 0.2.0-master.30

package/lib/idl/{mock_usdc_faucet.json → token_faucet.json}

@@ -1,23 +1,23 @@
 {
-    "version": "0.0.0",
-    "name": "mock_usdc_faucet",
+    "version": "0.1.0",
+    "name": "token_faucet",
     "instructions": [
         {
             "name": "initialize",
             "accounts": [
                 {
-                    "name": "mockUsdcFaucetState",
+                    "name": "faucetConfig",
                     "isMut": true,
                     "isSigner": false
                 },
                 {
                     "name": "admin",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": true
                 },
                 {
                     "name": "mintAccount",
-                    "isMut": false,
+                    "isMut": true,
                     "isSigner": false
                 },
                 {
@@ -29,20 +29,20 @@
                     "name": "systemProgram",
                     "isMut": false,
                     "isSigner": false
-                }
-            ],
-            "args": [
+                },
                 {
-                    "name": "mockUsdcFaucetNonce",
-                    "type": "u8"
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
                 }
-            ]
+            ],
+            "args": []
         },
         {
             "name": "mintToUser",
             "accounts": [
                 {
-                    "name": "mockUsdcFaucetState",
+                    "name": "faucetConfig",
                     "isMut": false,
                     "isSigner": false
                 },
@@ -73,11 +73,42 @@
                     "type": "u64"
                 }
             ]
+        },
+        {
+            "name": "transferMintAuthority",
+            "accounts": [
+                {
+                    "name": "faucetConfig",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "admin",
+                    "isMut": true,
+                    "isSigner": true
+                },
+                {
+                    "name": "mintAccount",
+                    "isMut": true,
+                    "isSigner": false
+                },
+                {
+                    "name": "mintAuthority",
+                    "isMut": false,
+                    "isSigner": false
+                },
+                {
+                    "name": "tokenProgram",
+                    "isMut": false,
+                    "isSigner": false
+                }
+            ],
+            "args": []
         }
     ],
     "accounts": [
         {
-            "name": "MockUSDCFaucetState",
+            "name": "FaucetConfig",
             "type": {
                 "kind": "struct",
                 "fields": [
@@ -103,17 +134,9 @@
     ],
     "errors": [
         {
-            "code": 300,
+            "code": 6000,
             "name": "InvalidMintAccountAuthority",
             "msg": "Program not mint authority"
-        },
-        {
-            "code": 301,
-            "name": "Unauthorized",
-            "msg": "Signer must be MockUSDCFaucet admin"
         }
-    ],
-    "metadata": {
-        "address": "2z2DLVD3tBWc86pbvvy5qN31v1NXprM6zA5MDr2FMx64"
-    }
+    ]
 }

package/lib/index.d.ts

@@ -1,29 +1,37 @@
 import { BN } from '@project-serum/anchor';
 import { PublicKey } from '@solana/web3.js';
-export * from './mockUSDCFaucet';
+import pyth from '@pythnetwork/client';
+export * from './tokenFaucet';
 export * from './oracles/types';
 export * from './oracles/pythClient';
 export * from './oracles/switchboardClient';
 export * from './types';
-export * from './constants/markets';
+export * from './constants/perpMarkets';
 export * from './accounts/fetch';
 export * from './accounts/webSocketClearingHouseAccountSubscriber';
 export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
+export * from './accounts/bulkUserStatsSubscription';
 export * from './accounts/pollingClearingHouseAccountSubscriber';
 export * from './accounts/pollingOracleSubscriber';
 export * from './accounts/pollingTokenAccountSubscriber';
+export * from './accounts/pollingUserAccountSubscriber';
+export * from './accounts/pollingUserStatsAccountSubscriber';
 export * from './accounts/types';
 export * from './addresses/pda';
 export * from './admin';
 export * from './clearingHouseUser';
 export * from './clearingHouseUserConfig';
+export * from './clearingHouseUserStats';
+export * from './clearingHouseUserStatsConfig';
 export * from './clearingHouse';
 export * from './factory/oracleClient';
 export * from './factory/bigNum';
 export * from './events/types';
 export * from './events/eventSubscriber';
+export * from './events/fetchLogs';
 export * from './math/auction';
+export * from './math/spotMarket';
 export * from './math/conversion';
 export * from './math/funding';
 export * from './math/market';
@@ -33,7 +41,8 @@ export * from './math/amm';
 export * from './math/trade';
 export * from './math/orders';
 export * from './math/repeg';
-export * from './orders';
+export * from './math/margin';
+export * from './math/insurance';
 export * from './orderParams';
 export * from './slot/SlotSubscriber';
 export * from './wallet';
@@ -41,10 +50,16 @@ export * from './types';
 export * from './math/utils';
 export * from './config';
 export * from './constants/numericConstants';
+export * from './serum/serumSubscriber';
 export * from './tx/retryTxSender';
 export * from './util/computeUnits';
 export * from './util/tps';
-export * from './math/bankBalance';
-export * from './constants/banks';
+export * from './math/spotBalance';
+export * from './constants/spotMarkets';
 export * from './clearingHouseConfig';
-export { BN, PublicKey };
+export * from './dlob/DLOB';
+export * from './dlob/DLOBNode';
+export * from './dlob/NodeList';
+export * from './userMap/userMap';
+export * from './userMap/userStatsMap';
+export { BN, PublicKey, pyth };

package/lib/index.js

@@ -13,36 +13,48 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PublicKey = exports.BN = void 0;
+exports.pyth = exports.PublicKey = exports.BN = void 0;
 const anchor_1 = require("@project-serum/anchor");
 Object.defineProperty(exports, "BN", { enumerable: true, get: function () { return anchor_1.BN; } });
 const web3_js_1 = require("@solana/web3.js");
 Object.defineProperty(exports, "PublicKey", { enumerable: true, get: function () { return web3_js_1.PublicKey; } });
-__exportStar(require("./mockUSDCFaucet"), exports);
+const client_1 = __importDefault(require("@pythnetwork/client"));
+exports.pyth = client_1.default;
+__exportStar(require("./tokenFaucet"), exports);
 __exportStar(require("./oracles/types"), exports);
 __exportStar(require("./oracles/pythClient"), exports);
 __exportStar(require("./oracles/switchboardClient"), exports);
 __exportStar(require("./types"), exports);
-__exportStar(require("./constants/markets"), exports);
+__exportStar(require("./constants/perpMarkets"), exports);
 __exportStar(require("./accounts/fetch"), exports);
 __exportStar(require("./accounts/webSocketClearingHouseAccountSubscriber"), exports);
 __exportStar(require("./accounts/bulkAccountLoader"), exports);
 __exportStar(require("./accounts/bulkUserSubscription"), exports);
+__exportStar(require("./accounts/bulkUserStatsSubscription"), exports);
 __exportStar(require("./accounts/pollingClearingHouseAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingOracleSubscriber"), exports);
 __exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingUserAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingUserStatsAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);
 __exportStar(require("./addresses/pda"), exports);
 __exportStar(require("./admin"), exports);
 __exportStar(require("./clearingHouseUser"), exports);
 __exportStar(require("./clearingHouseUserConfig"), exports);
+__exportStar(require("./clearingHouseUserStats"), exports);
+__exportStar(require("./clearingHouseUserStatsConfig"), exports);
 __exportStar(require("./clearingHouse"), exports);
 __exportStar(require("./factory/oracleClient"), exports);
 __exportStar(require("./factory/bigNum"), exports);
 __exportStar(require("./events/types"), exports);
 __exportStar(require("./events/eventSubscriber"), exports);
+__exportStar(require("./events/fetchLogs"), exports);
 __exportStar(require("./math/auction"), exports);
+__exportStar(require("./math/spotMarket"), exports);
 __exportStar(require("./math/conversion"), exports);
 __exportStar(require("./math/funding"), exports);
 __exportStar(require("./math/market"), exports);
@@ -52,7 +64,8 @@ __exportStar(require("./math/amm"), exports);
 __exportStar(require("./math/trade"), exports);
 __exportStar(require("./math/orders"), exports);
 __exportStar(require("./math/repeg"), exports);
-__exportStar(require("./orders"), exports);
+__exportStar(require("./math/margin"), exports);
+__exportStar(require("./math/insurance"), exports);
 __exportStar(require("./orderParams"), exports);
 __exportStar(require("./slot/SlotSubscriber"), exports);
 __exportStar(require("./wallet"), exports);
@@ -60,9 +73,15 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./math/utils"), exports);
 __exportStar(require("./config"), exports);
 __exportStar(require("./constants/numericConstants"), exports);
+__exportStar(require("./serum/serumSubscriber"), exports);
 __exportStar(require("./tx/retryTxSender"), exports);
 __exportStar(require("./util/computeUnits"), exports);
 __exportStar(require("./util/tps"), exports);
-__exportStar(require("./math/bankBalance"), exports);
-__exportStar(require("./constants/banks"), exports);
+__exportStar(require("./math/spotBalance"), exports);
+__exportStar(require("./constants/spotMarkets"), exports);
 __exportStar(require("./clearingHouseConfig"), exports);
+__exportStar(require("./dlob/DLOB"), exports);
+__exportStar(require("./dlob/DLOBNode"), exports);
+__exportStar(require("./dlob/NodeList"), exports);
+__exportStar(require("./userMap/userMap"), exports);
+__exportStar(require("./userMap/userStatsMap"), exports);

package/lib/math/amm.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import { BN } from '@project-serum/anchor';
-import { AMM, PositionDirection, SwapDirection, MarketAccount } from '../types';
+import { AMM, PositionDirection, SwapDirection, PerpMarketAccount } from '../types';
 import { OraclePriceData } from '../oracles/types';
 export declare function calculatePegFromTargetPrice(targetPrice: BN, baseAssetReserve: BN, quoteAssetReserve: BN): BN;
 export declare function calculateOptimalPegAndBudget(amm: AMM, oraclePriceData: OraclePriceData): [BN, BN, BN, boolean];
@@ -19,7 +19,7 @@ export declare function calculateBidAskPrice(amm: AMM, oraclePriceData: OraclePr
  * @param baseAssetReserves
  * @param quoteAssetReserves
  * @param pegMultiplier
- * @returns price : Precision MARK_PRICE_PRECISION
+ * @returns price : Precision PRICE_PRECISION
  */
 export declare function calculatePrice(baseAssetReserves: BN, quoteAssetReserves: BN, pegMultiplier: BN): BN;
 export declare type AssetType = 'quote' | 'base';
@@ -33,9 +33,11 @@ export declare type AssetType = 'quote' | 'base';
  * @returns quoteAssetReserve and baseAssetReserve after swap. : Precision AMM_RESERVE_PRECISION
  */
 export declare function calculateAmmReservesAfterSwap(amm: Pick<AMM, 'pegMultiplier' | 'quoteAssetReserve' | 'sqrtK' | 'baseAssetReserve'>, inputAssetType: AssetType, swapAmount: BN, swapDirection: SwapDirection): [BN, BN];
+export declare function calculateMarketOpenBidAsk(baseAssetReserve: BN, minBaseAssetReserve: BN, maxBaseAssetReserve: BN): [BN, BN];
+export declare function calculateInventoryScale(netBaseAssetAmount: BN, baseAssetReserve: BN, minBaseAssetReserve: BN, maxBaseAssetReserve: BN): number;
 export declare function calculateEffectiveLeverage(baseSpread: number, quoteAssetReserve: BN, terminalQuoteAssetReserve: BN, pegMultiplier: BN, netBaseAssetAmount: BN, markPrice: BN, totalFeeMinusDistributions: BN): number;
 export declare function calculateMaxSpread(marginRatioInitial: number): number;
-export declare function calculateSpreadBN(baseSpread: number, lastOracleMarkSpreadPct: BN, lastOracleConfPct: BN, maxSpread: number, quoteAssetReserve: BN, terminalQuoteAssetReserve: BN, pegMultiplier: BN, netBaseAssetAmount: BN, markPrice: BN, totalFeeMinusDistributions: BN): [number, number];
+export declare function calculateSpreadBN(baseSpread: number, lastOracleMarkSpreadPct: BN, lastOracleConfPct: BN, maxSpread: number, quoteAssetReserve: BN, terminalQuoteAssetReserve: BN, pegMultiplier: BN, netBaseAssetAmount: BN, markPrice: BN, totalFeeMinusDistributions: BN, baseAssetReserve: BN, minBaseAssetReserve: BN, maxBaseAssetReserve: BN): [number, number];
 export declare function calculateSpread(amm: AMM, direction: PositionDirection, oraclePriceData: OraclePriceData): number;
 export declare function calculateSpreadReserves(amm: AMM, direction: PositionDirection, oraclePriceData: OraclePriceData): {
     baseAssetReserve: BN;
@@ -62,8 +64,9 @@ export declare function getSwapDirection(inputAssetType: AssetType, positionDire
  * Helper function calculating terminal price of amm
  *
  * @param market
- * @returns cost : Precision MARK_PRICE_PRECISION
+ * @returns cost : Precision PRICE_PRECISION
  */
-export declare function calculateTerminalPrice(market: MarketAccount): BN;
+export declare function calculateTerminalPrice(market: PerpMarketAccount): BN;
 export declare function calculateMaxBaseAssetAmountToTrade(amm: AMM, limit_price: BN, direction: PositionDirection, oraclePriceData?: OraclePriceData): [BN, PositionDirection];
 export declare function calculateQuoteAssetAmountSwapped(quoteAssetReserves: BN, pegMultiplier: BN, swapDirection: SwapDirection): BN;
+export declare function calculateMaxBaseAssetAmountFillable(amm: AMM, orderDirection: PositionDirection): BN;

package/lib/math/amm.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
+exports.calculateMaxBaseAssetAmountFillable = exports.calculateQuoteAssetAmountSwapped = exports.calculateMaxBaseAssetAmountToTrade = exports.calculateTerminalPrice = exports.getSwapDirection = exports.calculateSwapOutput = exports.calculateSpreadReserves = exports.calculateSpread = exports.calculateSpreadBN = exports.calculateMaxSpread = exports.calculateEffectiveLeverage = exports.calculateInventoryScale = exports.calculateMarketOpenBidAsk = exports.calculateAmmReservesAfterSwap = exports.calculatePrice = exports.calculateBidAskPrice = exports.calculateUpdatedAMMSpreadReserves = exports.calculateUpdatedAMM = exports.calculateNewAmm = exports.calculateOptimalPegAndBudget = exports.calculatePegFromTargetPrice = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
@@ -8,11 +8,11 @@ const assert_1 = require("../assert/assert");
 const __1 = require("..");
 const repeg_1 = require("./repeg");
 function calculatePegFromTargetPrice(targetPrice, baseAssetReserve, quoteAssetReserve) {
-    return targetPrice
+    return anchor_1.BN.max(targetPrice
         .mul(baseAssetReserve)
         .div(quoteAssetReserve)
         .add(numericConstants_1.PRICE_DIV_PEG.div(new anchor_1.BN(2)))
-        .div(numericConstants_1.PRICE_DIV_PEG);
+        .div(numericConstants_1.PRICE_DIV_PEG), numericConstants_1.ONE);
 }
 exports.calculatePegFromTargetPrice = calculatePegFromTargetPrice;
 function calculateOptimalPegAndBudget(amm, oraclePriceData) {
@@ -127,14 +127,14 @@ exports.calculateBidAskPrice = calculateBidAskPrice;
  * @param baseAssetReserves
  * @param quoteAssetReserves
  * @param pegMultiplier
- * @returns price : Precision MARK_PRICE_PRECISION
+ * @returns price : Precision PRICE_PRECISION
  */
 function calculatePrice(baseAssetReserves, quoteAssetReserves, pegMultiplier) {
     if (baseAssetReserves.abs().lte(numericConstants_1.ZERO)) {
         return new anchor_1.BN(0);
     }
     return quoteAssetReserves
-        .mul(numericConstants_1.MARK_PRICE_PRECISION)
+        .mul(numericConstants_1.PRICE_PRECISION)
         .mul(pegMultiplier)
         .div(numericConstants_1.PEG_PRECISION)
         .div(baseAssetReserves);
@@ -165,6 +165,36 @@ function calculateAmmReservesAfterSwap(amm, inputAssetType, swapAmount, swapDire
     return [newQuoteAssetReserve, newBaseAssetReserve];
 }
 exports.calculateAmmReservesAfterSwap = calculateAmmReservesAfterSwap;
+function calculateMarketOpenBidAsk(baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve) {
+    // open orders
+    let openAsks;
+    if (maxBaseAssetReserve > baseAssetReserve) {
+        openAsks = maxBaseAssetReserve.sub(baseAssetReserve).mul(new anchor_1.BN(-1));
+    }
+    else {
+        openAsks = numericConstants_1.ZERO;
+    }
+    let openBids;
+    if (minBaseAssetReserve < baseAssetReserve) {
+        openBids = baseAssetReserve.sub(minBaseAssetReserve);
+    }
+    else {
+        openBids = numericConstants_1.ZERO;
+    }
+    return [openBids, openAsks];
+}
+exports.calculateMarketOpenBidAsk = calculateMarketOpenBidAsk;
+function calculateInventoryScale(netBaseAssetAmount, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve) {
+    // inventory skew
+    const [openBids, openAsks] = calculateMarketOpenBidAsk(baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve);
+    const minSideLiquidity = anchor_1.BN.max(new anchor_1.BN(1), anchor_1.BN.min(openBids.abs(), openAsks.abs()));
+    const inventoryScale = anchor_1.BN.min(netBaseAssetAmount.abs(), minSideLiquidity)
+        .mul(numericConstants_1.BID_ASK_SPREAD_PRECISION.mul(new anchor_1.BN(10)))
+        .div(minSideLiquidity)
+        .toNumber() / numericConstants_1.BID_ASK_SPREAD_PRECISION.toNumber();
+    return inventoryScale;
+}
+exports.calculateInventoryScale = calculateInventoryScale;
 function calculateEffectiveLeverage(baseSpread, quoteAssetReserve, terminalQuoteAssetReserve, pegMultiplier, netBaseAssetAmount, markPrice, totalFeeMinusDistributions) {
     // inventory skew
     const netBaseAssetValue = quoteAssetReserve
@@ -173,7 +203,7 @@ function calculateEffectiveLeverage(baseSpread, quoteAssetReserve, terminalQuote
         .div(numericConstants_1.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
     const localBaseAssetValue = netBaseAssetAmount
         .mul(markPrice)
-        .div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO.mul(numericConstants_1.MARK_PRICE_PRECISION));
+        .div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO.mul(numericConstants_1.PRICE_PRECISION));
     const effectiveLeverage = localBaseAssetValue.sub(netBaseAssetValue).toNumber() /
         (Math.max(0, totalFeeMinusDistributions.toNumber()) + 1) +
         1 / numericConstants_1.QUOTE_PRECISION.toNumber();
@@ -187,7 +217,7 @@ function calculateMaxSpread(marginRatioInitial) {
     return maxTargetSpread;
 }
 exports.calculateMaxSpread = calculateMaxSpread;
-function calculateSpreadBN(baseSpread, lastOracleMarkSpreadPct, lastOracleConfPct, maxSpread, quoteAssetReserve, terminalQuoteAssetReserve, pegMultiplier, netBaseAssetAmount, markPrice, totalFeeMinusDistributions) {
+function calculateSpreadBN(baseSpread, lastOracleMarkSpreadPct, lastOracleConfPct, maxSpread, quoteAssetReserve, terminalQuoteAssetReserve, pegMultiplier, netBaseAssetAmount, markPrice, totalFeeMinusDistributions, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve) {
     let longSpread = baseSpread / 2;
     let shortSpread = baseSpread / 2;
     if (lastOracleMarkSpreadPct.gt(numericConstants_1.ZERO)) {
@@ -196,8 +226,16 @@ function calculateSpreadBN(baseSpread, lastOracleMarkSpreadPct, lastOracleConfPc
     else if (lastOracleMarkSpreadPct.lt(numericConstants_1.ZERO)) {
         longSpread = Math.max(longSpread, lastOracleMarkSpreadPct.abs().toNumber() + lastOracleConfPct.toNumber());
     }
-    const maxTargetSpread = maxSpread;
+    const maxTargetSpread = Math.max(maxSpread, lastOracleMarkSpreadPct.abs().toNumber());
     const MAX_INVENTORY_SKEW = 5;
+    const inventoryScale = calculateInventoryScale(netBaseAssetAmount, baseAssetReserve, minBaseAssetReserve, maxBaseAssetReserve);
+    const inventorySpreadScale = Math.min(MAX_INVENTORY_SKEW, 1 + inventoryScale);
+    if (netBaseAssetAmount.gt(numericConstants_1.ZERO)) {
+        longSpread *= inventorySpreadScale;
+    }
+    else if (netBaseAssetAmount.lt(numericConstants_1.ZERO)) {
+        shortSpread *= inventorySpreadScale;
+    }
     const effectiveLeverage = calculateEffectiveLeverage(baseSpread, quoteAssetReserve, terminalQuoteAssetReserve, pegMultiplier, netBaseAssetAmount, markPrice, totalFeeMinusDistributions);
     if (totalFeeMinusDistributions.gt(numericConstants_1.ZERO)) {
         const spreadScale = Math.min(MAX_INVENTORY_SKEW, 1 + effectiveLeverage);
@@ -227,9 +265,8 @@ function calculateSpreadBN(baseSpread, lastOracleMarkSpreadPct, lastOracleConfPc
 }
 exports.calculateSpreadBN = calculateSpreadBN;
 function calculateSpread(amm, direction, oraclePriceData) {
-    let spread = amm.baseSpread / 2;
     if (amm.baseSpread == 0 || amm.curveUpdateIntensity == 0) {
-        return spread;
+        return amm.baseSpread / 2;
     }
     const markPrice = calculatePrice(amm.baseAssetReserve, amm.quoteAssetReserve, amm.pegMultiplier);
     const targetPrice = (oraclePriceData === null || oraclePriceData === void 0 ? void 0 : oraclePriceData.price) || markPrice;
@@ -241,40 +278,13 @@ function calculateSpread(amm, direction, oraclePriceData) {
     const confIntervalPct = confInterval
         .mul(numericConstants_1.BID_ASK_SPREAD_PRECISION)
         .div(markPrice);
-    // oracle retreat
-    if (((0, types_1.isVariant)(direction, 'long') && targetMarkSpreadPct.lt(numericConstants_1.ZERO)) ||
-        ((0, types_1.isVariant)(direction, 'short') && targetMarkSpreadPct.gt(numericConstants_1.ZERO))) {
-        spread = Math.max(spread, targetMarkSpreadPct.abs().toNumber() + confIntervalPct.abs().toNumber());
+    const [longSpread, shortSpread] = calculateSpreadBN(amm.baseSpread, targetMarkSpreadPct, confIntervalPct, amm.maxSpread, amm.quoteAssetReserve, amm.terminalQuoteAssetReserve, amm.pegMultiplier, amm.netBaseAssetAmount, markPrice, amm.totalFeeMinusDistributions, amm.baseAssetReserve, amm.minBaseAssetReserve, amm.maxBaseAssetReserve);
+    let spread;
+    if ((0, types_1.isVariant)(direction, 'long')) {
+        spread = longSpread;
     }
-    // inventory skew
-    const MAX_INVENTORY_SKEW = 5;
-    if ((amm.netBaseAssetAmount.gt(numericConstants_1.ZERO) && (0, types_1.isVariant)(direction, 'long')) ||
-        (amm.netBaseAssetAmount.lt(numericConstants_1.ZERO) && (0, types_1.isVariant)(direction, 'short')) ||
-        amm.totalFeeMinusDistributions.eq(numericConstants_1.ZERO)) {
-        const netCostBasis = amm.quoteAssetAmountLong.sub(amm.quoteAssetAmountShort);
-        const netBaseAssetValue = amm.quoteAssetReserve
-            .sub(amm.terminalQuoteAssetReserve)
-            .mul(amm.pegMultiplier)
-            .div(numericConstants_1.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO);
-        const localBaseAssetValue = amm.netBaseAssetAmount
-            .mul(markPrice)
-            .div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO.mul(numericConstants_1.MARK_PRICE_PRECISION));
-        const netPnl = netBaseAssetValue.sub(netCostBasis);
-        const localPnl = localBaseAssetValue.sub(netCostBasis);
-        let effectiveLeverage = MAX_INVENTORY_SKEW;
-        if (amm.totalFeeMinusDistributions.gt(numericConstants_1.ZERO)) {
-            effectiveLeverage =
-                localPnl.sub(netPnl).toNumber() /
-                    (amm.totalFeeMinusDistributions.toNumber() + 1);
-        }
-        let spreadScale = Math.min(MAX_INVENTORY_SKEW, 1 + effectiveLeverage);
-        const maxTargetSpread = numericConstants_1.BID_ASK_SPREAD_PRECISION.toNumber() / 50; // 2%
-        // cap the scale to attempt to only scale up to maxTargetSpread
-        // always let the oracle retreat methods go through 100%
-        if (spreadScale * spread > maxTargetSpread) {
-            spreadScale = Math.max(1.05, maxTargetSpread / spread);
-        }
-        spread *= spreadScale;
+    else {
+        spread = shortSpread;
     }
     return spread;
 }
@@ -343,7 +353,7 @@ exports.getSwapDirection = getSwapDirection;
  * Helper function calculating terminal price of amm
  *
  * @param market
- * @returns cost : Precision MARK_PRICE_PRECISION
+ * @returns cost : Precision PRICE_PRECISION
  */
 function calculateTerminalPrice(market) {
     const directionToClose = market.amm.netBaseAssetAmount.gt(numericConstants_1.ZERO)
@@ -351,7 +361,7 @@ function calculateTerminalPrice(market) {
         : types_1.PositionDirection.LONG;
     const [newQuoteAssetReserve, newBaseAssetReserve] = calculateAmmReservesAfterSwap(market.amm, 'base', market.amm.netBaseAssetAmount.abs(), getSwapDirection('base', directionToClose));
     const terminalPrice = newQuoteAssetReserve
-        .mul(numericConstants_1.MARK_PRICE_PRECISION)
+        .mul(numericConstants_1.PRICE_PRECISION)
         .mul(market.amm.pegMultiplier)
         .div(numericConstants_1.PEG_PRECISION)
         .div(newBaseAssetReserve);
@@ -361,7 +371,7 @@ exports.calculateTerminalPrice = calculateTerminalPrice;
 function calculateMaxBaseAssetAmountToTrade(amm, limit_price, direction, oraclePriceData) {
     const invariant = amm.sqrtK.mul(amm.sqrtK);
     const newBaseAssetReserveSquared = invariant
-        .mul(numericConstants_1.MARK_PRICE_PRECISION)
+        .mul(numericConstants_1.PRICE_PRECISION)
         .mul(amm.pegMultiplier)
         .div(limit_price)
         .div(numericConstants_1.PEG_PRECISION);
@@ -395,3 +405,15 @@ function calculateQuoteAssetAmountSwapped(quoteAssetReserves, pegMultiplier, swa
     return quoteAssetAmount;
 }
 exports.calculateQuoteAssetAmountSwapped = calculateQuoteAssetAmountSwapped;
+function calculateMaxBaseAssetAmountFillable(amm, orderDirection) {
+    const maxFillSize = amm.baseAssetReserve.div(new anchor_1.BN(amm.maxBaseAssetAmountRatio));
+    let maxBaseAssetAmountOnSide;
+    if ((0, types_1.isVariant)(orderDirection, 'long')) {
+        maxBaseAssetAmountOnSide = anchor_1.BN.max(numericConstants_1.ZERO, amm.baseAssetReserve.sub(amm.minBaseAssetReserve));
+    }
+    else {
+        maxBaseAssetAmountOnSide = anchor_1.BN.max(numericConstants_1.ZERO, amm.maxBaseAssetReserve.sub(amm.baseAssetReserve));
+    }
+    return (0, __1.standardizeBaseAssetAmount)(anchor_1.BN.min(maxFillSize, maxBaseAssetAmountOnSide), amm.baseAssetAmountStepSize);
+}
+exports.calculateMaxBaseAssetAmountFillable = calculateMaxBaseAssetAmountFillable;

package/lib/math/auction.js

@@ -4,7 +4,10 @@ exports.getAuctionPrice = exports.isAuctionComplete = void 0;
 const types_1 = require("../types");
 const _1 = require("../.");
 function isAuctionComplete(order, slot) {
-    return new _1.BN(slot).sub(order.slot).gte(new _1.BN(order.auctionDuration));
+    if (order.auctionDuration === 0) {
+        return true;
+    }
+    return new _1.BN(slot).sub(order.slot).gt(new _1.BN(order.auctionDuration));
 }
 exports.isAuctionComplete = isAuctionComplete;
 function getAuctionPrice(order, slot) {

package/lib/math/conversion.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToNumber = void 0;
 const numericConstants_1 = require("../constants/numericConstants");
-const convertToNumber = (bigNumber, precision = numericConstants_1.MARK_PRICE_PRECISION) => {
+const convertToNumber = (bigNumber, precision = numericConstants_1.PRICE_PRECISION) => {
     if (!bigNumber)
         return 0;
     return (bigNumber.div(precision).toNumber() +

package/lib/math/funding.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import { BN } from '@project-serum/anchor';
-import { MarketAccount } from '../types';
+import { PerpMarketAccount } from '../types';
 import { OraclePriceData } from '../oracles/types';
 /**
  *
@@ -9,7 +9,7 @@ import { OraclePriceData } from '../oracles/types';
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateAllEstimatedFundingRate(market: MarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN): Promise<[BN, BN, BN, BN, BN]>;
+export declare function calculateAllEstimatedFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN): Promise<[BN, BN, BN, BN, BN]>;
 /**
  *
  * @param market
@@ -18,7 +18,7 @@ export declare function calculateAllEstimatedFundingRate(market: MarketAccount,
  * @param estimationMethod
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateEstimatedFundingRate(market: MarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN, estimationMethod?: 'interpolated' | 'lowerbound' | 'capped'): Promise<BN>;
+export declare function calculateEstimatedFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN, estimationMethod?: 'interpolated' | 'lowerbound' | 'capped'): Promise<BN>;
 /**
  *
  * @param market
@@ -26,7 +26,7 @@ export declare function calculateEstimatedFundingRate(market: MarketAccount, ora
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateLongShortFundingRate(market: MarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN): Promise<[BN, BN]>;
+export declare function calculateLongShortFundingRate(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN): Promise<[BN, BN]>;
 /**
  *
  * @param market
@@ -34,10 +34,10 @@ export declare function calculateLongShortFundingRate(market: MarketAccount, ora
  * @param periodAdjustment
  * @returns Estimated funding rate. : Precision //TODO-PRECISION
  */
-export declare function calculateLongShortFundingRateAndLiveTwaps(market: MarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN): Promise<[BN, BN, BN, BN]>;
+export declare function calculateLongShortFundingRateAndLiveTwaps(market: PerpMarketAccount, oraclePriceData?: OraclePriceData, periodAdjustment?: BN): Promise<[BN, BN, BN, BN]>;
 /**
  *
  * @param market
  * @returns Estimated fee pool size
  */
-export declare function calculateFundingPool(market: MarketAccount): BN;
+export declare function calculateFundingPool(market: PerpMarketAccount): BN;