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

package/lib/clearingHouse.d.ts

@@ -97,18 +97,12 @@ export declare class ClearingHouse {
     openPosition(direction: PositionDirection, amount: BN, marketIndex: BN, limitPrice?: BN): Promise<TransactionSignature>;
     placeOrder(orderParams: OrderParams): Promise<TransactionSignature>;
     getPlaceOrderIx(orderParams: OrderParams): Promise<TransactionInstruction>;
-    expireOrders(userAccountPublicKey: PublicKey): Promise<TransactionSignature>;
-    getExpireOrdersIx(userAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
     updateAMMs(marketIndexes: BN[]): Promise<TransactionSignature>;
     getUpdateAMMsIx(marketIndexes: BN[]): Promise<TransactionInstruction>;
     cancelOrder(orderId?: BN): Promise<TransactionSignature>;
     getCancelOrderIx(orderId?: BN): Promise<TransactionInstruction>;
     cancelOrderByUserId(userOrderId: number): Promise<TransactionSignature>;
     getCancelOrderByUserIdIx(userOrderId: number): Promise<TransactionInstruction>;
-    cancelAllOrders(bestEffort?: boolean): Promise<TransactionSignature>;
-    getCancelAllOrdersIx(bestEffort?: boolean): Promise<TransactionInstruction>;
-    cancelOrdersByMarketAndSide(bestEffort?: boolean, marketIndexOnly?: BN, directionOnly?: PositionDirection): Promise<TransactionSignature>;
-    getCancelOrdersByMarketAndSideIx(bestEffort?: boolean, marketIndexOnly?: BN, directionOnly?: PositionDirection): Promise<TransactionInstruction>;
     fillOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Order, makerInfo?: MakerInfo): Promise<TransactionSignature>;
     getFillOrderIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, order: Order, makerInfo?: MakerInfo): Promise<TransactionInstruction>;
     triggerOrder(userAccountPublicKey: PublicKey, user: UserAccount, order: Order): Promise<TransactionSignature>;

package/lib/clearingHouse.js

@@ -491,8 +491,6 @@ class ClearingHouse {
     }
     async getPlaceOrderIx(orderParams) {
         const userAccountPublicKey = await this.getUserAccountPublicKey();
-        const priceOracle = this.getMarketAccount(orderParams.marketIndex).amm
-            .oracle;
         const remainingAccounts = this.getRemainingAccounts({
             writableMarketIndex: orderParams.marketIndex,
         });
@@ -501,26 +499,10 @@ class ClearingHouse {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKey,
                 authority: this.wallet.publicKey,
-                oracle: priceOracle,
             },
             remainingAccounts,
         });
     }
-    async expireOrders(userAccountPublicKey) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getExpireOrdersIx(userAccountPublicKey)), [], this.opts);
-        return txSig;
-    }
-    async getExpireOrdersIx(userAccountPublicKey) {
-        const fillerPublicKey = await this.getUserAccountPublicKey();
-        return await this.program.instruction.expireOrders({
-            accounts: {
-                state: await this.getStatePublicKey(),
-                filler: fillerPublicKey,
-                user: userAccountPublicKey,
-                authority: this.wallet.publicKey,
-            },
-        });
-    }
     async updateAMMs(marketIndexes) {
         const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getUpdateAMMsIx(marketIndexes)), [], this.opts);
         return txSig;
@@ -590,54 +572,6 @@ class ClearingHouse {
             remainingAccounts,
         });
     }
-    async cancelAllOrders(bestEffort) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getCancelAllOrdersIx(bestEffort)), [], this.opts);
-        return txSig;
-    }
-    async getCancelAllOrdersIx(bestEffort) {
-        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.cancelAllOrders(bestEffort, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user: userAccountPublicKey,
-                authority: this.wallet.publicKey,
-            },
-            remainingAccounts,
-        });
-    }
-    async cancelOrdersByMarketAndSide(bestEffort, marketIndexOnly, directionOnly) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getCancelOrdersByMarketAndSideIx(bestEffort, marketIndexOnly, directionOnly)), [], this.opts);
-        return txSig;
-    }
-    async getCancelOrdersByMarketAndSideIx(bestEffort, marketIndexOnly, directionOnly) {
-        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,
-        });
-    }
     async fillOrder(userAccountPublicKey, user, order, makerInfo) {
         const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getFillOrderIx(userAccountPublicKey, user, order, makerInfo)), [], this.opts);
         return txSig;
