@drift-labs/sdk 0.1.18-orders.1 → 0.1.18-orders.5

package/lib/index.d.ts

@@ -1,15 +1,20 @@
 import { BN } from '@project-serum/anchor';
+import { PublicKey } from '@solana/web3.js';
 export * from './mockUSDCFaucet';
 export * from './pythClient';
 export * from './types';
 export * from './constants/markets';
-export * from './accounts/defaultHistoryAccountSubscriber';
-export * from './accounts/defaultClearingHouseAccountSubscriber';
+export * from './accounts/webSocketClearingHouseAccountSubscriber';
+export * from './accounts/bulkAccountLoader';
+export * from './accounts/pollingClearingHouseAccountSubscriber';
+export * from './accounts/pollingTokenAccountSubscriber';
 export * from './accounts/types';
 export * from './addresses';
 export * from './admin';
 export * from './clearingHouseUser';
 export * from './clearingHouse';
+export * from './factory/clearingHouse';
+export * from './factory/clearingHouseUser';
 export * from './math/conversion';
 export * from './math/funding';
 export * from './math/insuranceFund';
@@ -27,4 +32,4 @@ export * from './config';
 export * from './constants/numericConstants';
 export * from './util/computeUnits';
 export * from './util/tps';
-export { BN };
+export { BN, PublicKey };

package/lib/index.js

@@ -10,20 +10,26 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BN = void 0;
+exports.PublicKey = exports.BN = void 0;
 const anchor_1 = require("@project-serum/anchor");
 Object.defineProperty(exports, "BN", { enumerable: true, get: function () { return anchor_1.BN; } });
