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

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -0,0 +1,136 @@
+"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.PollingUserAccountSubscriber = void 0;
+const types_1 = require("./types");
+const events_1 = require("events");
+const addresses_1 = require("../addresses");
+const utils_1 = require("./utils");
+class PollingUserAccountSubscriber {
+    constructor(program, authority, accountLoader) {
+        this.accountsToPoll = new Map();
+        this.type = 'polling';
+        this.isSubscribed = false;
+        this.program = program;
+        this.authority = authority;
+        this.accountLoader = accountLoader;
+        this.eventEmitter = new events_1.EventEmitter();
+    }
+    subscribe() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.isSubscribed) {
+                return true;
+            }
+            yield this.addToAccountLoader();
+            yield this.fetchIfUnloaded();
+            this.eventEmitter.emit('update');
+            this.isSubscribed = true;
+            return true;
+        });
+    }
+    addToAccountLoader() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.accountsToPoll.size > 0) {
+                return;
+            }
+            const userPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.authority);
+            const userAccount = (yield this.program.account.user.fetch(userPublicKey));
+            this.accountsToPoll.set(userPublicKey.toString(), {
+                key: 'user',
+                publicKey: userPublicKey,
+                eventType: 'userAccountData',
+            });
+            this.accountsToPoll.set(userAccount.positions.toString(), {
+                key: 'userPositions',
+                publicKey: userAccount.positions,
+                eventType: 'userPositionsData',
+            });
+            const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, userPublicKey);
+            const userOrdersExist = (yield this.program.provider.connection.getParsedAccountInfo(userOrdersPublicKey)).value !== null;
+            if (userOrdersExist) {
+                this.accountsToPoll.set(userOrdersPublicKey.toString(), {
+                    key: 'userOrders',
+                    publicKey: userOrdersPublicKey,
+                    eventType: 'userOrdersData',
+                });
+            }
+            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);
+                    this[accountToPoll.key] = account;
+                    // @ts-ignore
+                    this.eventEmitter.emit(accountToPoll.eventType, account);
+                    this.eventEmitter.emit('update');
+                });
+            }
+            this.errorCallbackId = this.accountLoader.addErrorCallbacks((error) => {
+                this.eventEmitter.emit('error', error);
+            });
+        });
+    }
+    fetchIfUnloaded() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let shouldFetch = false;
+            for (const [_, accountToPoll] of this.accountsToPoll) {
+                if (this[accountToPoll.key] === undefined) {
+                    shouldFetch = true;
+                    break;
+                }
+            }
+            if (shouldFetch) {
+                yield this.fetch();
+            }
+        });
+    }
+    fetch() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.accountLoader.load();
+            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);
+                }
+            }
+        });
+    }
+    unsubscribe() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.isSubscribed) {
+                return;
+            }
+            for (const [_, accountToPoll] of this.accountsToPoll) {
+                this.accountLoader.removeAccount(accountToPoll.publicKey, accountToPoll.callbackId);
+            }
+            this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
+            this.errorCallbackId = undefined;
+            this.accountsToPoll.clear();
+            this.isSubscribed = false;
+        });
+    }
+    assertIsSubscribed() {
+        if (!this.isSubscribed) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
+        }
+    }
+    getUserAccount() {
+        this.assertIsSubscribed();
+        return this.user;
+    }
+    getUserPositionsAccount() {
+        this.assertIsSubscribed();
+        return this.userPositions;
+    }
+    getUserOrdersAccount() {
+        this.assertIsSubscribed();
+        return this.userOrders;
+    }
+}
+exports.PollingUserAccountSubscriber = PollingUserAccountSubscriber;

package/lib/accounts/types.d.ts

@@ -1,12 +1,15 @@
 /// <reference types="node" />