@@ -646,7 +580,6 @@ class ClearingHouse {
         const fillerPublicKey = await this.getUserAccountPublicKey();
         const marketIndex = order.marketIndex;
         const marketAccount = this.getMarketAccount(marketIndex);
-        const oracle = marketAccount.amm.oracle;
         const bankAccountInfos = [
             {
                 pubkey: this.getQuoteAssetBankAccount().pubkey,
@@ -700,7 +633,6 @@ class ClearingHouse {
                 filler: fillerPublicKey,
                 user: userAccountPublicKey,
                 authority: this.wallet.publicKey,
-                oracle: oracle,
             },
             remainingAccounts,
         });
@@ -769,8 +701,6 @@ class ClearingHouse {
     }
     async getPlaceAndTakeIx(orderParams, makerInfo) {
         const userAccountPublicKey = await this.getUserAccountPublicKey();
-        const priceOracle = this.getMarketAccount(orderParams.marketIndex).amm
-            .oracle;
         const remainingAccounts = this.getRemainingAccounts({
             writableMarketIndex: orderParams.marketIndex,
             writableBankIndex: numericConstants_1.QUOTE_ASSET_BANK_INDEX,
@@ -789,7 +719,6 @@ class ClearingHouse {
                 state: await this.getStatePublicKey(),
                 user: userAccountPublicKey,
                 authority: this.wallet.publicKey,
-                oracle: priceOracle,
             },
             remainingAccounts,
         });

package/lib/idl/clearing_house.json

@@ -381,11 +381,6 @@
                     "name": "authority",
                     "isMut": false,
                     "isSigner": true
-                },
-                {
-                    "name": "oracle",
-                    "isMut": false,
-                    "isSigner": false
                 }
             ],
             "args": [
@@ -473,11 +468,6 @@
                     "name": "user",
                     "isMut": true,
                     "isSigner": false
-                },
-                {
-                    "name": "oracle",
-                    "isMut": false,
-                    "isSigner": false
                 }
             ],
             "args": [
@@ -512,11 +502,6 @@
                     "name": "authority",
                     "isMut": false,
                     "isSigner": true
-                },
-                {
-                    "name": "oracle",
-                    "isMut": false,
-                    "isSigner": false
                 }
             ],
             "args": [
@@ -556,11 +541,6 @@
                     "name": "authority",
                     "isMut": false,
                     "isSigner": true
-                },
-                {
-                    "name": "oracle",
-                    "isMut": false,
-                    "isSigner": false
                 }
             ],
             "args": [

package/lib/math/orders.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLimitPrice = exports.standardizeBaseAssetAmount = exports.isOrderReduceOnly = exports.isOrderRiskIncreasingInSameDirection = exports.isOrderRiskIncreasing = void 0;
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
-const anchor_1 = require("@project-serum/anchor");
 const auction_1 = require("./auction");
 function isOrderRiskIncreasing(user, order) {
     if ((0, types_1.isVariant)(order.status, 'init')) {
@@ -81,18 +80,9 @@ exports.standardizeBaseAssetAmount = standardizeBaseAssetAmount;
 function getLimitPrice(order, oraclePriceData, slot) {
     let limitPrice;
     if (!order.oraclePriceOffset.eq(numericConstants_1.ZERO)) {
-        const floatingPrice = oraclePriceData.price.add(order.oraclePriceOffset);
-        if (order.postOnly) {
-            limitPrice = (0, types_1.isVariant)(order.direction, 'long')
-                ? anchor_1.BN.min(order.price, floatingPrice)
-                : anchor_1.BN.max(order.price, floatingPrice);
-        }
-        else {
-            limitPrice = floatingPrice;
-        }
+        limitPrice = oraclePriceData.price.add(order.oraclePriceOffset);
     }
-    else if ((0, types_1.isVariant)(order.orderType, 'market') ||
-        (0, types_1.isVariant)(order.orderType, 'triggerMarket')) {
+    else if ((0, types_1.isOneOfVariant)(order.orderType, ['market', 'triggerMarket'])) {
         limitPrice = (0, auction_1.getAuctionPrice)(order, slot);
     }
     else {

package/lib/orders.js

@@ -101,15 +101,7 @@ function calculateAmountToTradeForLimit(market, order, oraclePriceData) {
         if (!oraclePriceData) {
             throw Error('Cant calculate limit price for oracle offset oracle without OraclePriceData');
         }
-        const floatingPrice = oraclePriceData.price.add(order.oraclePriceOffset);
-        if (order.postOnly) {
-            limitPrice = (0, types_1.isVariant)(order.direction, 'long')
-                ? _1.BN.min(order.price, floatingPrice)
-                : _1.BN.max(order.price, floatingPrice);
-        }
-        else {
-            limitPrice = floatingPrice;
-        }
+        limitPrice = oraclePriceData.price.add(order.oraclePriceOffset);
     }
     const [maxAmountToTrade, direction] = (0, amm_1.calculateMaxBaseAssetAmountToTrade)(market.amm, limitPrice, order.direction);
     const baseAssetAmount = (0, _1.standardizeBaseAssetAmount)(maxAmountToTrade, market.amm.baseAssetAmountStepSize);

package/package.json

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

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)),
@@ -970,95 +940,6 @@ export class ClearingHouse {
 		});
 	}
 
-	public async cancelAllOrders(
-		bestEffort?: boolean
-	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
-			wrapInTx(await this.getCancelAllOrdersIx(bestEffort)),
-			[],
-			this.opts
-		);
-		return txSig;
-	}
-
-	public async getCancelAllOrdersIx(
-		bestEffort?: boolean
-	): 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.cancelAllOrders(bestEffort, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				user: userAccountPublicKey,
-				authority: this.wallet.publicKey,
-			},
-			remainingAccounts,
-		});
-	}
-
-	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(
 		userAccountPublicKey: PublicKey,
 		user: UserAccount,
@@ -1085,7 +966,6 @@ export class ClearingHouse {
 
 		const marketIndex = order.marketIndex;
 		const marketAccount = this.getMarketAccount(marketIndex);
-		const oracle = marketAccount.amm.oracle;
 
 		const bankAccountInfos = [
 			{
@@ -1146,7 +1026,6 @@ export class ClearingHouse {
 				filler: fillerPublicKey,
 				user: userAccountPublicKey,
 				authority: this.wallet.publicKey,
-				oracle: oracle,
 			},
 			remainingAccounts,
 		});
@@ -1249,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,
@@ -1275,7 +1151,6 @@ export class ClearingHouse {
 					state: await this.getStatePublicKey(),
 					user: userAccountPublicKey,
 					authority: this.wallet.publicKey,
-					oracle: priceOracle,
 				},
 				remainingAccounts,
 			}

package/src/idl/clearing_house.json

@@ -381,11 +381,6 @@
           "name": "authority",
           "isMut": false,
           "isSigner": true
-        },
-        {
-          "name": "oracle",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
@@ -473,11 +468,6 @@
           "name": "user",
           "isMut": true,
           "isSigner": false
-        },
-        {
-          "name": "oracle",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
@@ -512,11 +502,6 @@
           "name": "authority",
           "isMut": false,
           "isSigner": true
-        },
-        {
-          "name": "oracle",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
@@ -556,11 +541,6 @@
           "name": "authority",
           "isMut": false,
           "isSigner": true
-        },
-        {
-          "name": "oracle",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [

package/src/math/orders.ts

@@ -1,5 +1,5 @@
 import { ClearingHouseUser } from '../clearingHouseUser';
-import { isVariant, Order } from '../types';
+import { isOneOfVariant, isVariant, Order } from '../types';
 import { ZERO, TWO } from '../constants/numericConstants';
 import { BN } from '@project-serum/anchor';
 import { OraclePriceData } from '../oracles/types';
@@ -125,18 +125,8 @@ export function getLimitPrice(
 ): BN {
 	let limitPrice;
 	if (!order.oraclePriceOffset.eq(ZERO)) {
-		const floatingPrice = oraclePriceData.price.add(order.oraclePriceOffset);
-		if (order.postOnly) {
-			limitPrice = isVariant(order.direction, 'long')
-				? BN.min(order.price, floatingPrice)
-				: BN.max(order.price, floatingPrice);
-		} else {
-			limitPrice = floatingPrice;
-		}
-	} else if (
-		isVariant(order.orderType, 'market') ||
-		isVariant(order.orderType, 'triggerMarket')
-	) {
+		limitPrice = oraclePriceData.price.add(order.oraclePriceOffset);
+	} else if (isOneOfVariant(order.orderType, ['market', 'triggerMarket'])) {
 		limitPrice = getAuctionPrice(order, slot);
 	} else {
 		limitPrice = order.price;

package/src/orders.ts

@@ -186,14 +186,7 @@ export function calculateAmountToTradeForLimit(
 				'Cant calculate limit price for oracle offset oracle without OraclePriceData'
 			);
 		}
-		const floatingPrice = oraclePriceData.price.add(order.oraclePriceOffset);
-		if (order.postOnly) {
-			limitPrice = isVariant(order.direction, 'long')
-				? BN.min(order.price, floatingPrice)
-				: BN.max(order.price, floatingPrice);
-		} else {
-			limitPrice = floatingPrice;
-		}
+		limitPrice = oraclePriceData.price.add(order.oraclePriceOffset);
 	}
 
 	const [maxAmountToTrade, direction] = calculateMaxBaseAssetAmountToTrade(