@drift-labs/sdk 2.45.0-beta.4 → 2.45.0-beta.6

package/README.md

@@ -57,7 +57,7 @@ The Drift SDK uses some common precisions, which are available as constants to i
 
 **Important Note for BigNum division**
 
-Because BN only supports integers, you need to be conscious of the numbers you are using when dividing. BN will return the floor when using the regular division function; if you want to get the exact divison, you need to add the modulus of the two numbers as well. There is a helper function `convertToNumber` in the SDK which will do this for you.
+Because BN only supports integers, you need to be conscious of the numbers you are using when dividing. BN will return the floor when using the regular division function; if you want to get the exact division, you need to add the modulus of the two numbers as well. There is a helper function `convertToNumber` in the SDK which will do this for you.
 
 ```typescript
 import {convertToNumber} from @drift-labs/sdk

package/VERSION

@@ -1 +1 @@
-2.45.0-beta.4
+2.45.0-beta.6

package/lib/adminClient.d.ts

@@ -36,6 +36,7 @@ export declare class AdminClient extends DriftClient {
     updateLiquidationMarginBufferRatio(updateLiquidationMarginBufferRatio: number): Promise<TransactionSignature>;
     updateOracleGuardRails(oracleGuardRails: OracleGuardRails): Promise<TransactionSignature>;
     updateStateSettlementDuration(settlementDuration: number): Promise<TransactionSignature>;
+    updateStateMaxNumberOfSubAccounts(maxNumberOfSubAccounts: number): Promise<TransactionSignature>;
     updateWithdrawGuardThreshold(spotMarketIndex: number, withdrawGuardThreshold: BN): Promise<TransactionSignature>;
     updateSpotMarketIfFactor(spotMarketIndex: number, userIfFactor: BN, totalIfFactor: BN): Promise<TransactionSignature>;
     updateSpotMarketRevenueSettlePeriod(spotMarketIndex: number, revenueSettlePeriod: BN): Promise<TransactionSignature>;

package/lib/adminClient.js

@@ -447,6 +447,14 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
+    async updateStateMaxNumberOfSubAccounts(maxNumberOfSubAccounts) {
+        return await this.program.rpc.updateStateMaxNumberOfSubAccounts(maxNumberOfSubAccounts, {
+            accounts: {
+                admin: this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+            },
+        });
+    }
     async updateWithdrawGuardThreshold(spotMarketIndex, withdrawGuardThreshold) {
         const tx = await this.program.transaction.updateWithdrawGuardThreshold(withdrawGuardThreshold, {
             accounts: {

package/lib/driftClient.d.ts

@@ -280,7 +280,7 @@ export declare class DriftClient {
      */
     sendMarketOrderAndGetSignedFillTx(orderParams: OptionalOrderParams, userAccountPublicKey: PublicKey, userAccount: UserAccount, makerInfo?: MakerInfo | MakerInfo[], txParams?: TxParams, bracketOrdersParams?: OptionalOrderParams[], referrerInfo?: ReferrerInfo, cancelExistingOrders?: boolean): Promise<{
         txSig: TransactionSignature;
-        signedFillTx: Transaction;
+        signedFillTx?: Transaction;
         signedCancelExistingOrdersTx?: Transaction;
     }>;
     placePerpOrder(orderParams: OptionalOrderParams, txParams?: TxParams): Promise<TransactionSignature>;

package/lib/driftClient.js

@@ -1378,10 +1378,6 @@ class DriftClient {
             const placeBracketOrderIx = await this.getPlacePerpOrderIx(bracketOrderParams);
             bracketOrderIxs.push(placeBracketOrderIx);
         }
-        const fillPerpOrderIx = await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
-            orderId,
-            marketIndex,
-        }, makerInfo, referrerInfo);
         let cancelOrdersIx;
         let cancelExistingOrdersTx;
         if (cancelExistingOrders && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
@@ -1392,6 +1388,10 @@ class DriftClient {
         // use versioned transactions if there is a lookup table account and wallet is compatible
         if (this.txVersion === 0) {
             const versionedMarketOrderTx = await this.buildTransaction([placePerpOrderIx].concat(bracketOrderIxs), txParams, 0);
+            const fillPerpOrderIx = await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
+                orderId,
+                marketIndex,
+            }, makerInfo, referrerInfo);
             const versionedFillTx = await this.buildTransaction([fillPerpOrderIx], txParams, 0);
             const [signedVersionedMarketOrderTx, signedVersionedFillTx, signedCancelExistingOrdersTx,] = await this.provider.wallet.signAllTransactions([
                 versionedMarketOrderTx,
@@ -1413,17 +1413,18 @@ class DriftClient {
             if (bracketOrderIxs.length > 0) {
                 marketOrderTx.add(...bracketOrderIxs);
             }
-            const fillTx = (0, utils_1.wrapInTx)(fillPerpOrderIx, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice);
             // Apply the latest blockhash to the txs so that we can sign before sending them
             const currentBlockHash = (await this.connection.getLatestBlockhash('finalized')).blockhash;
             marketOrderTx.recentBlockhash = currentBlockHash;
-            fillTx.recentBlockhash = currentBlockHash;
             marketOrderTx.feePayer = userAccount.authority;
-            fillTx.feePayer = userAccount.authority;
-            const [signedMarketOrderTx, signedFillTx, signedCancelExistingOrdersTx] = await this.provider.wallet.signAllTransactions([marketOrderTx, fillTx, cancelExistingOrdersTx].filter((tx) => tx !== undefined));
+            if (cancelExistingOrdersTx) {
+                cancelExistingOrdersTx.recentBlockhash = currentBlockHash;
+                cancelExistingOrdersTx.feePayer = userAccount.authority;
+            }
+            const [signedMarketOrderTx, signedCancelExistingOrdersTx] = await this.provider.wallet.signAllTransactions([marketOrderTx, cancelExistingOrdersTx].filter((tx) => tx !== undefined));
             const { txSig, slot } = await this.sendTransaction(signedMarketOrderTx, [], this.opts, true);
             this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
-            return { txSig, signedFillTx, signedCancelExistingOrdersTx };
+            return { txSig, signedFillTx: undefined, signedCancelExistingOrdersTx };
         }
     }
     async placePerpOrder(orderParams, txParams) {

package/lib/idl/drift.json

@@ -4163,6 +4163,27 @@
                 }
             ]
         },
+        {
+            "name": "updateStateMaxNumberOfSubAccounts",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "maxNumberOfSubAccounts",
+                    "type": "u16"
+                }
+            ]
+        },
         {
             "name": "updatePerpMarketOracle",
             "accounts": [
@@ -5722,12 +5743,16 @@
                         "name": "initialPctToLiquidate",
                         "type": "u16"
                     },
+                    {
+                        "name": "maxNumberOfSubAccounts",
+                        "type": "u16"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                14
+                                12
                             ]
                         }
                     }
@@ -10898,7 +10923,7 @@
         {
             "code": 6221,
             "name": "SpotFulfillmentConfigDisabled",
-            "msg": "Spot Fulfullment Config Disabled"
+            "msg": "Spot Fulfillment Config Disabled"
         },
         {
             "code": 6222,

package/lib/math/orders.js

@@ -204,7 +204,21 @@ function isTriggered(order) {
 }
 exports.isTriggered = isTriggered;
 function isRestingLimitOrder(order, slot) {
-    return (isLimitOrder(order) && (order.postOnly || (0, auction_1.isAuctionComplete)(order, slot)));
+    if (!isLimitOrder(order)) {
+        return false;
+    }
+    if ((0, types_1.isVariant)(order.orderType, 'triggerLimit')) {
+        if ((0, types_1.isVariant)(order.direction, 'long') &&
+            order.triggerPrice.lt(order.price)) {
+            return false;
+        }
+        else if ((0, types_1.isVariant)(order.direction, 'short') &&
+            order.triggerPrice.gt(order.price)) {
+            return false;
+        }
+        return (0, auction_1.isAuctionComplete)(order, slot);
+    }
+    return order.postOnly || (0, auction_1.isAuctionComplete)(order, slot);
 }
 exports.isRestingLimitOrder = isRestingLimitOrder;
 function isTakingOrder(order, slot) {

package/lib/types.d.ts

@@ -620,6 +620,7 @@ export type StateAccount = {
     defaultSpotAuctionDuration: number;
     liquidationMarginBufferRatio: number;
     settlementDuration: number;
+    maxNumberOfSubAccounts: number;
     signer: PublicKey;
     signerNonce: number;
     srmVault: PublicKey;

package/package.json

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

package/src/adminClient.ts

@@ -832,6 +832,20 @@ export class AdminClient extends DriftClient {
 		);
 	}
 
+	public async updateStateMaxNumberOfSubAccounts(
+		maxNumberOfSubAccounts: number
+	): Promise<TransactionSignature> {
+		return await this.program.rpc.updateStateMaxNumberOfSubAccounts(
+			maxNumberOfSubAccounts,
+			{
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
+
 	public async updateWithdrawGuardThreshold(
 		spotMarketIndex: number,
 		withdrawGuardThreshold: BN

package/src/driftClient.ts

@@ -2462,7 +2462,7 @@ export class DriftClient {
 		cancelExistingOrders?: boolean
 	): Promise<{
 		txSig: TransactionSignature;
-		signedFillTx: Transaction;
+		signedFillTx?: Transaction;
 		signedCancelExistingOrdersTx?: Transaction;
 	}> {
 		const marketIndex = orderParams.marketIndex;
@@ -2478,17 +2478,6 @@ export class DriftClient {
 			bracketOrderIxs.push(placeBracketOrderIx);
 		}
 
-		const fillPerpOrderIx = await this.getFillPerpOrderIx(
-			userAccountPublicKey,
-			userAccount,
-			{
-				orderId,
-				marketIndex,
-			},
-			makerInfo,
-			referrerInfo
-		);
-
 		let cancelOrdersIx: TransactionInstruction;
 		let cancelExistingOrdersTx: Transaction;
 		if (cancelExistingOrders && isVariant(orderParams.marketType, 'perp')) {
@@ -2513,6 +2502,18 @@ export class DriftClient {
 				txParams,
 				0
 			);
+
+			const fillPerpOrderIx = await this.getFillPerpOrderIx(
+				userAccountPublicKey,
+				userAccount,
+				{
+					orderId,
+					marketIndex,
+				},
+				makerInfo,
+				referrerInfo
+			);
+
 			const versionedFillTx = await this.buildTransaction(
 				[fillPerpOrderIx],
 				txParams,
@@ -2554,25 +2555,22 @@ export class DriftClient {
 				marketOrderTx.add(...bracketOrderIxs);
 			}
 
-			const fillTx = wrapInTx(
-				fillPerpOrderIx,
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
-			);
-
 			// Apply the latest blockhash to the txs so that we can sign before sending them
 			const currentBlockHash = (
 				await this.connection.getLatestBlockhash('finalized')
 			).blockhash;
 			marketOrderTx.recentBlockhash = currentBlockHash;
-			fillTx.recentBlockhash = currentBlockHash;
 
 			marketOrderTx.feePayer = userAccount.authority;
-			fillTx.feePayer = userAccount.authority;
 
-			const [signedMarketOrderTx, signedFillTx, signedCancelExistingOrdersTx] =
+			if (cancelExistingOrdersTx) {
+				cancelExistingOrdersTx.recentBlockhash = currentBlockHash;
+				cancelExistingOrdersTx.feePayer = userAccount.authority;
+			}
+
+			const [signedMarketOrderTx, signedCancelExistingOrdersTx] =
 				await this.provider.wallet.signAllTransactions(
-					[marketOrderTx, fillTx, cancelExistingOrdersTx].filter(
+					[marketOrderTx, cancelExistingOrdersTx].filter(
 						(tx) => tx !== undefined
 					)
 				);
@@ -2584,7 +2582,7 @@ export class DriftClient {
 			);
 			this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
 
-			return { txSig, signedFillTx, signedCancelExistingOrdersTx };
+			return { txSig, signedFillTx: undefined, signedCancelExistingOrdersTx };
 		}
 	}
 

package/src/idl/drift.json

@@ -4163,6 +4163,27 @@
         }
       ]
     },
+    {
+      "name": "updateStateMaxNumberOfSubAccounts",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "maxNumberOfSubAccounts",
+          "type": "u16"
+        }
+      ]
+    },
     {
       "name": "updatePerpMarketOracle",
       "accounts": [
@@ -5722,12 +5743,16 @@
             "name": "initialPctToLiquidate",
             "type": "u16"
           },
+          {
+            "name": "maxNumberOfSubAccounts",
+            "type": "u16"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                14
+                12
               ]
             }
           }
@@ -10898,7 +10923,7 @@
     {
       "code": 6221,
       "name": "SpotFulfillmentConfigDisabled",
-      "msg": "Spot Fulfullment Config Disabled"
+      "msg": "Spot Fulfillment Config Disabled"
     },
     {
       "code": 6222,
@@ -11071,4 +11096,4 @@
       "msg": "InvalidMarginCalculation"
     }
   ]
-}
+}

package/src/math/orders.ts

@@ -322,9 +322,27 @@ export function isTriggered(order: Order): boolean {
 }
 
 export function isRestingLimitOrder(order: Order, slot: number): boolean {
-	return (
-		isLimitOrder(order) && (order.postOnly || isAuctionComplete(order, slot))
-	);
+	if (!isLimitOrder(order)) {
+		return false;
+	}
+
+	if (isVariant(order.orderType, 'triggerLimit')) {
+		if (
+			isVariant(order.direction, 'long') &&
+			order.triggerPrice.lt(order.price)
+		) {
+			return false;
+		} else if (
+			isVariant(order.direction, 'short') &&
+			order.triggerPrice.gt(order.price)
+		) {
+			return false;
+		}
+
+		return isAuctionComplete(order, slot);
+	}
+
+	return order.postOnly || isAuctionComplete(order, slot);
 }
 
 export function isTakingOrder(order: Order, slot: number): boolean {

package/src/types.ts

@@ -543,6 +543,7 @@ export type StateAccount = {
 	defaultSpotAuctionDuration: number;
 	liquidationMarginBufferRatio: number;
 	settlementDuration: number;
+	maxNumberOfSubAccounts: number;
 	signer: PublicKey;
 	signerNonce: number;
 	srmVault: PublicKey;

package/tests/dlob/helpers.ts

@@ -584,6 +584,7 @@ export const mockStateAccount: StateAccount = {
 	},
 	srmVault: PublicKey.default,
 	whitelistMint: PublicKey.default,
+	maxNumberOfSubAccounts: 0,
 };
 
 export class MockUserMap implements UserMapInterface {

package/tests/dlob/test.ts

@@ -27,6 +27,7 @@ import {
 
 import { mockPerpMarkets, mockSpotMarkets, mockStateAccount } from './helpers';
 import { DLOBOrdersCoder } from '../../src/dlob/DLOBOrders';
+import {isAuctionComplete, isRestingLimitOrder} from "../../lib";
 
 function insertOrderToDLOB(
 	dlob: DLOB,
@@ -2504,6 +2505,52 @@ describe('DLOB Perp Tests', () => {
 		}
 	});
 
+	it('Test trigger limit isnt maker', () => {
+		const vAsk = new BN(15);
+		const vBid = new BN(8);
+
+		const user0 = Keypair.generate();
+
+		const dlob = new DLOB();
+		const marketIndex = 0;
+
+		const slot = 20;
+		const oracle = {
+			price: vBid.add(vAsk).div(new BN(2)),
+			slot: new BN(slot),
+			confidence: new BN(1),
+			hasSufficientNumberOfDataPoints: true,
+		};
+
+		// should trigger limit buy with above condition
+		insertTriggerOrderToDLOB(
+			dlob,
+			user0.publicKey,
+			OrderType.TRIGGER_LIMIT,
+			MarketType.PERP,
+			1, //orderId
+			marketIndex, // marketIndex
+			oracle.price.add(new BN(1)), // price
+			BASE_PRECISION, // baseAssetAmount: BN,
+			PositionDirection.LONG,
+			oracle.price.sub(new BN(1)), // triggerPrice: BN,
+			OrderTriggerCondition.TRIGGERED_ABOVE, // triggerCondition: OrderTriggerCondition,
+			vBid,
+			vAsk,
+			new BN(1), // slot
+		);
+
+		const restingLimitBids = Array.from(dlob.getRestingLimitBids(marketIndex, slot, MarketType.PERP, oracle));
+		expect(restingLimitBids.length).to.equal(0);
+
+		const takingBids = Array.from(dlob.getTakingBids(marketIndex, MarketType.PERP, slot, oracle));
+		expect(takingBids.length).to.equal(1);
+		const triggerLimitBid = takingBids[0];
+		expect(isAuctionComplete(triggerLimitBid.order, slot)).to.equal(true);
+		expect(isRestingLimitOrder(triggerLimitBid.order, slot)).to.equal(false);
+
+	});
+
 	it('Test will return expired market orders to fill', () => {
 		const vAsk = new BN(15);
 		const vBid = new BN(8);