-import { CurveHistoryAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, MarketsAccount, OrderHistoryAccount, OrderStateAccount, StateAccount, TradeHistoryAccount, UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
+import { DepositHistoryAccount, ExtendedCurveHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, MarketsAccount, OrderHistoryAccount, OrderStateAccount, StateAccount, TradeHistoryAccount, UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
 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 '..';
 export interface AccountSubscriber<T> {
     data?: T;
     subscribe(onChange: (data: T) => void): Promise<void>;
     fetch(): Promise<void>;
-    unsubscribe(): void;
+    unsubscribe(): Promise<void>;
 }
 export declare class NotSubscribedError extends Error {
     name: string;
@@ -19,10 +22,11 @@ export interface ClearingHouseAccountEvents {
     tradeHistoryAccountUpdate: (payload: TradeHistoryAccount) => void;
     liquidationHistoryAccountUpdate: (payload: LiquidationHistoryAccount) => void;
     depositHistoryAccountUpdate: (payload: DepositHistoryAccount) => void;
-    curveHistoryAccountUpdate: (payload: CurveHistoryAccount) => void;
+    curveHistoryAccountUpdate: (payload: ExtendedCurveHistoryAccount) => void;
     orderHistoryAccountUpdate: (payload: OrderHistoryAccount) => void;
     orderStateAccountUpdate: (payload: OrderStateAccount) => void;
     update: void;
+    error: (e: Error) => void;
 }
 export declare type ClearingHouseAccountTypes = 'tradeHistoryAccount' | 'depositHistoryAccount' | 'fundingPaymentHistoryAccount' | 'fundingRateHistoryAccount' | 'curveHistoryAccount' | 'liquidationHistoryAccount' | 'orderHistoryAccount';
 export interface ClearingHouseAccountSubscriber {
@@ -38,37 +42,18 @@ export interface ClearingHouseAccountSubscriber {
     getDepositHistoryAccount(): DepositHistoryAccount;
     getFundingPaymentHistoryAccount(): FundingPaymentHistoryAccount;
     getFundingRateHistoryAccount(): FundingRateHistoryAccount;
-    getCurveHistoryAccount(): CurveHistoryAccount;
+    getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
     getOrderStateAccount(): OrderStateAccount;
     getOrderHistoryAccount(): OrderHistoryAccount;
-}
-export interface HistoryAccountEvents {
-    fundingPaymentHistoryAccountUpdate: (payload: FundingPaymentHistoryAccount) => void;
-    fundingRateHistoryAccountUpdate: (payload: FundingRateHistoryAccount) => void;
-    tradeHistoryAccountUpdate: (payload: TradeHistoryAccount) => void;
-    liquidationHistoryAccountUpdate: (payload: LiquidationHistoryAccount) => void;
-    depositHistoryAccountUpdate: (payload: DepositHistoryAccount) => void;
-    curveHistoryAccountUpdate: (payload: CurveHistoryAccount) => void;
-    update: void;
-}
-export interface HistoryAccountSubscriber {
-    eventEmitter: StrictEventEmitter<EventEmitter, HistoryAccountEvents>;
-    isSubscribed: boolean;
-    subscribe(): Promise<boolean>;
-    unsubscribe(): Promise<void>;
-    getTradeHistoryAccount(): TradeHistoryAccount;
-    getDepositHistoryAccount(): DepositHistoryAccount;
-    getFundingPaymentHistoryAccount(): FundingPaymentHistoryAccount;
-    getFundingRateHistoryAccount(): FundingRateHistoryAccount;
-    getCurveHistoryAccount(): CurveHistoryAccount;
-    getLiquidationHistoryAccount(): LiquidationHistoryAccount;
+    type: ClearingHouseConfigType;
 }
 export interface UserAccountEvents {
     userAccountData: (payload: UserAccount) => void;
     userPositionsData: (payload: UserPositionsAccount) => void;
     userOrdersData: (payload: UserOrdersAccount) => void;
     update: void;
+    error: (e: Error) => void;
 }
 export interface UserAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
@@ -79,4 +64,28 @@ export interface UserAccountSubscriber {
     getUserAccount(): UserAccount;
     getUserPositionsAccount(): UserPositionsAccount;
     getUserOrdersAccount(): UserOrdersAccount;
+    type: ClearingHouseUserConfigType;
+}
+export interface TokenAccountEvents {
+    tokenAccountUpdate: (payload: AccountInfo) => void;
+    update: void;
+    error: (e: Error) => void;
+}
+export interface TokenAccountSubscriber {
+    eventEmitter: StrictEventEmitter<EventEmitter, TokenAccountEvents>;
+    isSubscribed: boolean;
+    subscribe(): Promise<boolean>;
+    fetch(): Promise<void>;
+    unsubscribe(): Promise<void>;
+    getTokenAccount(): AccountInfo;
 }
+export declare type AccountToPoll = {
+    key: string;
+    publicKey: PublicKey;
+    eventType: string;
+    callbackId?: string;
+};
+export declare type AccountData = {
+    slot: number;
+    buffer: Buffer | undefined;
+};

package/lib/accounts/utils.d.ts

@@ -0,0 +1 @@
+export declare function capitalize(value: string): string;

package/lib/accounts/utils.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.capitalize = void 0;
+function capitalize(value) {
+    return value[0].toUpperCase() + value.slice(1);
+}
+exports.capitalize = capitalize;

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -1,14 +1,18 @@
-import { AccountSubscriber } from './types';
+/// <reference types="node" />
+import { AccountData, AccountSubscriber } from './types';
 import { Program } from '@project-serum/anchor';
-import { PublicKey } from '@solana/web3.js';
+import { AccountInfo, Context, PublicKey } from '@solana/web3.js';
 export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
     data?: T;
+    accountData?: AccountData;
     accountName: string;
     program: Program;
     accountPublicKey: PublicKey;
     onChange: (data: T) => void;
+    listenerId?: number;
     constructor(accountName: string, program: Program, accountPublicKey: PublicKey);
     subscribe(onChange: (data: T) => void): Promise<void>;
     fetch(): Promise<void>;
+    handleRpcResponse(context: Context, accountInfo?: AccountInfo<Buffer>): void;
     unsubscribe(): Promise<void>;
 }

package/lib/accounts/webSocketAccountSubscriber.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketAccountSubscriber = void 0;
+const utils_1 = require("./utils");
 class WebSocketAccountSubscriber {
     constructor(accountName, program, accountPublicKey) {
         this.accountName = accountName;
@@ -18,28 +19,58 @@ class WebSocketAccountSubscriber {
     }
     subscribe(onChange) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.listenerId) {
+                return;
+            }
             this.onChange = onChange;
             yield this.fetch();
-            this.program.account[this.accountName]
-                .subscribe(this.accountPublicKey, this.program.provider.opts.commitment)
-                .on('change', (data) => __awaiter(this, void 0, void 0, function* () {
-                this.data = data;
-                this.onChange(data);
-            }));
+            this.listenerId = this.program.provider.connection.onAccountChange(this.accountPublicKey, (accountInfo, context) => {
+                this.handleRpcResponse(context, accountInfo);
+            }, this.program.provider.opts.commitment);
         });
     }
     fetch() {
         return __awaiter(this, void 0, void 0, function* () {
-            const newData = (yield this.program.account[this.accountName].fetch(this.accountPublicKey));
-            // if data has changed trigger update
-            if (JSON.stringify(newData) !== JSON.stringify(this.data)) {
-                this.data = newData;
+            const rpcResponse = yield this.program.provider.connection.getAccountInfoAndContext(this.accountPublicKey, this.program.provider.opts.commitment);
+            this.handleRpcResponse(rpcResponse.context, rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value);
+        });
+    }
+    handleRpcResponse(context, accountInfo) {
+        const newSlot = context.slot;
+        let newBuffer = undefined;
+        if (accountInfo) {
+            newBuffer = accountInfo.data;
+        }
+        if (!this.accountData) {
+            this.accountData = {
+                buffer: newBuffer,
+                slot: newSlot,
+            };
+            if (newBuffer) {
+                this.data = this.program.account[this.accountName].coder.accounts.decode(utils_1.capitalize(this.accountName), newBuffer);
                 this.onChange(this.data);
             }
-        });
+            return;
+        }
+        if (newSlot <= this.accountData.slot) {
+            return;
+        }
+        const oldBuffer = this.accountData.buffer;
+        if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
+            this.accountData = {
+                buffer: newBuffer,
+                slot: newSlot,
+            };
+            this.data = this.program.account[this.accountName].coder.accounts.decode(utils_1.capitalize(this.accountName), newBuffer);
+            this.onChange(this.data);
+        }
     }
     unsubscribe() {
-        return this.program.account[this.accountName].unsubscribe(this.accountPublicKey);
+        if (this.listenerId) {
+            const promise = this.program.provider.connection.removeAccountChangeListener(this.listenerId);
+            this.listenerId = undefined;
+            return promise;
+        }
     }
 }
 exports.WebSocketAccountSubscriber = WebSocketAccountSubscriber;

