@drift-labs/sdk 0.1.18-orders.4 → 0.1.18-orders.8

package/lib/accounts/bulkAccountLoader.js

@@ -91,8 +91,10 @@ class BulkAccountLoader {
                     callback(e);
                 }
             }
-            this.loadPromiseResolver();
-            this.loadPromise = undefined;
+            finally {
+                this.loadPromiseResolver();
+                this.loadPromise = undefined;
+            }
         });
     }
     loadChunk(accountsToLoad) {

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -54,11 +54,14 @@ class PollingUserAccountSubscriber {
                 eventType: 'userPositionsData',
             });
             const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, userPublicKey);
-            this.accountsToPoll.set(userOrdersPublicKey.toString(), {
-                key: 'userOrders',
-                publicKey: userOrdersPublicKey,
-                eventType: 'userOrdersData',
-            });
+            const userOrdersExist = (yield this.program.provider.connection.getParsedAccountInfo(userOrdersPublicKey)).value !== null;
+            if (userOrdersExist) {
+                this.accountsToPoll.set(userOrdersPublicKey.toString(), {
+                    key: 'userOrders',
+                    publicKey: userOrdersPublicKey,
+                    eventType: 'userOrdersData',
+                });
+            }
             for (const [_, accountToPoll] of this.accountsToPoll) {
                 accountToPoll.callbackId = this.accountLoader.addAccount(accountToPoll.publicKey, (buffer) => {
                     const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);

package/lib/clearingHouseUser.d.ts

@@ -50,6 +50,11 @@ export declare class ClearingHouseUser {
      * @returns Order
      */
     getOrder(orderId: BN): Order | undefined;
+    /**
+     * @param userOrderId
+     * @returns Order
+     */
+    getOrderByUserOrderId(userOrderId: number): Order | undefined;
     getUserAccountPublicKey(): Promise<PublicKey>;
     getUserOrdersAccountPublicKey(): Promise<PublicKey>;
     exists(): Promise<boolean>;

package/lib/clearingHouseUser.js

@@ -100,6 +100,13 @@ class ClearingHouseUser {
     getOrder(orderId) {
         return this.getUserOrdersAccount().orders.find((order) => order.orderId.eq(orderId));
     }
+    /**
+     * @param userOrderId
+     * @returns Order
+     */
+    getOrderByUserOrderId(userOrderId) {
+        return this.getUserOrdersAccount().orders.find((order) => order.userOrderId === userOrderId);
+    }
     getUserAccountPublicKey() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.userAccountPublicKey) {

package/lib/config.js

@@ -5,7 +5,7 @@ exports.configs = {
     devnet: {
         ENV: 'devnet',
         PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-        CLEARING_HOUSE_PROGRAM_ID: '3PfbDmWxR6e2rJ2brhSv7KJyUrHbSCu63d3FHqdLhxUJ',
+        CLEARING_HOUSE_PROGRAM_ID: 'AsW7LnXB9UA1uec9wi9MctYTgTz7YH9snhxd16GsFaGX',
         USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
     },
     'mainnet-beta': {

package/lib/constants/markets.js

@@ -99,6 +99,14 @@ exports.Markets = [
         mainnetPythOracle: '8JPJJkmDScpcNmBRKGZuPuG2GYAveQgP3t5gFuMymwvF',
         launchTs: 1644382122000,
     },
+    {
+        symbol: 'LTC-PERP',
+        baseAssetSymbol: 'LTC',
+        marketIndex: new __1.BN(12),
+        devnetPythOracle: 'BLArYBCUYhdWiY8PCUTpvFE21iaJq85dvxLk9bYMobcU',
+        mainnetPythOracle: '8RMnV1eD55iqUFJLMguPkYBkq8DCtx81XcmAja93LvRR',
+        launchTs: 1645027429000,
+    },
     // {
     // 	symbol: 'mSOL-PERP',
     // 	baseAssetSymbol: 'mSOL',

package/lib/constants/numericConstants.d.ts

@@ -2,6 +2,7 @@
 import { BN } from '../';
 export declare const ZERO: BN;
 export declare const ONE: BN;
+export declare const TWO: BN;
 export declare const TEN_THOUSAND: BN;
 export declare const BN_MAX: BN;
 export declare const MAX_LEVERAGE: BN;

package/lib/constants/numericConstants.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.PARTIAL_LIQUIDATION_RATIO = exports.FULL_LIQUIDATION_RATIO = exports.MAX_LEVERAGE = exports.BN_MAX = exports.TEN_THOUSAND = exports.ONE = exports.ZERO = void 0;
+exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_PAYMENT_PRECISION = exports.MARK_PRICE_PRECISION = exports.QUOTE_PRECISION = exports.PARTIAL_LIQUIDATION_RATIO = exports.FULL_LIQUIDATION_RATIO = exports.MAX_LEVERAGE = exports.BN_MAX = exports.TEN_THOUSAND = exports.TWO = exports.ONE = exports.ZERO = void 0;
 const __1 = require("../");
 exports.ZERO = new __1.BN(0);
 exports.ONE = new __1.BN(1);
+exports.TWO = new __1.BN(2);
 exports.TEN_THOUSAND = new __1.BN(10000);
 exports.BN_MAX = new __1.BN(Number.MAX_SAFE_INTEGER);
 exports.MAX_LEVERAGE = new __1.BN(5);

package/lib/idl/clearing_house.json

@@ -572,7 +572,7 @@
                 },
                 {
                     "name": "markets",
-                    "isMut": true,
+                    "isMut": false,
                     "isSigner": false
                 },
                 {
@@ -628,7 +628,7 @@
                 },
                 {
                     "name": "markets",
-                    "isMut": true,
+                    "isMut": false,
                     "isSigner": false
                 },
                 {

package/lib/math/orders.js

@@ -22,9 +22,11 @@ function isOrderRiskIncreasing(user, order) {
         types_1.isVariant(order.direction, 'short')) {
         return true;
     }
+    const baseAssetAmountToFill = order.baseAssetAmount.sub(order.baseAssetAmountFilled);
     // if order will flip position
-    if (position.baseAssetAmount.abs().gt(order.baseAssetAmountFilled)) {
+    if (baseAssetAmountToFill.gt(position.baseAssetAmount.abs().mul(numericConstants_1.TWO))) {
         return true;
     }
+    return false;
 }
 exports.isOrderRiskIncreasing = isOrderRiskIncreasing;

package/lib/orders.d.ts

@@ -3,4 +3,4 @@ import { Market, Order, UserAccount, UserPosition } from './types';
 import { BN } from '.';
 export declare function calculateNewStateAfterOrder(userAccount: UserAccount, userPosition: UserPosition, market: Market, order: Order): [UserAccount, UserPosition, Market] | null;
 export declare function calculateAmountToTradeForLimit(market: Market, order: Order): BN;
-export declare function calculateAmountToTradeForStopLimit(market: Market, order: Order): BN;
+export declare function calculateAmountToTradeForTriggerLimit(market: Market, order: Order): BN;

package/lib/orders.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateAmountToTradeForStopLimit = exports.calculateAmountToTradeForLimit = exports.calculateNewStateAfterOrder = void 0;
+exports.calculateAmountToTradeForTriggerLimit = exports.calculateAmountToTradeForLimit = exports.calculateNewStateAfterOrder = void 0;
 const types_1 = require("./types");
 const market_1 = require("./math/market");
 const numericConstants_1 = require("./constants/numericConstants");
@@ -83,15 +83,15 @@ function calculateAmountToTrade(market, order) {
     if (types_1.isVariant(order.orderType, 'limit')) {
         return calculateAmountToTradeForLimit(market, order);
     }
-    else if (types_1.isVariant(order.orderType, 'stopLimit')) {
-        return calculateAmountToTradeForStopLimit(market, order);
+    else if (types_1.isVariant(order.orderType, 'triggerLimit')) {
+        return calculateAmountToTradeForTriggerLimit(market, order);
     }
     else if (types_1.isVariant(order.orderType, 'market')) {
         // should never be a market order queued
         return numericConstants_1.ZERO;
     }
     else {
-        return calculateAmountToTradeForStop(market, order);
+        return calculateAmountToTradeForTriggerMarket(market, order);
     }
 }
 function calculateAmountToTradeForLimit(market, order) {
@@ -106,21 +106,21 @@ function calculateAmountToTradeForLimit(market, order) {
         : maxAmountToTrade;
 }
 exports.calculateAmountToTradeForLimit = calculateAmountToTradeForLimit;
-function calculateAmountToTradeForStopLimit(market, order) {
+function calculateAmountToTradeForTriggerLimit(market, order) {
     if (order.baseAssetAmountFilled.eq(numericConstants_1.ZERO)) {
-        const baseAssetAmount = calculateAmountToTradeForStop(market, order);
+        const baseAssetAmount = calculateAmountToTradeForTriggerMarket(market, order);
         if (baseAssetAmount.eq(numericConstants_1.ZERO)) {
             return numericConstants_1.ZERO;
         }
     }
     return calculateAmountToTradeForLimit(market, order);
 }
-exports.calculateAmountToTradeForStopLimit = calculateAmountToTradeForStopLimit;
+exports.calculateAmountToTradeForTriggerLimit = calculateAmountToTradeForTriggerLimit;
 function isSameDirection(firstDirection, secondDirection) {
     return ((types_1.isVariant(firstDirection, 'long') && types_1.isVariant(secondDirection, 'long')) ||
         (types_1.isVariant(firstDirection, 'short') && types_1.isVariant(secondDirection, 'short')));
 }
-function calculateAmountToTradeForStop(market, order) {
+function calculateAmountToTradeForTriggerMarket(market, order) {
     return isTriggerConditionSatisfied(market, order)
         ? order.baseAssetAmount
         : numericConstants_1.ZERO;

package/lib/types.d.ts

@@ -356,6 +356,7 @@ export declare type Order = {
     referrer: PublicKey;
     postOnly: boolean;
     immediateOrCancel: boolean;
+    oraclePriceOffset: BN;
 };
 export declare type OrderParams = {
     orderType: OrderType;

package/package.json

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

package/src/accounts/bulkAccountLoader.ts

@@ -117,10 +117,10 @@ export class BulkAccountLoader {
 			for (const [_, callback] of this.errorCallbacks) {
 				callback(e);
 			}
+		} finally {
+			this.loadPromiseResolver();
+			this.loadPromise = undefined;
 		}
-
-		this.loadPromiseResolver();
-		this.loadPromise = undefined;
 	}
 
 	async loadChunk(accountsToLoad: AccountToLoad[]): Promise<void> {

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -89,11 +89,19 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 			userPublicKey
 		);
 
-		this.accountsToPoll.set(userOrdersPublicKey.toString(), {
-			key: 'userOrders',
-			publicKey: userOrdersPublicKey,
-			eventType: 'userOrdersData',
-		});
+		const userOrdersExist =
+			(
+				await this.program.provider.connection.getParsedAccountInfo(
+					userOrdersPublicKey
+				)
+			).value !== null;
+		if (userOrdersExist) {
+			this.accountsToPoll.set(userOrdersPublicKey.toString(), {
+				key: 'userOrders',
+				publicKey: userOrdersPublicKey,
+				eventType: 'userOrdersData',
+			});
+		}
 
 		for (const [_, accountToPoll] of this.accountsToPoll) {
 			accountToPoll.callbackId = this.accountLoader.addAccount(

package/src/clearingHouseUser.ts

@@ -155,6 +155,16 @@ export class ClearingHouseUser {
 		);
 	}
 
+	/**
+	 * @param userOrderId
+	 * @returns Order
+	 */
+	public getOrderByUserOrderId(userOrderId: number): Order | undefined {
+		return this.getUserOrdersAccount().orders.find(
+			(order) => order.userOrderId === userOrderId
+		);
+	}
+
 	public async getUserAccountPublicKey(): Promise<PublicKey> {
 		if (this.userAccountPublicKey) {
 			return this.userAccountPublicKey;

package/src/config.ts

@@ -11,7 +11,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		CLEARING_HOUSE_PROGRAM_ID: '3PfbDmWxR6e2rJ2brhSv7KJyUrHbSCu63d3FHqdLhxUJ',
+		CLEARING_HOUSE_PROGRAM_ID: 'AsW7LnXB9UA1uec9wi9MctYTgTz7YH9snhxd16GsFaGX',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 	},
 	'mainnet-beta': {

package/src/constants/markets.ts

@@ -106,6 +106,14 @@ export const Markets: Market[] = [
 		mainnetPythOracle: '8JPJJkmDScpcNmBRKGZuPuG2GYAveQgP3t5gFuMymwvF',
 		launchTs: 1644382122000,
 	},
+	{
+		symbol: 'LTC-PERP',
+		baseAssetSymbol: 'LTC',
+		marketIndex: new BN(12),
+		devnetPythOracle: 'BLArYBCUYhdWiY8PCUTpvFE21iaJq85dvxLk9bYMobcU',
+		mainnetPythOracle: '8RMnV1eD55iqUFJLMguPkYBkq8DCtx81XcmAja93LvRR',
+		launchTs: 1645027429000,
+	},
 	// {
 	// 	symbol: 'mSOL-PERP',
 	// 	baseAssetSymbol: 'mSOL',

package/src/constants/numericConstants.ts

@@ -2,6 +2,7 @@ import { BN } from '../';
 
 export const ZERO = new BN(0);
 export const ONE = new BN(1);
+export const TWO = new BN(2);
 export const TEN_THOUSAND = new BN(10000);
 export const BN_MAX = new BN(Number.MAX_SAFE_INTEGER);
 

package/src/idl/clearing_house.json

@@ -572,7 +572,7 @@
         },
         {
           "name": "markets",
-          "isMut": true,
+          "isMut": false,
           "isSigner": false
         },
         {
@@ -628,7 +628,7 @@
         },
         {
           "name": "markets",
-          "isMut": true,
+          "isMut": false,
           "isSigner": false
         },
         {

package/src/math/orders.ts

@@ -1,6 +1,6 @@
 import { ClearingHouseUser } from '../clearingHouseUser';
 import { isVariant, Order } from '../types';
-import { ZERO } from '../constants/numericConstants';
+import { ZERO, TWO } from '../constants/numericConstants';
 
 export function isOrderRiskIncreasing(
 	user: ClearingHouseUser,
@@ -32,8 +32,13 @@ export function isOrderRiskIncreasing(
 		return true;
 	}
 
+	const baseAssetAmountToFill = order.baseAssetAmount.sub(
+		order.baseAssetAmountFilled
+	);
 	// if order will flip position
-	if (position.baseAssetAmount.abs().gt(order.baseAssetAmountFilled)) {
+	if (baseAssetAmountToFill.gt(position.baseAssetAmount.abs().mul(TWO))) {
 		return true;
 	}
+
+	return false;
 }

package/src/orders.ts

@@ -160,13 +160,13 @@ function calculateAmountSwapped(
 function calculateAmountToTrade(market: Market, order: Order): BN {
 	if (isVariant(order.orderType, 'limit')) {
 		return calculateAmountToTradeForLimit(market, order);
-	} else if (isVariant(order.orderType, 'stopLimit')) {
-		return calculateAmountToTradeForStopLimit(market, order);
+	} else if (isVariant(order.orderType, 'triggerLimit')) {
+		return calculateAmountToTradeForTriggerLimit(market, order);
 	} else if (isVariant(order.orderType, 'market')) {
 		// should never be a market order queued
 		return ZERO;
 	} else {
-		return calculateAmountToTradeForStop(market, order);
+		return calculateAmountToTradeForTriggerMarket(market, order);
 	}
 }
 
@@ -190,12 +190,15 @@ export function calculateAmountToTradeForLimit(
 		: maxAmountToTrade;
 }
 
-export function calculateAmountToTradeForStopLimit(
+export function calculateAmountToTradeForTriggerLimit(
 	market: Market,
 	order: Order
 ): BN {
 	if (order.baseAssetAmountFilled.eq(ZERO)) {
-		const baseAssetAmount = calculateAmountToTradeForStop(market, order);
+		const baseAssetAmount = calculateAmountToTradeForTriggerMarket(
+			market,
+			order
+		);
 		if (baseAssetAmount.eq(ZERO)) {
 			return ZERO;
 		}
@@ -214,7 +217,10 @@ function isSameDirection(
 	);
 }
 
-function calculateAmountToTradeForStop(market: Market, order: Order): BN {
+function calculateAmountToTradeForTriggerMarket(
+	market: Market,
+	order: Order
+): BN {
 	return isTriggerConditionSatisfied(market, order)
 		? order.baseAssetAmount
 		: ZERO;

package/src/types.ts

@@ -359,6 +359,7 @@ export type Order = {
 	referrer: PublicKey;
 	postOnly: boolean;
 	immediateOrCancel: boolean;
+	oraclePriceOffset: BN;
 };
 
 export type OrderParams = {