@drift-labs/sdk 2.0.2 → 2.0.4

package/README.md

@@ -228,3 +228,4 @@ Drift Protocol v1 is licensed under [Apache 2.0](./LICENSE).
 Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in Drift SDK by you, as defined in the Apache-2.0 license, shall be
 licensed as above, without any additional terms or conditions.
+

package/lib/accounts/types.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { SpotMarketAccount, PerpMarketAccount, OracleSource, StateAccount, UserAccount, UserStatsAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';

package/lib/idl/drift.json

@@ -5955,6 +5955,9 @@
                     {
                         "name": "RiskingIncreasingOrder"
                     },
+                    {
+                        "name": "ReduceOnlyOrderIncreasedPosition"
+                    },
                     {
                         "name": "OrderFillWithSerum"
                     }

package/lib/math/orders.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import { User } from '../user';
-import { PerpMarketAccount, Order } from '../types';
+import { PerpMarketAccount, AMM, Order } from '../types';
 import { BN } from '@project-serum/anchor';
 import { OraclePriceData } from '../oracles/types';
 export declare function isOrderRiskIncreasing(user: User, order: Order): boolean;
@@ -12,7 +12,7 @@ export declare function getOptionalLimitPrice(order: Order, oraclePriceData: Ora
 export declare function hasLimitPrice(order: Order, slot: number): boolean;
 export declare function isFillableByVAMM(order: Order, market: PerpMarketAccount, oraclePriceData: OraclePriceData, slot: number, ts: number): boolean;
 export declare function calculateBaseAssetAmountForAmmToFulfill(order: Order, market: PerpMarketAccount, oraclePriceData: OraclePriceData, slot: number): BN;
-export declare function calculateBaseAssetAmountToFillUpToLimitPrice(order: Order, market: PerpMarketAccount, limitPrice: BN, oraclePriceData: OraclePriceData): BN;
+export declare function calculateBaseAssetAmountToFillUpToLimitPrice(order: Order, amm: AMM, limitPrice: BN, oraclePriceData: OraclePriceData): BN;
 export declare function isOrderExpired(order: Order, ts: number): boolean;
 export declare function isMarketOrder(order: Order): boolean;
 export declare function isLimitOrder(order: Order): boolean;

package/lib/math/orders.js

@@ -135,19 +135,20 @@ function calculateBaseAssetAmountForAmmToFulfill(order, market, oraclePriceData,
     }
     const limitPrice = getOptionalLimitPrice(order, oraclePriceData, slot);
     let baseAssetAmount;
+    const updatedAMM = (0, amm_1.calculateUpdatedAMM)(market.amm, oraclePriceData);
     if (limitPrice !== undefined) {
-        baseAssetAmount = calculateBaseAssetAmountToFillUpToLimitPrice(order, market, limitPrice, oraclePriceData);
+        baseAssetAmount = calculateBaseAssetAmountToFillUpToLimitPrice(order, updatedAMM, limitPrice, oraclePriceData);
     }
     else {
         baseAssetAmount = order.baseAssetAmount.sub(order.baseAssetAmountFilled);
     }
-    const maxBaseAssetAmount = (0, amm_1.calculateMaxBaseAssetAmountFillable)(market.amm, order.direction);
+    const maxBaseAssetAmount = (0, amm_1.calculateMaxBaseAssetAmountFillable)(updatedAMM, order.direction);
     return anchor_1.BN.min(maxBaseAssetAmount, baseAssetAmount);
 }
 exports.calculateBaseAssetAmountForAmmToFulfill = calculateBaseAssetAmountForAmmToFulfill;
-function calculateBaseAssetAmountToFillUpToLimitPrice(order, market, limitPrice, oraclePriceData) {
-    const [maxAmountToTrade, direction] = (0, amm_1.calculateMaxBaseAssetAmountToTrade)(market.amm, limitPrice, order.direction, oraclePriceData);
-    const baseAssetAmount = standardizeBaseAssetAmount(maxAmountToTrade, market.amm.orderStepSize);
+function calculateBaseAssetAmountToFillUpToLimitPrice(order, amm, limitPrice, oraclePriceData) {
+    const [maxAmountToTrade, direction] = (0, amm_1.calculateMaxBaseAssetAmountToTrade)(amm, limitPrice, order.direction, oraclePriceData);
+    const baseAssetAmount = standardizeBaseAssetAmount(maxAmountToTrade, amm.orderStepSize);
     // Check that directions are the same
     const sameDirection = isSameDirection(direction, order.direction);
     if (!sameDirection) {

package/lib/types.d.ts

@@ -234,6 +234,9 @@ export declare class OrderActionExplanation {
     static readonly ORDER_FILLED_WITH_SERUM: {
         orderFillWithSerum: {};
     };
+    static readonly REDUCE_ONLY_ORDER_INCREASED_POSITION: {
+        reduceOnlyOrderIncreasedPosition: {};
+    };
 }
 export declare class OrderTriggerCondition {
     static readonly ABOVE: {

package/lib/types.js

@@ -140,6 +140,9 @@ OrderActionExplanation.RISK_INCREASING_ORDER = {
 OrderActionExplanation.ORDER_FILLED_WITH_SERUM = {
     orderFillWithSerum: {},
 };
+OrderActionExplanation.REDUCE_ONLY_ORDER_INCREASED_POSITION = {
+    reduceOnlyOrderIncreasedPosition: {},
+};
 class OrderTriggerCondition {
 }
 exports.OrderTriggerCondition = OrderTriggerCondition;

package/lib/user.js

@@ -602,7 +602,7 @@ class User {
         return totalAssetValue.mul(numericConstants_1.TEN_THOUSAND).div(totalLiabilityValue);
     }
     canBeLiquidated() {
-        const totalCollateral = this.getTotalCollateral();
+        const totalCollateral = this.getTotalCollateral('Maintenance');
         // if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
         let liquidationBuffer = undefined;
         const isBeingLiquidated = (0, types_1.isVariant)(this.getUserAccount().status, 'beingLiquidated');

package/package.json

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

package/src/idl/drift.json

@@ -5955,6 +5955,9 @@
           {
             "name": "RiskingIncreasingOrder"
           },
+          {
+            "name": "ReduceOnlyOrderIncreasedPosition"
+          },
           {
             "name": "OrderFillWithSerum"
           }

package/src/math/orders.ts

@@ -3,6 +3,7 @@ import {
 	isOneOfVariant,
 	isVariant,
 	PerpMarketAccount,
+	AMM,
 	Order,
 	PositionDirection,
 } from '../types';
@@ -13,6 +14,7 @@ import { getAuctionPrice, isAuctionComplete } from './auction';
 import {
 	calculateMaxBaseAssetAmountFillable,
 	calculateMaxBaseAssetAmountToTrade,
+	calculateUpdatedAMM,
 } from './amm';
 
 export function isOrderRiskIncreasing(user: User, order: Order): boolean {
@@ -202,10 +204,12 @@ export function calculateBaseAssetAmountForAmmToFulfill(
 
 	const limitPrice = getOptionalLimitPrice(order, oraclePriceData, slot);
 	let baseAssetAmount;
+
+	const updatedAMM = calculateUpdatedAMM(market.amm, oraclePriceData);
 	if (limitPrice !== undefined) {
 		baseAssetAmount = calculateBaseAssetAmountToFillUpToLimitPrice(
 			order,
-			market,
+			updatedAMM,
 			limitPrice,
 			oraclePriceData
 		);
@@ -214,7 +218,7 @@ export function calculateBaseAssetAmountForAmmToFulfill(
 	}
 
 	const maxBaseAssetAmount = calculateMaxBaseAssetAmountFillable(
-		market.amm,
+		updatedAMM,
 		order.direction
 	);
 
@@ -223,12 +227,12 @@ export function calculateBaseAssetAmountForAmmToFulfill(
 
 export function calculateBaseAssetAmountToFillUpToLimitPrice(
 	order: Order,
-	market: PerpMarketAccount,
+	amm: AMM,
 	limitPrice: BN,
 	oraclePriceData: OraclePriceData
 ): BN {
 	const [maxAmountToTrade, direction] = calculateMaxBaseAssetAmountToTrade(
-		market.amm,
+		amm,
 		limitPrice,
 		order.direction,
 		oraclePriceData
@@ -236,7 +240,7 @@ export function calculateBaseAssetAmountToFillUpToLimitPrice(
 
 	const baseAssetAmount = standardizeBaseAssetAmount(
 		maxAmountToTrade,
-		market.amm.orderStepSize
+		amm.orderStepSize
 	);
 
 	// Check that directions are the same

package/src/types.ts

@@ -139,6 +139,9 @@ export class OrderActionExplanation {
 	static readonly ORDER_FILLED_WITH_SERUM = {
 		orderFillWithSerum: {},
 	};
+	static readonly REDUCE_ONLY_ORDER_INCREASED_POSITION = {
+		reduceOnlyOrderIncreasedPosition: {},
+	};
 }
 
 export class OrderTriggerCondition {

package/src/user.ts

@@ -1021,7 +1021,7 @@ export class User {
 	}
 
 	public canBeLiquidated(): boolean {
-		const totalCollateral = this.getTotalCollateral();
+		const totalCollateral = this.getTotalCollateral('Maintenance');
 
 		// if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
 		let liquidationBuffer = undefined;