package/lib/accounts/{defaultClearingHouseAccountSubscriber.d.ts → webSocketClearingHouseAccountSubscriber.d.ts}

@@ -1,11 +1,12 @@
 /// <reference types="node" />
 import { ClearingHouseAccountSubscriber, ClearingHouseAccountEvents, ClearingHouseAccountTypes } from './types';
 import { AccountSubscriber } from './types';
-import { CurveHistoryAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, MarketsAccount, OrderHistoryAccount, OrderStateAccount, StateAccount, TradeHistoryAccount } from '../types';
+import { DepositHistoryAccount, ExtendedCurveHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, LiquidationHistoryAccount, MarketsAccount, OrderHistoryAccount, OrderStateAccount, StateAccount, TradeHistoryAccount } from '../types';
 import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-export declare class DefaultClearingHouseAccountSubscriber implements ClearingHouseAccountSubscriber {
+import { ClearingHouseConfigType } from '../factory/clearingHouse';
+export declare class WebSocketClearingHouseAccountSubscriber implements ClearingHouseAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
@@ -15,11 +16,12 @@ export declare class DefaultClearingHouseAccountSubscriber implements ClearingHo
     depositHistoryAccountSubscriber?: AccountSubscriber<DepositHistoryAccount>;
     fundingPaymentHistoryAccountSubscriber?: AccountSubscriber<FundingPaymentHistoryAccount>;
     fundingRateHistoryAccountSubscriber?: AccountSubscriber<FundingRateHistoryAccount>;
-    curveHistoryAccountSubscriber?: AccountSubscriber<CurveHistoryAccount>;
+    curveHistoryAccountSubscriber?: AccountSubscriber<ExtendedCurveHistoryAccount>;
     liquidationHistoryAccountSubscriber?: AccountSubscriber<LiquidationHistoryAccount>;
     orderStateAccountSubscriber?: AccountSubscriber<OrderStateAccount>;
     orderHistoryAccountSubscriber?: AccountSubscriber<OrderHistoryAccount>;
     optionalExtraSubscriptions: ClearingHouseAccountTypes[];
+    type: ClearingHouseConfigType;
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
@@ -35,7 +37,7 @@ export declare class DefaultClearingHouseAccountSubscriber implements ClearingHo
     getDepositHistoryAccount(): DepositHistoryAccount;
     getFundingPaymentHistoryAccount(): FundingPaymentHistoryAccount;
     getFundingRateHistoryAccount(): FundingRateHistoryAccount;
-    getCurveHistoryAccount(): CurveHistoryAccount;
+    getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
     getOrderHistoryAccount(): OrderHistoryAccount;
     getOrderStateAccount(): OrderStateAccount;

package/lib/accounts/{defaultClearingHouseAccountSubscriber.js → webSocketClearingHouseAccountSubscriber.js}

@@ -9,14 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultClearingHouseAccountSubscriber = void 0;
+exports.WebSocketClearingHouseAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
 const addresses_1 = require("../addresses");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
-class DefaultClearingHouseAccountSubscriber {
+class WebSocketClearingHouseAccountSubscriber {
     constructor(program) {
         this.optionalExtraSubscriptions = [];
+        this.type = 'websocket';
         this.isSubscribing = false;
         this.isSubscribed = false;
         this.program = program;
@@ -60,7 +61,7 @@ class DefaultClearingHouseAccountSubscriber {
                 new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('fundingPaymentHistory', this.program, state.fundingPaymentHistory);
             this.fundingRateHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('fundingRateHistory', this.program, state.fundingRateHistory);
             this.liquidationHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('liquidationHistory', this.program, state.liquidationHistory);
-            this.curveHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('curveHistory', this.program, state.curveHistory);
+            this.curveHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('extendedCurveHistory', this.program, state.extendedCurveHistory);
             this.orderHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('orderHistory', this.program, orderState.orderHistory);
             const extraSusbcribersToUse = [];
             if (optionalSubscriptions === null || optionalSubscriptions === void 0 ? void 0 : optionalSubscriptions.includes('tradeHistoryAccount'))
@@ -222,4 +223,4 @@ class DefaultClearingHouseAccountSubscriber {
         return this.orderStateAccountSubscriber.data;
     }
 }
-exports.DefaultClearingHouseAccountSubscriber = DefaultClearingHouseAccountSubscriber;
+exports.WebSocketClearingHouseAccountSubscriber = WebSocketClearingHouseAccountSubscriber;

package/lib/accounts/{defaultUserAccountSubscriber.d.ts → webSocketUserAccountSubscriber.d.ts}

@@ -5,7 +5,8 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
 import { UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
-export declare class DefaultUserAccountSubscriber implements UserAccountSubscriber {
+import { ClearingHouseConfigType } from '../factory/clearingHouse';
+export declare class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
@@ -13,6 +14,7 @@ export declare class DefaultUserAccountSubscriber implements UserAccountSubscrib
     userDataAccountSubscriber: AccountSubscriber<UserAccount>;
     userPositionsAccountSubscriber: AccountSubscriber<UserPositionsAccount>;
     userOrdersAccountSubscriber: AccountSubscriber<UserOrdersAccount>;
+    type: ClearingHouseConfigType;
     constructor(program: Program, authority: PublicKey);
     subscribe(): Promise<boolean>;
     fetch(): Promise<void>;

package/lib/accounts/{defaultUserAccountSubscriber.js → webSocketUserAccountSubscriber.js}

@@ -9,13 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultUserAccountSubscriber = void 0;
+exports.WebSocketUserAccountSubscriber = void 0;
 const types_1 = require("./types");
 const events_1 = require("events");
 const addresses_1 = require("../addresses");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
-class DefaultUserAccountSubscriber {
+class WebSocketUserAccountSubscriber {
     constructor(program, authority) {
+        this.type = 'websocket';
         this.isSubscribed = false;
         this.program = program;
         this.authority = authority;
@@ -38,7 +39,7 @@ class DefaultUserAccountSubscriber {
                 this.eventEmitter.emit('userPositionsData', data);
                 this.eventEmitter.emit('update');
             });
-            const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, this.authority);
+            const userOrdersPublicKey = yield 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);
@@ -63,9 +64,11 @@ class DefaultUserAccountSubscriber {
             if (!this.isSubscribed) {
                 return;
             }
-            this.userDataAccountSubscriber.unsubscribe();
-            this.userPositionsAccountSubscriber.unsubscribe();
-            this.userOrdersAccountSubscriber.unsubscribe();
+            yield Promise.all([
+                this.userDataAccountSubscriber.unsubscribe(),
+                this.userPositionsAccountSubscriber.unsubscribe(),
+                yield this.userOrdersAccountSubscriber.unsubscribe(),
+            ]);
             this.isSubscribed = false;
         });
     }
@@ -86,4 +89,4 @@ class DefaultUserAccountSubscriber {
         return this.userOrdersAccountSubscriber.data;
     }
 }
-exports.DefaultUserAccountSubscriber = DefaultUserAccountSubscriber;
+exports.WebSocketUserAccountSubscriber = WebSocketUserAccountSubscriber;

package/lib/addresses.d.ts

@@ -5,5 +5,5 @@ export declare function getOrderStateAccountPublicKeyAndNonce(programId: PublicK
 export declare function getClearingHouseStateAccountPublicKey(programId: PublicKey): Promise<PublicKey>;
 export declare function getUserAccountPublicKeyAndNonce(programId: PublicKey, authority: PublicKey): Promise<[PublicKey, number]>;
 export declare function getUserAccountPublicKey(programId: PublicKey, authority: PublicKey): Promise<PublicKey>;
-export declare function getUserOrdersAccountPublicKeyAndNonce(programId: PublicKey, authority: PublicKey): Promise<[PublicKey, number]>;
-export declare function getUserOrdersAccountPublicKey(programId: PublicKey, authority: PublicKey): Promise<PublicKey>;
+export declare function getUserOrdersAccountPublicKeyAndNonce(programId: PublicKey, userAccount: PublicKey): Promise<[PublicKey, number]>;
+export declare function getUserOrdersAccountPublicKey(programId: PublicKey, userAccount: PublicKey): Promise<PublicKey>;

package/lib/addresses.js

@@ -66,18 +66,18 @@ function getUserAccountPublicKey(programId, authority) {
     });
 }
 exports.getUserAccountPublicKey = getUserAccountPublicKey;
-function getUserOrdersAccountPublicKeyAndNonce(programId, authority) {
+function getUserOrdersAccountPublicKeyAndNonce(programId, userAccount) {
     return __awaiter(this, void 0, void 0, function* () {
         return anchor.web3.PublicKey.findProgramAddress([
             Buffer.from(anchor.utils.bytes.utf8.encode('user_orders')),
-            authority.toBuffer(),
+            userAccount.toBuffer(),
         ], programId);
     });
 }
 exports.getUserOrdersAccountPublicKeyAndNonce = getUserOrdersAccountPublicKeyAndNonce;
-function getUserOrdersAccountPublicKey(programId, authority) {
+function getUserOrdersAccountPublicKey(programId, userAccount) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield getUserOrdersAccountPublicKeyAndNonce(programId, authority))[0];
+        return (yield getUserOrdersAccountPublicKeyAndNonce(programId, userAccount))[0];
     });
 }
 exports.getUserOrdersAccountPublicKey = getUserOrdersAccountPublicKey;

