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

package/src/clearingHouse.ts

@@ -827,9 +827,6 @@ export class ClearingHouse {
 	): Promise<TransactionInstruction> {
 		const userAccountPublicKey = await this.getUserAccountPublicKey();
 
-		const priceOracle = this.getMarketAccount(orderParams.marketIndex).amm
-			.oracle;
-
 		const remainingAccounts = this.getRemainingAccounts({
 			writableMarketIndex: orderParams.marketIndex,
 		});
@@ -839,38 +836,11 @@ export class ClearingHouse {
 				state: await this.getStatePublicKey(),
 				user: userAccountPublicKey,
 				authority: this.wallet.publicKey,
-				oracle: priceOracle,
 			},
 			remainingAccounts,
 		});
 	}
 
-	public async expireOrders(
-		userAccountPublicKey: PublicKey
-	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
-			wrapInTx(await this.getExpireOrdersIx(userAccountPublicKey)),
-			[],
-			this.opts
-		);
-		return txSig;
-	}
-
-	public async getExpireOrdersIx(
-		userAccountPublicKey: PublicKey
-	): Promise<TransactionInstruction> {
-		const fillerPublicKey = await this.getUserAccountPublicKey();
-
-		return await this.program.instruction.expireOrders({
-			accounts: {
-				state: await this.getStatePublicKey(),
-				filler: fillerPublicKey,
-				user: userAccountPublicKey,
-				authority: this.wallet.publicKey,
-			},
-		});
-	}
-
 	public async updateAMMs(marketIndexes: BN[]): Promise<TransactionSignature> {
 		const { txSig } = await this.txSender.send(
 			wrapInTx(await this.getUpdateAMMsIx(marketIndexes)),
@@ -914,7 +884,7 @@ export class ClearingHouse {
 		});
 	}
 
