@drift-labs/sdk 0.1.24 → 0.1.27

package/lib/accounts/bulkAccountLoader.d.ts

@@ -16,6 +16,7 @@ export declare class BulkAccountLoader {
     loadPromise?: Promise<void>;
     loadPromiseResolver: () => void;
     loggingEnabled: boolean;
+    lastUpdate: number;
     constructor(connection: Connection, commitment: Commitment, pollingFrequency: number);
     addAccount(publicKey: PublicKey, callback: (buffer: Buffer) => void): string;
     removeAccount(publicKey: PublicKey, callbackId: string): void;

package/lib/accounts/bulkAccountLoader.js

@@ -10,21 +10,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BulkAccountLoader = void 0;
+const web3_js_1 = require("@solana/web3.js");
 const uuid_1 = require("uuid");
 const GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
+const fiveMinutes = 5 * 60 * 1000;
 class BulkAccountLoader {
     constructor(connection, commitment, pollingFrequency) {
         this.accountsToLoad = new Map();
         this.accountData = new Map();
         this.errorCallbacks = new Map();
         this.loggingEnabled = false;
+        this.lastUpdate = Date.now();
         this.connection = connection;
         this.commitment = commitment;
         this.pollingFrequency = pollingFrequency;
     }
     addAccount(publicKey, callback) {
         const existingSize = this.accountsToLoad.size;
-        const callbackId = uuid_1.v4();
+        const callbackId = (0, uuid_1.v4)();
         const existingAccountToLoad = this.accountsToLoad.get(publicKey.toString());
         if (existingAccountToLoad) {
             existingAccountToLoad.callbacks.set(callbackId, callback);
@@ -58,7 +61,7 @@ class BulkAccountLoader {
         }
     }
     addErrorCallbacks(callback) {
-        const callbackId = uuid_1.v4();
+        const callbackId = (0, uuid_1.v4)();
         this.errorCallbacks.set(callbackId, callback);
         return callbackId;
     }
@@ -98,6 +101,15 @@ class BulkAccountLoader {
             finally {
                 this.loadPromiseResolver();
                 this.loadPromise = undefined;
+                const now = Date.now();
+                if (now - this.lastUpdate > fiveMinutes) {
+                    if (this.loggingEnabled) {
+                        console.log("Haven't seen updated account in five minutes. Bulk account loader creating new Connection Object");
+                    }
+                    this.connection = new web3_js_1.Connection(
+                    // @ts-ignore
+                    this.connection._rpcEndpoint, this.connection.commitment);
+                }
             }
         });
     }
@@ -131,6 +143,7 @@ class BulkAccountLoader {
                         buffer: newBuffer,
                     });
                     this.handleAccountCallbacks(accountToLoad, newBuffer);
+                    this.lastUpdate = Date.now();
                     continue;
                 }
                 if (newSlot <= oldRPCResponse.slot) {
@@ -143,6 +156,7 @@ class BulkAccountLoader {
                         buffer: newBuffer,
                     });
                     this.handleAccountCallbacks(accountToLoad, newBuffer);
+                    this.lastUpdate = Date.now();
                 }
             }
         });

package/lib/accounts/pollingClearingHouseAccountSubscriber.js

