@drift-labs/sdk 2.14.0 → 2.15.0

package/lib/constants/perpMarkets.js

@@ -76,6 +76,16 @@ exports.MainnetPerpMarkets = [
         launchTs: 1670347281000,
         oracleSource: __1.OracleSource.PYTH,
     },
+    {
+        fullName: 'Aptos',
+        category: ['L1', 'Infra'],
+        symbol: 'APT-PERP',
+        baseAssetSymbol: 'APT',
+        marketIndex: 3,
+        oracle: new web3_js_1.PublicKey('FNNvb1AFDnDVPkocEri8mWbJ1952HQZtFLuwPiUjSJQ'),
+        launchTs: 1675802661000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.14.0",
+    "version": "2.15.0",
     "name": "drift",
     "instructions": [
         {

package/lib/math/market.d.ts

@@ -30,6 +30,7 @@ export declare function calculateOracleSpread(price: BN, oraclePriceData: Oracle
 export declare function calculateMarketMarginRatio(market: PerpMarketAccount, size: BN, marginCategory: MarginCategory): number;
 export declare function calculateUnrealizedAssetWeight(market: PerpMarketAccount, quoteSpotMarket: SpotMarketAccount, unrealizedPnl: BN, marginCategory: MarginCategory, oraclePriceData: OraclePriceData): BN;
 export declare function calculateMarketAvailablePNL(perpMarket: PerpMarketAccount, spotMarket: SpotMarketAccount): BN;
+export declare function calculateMarketMaxAvailableInsurance(perpMarket: PerpMarketAccount, spotMarket: SpotMarketAccount): BN;
 export declare function calculateNetUserPnl(perpMarket: PerpMarketAccount, oraclePriceData: OraclePriceData): BN;
 export declare function calculateNetUserPnlImbalance(perpMarket: PerpMarketAccount, spotMarket: SpotMarketAccount, oraclePriceData: OraclePriceData): BN;
 export declare function calculateAvailablePerpLiquidity(market: PerpMarketAccount, oraclePriceData: OraclePriceData, dlob: DLOB, slot: number): {

package/lib/math/market.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateAvailablePerpLiquidity = exports.calculateNetUserPnlImbalance = exports.calculateNetUserPnl = exports.calculateMarketAvailablePNL = exports.calculateUnrealizedAssetWeight = exports.calculateMarketMarginRatio = exports.calculateOracleSpread = exports.calculateOracleReserveSpread = exports.calculateNewMarketAfterTrade = exports.calculateAskPrice = exports.calculateBidPrice = exports.calculateReservePrice = void 0;
+exports.calculateAvailablePerpLiquidity = exports.calculateNetUserPnlImbalance = exports.calculateNetUserPnl = exports.calculateMarketMaxAvailableInsurance = exports.calculateMarketAvailablePNL = exports.calculateUnrealizedAssetWeight = exports.calculateMarketMarginRatio = exports.calculateOracleSpread = exports.calculateOracleReserveSpread = exports.calculateNewMarketAfterTrade = exports.calculateAskPrice = exports.calculateBidPrice = exports.calculateReservePrice = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const types_1 = require("../types");
 const amm_1 = require("./amm");
 const margin_1 = require("./margin");
 const numericConstants_1 = require("../constants/numericConstants");
 const spotBalance_1 = require("./spotBalance");
+const assert_1 = require("../assert/assert");
 /**
  * Calculates market mark price
  *
@@ -98,6 +99,14 @@ function calculateMarketAvailablePNL(perpMarket, spotMarket) {
     return spotBalance_1.getTokenAmount(perpMarket.pnlPool.scaledBalance, spotMarket, types_1.SpotBalanceType.DEPOSIT);
 }
 exports.calculateMarketAvailablePNL = calculateMarketAvailablePNL;
+function calculateMarketMaxAvailableInsurance(perpMarket, spotMarket) {
+    assert_1.assert(spotMarket.marketIndex == numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
+    // todo: insuranceFundAllocation technically not guaranteed to be in Insurance Fund
+    const insuranceFundAllocation = perpMarket.insuranceClaim.quoteMaxInsurance.sub(perpMarket.insuranceClaim.quoteSettledInsurance);
+    const ammFeePool = spotBalance_1.getTokenAmount(perpMarket.amm.feePool.scaledBalance, spotMarket, types_1.SpotBalanceType.DEPOSIT);
+    return insuranceFundAllocation.add(ammFeePool);
+}
+exports.calculateMarketMaxAvailableInsurance = calculateMarketMaxAvailableInsurance;
 function calculateNetUserPnl(perpMarket, oraclePriceData) {
     const netUserPositionValue = perpMarket.amm.baseAssetAmountWithAmm
         .mul(oraclePriceData.price)

package/lib/user.js

@@ -777,7 +777,7 @@ class User {
         const maintenanceMarginRequirement = this.getMaintenanceMarginRequirement();
         const freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(maintenanceMarginRequirement));
         const market = this.driftClient.getPerpMarketAccount(marketIndex);
-        const currentPerpPosition = this.getPerpPosition(marketIndex);
+        const currentPerpPosition = this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
         let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange);
         if (!freeCollateralDelta) {
             return new _1.BN(-1);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.14.0",
+	"version": "2.15.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/constants/perpMarkets.ts

@@ -87,6 +87,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1670347281000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Aptos',
+		category: ['L1', 'Infra'],
+		symbol: 'APT-PERP',
+		baseAssetSymbol: 'APT',
+		marketIndex: 3,
+		oracle: new PublicKey('FNNvb1AFDnDVPkocEri8mWbJ1952HQZtFLuwPiUjSJQ'),
+		launchTs: 1675802661000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.14.0",
+  "version": "2.15.0",
   "name": "drift",
   "instructions": [
     {

package/src/math/market.ts

@@ -25,9 +25,11 @@ import {
 	MARGIN_PRECISION,
 	PRICE_TO_QUOTE_PRECISION,
 	ZERO,
+	QUOTE_SPOT_MARKET_INDEX,
 } from '../constants/numericConstants';
 import { getTokenAmount } from './spotBalance';
 import { DLOB } from '../dlob/DLOB';
+import { assert } from '../assert/assert';
 
 /**
  * Calculates market mark price
@@ -202,6 +204,25 @@ export function calculateMarketAvailablePNL(
 	);
 }
 
+export function calculateMarketMaxAvailableInsurance(
+	perpMarket: PerpMarketAccount,
+	spotMarket: SpotMarketAccount
+): BN {
+	assert(spotMarket.marketIndex == QUOTE_SPOT_MARKET_INDEX);
+
+	// todo: insuranceFundAllocation technically not guaranteed to be in Insurance Fund
+	const insuranceFundAllocation =
+		perpMarket.insuranceClaim.quoteMaxInsurance.sub(
+			perpMarket.insuranceClaim.quoteSettledInsurance
+		);
+	const ammFeePool = getTokenAmount(
+		perpMarket.amm.feePool.scaledBalance,
+		spotMarket,
+		SpotBalanceType.DEPOSIT
+	);
+	return insuranceFundAllocation.add(ammFeePool);
+}
+
 export function calculateNetUserPnl(
 	perpMarket: PerpMarketAccount,
 	oraclePriceData: OraclePriceData

package/src/user.ts

@@ -1377,7 +1377,8 @@ export class User {
 		);
 
 		const market = this.driftClient.getPerpMarketAccount(marketIndex);
-		const currentPerpPosition = this.getPerpPosition(marketIndex);
+		const currentPerpPosition =
+			this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
 
 		let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(
 			market,