package/lib/admin.d.ts

@@ -14,8 +14,11 @@ export declare class Admin extends ClearingHouse {
     initializeMarket(marketIndex: BN, priceOracle: PublicKey, baseAssetReserve: BN, quoteAssetReserve: BN, periodicity: BN, pegMultiplier?: BN): Promise<TransactionSignature>;
     moveAmmPrice(baseAssetReserve: BN, quoteAssetReserve: BN, marketIndex: BN): Promise<TransactionSignature>;
     updateK(sqrtK: BN, marketIndex: BN): Promise<TransactionSignature>;
+    updateCurveHistory(): Promise<TransactionSignature>;
     moveAmmToPrice(marketIndex: BN, targetPrice: BN): Promise<TransactionSignature>;
     repegAmmCurve(newPeg: BN, marketIndex: BN): Promise<TransactionSignature>;
+    updateAmmOracleTwap(marketIndex: BN): Promise<TransactionSignature>;
+    resetAmmOracleTwap(marketIndex: BN): Promise<TransactionSignature>;
     withdrawFromInsuranceVault(amount: BN, recipient: PublicKey): Promise<TransactionSignature>;
     withdrawFees(marketIndex: BN, amount: BN, recipient: PublicKey): Promise<TransactionSignature>;
     withdrawFromInsuranceVaultToMarket(marketIndex: BN, amount: BN): Promise<TransactionSignature>;

package/lib/admin.js

@@ -27,9 +27,6 @@ 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.Admin = void 0;
 const web3_js_1 = require("@solana/web3.js");
@@ -39,18 +36,13 @@ const addresses_1 = require("./addresses");
 const spl_token_1 = require("@solana/spl-token");
 const clearingHouse_1 = require("./clearingHouse");
 const numericConstants_1 = require("./constants/numericConstants");
-const clearing_house_json_1 = __importDefault(require("./idl/clearing_house.json"));
-const defaultClearingHouseAccountSubscriber_1 = require("./accounts/defaultClearingHouseAccountSubscriber");
-const defaultTxSender_1 = require("./tx/defaultTxSender");
 const trade_1 = require("./math/trade");
 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 provider = new anchor_1.Provider(connection, wallet, opts);
-        const program = new anchor_1.Program(clearing_house_json_1.default, clearingHouseProgramId, provider);
-        const accountSubscriber = new defaultClearingHouseAccountSubscriber_1.DefaultClearingHouseAccountSubscriber(program);
-        const txSender = new defaultTxSender_1.DefaultTxSender(provider);
-        return new Admin(connection, wallet, program, accountSubscriber, txSender, opts);
+        const config = clearingHouse_2.getWebSocketClearingHouseConfig(connection, wallet, clearingHouseProgramId, opts);
+        return clearingHouse_2.getAdmin(config);
     }
     initialize(usdcMint, adminControlsPrices) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -108,7 +100,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
                     yield this.program.account.tradeHistory.createInstruction(tradeHistory),
                     yield this.program.account.liquidationHistory.createInstruction(liquidationHistory),
                     yield this.program.account.depositHistory.createInstruction(depositHistory),