+const web3_js_1 = require("@solana/web3.js");
+Object.defineProperty(exports, "PublicKey", { enumerable: true, get: function () { return web3_js_1.PublicKey; } });
 __exportStar(require("./mockUSDCFaucet"), exports);
 __exportStar(require("./pythClient"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./constants/markets"), exports);
-__exportStar(require("./accounts/defaultHistoryAccountSubscriber"), exports);
-__exportStar(require("./accounts/defaultClearingHouseAccountSubscriber"), exports);
+__exportStar(require("./accounts/webSocketClearingHouseAccountSubscriber"), exports);
+__exportStar(require("./accounts/bulkAccountLoader"), exports);
+__exportStar(require("./accounts/pollingClearingHouseAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);
 __exportStar(require("./addresses"), exports);
 __exportStar(require("./admin"), exports);
 __exportStar(require("./clearingHouseUser"), exports);
 __exportStar(require("./clearingHouse"), exports);
+__exportStar(require("./factory/clearingHouse"), exports);
+__exportStar(require("./factory/clearingHouseUser"), exports);
 __exportStar(require("./math/conversion"), exports);
 __exportStar(require("./math/funding"), exports);
 __exportStar(require("./math/insuranceFund"), exports);

package/lib/math/conversion.d.ts

@@ -1,3 +1,3 @@
-import BN from 'bn.js';
+import { BN } from '../';
 export declare const convertToNumber: (bigNumber: BN, precision?: BN) => number;
 export declare const convertBaseAssetAmountToNumber: (baseAssetAmount: BN) => number;

package/lib/math/funding.js

@@ -242,7 +242,10 @@ exports.calculateLongShortFundingRateAndLiveTwaps = calculateLongShortFundingRat
 function calculateFundingPool(market) {
     // todo
     const totalFeeLB = market.amm.totalFee.div(new anchor_1.BN(2));
-    const feePool = anchor_1.BN.max(numericConstants_1.ZERO, market.amm.totalFeeMinusDistributions.sub(totalFeeLB));
+    const feePool = anchor_1.BN.max(numericConstants_1.ZERO, market.amm.totalFeeMinusDistributions
+        .sub(totalFeeLB)
+        .mul(new anchor_1.BN(2))
+        .div(new anchor_1.BN(3)));
     return feePool;
 }
 exports.calculateFundingPool = calculateFundingPool;

package/lib/math/insuranceFund.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="bn.js" />
 import { MarketsAccount, StateAccount } from '../types';
-import BN from 'bn.js';
+import { BN } from '../';
 import { Connection } from '@solana/web3.js';
 /**
  * In the case of a levered loss, the exchange first pays out undistributed fees and then the insurance fund.

package/lib/math/insuranceFund.js

@@ -8,12 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateInsuranceFundSize = void 0;
-const bn_js_1 = __importDefault(require("bn.js"));
+const __1 = require("../");
 /**
  * In the case of a levered loss, the exchange first pays out undistributed fees and then the insurance fund.
  * Thus the de facto size of the insurance fund is the amount in the insurance vault plus the sum of each markets
@@ -27,9 +24,9 @@ const bn_js_1 = __importDefault(require("bn.js"));
 function calculateInsuranceFundSize(connection, state, marketsAccount) {
     return __awaiter(this, void 0, void 0, function* () {
         const insuranceVaultPublicKey = state.insuranceVault;
-        const insuranceVaultAmount = new bn_js_1.default((yield connection.getTokenAccountBalance(insuranceVaultPublicKey)).value.amount);
+        const insuranceVaultAmount = new __1.BN((yield connection.getTokenAccountBalance(insuranceVaultPublicKey)).value.amount);
         return marketsAccount.markets.reduce((insuranceVaultAmount, market) => {
-            return insuranceVaultAmount.add(market.amm.totalFee.div(new bn_js_1.default(2)));
+            return insuranceVaultAmount.add(market.amm.totalFee.div(new __1.BN(2)));
         }, insuranceVaultAmount);
     });
 }

package/lib/math/position.d.ts

@@ -1,4 +1,5 @@
-import BN from 'bn.js';
+/// <reference types="bn.js" />
+import { BN } from '../';
 import { Market, PositionDirection, UserPosition } from '../types';
 /**
  * calculateBaseAssetValue

package/lib/math/position.js

@@ -1,10 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isEmptyPosition = exports.positionCurrentDirection = exports.findDirectionToClose = exports.calculateEntryPrice = exports.calculatePositionFundingPNL = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
-const bn_js_1 = __importDefault(require("bn.js"));
+const __1 = require("../");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
 const amm_1 = require("./amm");
@@ -84,7 +81,7 @@ function calculatePositionFundingPNL(market, marketPosition) {
         .mul(marketPosition.baseAssetAmount)
         .div(numericConstants_1.AMM_RESERVE_PRECISION)
         .div(numericConstants_1.FUNDING_PAYMENT_PRECISION)
-        .mul(new bn_js_1.default(-1));
+        .mul(new __1.BN(-1));
     return perPositionFundingRate;
 }
 exports.calculatePositionFundingPNL = calculatePositionFundingPNL;

package/lib/math/utils.d.ts

@@ -1,2 +1,3 @@
 /// <reference types="bn.js" />
-export declare const squareRootBN: (n: any, closeness?: import("bn.js")) => any;
+import { BN } from '../';
+export declare const squareRootBN: (n: any, closeness?: BN) => any;

package/lib/math/utils.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.squareRootBN = void 0;
-const bn_js_1 = require("bn.js");
-const squareRootBN = (n, closeness = new bn_js_1.BN(1)) => {
+const __1 = require("../");
+const squareRootBN = (n, closeness = new __1.BN(1)) => {
     // Assuming the sqrt of n as n only
     let x = n;
     // The closed guess will be stored in the root
     let root;
     // To count the number of iterations
     let count = 0;
-    const TWO = new bn_js_1.BN(2);
+    const TWO = new __1.BN(2);
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     while (count < Number.MAX_SAFE_INTEGER) {
         count++;

package/lib/mockUSDCFaucet.d.ts

@@ -1,8 +1,9 @@
+/// <reference types="bn.js" />
 import * as anchor from '@project-serum/anchor';
 import { Program, Provider } from '@project-serum/anchor';
 import { AccountInfo } from '@solana/spl-token';
 import { ConfirmOptions, Connection, PublicKey, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
-import BN from 'bn.js';
+import { BN } from '.';
 import { IWallet } from './types';
 export declare class MockUSDCFaucet {
     connection: Connection;

package/lib/orderParams.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="bn.js" />
 import { OrderParams, OrderTriggerCondition, PositionDirection } from './types';
 import { BN } from '@project-serum/anchor';
-export declare function getLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean): OrderParams;
-export declare function getStopOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean): OrderParams;
-export declare function getStopLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean): OrderParams;
+export declare function getLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number): OrderParams;
+export declare function getTriggerMarketOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number): OrderParams;
+export declare function getTriggerLimitOrderParams(marketIndex: BN, direction: PositionDirection, baseAssetAmount: BN, price: BN, triggerPrice: BN, triggerCondition: OrderTriggerCondition, reduceOnly: boolean, discountToken?: boolean, referrer?: boolean, userOrderId?: number): OrderParams;
 export declare function getMarketOrderParams(marketIndex: BN, direction: PositionDirection, quoteAssetAmount: BN, baseAssetAmount: BN, reduceOnly: boolean, price?: BN, discountToken?: boolean, referrer?: boolean): OrderParams;

package/lib/orderParams.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMarketOrderParams = exports.getStopLimitOrderParams = exports.getStopOrderParams = exports.getLimitOrderParams = void 0;
+exports.getMarketOrderParams = exports.getTriggerLimitOrderParams = exports.getTriggerMarketOrderParams = exports.getLimitOrderParams = void 0;
 const types_1 = require("./types");
 const numericConstants_1 = require("./constants/numericConstants");
-function getLimitOrderParams(marketIndex, direction, baseAssetAmount, price, reduceOnly, discountToken = false, referrer = false) {
+function getLimitOrderParams(marketIndex, direction, baseAssetAmount, price, reduceOnly, discountToken = false, referrer = false, userOrderId = 0) {
     return {
         orderType: types_1.OrderType.LIMIT,
+        userOrderId,
         marketIndex,
         direction,
         quoteAssetAmount: numericConstants_1.ZERO,
@@ -14,18 +15,23 @@ function getLimitOrderParams(marketIndex, direction, baseAssetAmount, price, red
         reduceOnly,
         postOnly: false,
         immediateOrCancel: false,
+        positionLimit: numericConstants_1.ZERO,
+        padding0: true,
+        padding1: numericConstants_1.ZERO,
         optionalAccounts: {
             discountToken,
             referrer,
         },
         triggerCondition: types_1.OrderTriggerCondition.ABOVE,
         triggerPrice: numericConstants_1.ZERO,
+        oraclePriceOffset: numericConstants_1.ZERO,
     };
 }
 exports.getLimitOrderParams = getLimitOrderParams;
-function getStopOrderParams(marketIndex, direction, baseAssetAmount, triggerPrice, triggerCondition, reduceOnly, discountToken = false, referrer = false) {
+function getTriggerMarketOrderParams(marketIndex, direction, baseAssetAmount, triggerPrice, triggerCondition, reduceOnly, discountToken = false, referrer = false, userOrderId = 0) {
     return {
-        orderType: types_1.OrderType.STOP,
+        orderType: types_1.OrderType.TRIGGER_MARKET,
+        userOrderId,
         marketIndex,
         direction,
         quoteAssetAmount: numericConstants_1.ZERO,
@@ -34,18 +40,23 @@ function getStopOrderParams(marketIndex, direction, baseAssetAmount, triggerPric
         reduceOnly,
         postOnly: false,
         immediateOrCancel: false,
+        positionLimit: numericConstants_1.ZERO,
+        padding0: true,
+        padding1: numericConstants_1.ZERO,
         optionalAccounts: {
             discountToken,
             referrer,
         },
         triggerCondition,
         triggerPrice,
+        oraclePriceOffset: numericConstants_1.ZERO,
     };
 }
-exports.getStopOrderParams = getStopOrderParams;
-function getStopLimitOrderParams(marketIndex, direction, baseAssetAmount, price, triggerPrice, triggerCondition, reduceOnly, discountToken = false, referrer = false) {
+exports.getTriggerMarketOrderParams = getTriggerMarketOrderParams;
+function getTriggerLimitOrderParams(marketIndex, direction, baseAssetAmount, price, triggerPrice, triggerCondition, reduceOnly, discountToken = false, referrer = false, userOrderId = 0) {
     return {
-        orderType: types_1.OrderType.STOP_LIMIT,
+        orderType: types_1.OrderType.TRIGGER_LIMIT,
+        userOrderId,
         marketIndex,
         direction,
         quoteAssetAmount: numericConstants_1.ZERO,
@@ -54,21 +65,26 @@ function getStopLimitOrderParams(marketIndex, direction, baseAssetAmount, price,
         reduceOnly,
         postOnly: false,
         immediateOrCancel: false,
+        positionLimit: numericConstants_1.ZERO,
+        padding0: true,
+        padding1: numericConstants_1.ZERO,
         optionalAccounts: {
             discountToken,
             referrer,
         },
         triggerCondition,
         triggerPrice,
+        oraclePriceOffset: numericConstants_1.ZERO,
     };
 }
-exports.getStopLimitOrderParams = getStopLimitOrderParams;
+exports.getTriggerLimitOrderParams = getTriggerLimitOrderParams;
 function getMarketOrderParams(marketIndex, direction, quoteAssetAmount, baseAssetAmount, reduceOnly, price = numericConstants_1.ZERO, discountToken = false, referrer = false) {
     if (baseAssetAmount.eq(numericConstants_1.ZERO) && quoteAssetAmount.eq(numericConstants_1.ZERO)) {
         throw Error('baseAssetAmount or quoteAssetAmount must be zero');
     }
     return {
         orderType: types_1.OrderType.MARKET,
+        userOrderId: 0,
         marketIndex,
         direction,
         quoteAssetAmount,
@@ -77,12 +93,16 @@ function getMarketOrderParams(marketIndex, direction, quoteAssetAmount, baseAsse
         reduceOnly,
         postOnly: false,
         immediateOrCancel: false,
+        positionLimit: numericConstants_1.ZERO,
+        padding0: true,
+        padding1: numericConstants_1.ZERO,
         optionalAccounts: {
             discountToken,
             referrer,
         },
         triggerCondition: types_1.OrderTriggerCondition.ABOVE,
         triggerPrice: numericConstants_1.ZERO,
+        oraclePriceOffset: numericConstants_1.ZERO,
     };
 }
 exports.getMarketOrderParams = getMarketOrderParams;

package/lib/orders.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="bn.js" />
 import { Market, Order, UserAccount, UserPosition } from './types';
-import BN from 'bn.js';
+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/token/index.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="node" />
+import { AccountInfo } from '@solana/spl-token';
+export declare function parseTokenAccount(data: Buffer): AccountInfo;

package/lib/token/index.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseTokenAccount = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+function parseTokenAccount(data) {
+    const accountInfo = spl_token_1.AccountLayout.decode(data);
+    accountInfo.mint = new web3_js_1.PublicKey(accountInfo.mint);
+    accountInfo.owner = new web3_js_1.PublicKey(accountInfo.owner);
+    accountInfo.amount = spl_token_1.u64.fromBuffer(accountInfo.amount);
+    if (accountInfo.delegateOption === 0) {
+        accountInfo.delegate = null;
+        // eslint-disable-next-line new-cap
+        accountInfo.delegatedAmount = new spl_token_1.u64(0);
+    }
+    else {
+        accountInfo.delegate = new web3_js_1.PublicKey(accountInfo.delegate);
+        accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(accountInfo.delegatedAmount);
+    }
+    accountInfo.isInitialized = accountInfo.state !== 0;
+    accountInfo.isFrozen = accountInfo.state === 2;
+    if (accountInfo.isNativeOption === 1) {
+        accountInfo.rentExemptReserve = spl_token_1.u64.fromBuffer(accountInfo.isNative);
+        accountInfo.isNative = true;
+    }
+    else {
+        accountInfo.rentExemptReserve = null;
+        accountInfo.isNative = false;
+    }
+    if (accountInfo.closeAuthorityOption === 0) {
+        accountInfo.closeAuthority = null;
+    }
+    else {
+        accountInfo.closeAuthority = new web3_js_1.PublicKey(accountInfo.closeAuthority);
+    }
+    return accountInfo;
+}
+exports.parseTokenAccount = parseTokenAccount;

package/lib/types.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="bn.js" />
 import { PublicKey, Transaction } from '@solana/web3.js';
-import BN from 'bn.js';
+import { BN } from '.';
 export declare class SwapDirection {
     static readonly ADD: {
         add: {};
@@ -28,11 +29,11 @@ export declare class OrderType {
     static readonly LIMIT: {
         limit: {};
     };
-    static readonly STOP: {
-        stop: {};
+    static readonly TRIGGER_MARKET: {
+        triggerMarket: {};
     };
-    static readonly STOP_LIMIT: {
-        stopLimit: {};
+    static readonly TRIGGER_LIMIT: {
+        triggerLimit: {};
     };
     static readonly MARKET: {
         market: {};
@@ -97,9 +98,9 @@ export declare type DepositHistoryAccount = {
     head: BN;
     depositRecords: DepositRecord[];
 };
-export declare type CurveHistoryAccount = {
+export declare type ExtendedCurveHistoryAccount = {
     head: BN;
-    curveRecords: CurveRecord[];
+    curveRecords: ExtendedCurveRecord[];
 };
 export declare type FundingRateHistoryAccount = {
     head: BN;
@@ -131,7 +132,7 @@ export declare type DepositRecord = {
     cumulativeDepositsBefore: BN;
     amount: BN;
 };
-export declare type CurveRecord = {
+export declare type ExtendedCurveRecord = {
     ts: BN;
     recordId: BN;
     marketIndex: BN;
@@ -147,6 +148,8 @@ export declare type CurveRecord = {
     baseAssetAmountShort: BN;
     baseAssetAmount: BN;
     openInterest: BN;
+    oraclePrice: BN;
+    tradeId: BN;
 };
 export declare type TradeRecord = {
     ts: BN;
@@ -261,6 +264,7 @@ export declare type StateAccount = {
     oracleGuardRails: OracleGuardRails;
     maxDeposit: BN;
     orderState: PublicKey;
+    extendedCurveHistory: PublicKey;
 };
 export declare type OrderStateAccount = {
     orderHistory: PublicKey;
@@ -303,6 +307,7 @@ export declare type AMM = {
     totalFee: BN;
     minimumQuoteAssetTradeSize: BN;
     minimumBaseAssetTradeSize: BN;
+    lastOraclePrice: BN;
 };
 export declare type UserPosition = {
     baseAssetAmount: BN;
@@ -334,8 +339,10 @@ export declare type Order = {
     orderType: OrderType;
     ts: BN;
     orderId: BN;
+    userOrderId: number;
     marketIndex: BN;
     price: BN;
+    userBaseAssetAmount: BN;
     baseAssetAmount: BN;
     baseAssetAmountFilled: BN;
     quoteAssetAmount: BN;
@@ -352,6 +359,7 @@ export declare type Order = {
 };
 export declare type OrderParams = {
     orderType: OrderType;
+    userOrderId: number;
     direction: PositionDirection;
     quoteAssetAmount: BN;
     baseAssetAmount: BN;
@@ -362,6 +370,10 @@ export declare type OrderParams = {
     immediateOrCancel: boolean;
     triggerPrice: BN;
     triggerCondition: OrderTriggerCondition;
+    positionLimit: BN;
+    oraclePriceOffset: BN;
+    padding0: boolean;
+    padding1: BN;
     optionalAccounts: {
         discountToken: boolean;
         referrer: boolean;

package/lib/types.js

@@ -21,8 +21,8 @@ class OrderType {
 }
 exports.OrderType = OrderType;
 OrderType.LIMIT = { limit: {} };
-OrderType.STOP = { stop: {} };
-OrderType.STOP_LIMIT = { stopLimit: {} };
+OrderType.TRIGGER_MARKET = { triggerMarket: {} };
+OrderType.TRIGGER_LIMIT = { triggerLimit: {} };
 OrderType.MARKET = { market: {} };
 class OrderStatus {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.18-orders.1",
+	"version": "0.1.18-orders.5",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -10,6 +10,7 @@
 		"url": "git@github.com:drift-labs/protocol-v1.git"
 	},
 	"scripts": {
+		"lint": "eslint './**/*.{ts,tsx}' --quiet",
 		"build": "yarn clean && tsc",
 		"clean": "rm -rf lib",
 		"patch-and-pub": "npm version patch --force && npm publish"
@@ -31,8 +32,15 @@
 		"@pythnetwork/client": "^2.5.1",
 		"@solana/spl-token": "^0.1.6",
 		"@solana/web3.js": "^1.22.0",
-		"@types/bn.js": "^5.1.0",
-		"strict-event-emitter-types": "^2.0.0"
+		"strict-event-emitter-types": "^2.0.0",
+		"uuid": "^8.3.2"
+	},
+	"devDependencies": {
+		"@typescript-eslint/eslint-plugin": "^4.28.0",
+		"@typescript-eslint/parser": "^4.28.0",
+		"eslint": "^7.29.0",
+		"eslint-config-prettier": "^8.3.0",
+		"eslint-plugin-prettier": "^3.4.0"
 	},
 	"description": "SDK for Drift Protocol v1",
 	"engines": {