-	public async cancelOrder(orderId: BN): Promise<TransactionSignature> {
+	public async cancelOrder(orderId?: BN): Promise<TransactionSignature> {
 		const { txSig } = await this.txSender.send(
 			wrapInTx(await this.getCancelOrderIx(orderId)),
 			[],
@@ -923,20 +893,16 @@ export class ClearingHouse {
 		return txSig;
 	}
 
-	public async getCancelOrderIx(orderId: BN): Promise<TransactionInstruction> {
+	public async getCancelOrderIx(orderId?: BN): Promise<TransactionInstruction> {
 		const userAccountPublicKey = await this.getUserAccountPublicKey();
 
-		const order = this.getOrder(orderId);
-		const oracle = this.getMarketAccount(order.marketIndex).amm.oracle;
-
 		const remainingAccounts = this.getRemainingAccounts({});
 
-		return await this.program.instruction.cancelOrder(orderId, {
+		return await this.program.instruction.cancelOrder(orderId ?? null, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				user: userAccountPublicKey,
 				authority: this.wallet.publicKey,
-				oracle,
 			},
 			remainingAccounts,
 		});
@@ -974,36 +940,90 @@ export class ClearingHouse {
 		});
 	}
 
-	public async cancelAllOrders(
-		bestEffort?: boolean
+	public async fillOrder(
+		userAccountPublicKey: PublicKey,
+		user: UserAccount,
+		order?: Order,
+		makerInfo?: MakerInfo
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.txSender.send(
-			wrapInTx(await this.getCancelAllOrdersIx(bestEffort)),
+			wrapInTx(
+				await this.getFillOrderIx(userAccountPublicKey, user, order, makerInfo)
+			),
 			[],
 			this.opts
 		);
 		return txSig;
 	}
 
-	public async getCancelAllOrdersIx(
-		bestEffort?: boolean
+	public async getFillOrderIx(
+		userAccountPublicKey: PublicKey,
+		userAccount: UserAccount,
+		order: Order,
+		makerInfo?: MakerInfo
 	): Promise<TransactionInstruction> {
-		const userAccountPublicKey = await this.getUserAccountPublicKey();
+		const fillerPublicKey = await this.getUserAccountPublicKey();
 
-		const remainingAccounts = this.getRemainingAccounts({});
+		const marketIndex = order.marketIndex;
+		const marketAccount = this.getMarketAccount(marketIndex);
 
-		for (const order of this.getUserAccount().orders) {
-			const oracle = this.getMarketAccount(order.marketIndex).amm.oracle;
-			remainingAccounts.push({
-				pubkey: oracle,
+		const bankAccountInfos = [
+			{
+				pubkey: this.getQuoteAssetBankAccount().pubkey,
+				isSigner: false,
+				isWritable: true,
+			},
+		];
+		const marketAccountInfos = [
+			{
+				pubkey: marketAccount.pubkey,
+				isWritable: true,
+				isSigner: false,
+			},
+		];
+		const oracleAccountInfos = [
+			{
+				pubkey: marketAccount.amm.oracle,
 				isWritable: false,
 				isSigner: false,
+			},
+		];
+		for (const position of userAccount.positions) {
+			if (
+				!positionIsAvailable(position) &&
+				!position.marketIndex.eq(order.marketIndex)
+			) {
+				const market = this.getMarketAccount(position.marketIndex);
+				marketAccountInfos.push({
+					pubkey: market.pubkey,
+					isWritable: false,
+					isSigner: false,
+				});
+				oracleAccountInfos.push({
+					pubkey: market.amm.oracle,
+					isWritable: false,
+					isSigner: false,
+				});
+			}
+		}
+		const remainingAccounts = oracleAccountInfos.concat(
+			bankAccountInfos.concat(marketAccountInfos)
+		);
+
+		if (makerInfo) {
+			remainingAccounts.push({
+				pubkey: makerInfo.maker,
+				isWritable: true,
+				isSigner: false,
 			});
 		}
 
-		return await this.program.instruction.cancelAllOrders(bestEffort, {
+		const orderId = order.orderId;
+		const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
+		return await this.program.instruction.fillOrder(orderId, makerOrderId, {
 			accounts: {
 				state: await this.getStatePublicKey(),
+				filler: fillerPublicKey,
 				user: userAccountPublicKey,
 				authority: this.wallet.publicKey,
 			},
@@ -1011,85 +1031,28 @@ export class ClearingHouse {
 		});
 	}
 
-	public async cancelOrdersByMarketAndSide(
-		bestEffort?: boolean,
-		marketIndexOnly?: BN,
-		directionOnly?: PositionDirection
-	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
-			wrapInTx(
-				await this.getCancelOrdersByMarketAndSideIx(
-					bestEffort,
-					marketIndexOnly,
-					directionOnly
-				)
-			),
-			[],
-			this.opts
-		);
-		return txSig;
-	}
-
-	public async getCancelOrdersByMarketAndSideIx(
-		bestEffort?: boolean,
-		marketIndexOnly?: BN,
-		directionOnly?: PositionDirection
-	): Promise<TransactionInstruction> {
-		const userAccountPublicKey = await this.getUserAccountPublicKey();
-
-		const remainingAccounts = this.getRemainingAccounts({});
-
-		for (const order of this.getUserAccount().orders) {
-			const oracle = this.getMarketAccount(order.marketIndex).amm.oracle;
-			remainingAccounts.push({
-				pubkey: oracle,
-				isWritable: false,
-				isSigner: false,
-			});
-		}
-
-		return await this.program.instruction.cancelOrdersByMarketAndSide(
-			bestEffort,
-			marketIndexOnly,
-			directionOnly,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user: userAccountPublicKey,
-					authority: this.wallet.publicKey,
-				},
-				remainingAccounts,
-			}
-		);
-	}
-
-	public async fillOrder(
+	public async triggerOrder(
 		userAccountPublicKey: PublicKey,
 		user: UserAccount,
-		order: Order,
-		makerInfo?: MakerInfo
+		order: Order
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.txSender.send(
-			wrapInTx(
-				await this.getFillOrderIx(userAccountPublicKey, user, order, makerInfo)
-			),
+			wrapInTx(await this.getTriggerOrderIx(userAccountPublicKey, user, order)),
 			[],
 			this.opts
 		);
 		return txSig;
 	}
 
-	public async getFillOrderIx(
+	public async getTriggerOrderIx(
 		userAccountPublicKey: PublicKey,
 		userAccount: UserAccount,
-		order: Order,
-		makerInfo?: MakerInfo
+		order: Order
 	): Promise<TransactionInstruction> {
 		const fillerPublicKey = await this.getUserAccountPublicKey();
 
 		const marketIndex = order.marketIndex;
 		const marketAccount = this.getMarketAccount(marketIndex);
-		const oracle = marketAccount.amm.oracle;
 
 		const bankAccountInfos = [
 			{
@@ -1134,23 +1097,13 @@ export class ClearingHouse {
 			bankAccountInfos.concat(marketAccountInfos)
 		);
 
-		if (makerInfo) {
-			remainingAccounts.push({
-				pubkey: makerInfo.maker,
-				isWritable: true,
-				isSigner: false,
-			});
-		}
-
 		const orderId = order.orderId;
-		const makerOrderId = makerInfo ? makerInfo.order.orderId : null;
-		return await this.program.instruction.fillOrder(orderId, makerOrderId, {
+		return await this.program.instruction.triggerOrder(orderId, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				filler: fillerPublicKey,
 				user: userAccountPublicKey,
 				authority: this.wallet.publicKey,
-				oracle: oracle,
 			},
 			remainingAccounts,
 		});
@@ -1175,9 +1128,6 @@ export class ClearingHouse {
 	): Promise<TransactionInstruction> {
 		const userAccountPublicKey = await this.getUserAccountPublicKey();
 
-		const priceOracle = this.getMarketAccount(orderParams.marketIndex).amm
-			.oracle;
-
 		const remainingAccounts = this.getRemainingAccounts({
 			writableMarketIndex: orderParams.marketIndex,
 			writableBankIndex: QUOTE_ASSET_BANK_INDEX,
@@ -1201,7 +1151,6 @@ export class ClearingHouse {
 					state: await this.getStatePublicKey(),
 					user: userAccountPublicKey,
 					authority: this.wallet.publicKey,
-					oracle: priceOracle,
 				},
 				remainingAccounts,
 			}

package/src/config.ts

@@ -28,7 +28,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 	devnet: {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
-		CLEARING_HOUSE_PROGRAM_ID: 'GCuH76fb1rXc7bjFXNcnNvWSekLgzpsnMbc1Ng4FsGSs',
+		CLEARING_HOUSE_PROGRAM_ID: '9jwr5nC2f9yAraXrg4UzHXmCX3vi9FQkjD6p9e8bRqNa',
 		USDC_MINT_ADDRESS: '8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2',
 		MARKETS: DevnetMarkets,
 		BANKS: DevnetBanks,

package/src/constants/numericConstants.ts

@@ -43,6 +43,7 @@ export const BASE_PRECISION_EXP = AMM_RESERVE_PRECISION_EXP;
 
 export const AMM_TO_QUOTE_PRECISION_RATIO =
 	AMM_RESERVE_PRECISION.div(QUOTE_PRECISION); // 10^7
+export const PRICE_DIV_PEG = MARK_PRICE_PRECISION.div(PEG_PRECISION); //10^7
 export const PRICE_TO_QUOTE_PRECISION =
 	MARK_PRICE_PRECISION.div(QUOTE_PRECISION);
 export const AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO =

package/src/factory/bigNum.ts

@@ -234,8 +234,14 @@ export class BigNum {
 		return printString;
 	}
 
-	public prettyPrint(): string {
-		const [leftSide, rightSide] = this.printShort().split(BigNum.delim);
+	public prettyPrint(
+		useTradePrecision?: boolean,
+		precisionOverride?: number
+	): string {
+		const [leftSide, rightSide] = this.printShort(
+			useTradePrecision,
+			precisionOverride
+		).split(BigNum.delim);
 
 		let formattedLeftSide = leftSide;
 
@@ -374,13 +380,24 @@ export class BigNum {
 		return this.toPrecision(6, true);
 	}
 
-	public toNotional(): string {
-		return `${this.lt(BigNum.zero()) ? `-` : ``}$${BigNum.fromPrint(
-			this.toFixed(2),
-			new BN(2)
-		)
-			.prettyPrint()
-			.replace('-', '')}`;
+	/**
+	 * Print dollar formatted value. Defaults to fixed decimals two unless a given precision is given.
+	 * @param useTradePrecision
+	 * @param precisionOverride
+	 * @returns
+	 */
+	public toNotional(
+		useTradePrecision?: boolean,
+		precisionOverride?: number
+	): string {
+		const prefix = `${this.lt(BigNum.zero()) ? `-` : ``}$`;
+
+		const val =
+			useTradePrecision || precisionOverride
+				? this.prettyPrint(useTradePrecision, precisionOverride)
+				: BigNum.fromPrint(this.toFixed(2), new BN(2)).prettyPrint();
+
+		return `${prefix}${val.replace('-', '')}`;
 	}
 
 	public toMillified(precision = 3): string {

package/src/idl/clearing_house.json

@@ -381,11 +381,6 @@
           "name": "authority",
           "isMut": false,
           "isSigner": true
-        },
-        {
-          "name": "oracle",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
@@ -414,17 +409,14 @@
           "name": "authority",
           "isMut": false,
           "isSigner": true
-        },
-        {
-          "name": "oracle",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
         {
           "name": "orderId",
-          "type": "u64"
+          "type": {
+            "option": "u64"
+          }
         }
       ]
     },
@@ -445,11 +437,6 @@
           "name": "authority",
           "isMut": false,
           "isSigner": true
-        },
-        {
-          "name": "oracle",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
@@ -481,17 +468,14 @@
           "name": "user",
           "isMut": true,
           "isSigner": false
-        },
-        {
-          "name": "oracle",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
         {
           "name": "orderId",
-          "type": "u64"
+          "type": {
+            "option": "u64"
+          }
         },
         {
           "name": "makerOrderId",
@@ -518,11 +502,6 @@
           "name": "authority",
           "isMut": false,
           "isSigner": true
-        },
-        {
-          "name": "oracle",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
@@ -562,11 +541,6 @@
           "name": "authority",
           "isMut": false,
           "isSigner": true
-        },
-        {
-          "name": "oracle",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
@@ -582,6 +556,37 @@
         }
       ]
     },
+    {
+      "name": "triggerOrder",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "filler",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "orderId",
+          "type": "u64"
+        }
+      ]
+    },
     {
       "name": "updateAmms",
       "accounts": [
@@ -993,11 +998,6 @@
           "name": "user",
           "isMut": true,
           "isSigner": false
-        },
-        {
-          "name": "market",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": []
@@ -1389,6 +1389,32 @@
         }
       ]
     },
+    {
+      "name": "updateMarketMaxSpread",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "market",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "maxSpread",
+          "type": "u32"
+        }
+      ]
+    },
     {
       "name": "updateMarketBaseAssetAmountStepSize",
       "accounts": [
@@ -2194,6 +2220,10 @@
             "name": "shortSpread",
             "type": "u128"
           },
+          {
+            "name": "maxSpread",
+            "type": "u32"
+          },
           {
             "name": "askBaseAssetReserve",
             "type": "u128"
@@ -2252,7 +2282,7 @@
           },
           {
             "name": "totalFeeMinusDistributions",
-            "type": "u128"
+            "type": "i128"
           },
           {
             "name": "totalFeeWithdrawn",
@@ -2712,6 +2742,10 @@
               "defined": "OrderTriggerCondition"
             }
           },
+          {
+            "name": "triggered",
+            "type": "bool"
+          },
           {
             "name": "referrer",
             "type": "publicKey"
@@ -2848,6 +2882,9 @@
           {
             "name": "Fill"
           },
+          {
+            "name": "Trigger"
+          },
           {
             "name": "Expire"
           }
@@ -3016,6 +3053,11 @@
           "type": "u64",
           "index": false
         },
+        {
+          "name": "oraclePrice",
+          "type": "i128",
+          "index": false
+        },
         {
           "name": "from",
           "type": {
@@ -3217,7 +3259,7 @@
         },
         {
           "name": "totalFeeMinusDistributions",
-          "type": "u128",
+          "type": "i128",
           "index": false
         },
         {
@@ -3349,6 +3391,16 @@
           },
           "index": false
         },
+        {
+          "name": "makerUnsettledPnl",
+          "type": "i128",
+          "index": false
+        },
+        {
+          "name": "takerUnsettledPnl",
+          "type": "i128",
+          "index": false
+        },
         {
           "name": "action",
           "type": {
@@ -3854,6 +3906,21 @@
     },
     {
       "code": 6087,
+      "name": "OrderMustBeTriggeredFirst",
+      "msg": "OrderMustBeTriggeredFirst"
+    },
+    {
+      "code": 6088,
+      "name": "OrderNotTriggerable",
+      "msg": "OrderNotTriggerable"
+    },
+    {
+      "code": 6089,
+      "name": "OrderDidNotSatisfyTriggerCondition",
+      "msg": "OrderDidNotSatisfyTriggerCondition"
+    },
+    {
+      "code": 6090,
       "name": "DefaultError",
       "msg": "DefaultError"
     }