-                    yield this.program.account.curveHistory.createInstruction(curveHistory),
+                    yield this.program.account.extendedCurveHistory.createInstruction(curveHistory),
                 ],
             });
             const initializeHistoryTxSig = yield this.txSender.send(initializeHistoryTx, [
@@ -175,13 +167,35 @@ class Admin extends clearingHouse_1.ClearingHouse {
     updateK(sqrtK, marketIndex) {
         return __awaiter(this, void 0, void 0, function* () {
             const state = this.getStateAccount();
+            const markets = this.getMarketsAccount();
+            const marketData = markets.markets[marketIndex.toNumber()];
+            const ammData = marketData.amm;
             return yield this.program.rpc.updateK(sqrtK, marketIndex, {
                 accounts: {
                     state: yield this.getStatePublicKey(),
                     admin: this.wallet.publicKey,
                     markets: state.markets,
+                    curveHistory: state.extendedCurveHistory,
+                    oracle: ammData.oracle,
+                },
+            });
+        });
+    }
+    updateCurveHistory() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const extendedCurveHistory = anchor.web3.Keypair.generate();
+            const state = this.getStateAccount();
+            return yield this.program.rpc.updateCurveHistory({
+                accounts: {
+                    state: yield this.getStatePublicKey(),
+                    admin: this.wallet.publicKey,
                     curveHistory: state.curveHistory,
+                    extendedCurveHistory: extendedCurveHistory.publicKey,
                 },
+                instructions: [
+                    yield this.program.account.extendedCurveHistory.createInstruction(extendedCurveHistory),
+                ],
+                signers: [extendedCurveHistory],
             });
         });
     }