@@ -54,7 +54,7 @@ class PollingClearingHouseAccountSubscriber {
             if (this.accountsToPoll.size > 0) {
                 return;
             }
-            const statePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
+            const statePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
             const state = (yield this.program.account.state.fetch(statePublicKey));
             this.accountsToPoll.set(statePublicKey.toString(), {
                 key: 'state',
@@ -127,7 +127,7 @@ class PollingClearingHouseAccountSubscriber {
         return __awaiter(this, void 0, void 0, function* () {
             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);
+                    const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                     this[accountToPoll.key] = account;
                     // @ts-ignore
                     this.eventEmitter.emit(accountToPoll.eventType, account);
@@ -145,7 +145,7 @@ class PollingClearingHouseAccountSubscriber {
             for (const [_, accountToPoll] of this.accountsToPoll) {
                 const buffer = this.accountLoader.getAccountData(accountToPoll.publicKey);
                 if (buffer) {
-                    this[accountToPoll.key] = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                    this[accountToPoll.key] = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                 }
             }
         });

package/lib/accounts/pollingOracleSubscriber.d.ts

@@ -0,0 +1,26 @@
+/// <reference types="node" />
+import { OracleEvents, OracleSubscriber } from './types';
+import { Program } from '@project-serum/anchor';
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+import { PublicKey } from '@solana/web3.js';
+import { BulkAccountLoader } from './bulkAccountLoader';
+import { OracleClient, OraclePriceData } from '../oracles/types';
+export declare class PollingOracleSubscriber implements OracleSubscriber {
+    isSubscribed: boolean;
+    program: Program;
+    eventEmitter: StrictEventEmitter<EventEmitter, OracleEvents>;
+    publicKey: PublicKey;
+    accountLoader: BulkAccountLoader;
+    oracleClient: OracleClient;
+    callbackId?: string;
+    errorCallbackId?: string;
+    oraclePriceData?: OraclePriceData;
+    constructor(publicKey: PublicKey, oracleClient: OracleClient, accountLoader: BulkAccountLoader);
+    subscribe(): Promise<boolean>;
+    addToAccountLoader(): void;
+    fetch(): Promise<void>;
+    unsubscribe(): Promise<void>;
+    assertIsSubscribed(): void;
+    getOraclePriceData(): OraclePriceData;
+}

package/lib/accounts/pollingOracleSubscriber.js

@@ -0,0 +1,79 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PollingOracleSubscriber = void 0;
+const types_1 = require("./types");
+const events_1 = require("events");
+class PollingOracleSubscriber {
+    constructor(publicKey, oracleClient, accountLoader) {
+        this.isSubscribed = false;
+        this.publicKey = publicKey;
+        this.oracleClient = oracleClient;
+        this.accountLoader = accountLoader;
+        this.eventEmitter = new events_1.EventEmitter();
+    }
+    subscribe() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isSubscribed) {
+                return true;
+            }
+            this.addToAccountLoader();
+            yield this.fetch();
+            this.eventEmitter.emit('update');
+            this.isSubscribed = true;
+            return true;
+        });
+    }
+    addToAccountLoader() {
+        if (this.callbackId) {
+            return;
+        }
+        this.callbackId = this.accountLoader.addAccount(this.publicKey, (buffer) => __awaiter(this, void 0, void 0, function* () {
+            const oraclePriceData = yield this.oracleClient.getOraclePriceDataFromBuffer(buffer);
+            this.oraclePriceData = oraclePriceData;
+            // @ts-ignore
+            this.eventEmitter.emit('oracleUpdate', oraclePriceData);
+            this.eventEmitter.emit('update');
+        }));
+        this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {
+            this.eventEmitter.emit('error', error);
+        });
+    }
+    fetch() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.accountLoader.load();
+            const buffer = this.accountLoader.getAccountData(this.publicKey);
+            this.oraclePriceData = yield this.oracleClient.getOraclePriceDataFromBuffer(buffer);
+        });
+    }
+    unsubscribe() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.isSubscribed) {
+                return;
+            }
+            this.accountLoader.removeAccount(this.publicKey, this.callbackId);
+            this.callbackId = undefined;
+            this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
+            this.errorCallbackId = undefined;
+            this.isSubscribed = false;
+        });
+    }
+    assertIsSubscribed() {
+        if (!this.isSubscribed) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
+        }
+    }
+    getOraclePriceData() {
+        this.assertIsSubscribed();
+        return this.oraclePriceData;
+    }
+}
+exports.PollingOracleSubscriber = PollingOracleSubscriber;

package/lib/accounts/pollingTokenAccountSubscriber.js