@@ -212,7 +226,41 @@ class Admin extends clearingHouse_1.ClearingHouse {
                     admin: this.wallet.publicKey,
                     oracle: ammData.oracle,
                     markets: state.markets,
-                    curveHistory: state.curveHistory,
+                    curveHistory: state.extendedCurveHistory,
+                },
+            });
+        });
+    }
+    updateAmmOracleTwap(marketIndex) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const state = this.getStateAccount();
+            const markets = this.getMarketsAccount();
+            const marketData = markets.markets[marketIndex.toNumber()];
+            const ammData = marketData.amm;
+            return yield this.program.rpc.updateAmmOracleTwap(marketIndex, {
+                accounts: {
+                    state: yield this.getStatePublicKey(),
+                    admin: this.wallet.publicKey,
+                    oracle: ammData.oracle,
+                    markets: state.markets,
+                    curveHistory: state.extendedCurveHistory,
+                },
+            });
+        });
+    }
+    resetAmmOracleTwap(marketIndex) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const state = this.getStateAccount();
+            const markets = this.getMarketsAccount();
+            const marketData = markets.markets[marketIndex.toNumber()];
+            const ammData = marketData.amm;
+            return yield this.program.rpc.resetAmmOracleTwap(marketIndex, {
+                accounts: {
+                    state: yield this.getStatePublicKey(),
+                    admin: this.wallet.publicKey,
+                    oracle: ammData.oracle,
+                    markets: state.markets,
+                    curveHistory: state.extendedCurveHistory,
                 },
             });
         });