@@ -37,7 +37,7 @@ class PollingTokenAccountSubscriber {
             return;
         }
         this.callbackId = this.accountLoader.addAccount(this.publicKey, (buffer) => {
-            const tokenAccount = token_1.parseTokenAccount(buffer);
+            const tokenAccount = (0, token_1.parseTokenAccount)(buffer);
             this.tokenAccount = tokenAccount;
             // @ts-ignore
             this.eventEmitter.emit('tokenAccountUpdate', tokenAccount);
@@ -51,7 +51,7 @@ class PollingTokenAccountSubscriber {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.accountLoader.load();
             const buffer = this.accountLoader.getAccountData(this.publicKey);
-            this.tokenAccount = token_1.parseTokenAccount(buffer);
+            this.tokenAccount = (0, token_1.parseTokenAccount)(buffer);
         });
     }
     unsubscribe() {

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -42,7 +42,7 @@ class PollingUserAccountSubscriber {
                 return;
             }
             if (!userPublicKeys) {
-                const userPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.authority);
+                const userPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.authority);
                 const userAccount = (yield this.program.account.user.fetch(userPublicKey));
                 this.accountsToPoll.set(userPublicKey.toString(), {
                     key: 'user',
@@ -54,7 +54,7 @@ class PollingUserAccountSubscriber {
                     publicKey: userAccount.positions,
                     eventType: 'userPositionsData',
                 });
-                const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, userPublicKey);
+                const userOrdersPublicKey = yield (0, addresses_1.getUserOrdersAccountPublicKey)(this.program.programId, userPublicKey);
                 this.accountsToPoll.set(userOrdersPublicKey.toString(), {
                     key: 'userOrders',
                     publicKey: userOrdersPublicKey,
@@ -85,7 +85,7 @@ class PollingUserAccountSubscriber {
                     if (!buffer) {
                         return;
                     }
-                    const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                    const account = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                     this[accountToPoll.key] = account;
                     // @ts-ignore
                     this.eventEmitter.emit(accountToPoll.eventType, account);
@@ -117,7 +117,7 @@ class PollingUserAccountSubscriber {
             for (const [_, accountToPoll] of this.accountsToPoll) {
                 const buffer = this.accountLoader.getAccountData(accountToPoll.publicKey);
                 if (buffer) {
-                    this[accountToPoll.key] = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
+                    this[accountToPoll.key] = this.program.account[accountToPoll.key].coder.accounts.decode((0, utils_1.capitalize)(accountToPoll.key), buffer);
                 }
             }
         });

package/lib/accounts/types.d.ts

@@ -4,7 +4,7 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
 import { AccountInfo } from '@solana/spl-token';
-import { ClearingHouseConfigType, ClearingHouseUserConfigType } from '..';
+import { ClearingHouseConfigType, ClearingHouseUserConfigType, OraclePriceData } from '..';
 export interface AccountSubscriber<T> {
     data?: T;
     subscribe(onChange: (data: T) => void): Promise<void>;
@@ -84,6 +84,19 @@ export interface TokenAccountSubscriber {
     unsubscribe(): Promise<void>;
     getTokenAccount(): AccountInfo;
 }
+export interface OracleEvents {
+    oracleUpdate: (payload: OraclePriceData) => void;
+    update: void;
+    error: (e: Error) => void;
+}
+export interface OracleSubscriber {
+    eventEmitter: StrictEventEmitter<EventEmitter, OracleEvents>;
+    isSubscribed: boolean;
+    subscribe(): Promise<boolean>;
+    fetch(): Promise<void>;
+    unsubscribe(): Promise<void>;
+    getOraclePriceData(): OraclePriceData;
+}
 export declare type AccountToPoll = {
     key: string;
     publicKey: PublicKey;

package/lib/accounts/webSocketAccountSubscriber.js

@@ -47,7 +47,7 @@ class WebSocketAccountSubscriber {
                 slot: newSlot,
             };
             if (newBuffer) {
-                this.data = this.program.account[this.accountName].coder.accounts.decode(utils_1.capitalize(this.accountName), newBuffer);
+                this.data = this.program.account[this.accountName].coder.accounts.decode((0, utils_1.capitalize)(this.accountName), newBuffer);
                 this.onChange(this.data);
             }
             return;
@@ -61,7 +61,7 @@ class WebSocketAccountSubscriber {
                 buffer: newBuffer,
                 slot: newSlot,
             };
-            this.data = this.program.account[this.accountName].coder.accounts.decode(utils_1.capitalize(this.accountName), newBuffer);
+            this.data = this.program.account[this.accountName].coder.accounts.decode((0, utils_1.capitalize)(this.accountName), newBuffer);
             this.onChange(this.data);
         }
     }

package/lib/accounts/webSocketClearingHouseAccountSubscriber.js

@@ -35,7 +35,7 @@ class WebSocketClearingHouseAccountSubscriber {
             this.subscriptionPromise = new Promise((res) => {
                 this.subscriptionPromiseResolver = res;
             });
-            const statePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
+            const statePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
             // create and activate main state account subscription
             this.stateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('state', this.program, statePublicKey);
             yield this.stateAccountSubscriber.subscribe((data) => {

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -27,7 +27,7 @@ class WebSocketUserAccountSubscriber {
             if (this.isSubscribed) {
                 return true;
             }
-            const userPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.authority);
+            const userPublicKey = yield (0, addresses_1.getUserAccountPublicKey)(this.program.programId, this.authority);
             this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, userPublicKey);
             yield this.userDataAccountSubscriber.subscribe((data) => {
                 this.eventEmitter.emit('userAccountData', data);
@@ -39,7 +39,7 @@ class WebSocketUserAccountSubscriber {
                 this.eventEmitter.emit('userPositionsData', data);
                 this.eventEmitter.emit('update');
             });
-            const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, userPublicKey);
+            const userOrdersPublicKey = yield (0, addresses_1.getUserOrdersAccountPublicKey)(this.program.programId, userPublicKey);
             this.userOrdersAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userOrders', this.program, userOrdersPublicKey);
             yield this.userOrdersAccountSubscriber.subscribe((data) => {
                 this.eventEmitter.emit('userOrdersData', data);

package/lib/addresses.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/admin.d.ts

@@ -11,7 +11,7 @@ export declare class Admin extends ClearingHouse {
         TransactionSignature
     ]>;
     initializeOrderState(): Promise<TransactionSignature>;
-    initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, marginRatioInitial?: number, marginRatioPartial?: number, marginRatioMaintenance?: number): Promise<TransactionSignature>;
+    initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN, oracleSource?: OracleSource, marginRatioInitial?: number, marginRatioPartial?: number, marginRatioMaintenance?: number): Promise<TransactionSignature>;
     moveAmmPrice(baseAssetReserve: BN, quoteAssetReserve: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateK(sqrtK: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateCurveHistory(): Promise<TransactionSignature>;

package/lib/admin.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -30,6 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Admin = void 0;
 const web3_js_1 = require("@solana/web3.js");
+const types_1 = require("./types");
 const anchor_1 = require("@project-serum/anchor");
 const anchor = __importStar(require("@project-serum/anchor"));
 const addresses_1 = require("./addresses");
@@ -41,8 +46,8 @@ const amm_1 = require("./math/amm");
 const clearingHouse_2 = require("./factory/clearingHouse");
 class Admin extends clearingHouse_1.ClearingHouse {
     static from(connection, wallet, clearingHouseProgramId, opts = anchor_1.Provider.defaultOptions()) {
-        const config = clearingHouse_2.getWebSocketClearingHouseConfig(connection, wallet, clearingHouseProgramId, opts);
-        return clearingHouse_2.getAdmin(config);
+        const config = (0, clearingHouse_2.getWebSocketClearingHouseConfig)(connection, wallet, clearingHouseProgramId, opts);
+        return (0, clearingHouse_2.getAdmin)(config);
     }
     initialize(usdcMint, adminControlsPrices) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -61,7 +66,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
             const tradeHistory = anchor.web3.Keypair.generate();
             const liquidationHistory = anchor.web3.Keypair.generate();
             const curveHistory = anchor.web3.Keypair.generate();
-            const [clearingHouseStatePublicKey, clearingHouseNonce] = yield addresses_1.getClearingHouseStateAccountPublicKeyAndNonce(this.program.programId);
+            const [clearingHouseStatePublicKey, clearingHouseNonce] = yield (0, addresses_1.getClearingHouseStateAccountPublicKeyAndNonce)(this.program.programId);
             const initializeTx = yield this.program.transaction.initialize(clearingHouseNonce, collateralVaultNonce, insuranceVaultNonce, adminControlsPrices, {
                 accounts: {
                     admin: this.wallet.publicKey,
@@ -118,8 +123,8 @@ class Admin extends clearingHouse_1.ClearingHouse {
     initializeOrderState() {
         return __awaiter(this, void 0, void 0, function* () {
             const orderHistory = anchor.web3.Keypair.generate();
-            const [orderStatePublicKey, orderStateNonce] = yield addresses_1.getOrderStateAccountPublicKeyAndNonce(this.program.programId);
-            const clearingHouseStatePublicKey = yield addresses_1.getClearingHouseStateAccountPublicKey(this.program.programId);
+            const [orderStatePublicKey, orderStateNonce] = yield (0, addresses_1.getOrderStateAccountPublicKeyAndNonce)(this.program.programId);
+            const clearingHouseStatePublicKey = yield (0, addresses_1.getClearingHouseStateAccountPublicKey)(this.program.programId);
             const initializeOrderStateTx = yield this.program.transaction.initializeOrderState(orderStateNonce, {
                 accounts: {
                     admin: this.wallet.publicKey,
@@ -136,12 +141,12 @@ class Admin extends clearingHouse_1.ClearingHouse {
             return yield this.txSender.send(initializeOrderStateTx, [orderHistory], this.opts);
         });
     }
-    initializeMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, marginRatioInitial = 2000, marginRatioPartial = 625, marginRatioMaintenance = 500) {
+    initializeMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioPartial = 625, marginRatioMaintenance = 500) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.getMarketsAccount().markets[marketIndex.toNumber()].initialized) {
                 throw Error(`MarketIndex ${marketIndex.toNumber()} already initialized`);
             }
-            const initializeMarketTx = yield this.program.transaction.initializeMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, marginRatioInitial, marginRatioPartial, marginRatioMaintenance, {
+            const initializeMarketTx = yield this.program.transaction.initializeMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioPartial, marginRatioMaintenance, {
                 accounts: {
                     state: yield this.getStatePublicKey(),
                     admin: this.wallet.publicKey,
@@ -202,8 +207,8 @@ class Admin extends clearingHouse_1.ClearingHouse {
     moveAmmToPrice(marketIndex, targetPrice) {
         return __awaiter(this, void 0, void 0, function* () {
             const market = this.getMarket(marketIndex);
-            const [direction, tradeSize, _] = trade_1.calculateTargetPriceTrade(market, targetPrice);
-            const [newQuoteAssetAmount, newBaseAssetAmount] = amm_1.calculateAmmReservesAfterSwap(market.amm, 'quote', tradeSize, amm_1.getSwapDirection('quote', direction));
+            const [direction, tradeSize, _] = (0, trade_1.calculateTargetPriceTrade)(market, targetPrice);
+            const [newQuoteAssetAmount, newBaseAssetAmount] = (0, amm_1.calculateAmmReservesAfterSwap)(market.amm, 'quote', tradeSize, (0, amm_1.getSwapDirection)('quote', direction));
             const state = this.getStateAccount();
             return yield this.program.rpc.moveAmmPrice(newBaseAssetAmount, newQuoteAssetAmount, marketIndex, {
                 accounts: {

package/lib/clearingHouse.d.ts

@@ -121,10 +121,10 @@ export declare class ClearingHouse {
     initializeUserOrdersThenPlaceOrder(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionSignature>;
     placeOrder(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionSignature>;
     getPlaceOrderIx(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionInstruction>;
-    cancelOrder(orderId: BN): Promise<TransactionSignature>;
-    getCancelOrderIx(orderId: BN): Promise<TransactionInstruction>;
-    cancelOrderByUserId(userOrderId: number): Promise<TransactionSignature>;
-    getCancelOrderByUserIdIx(userOrderId: number): Promise<TransactionInstruction>;
+    cancelOrder(orderId: BN, oracle?: PublicKey): Promise<TransactionSignature>;
+    getCancelOrderIx(orderId: BN, oracle?: PublicKey): Promise<TransactionInstruction>;
+    cancelOrderByUserId(userOrderId: number, oracle?: PublicKey): Promise<TransactionSignature>;
+    getCancelOrderByUserIdIx(userOrderId: number, oracle?: PublicKey): Promise<TransactionInstruction>;
     fillOrder(userAccountPublicKey: PublicKey, userOrdersAccountPublicKey: PublicKey, order: Order): Promise<TransactionSignature>;
     getFillOrderIx(userAccountPublicKey: PublicKey, userOrdersAccountPublicKey: PublicKey, order: Order): Promise<TransactionInstruction>;
     initializeUserOrdersThenPlaceAndFillOrder(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionSignature>;