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

package/README.md

@@ -84,7 +84,7 @@ convertToNumber(new BN(10500), new BN(1000)); // = 10.5
 ### Setting up an account and making a trade
 
 ```typescript
-import { BN, Provider, Wallet } from '@project-serum/anchor';
+import { BN, Provider } from '@project-serum/anchor';
 import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
 import {
@@ -98,6 +98,7 @@ import {
 	calculateTradeSlippage,
 	MARK_PRICE_PRECISION,
 	QUOTE_PRECISION,
+	Wallet
 } from '@drift-labs/sdk';
 
 export const getTokenAddress = (

package/lib/accounts/defaultClearingHouseAccountSubscriber.d.ts

@@ -1,7 +1,7 @@
 /// <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, StateAccount, TradeHistoryAccount } from '../types';
 import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -15,10 +15,8 @@ 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[];
     private isSubscribing;
     private subscriptionPromise;
@@ -35,8 +33,7 @@ export declare class DefaultClearingHouseAccountSubscriber implements ClearingHo
     getDepositHistoryAccount(): DepositHistoryAccount;
     getFundingPaymentHistoryAccount(): FundingPaymentHistoryAccount;
     getFundingRateHistoryAccount(): FundingRateHistoryAccount;
-    getCurveHistoryAccount(): CurveHistoryAccount;
+    getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
-    getOrderHistoryAccount(): OrderHistoryAccount;
-    getOrderStateAccount(): OrderStateAccount;
 }
+//# sourceMappingURL=defaultClearingHouseAccountSubscriber.d.ts.map

package/lib/accounts/defaultClearingHouseAccountSubscriber.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultClearingHouseAccountSubscriber.d.ts","sourceRoot":"","sources":["../../src/accounts/defaultClearingHouseAccountSubscriber.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,8BAA8B,EAC9B,0BAA0B,EAC1B,yBAAyB,EACzB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,iBAAiB,EAAsB,MAAM,SAAS,CAAC;AAChE,OAAO,EACN,qBAAqB,EACrB,2BAA2B,EAC3B,4BAA4B,EAC5B,yBAAyB,EACzB,yBAAyB,EACzB,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,qBAAa,qCACZ,YAAW,8BAA8B;IAEzC,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,0BAA0B,CAAC,CAAC;IAC3E,sBAAsB,CAAC,EAAE,iBAAiB,CAAC,YAAY,CAAC,CAAC;IACzD,wBAAwB,CAAC,EAAE,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAC7D,6BAA6B,CAAC,EAAE,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;IACvE,+BAA+B,CAAC,EAAE,iBAAiB,CAAC,qBAAqB,CAAC,CAAC;IAC3E,sCAAsC,CAAC,EAAE,iBAAiB,CAAC,4BAA4B,CAAC,CAAC;IACzF,mCAAmC,CAAC,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;IACnF,6BAA6B,CAAC,EAAE,iBAAiB,CAAC,2BAA2B,CAAC,CAAC;IAC/E,mCAAmC,CAAC,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC;IAEnF,0BAA0B,EAAE,yBAAyB,EAAE,CAAM;IAE7D,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,mBAAmB,CAAmB;IAC9C,OAAO,CAAC,2BAA2B,CAAyB;gBAEzC,OAAO,EAAE,OAAO;IAMtB,SAAS,CACrB,qBAAqB,CAAC,EAAE,yBAAyB,EAAE,GACjD,OAAO,CAAC,OAAO,CAAC;IAiJN,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAkBtB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAqCzC,kBAAkB,IAAI,IAAI;IAQ1B,0BAA0B,CACzB,oBAAoB,EAAE,yBAAyB,GAC7C,IAAI;IAcA,eAAe,IAAI,YAAY;IAK/B,iBAAiB,IAAI,cAAc;IAKnC,sBAAsB,IAAI,mBAAmB;IAM7C,wBAAwB,IAAI,qBAAqB;IAMjD,+BAA+B,IAAI,4BAA4B;IAM/D,4BAA4B,IAAI,yBAAyB;IAMzD,sBAAsB,IAAI,2BAA2B;IAMrD,4BAA4B,IAAI,yBAAyB;CAKhE"}

package/lib/accounts/defaultClearingHouseAccountSubscriber.js

@@ -47,12 +47,6 @@ class DefaultClearingHouseAccountSubscriber {
                 this.eventEmitter.emit('marketsAccountUpdate', data);
                 this.eventEmitter.emit('update');
             });
-            this.orderStateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('orderState', this.program, state.orderState);
-            yield this.orderStateAccountSubscriber.subscribe((data) => {
-                this.eventEmitter.emit('orderStateAccountUpdate', data);
-                this.eventEmitter.emit('update');
-            });
-            const orderState = this.orderStateAccountSubscriber.data;
             // create subscribers for other state accounts
             this.tradeHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('tradeHistory', this.program, state.tradeHistory);
             this.depositHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('depositHistory', this.program, state.depositHistory);
@@ -60,8 +54,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.orderHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('orderHistory', this.program, orderState.orderHistory);
+            this.curveHistoryAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('extendedCurveHistory', this.program, state.extendedCurveHistory);
             const extraSusbcribersToUse = [];
             if (optionalSubscriptions === null || optionalSubscriptions === void 0 ? void 0 : optionalSubscriptions.includes('tradeHistoryAccount'))
                 extraSusbcribersToUse.push({
@@ -93,11 +86,6 @@ class DefaultClearingHouseAccountSubscriber {
                     subscriber: this.curveHistoryAccountSubscriber,
                     eventType: 'curveHistoryAccountUpdate',
                 });
-            if (optionalSubscriptions === null || optionalSubscriptions === void 0 ? void 0 : optionalSubscriptions.includes('orderHistoryAccount'))
-                extraSusbcribersToUse.push({
-                    subscriber: this.orderHistoryAccountSubscriber,
-                    eventType: 'orderHistoryAccountUpdate',
-                });
             this.optionalExtraSubscriptions = optionalSubscriptions !== null && optionalSubscriptions !== void 0 ? optionalSubscriptions : [];
             // await all subcriptions in parallel to boost performance
             //// the state account subscription above can't happen in here, because some of these susbcriptions are dependent on clearing house state being available
@@ -136,7 +124,6 @@ class DefaultClearingHouseAccountSubscriber {
             }
             yield this.stateAccountSubscriber.unsubscribe();
             yield this.marketsAccountSubscriber.unsubscribe();
-            yield this.orderStateAccountSubscriber.unsubscribe();
             if (this.optionalExtraSubscriptions.includes('tradeHistoryAccount')) {
                 yield this.tradeHistoryAccountSubscriber.unsubscribe();
             }
@@ -155,9 +142,6 @@ class DefaultClearingHouseAccountSubscriber {
             if (this.optionalExtraSubscriptions.includes('liquidationHistoryAccount')) {
                 yield this.liquidationHistoryAccountSubscriber.unsubscribe();
             }
-            if (this.optionalExtraSubscriptions.includes('orderHistoryAccount')) {
-                yield this.orderHistoryAccountSubscriber.unsubscribe();
-            }
             this.isSubscribed = false;
         });
     }
@@ -212,14 +196,5 @@ class DefaultClearingHouseAccountSubscriber {
         this.assertOptionalIsSubscribed('liquidationHistoryAccount');
         return this.liquidationHistoryAccountSubscriber.data;
     }
-    getOrderHistoryAccount() {
-        this.assertIsSubscribed();
-        this.assertOptionalIsSubscribed('orderHistoryAccount');
-        return this.orderHistoryAccountSubscriber.data;
-    }
-    getOrderStateAccount() {
-        this.assertIsSubscribed();
-        return this.orderStateAccountSubscriber.data;
-    }
 }
 exports.DefaultClearingHouseAccountSubscriber = DefaultClearingHouseAccountSubscriber;

package/lib/accounts/defaultUserAccountSubscriber.d.ts

@@ -4,7 +4,7 @@ import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import { UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
+import { UserAccount, UserPositionsAccount } from '../types';
 export declare class DefaultUserAccountSubscriber implements UserAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
@@ -12,7 +12,6 @@ export declare class DefaultUserAccountSubscriber implements UserAccountSubscrib
     authority: PublicKey;
     userDataAccountSubscriber: AccountSubscriber<UserAccount>;
     userPositionsAccountSubscriber: AccountSubscriber<UserPositionsAccount>;
-    userOrdersAccountSubscriber: AccountSubscriber<UserOrdersAccount>;
     constructor(program: Program, authority: PublicKey);
     subscribe(): Promise<boolean>;
     fetch(): Promise<void>;
@@ -20,5 +19,5 @@ export declare class DefaultUserAccountSubscriber implements UserAccountSubscrib
     assertIsSubscribed(): void;
     getUserAccount(): UserAccount;
     getUserPositionsAccount(): UserPositionsAccount;
-    getUserOrdersAccount(): UserOrdersAccount;
 }
+//# sourceMappingURL=defaultUserAccountSubscriber.d.ts.map

package/lib/accounts/defaultUserAccountSubscriber.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultUserAccountSubscriber.d.ts","sourceRoot":"","sources":["../../src/accounts/defaultUserAccountSubscriber.ts"],"names":[],"mappings":";AAAA,OAAO,EACN,iBAAiB,EAEjB,iBAAiB,EACjB,qBAAqB,EACrB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAE7D,qBAAa,4BAA6B,YAAW,qBAAqB;IACzE,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,iBAAiB,CAAC,CAAC;IAClE,SAAS,EAAE,SAAS,CAAC;IAErB,yBAAyB,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAC1D,8BAA8B,EAAE,iBAAiB,CAAC,oBAAoB,CAAC,CAAC;gBAErD,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,SAAS;IAOnD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAsC7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtB,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAalC,kBAAkB,IAAI,IAAI;IAQnB,cAAc,IAAI,WAAW;IAK7B,uBAAuB,IAAI,oBAAoB;CAItD"}

package/lib/accounts/defaultUserAccountSubscriber.js

@@ -38,12 +38,6 @@ class DefaultUserAccountSubscriber {
                 this.eventEmitter.emit('userPositionsData', data);
                 this.eventEmitter.emit('update');
             });
-            const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, this.authority);
-            this.userOrdersAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userOrders', this.program, userOrdersPublicKey);
-            yield this.userOrdersAccountSubscriber.subscribe((data) => {
-                this.eventEmitter.emit('userOrdersData', data);
-                this.eventEmitter.emit('update');
-            });
             this.eventEmitter.emit('update');
             this.isSubscribed = true;
             return true;
@@ -54,7 +48,6 @@ class DefaultUserAccountSubscriber {
             yield Promise.all([
                 this.userDataAccountSubscriber.fetch(),
                 this.userPositionsAccountSubscriber.fetch(),
-                this.userOrdersAccountSubscriber.fetch(),
             ]);
         });
     }
@@ -63,9 +56,10 @@ class DefaultUserAccountSubscriber {
             if (!this.isSubscribed) {
                 return;
             }
-            this.userDataAccountSubscriber.unsubscribe();
-            this.userPositionsAccountSubscriber.unsubscribe();
-            this.userOrdersAccountSubscriber.unsubscribe();
+            yield Promise.all([
+                this.userDataAccountSubscriber.unsubscribe(),
+                this.userPositionsAccountSubscriber.unsubscribe(),
+            ]);
             this.isSubscribed = false;
         });
     }
@@ -82,8 +76,5 @@ class DefaultUserAccountSubscriber {
         this.assertIsSubscribed();
         return this.userPositionsAccountSubscriber.data;
     }
-    getUserOrdersAccount() {
-        return this.userOrdersAccountSubscriber.data;
-    }
 }
 exports.DefaultUserAccountSubscriber = DefaultUserAccountSubscriber;

package/lib/accounts/types.d.ts

@@ -1,12 +1,12 @@
 /// <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, StateAccount, TradeHistoryAccount, UserAccount, UserPositionsAccount } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 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,12 +19,10 @@ export interface ClearingHouseAccountEvents {
     tradeHistoryAccountUpdate: (payload: TradeHistoryAccount) => void;
     liquidationHistoryAccountUpdate: (payload: LiquidationHistoryAccount) => void;
     depositHistoryAccountUpdate: (payload: DepositHistoryAccount) => void;
-    curveHistoryAccountUpdate: (payload: CurveHistoryAccount) => void;
-    orderHistoryAccountUpdate: (payload: OrderHistoryAccount) => void;
-    orderStateAccountUpdate: (payload: OrderStateAccount) => void;
+    curveHistoryAccountUpdate: (payload: ExtendedCurveHistoryAccount) => void;
     update: void;
 }
-export declare type ClearingHouseAccountTypes = 'tradeHistoryAccount' | 'depositHistoryAccount' | 'fundingPaymentHistoryAccount' | 'fundingRateHistoryAccount' | 'curveHistoryAccount' | 'liquidationHistoryAccount' | 'orderHistoryAccount';
+export declare type ClearingHouseAccountTypes = 'tradeHistoryAccount' | 'depositHistoryAccount' | 'fundingPaymentHistoryAccount' | 'fundingRateHistoryAccount' | 'curveHistoryAccount' | 'liquidationHistoryAccount';
 export interface ClearingHouseAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
     isSubscribed: boolean;
@@ -38,36 +36,12 @@ export interface ClearingHouseAccountSubscriber {
     getDepositHistoryAccount(): DepositHistoryAccount;
     getFundingPaymentHistoryAccount(): FundingPaymentHistoryAccount;
     getFundingRateHistoryAccount(): FundingRateHistoryAccount;
-    getCurveHistoryAccount(): CurveHistoryAccount;
-    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;
+    getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
 }
 export interface UserAccountEvents {
     userAccountData: (payload: UserAccount) => void;
     userPositionsData: (payload: UserPositionsAccount) => void;
-    userOrdersData: (payload: UserOrdersAccount) => void;
     update: void;
 }
 export interface UserAccountSubscriber {
@@ -78,5 +52,5 @@ export interface UserAccountSubscriber {
     unsubscribe(): Promise<void>;
     getUserAccount(): UserAccount;
     getUserPositionsAccount(): UserPositionsAccount;
-    getUserOrdersAccount(): UserOrdersAccount;
 }
+//# sourceMappingURL=types.d.ts.map

package/lib/accounts/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/accounts/types.ts"],"names":[],"mappings":"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"}

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -12,3 +12,4 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
 }
+//# sourceMappingURL=webSocketAccountSubscriber.d.ts.map

package/lib/accounts/webSocketAccountSubscriber.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webSocketAccountSubscriber.d.ts","sourceRoot":"","sources":["../../src/accounts/webSocketAccountSubscriber.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,0BAA0B,CAAC,CAAC,CAAE,YAAW,iBAAiB,CAAC,CAAC,CAAC;IACzE,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,SAAS,CAAC;IAC5B,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;gBAG3B,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,SAAS;IAOtB,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAYrD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAY5B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK5B"}

package/lib/addresses.d.ts

@@ -1,9 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 export declare function getClearingHouseStateAccountPublicKeyAndNonce(programId: PublicKey): Promise<[PublicKey, number]>;
-export declare function getOrderStateAccountPublicKey(programId: PublicKey): Promise<PublicKey>;
-export declare function getOrderStateAccountPublicKeyAndNonce(programId: PublicKey): Promise<[PublicKey, number]>;
 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>;
+//# sourceMappingURL=addresses.d.ts.map

package/lib/addresses.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"addresses.d.ts","sourceRoot":"","sources":["../src/addresses.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,wBAAsB,6CAA6C,CAClE,SAAS,EAAE,SAAS,GAClB,OAAO,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAK9B;AAED,wBAAsB,qCAAqC,CAC1D,SAAS,EAAE,SAAS,GAClB,OAAO,CAAC,SAAS,CAAC,CAEpB;AAED,wBAAsB,+BAA+B,CACpD,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,GAClB,OAAO,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAK9B;AAED,wBAAsB,uBAAuB,CAC5C,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,SAAS,GAClB,OAAO,CAAC,SAAS,CAAC,CAEpB"}

package/lib/addresses.js

@@ -28,7 +28,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserOrdersAccountPublicKey = exports.getUserOrdersAccountPublicKeyAndNonce = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getOrderStateAccountPublicKeyAndNonce = exports.getOrderStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
+exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getClearingHouseStateAccountPublicKey = exports.getClearingHouseStateAccountPublicKeyAndNonce = void 0;
 const anchor = __importStar(require("@project-serum/anchor"));
 function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -36,18 +36,6 @@ function getClearingHouseStateAccountPublicKeyAndNonce(programId) {
     });
 }
 exports.getClearingHouseStateAccountPublicKeyAndNonce = getClearingHouseStateAccountPublicKeyAndNonce;
-function getOrderStateAccountPublicKey(programId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield getOrderStateAccountPublicKeyAndNonce(programId))[0];
-    });
-}
-exports.getOrderStateAccountPublicKey = getOrderStateAccountPublicKey;
-function getOrderStateAccountPublicKeyAndNonce(programId) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return anchor.web3.PublicKey.findProgramAddress([Buffer.from(anchor.utils.bytes.utf8.encode('order_state'))], programId);
-    });
-}
-exports.getOrderStateAccountPublicKeyAndNonce = getOrderStateAccountPublicKeyAndNonce;
 function getClearingHouseStateAccountPublicKey(programId) {
     return __awaiter(this, void 0, void 0, function* () {
         return (yield getClearingHouseStateAccountPublicKeyAndNonce(programId))[0];
@@ -66,18 +54,3 @@ function getUserAccountPublicKey(programId, authority) {
     });
 }
 exports.getUserAccountPublicKey = getUserAccountPublicKey;
-function getUserOrdersAccountPublicKeyAndNonce(programId, authority) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return anchor.web3.PublicKey.findProgramAddress([
-            Buffer.from(anchor.utils.bytes.utf8.encode('user_orders')),
-            authority.toBuffer(),
-        ], programId);
-    });
-}
-exports.getUserOrdersAccountPublicKeyAndNonce = getUserOrdersAccountPublicKeyAndNonce;
-function getUserOrdersAccountPublicKey(programId, authority) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return (yield getUserOrdersAccountPublicKeyAndNonce(programId, authority))[0];
-    });
-}
-exports.getUserOrdersAccountPublicKey = getUserOrdersAccountPublicKey;

package/lib/admin.d.ts

@@ -1,21 +1,18 @@
 /// <reference types="bn.js" />
 import { ConfirmOptions, Connection, PublicKey, TransactionSignature } from '@solana/web3.js';
-import { FeeStructure, IWallet, OracleGuardRails, OracleSource, OrderFillerRewardStructure } from './types';
+import { FeeStructure, IWallet, OracleGuardRails, OracleSource } from './types';
 import { BN } from '@project-serum/anchor';
 import { ClearingHouse } from './clearingHouse';
 export declare class Admin extends ClearingHouse {
     static from(connection: Connection, wallet: IWallet, clearingHouseProgramId: PublicKey, opts?: ConfirmOptions): Admin;
-    initialize(usdcMint: PublicKey, adminControlsPrices: boolean): Promise<[
-        TransactionSignature,
-        TransactionSignature,
-        TransactionSignature
-    ]>;
-    initializeOrderState(): Promise<TransactionSignature>;
+    initialize(usdcMint: PublicKey, adminControlsPrices: boolean): Promise<[TransactionSignature, TransactionSignature]>;
     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>;
     withdrawFromInsuranceVault(amount: BN, recipient: PublicKey): Promise<TransactionSignature>;
     withdrawFees(marketIndex: BN, amount: BN, recipient: PublicKey): Promise<TransactionSignature>;
     withdrawFromInsuranceVaultToMarket(marketIndex: BN, amount: BN): Promise<TransactionSignature>;
@@ -26,12 +23,10 @@ export declare class Admin extends ClearingHouse {
     updateFullLiquidationPenaltyPercentage(numerator: BN, denominator: BN): Promise<TransactionSignature>;
     updatePartialLiquidationShareDenominator(denominator: BN): Promise<TransactionSignature>;
     updateFullLiquidationShareDenominator(denominator: BN): Promise<TransactionSignature>;
-    updateOrderFillerRewardStructure(orderFillerRewardStructure: OrderFillerRewardStructure): Promise<TransactionSignature>;
     updateFee(fees: FeeStructure): Promise<TransactionSignature>;
     updateOracleGuardRails(oracleGuardRails: OracleGuardRails): Promise<TransactionSignature>;
     updateMarketOracle(marketIndex: BN, oracle: PublicKey, oracleSource: OracleSource): Promise<TransactionSignature>;
-    updateMarketMinimumQuoteAssetTradeSize(marketIndex: BN, minimumTradeSize: BN): Promise<TransactionSignature>;
-    updateMarketMinimumBaseAssetTradeSize(marketIndex: BN, minimumTradeSize: BN): Promise<TransactionSignature>;
+    updateMarketMinimumTradeSize(marketIndex: BN, minimumTradeSize: BN): Promise<TransactionSignature>;
     updateWhitelistMint(whitelistMint?: PublicKey): Promise<TransactionSignature>;
     updateDiscountMint(discountMint: PublicKey): Promise<TransactionSignature>;
     updateMaxDeposit(maxDeposit: BN): Promise<TransactionSignature>;
@@ -39,3 +34,4 @@ export declare class Admin extends ClearingHouse {
     updateExchangePaused(exchangePaused: boolean): Promise<TransactionSignature>;
     disableAdminControlsPrices(): Promise<TransactionSignature>;
 }
+//# sourceMappingURL=admin.d.ts.map

package/lib/admin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../src/admin.ts"],"names":[],"mappings":"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"}

package/lib/admin.js

@@ -108,7 +108,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, [
@@ -119,29 +119,7 @@ class Admin extends clearingHouse_1.ClearingHouse {
                 fundingRateHistory,
                 curveHistory,
             ], this.opts);
-            const initializeOrderStateTxSig = yield this.initializeOrderState();
-            return [initializeTxSig, initializeHistoryTxSig, initializeOrderStateTxSig];
-        });
-    }
-    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 initializeOrderStateTx = yield this.program.transaction.initializeOrderState(orderStateNonce, {
-                accounts: {
-                    admin: this.wallet.publicKey,
-                    state: clearingHouseStatePublicKey,
-                    orderHistory: orderHistory.publicKey,
-                    orderState: orderStatePublicKey,
-                    rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                    systemProgram: anchor.web3.SystemProgram.programId,
-                },
-                instructions: [
-                    yield this.program.account.orderHistory.createInstruction(orderHistory),
-                ],
-            });
-            return yield this.txSender.send(initializeOrderStateTx, [orderHistory], this.opts);
+            return [initializeTxSig, initializeHistoryTxSig];
         });
     }
     initializeMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION) {
@@ -175,13 +153,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 +212,24 @@ 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,
                 },
             });
         });
@@ -334,17 +351,6 @@ class Admin extends clearingHouse_1.ClearingHouse {
             });
         });
     }
-    updateOrderFillerRewardStructure(orderFillerRewardStructure) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.program.rpc.updateOrderFillerRewardStructure(orderFillerRewardStructure, {
-                accounts: {
-                    admin: this.wallet.publicKey,
-                    state: yield this.getStatePublicKey(),
-                    orderState: yield this.getOrderStatePublicKey(),
-                },
-            });
-        });
-    }
     updateFee(fees) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield this.program.rpc.updateFee(fees, {
@@ -377,22 +383,10 @@ class Admin extends clearingHouse_1.ClearingHouse {
             });
         });
     }
-    updateMarketMinimumQuoteAssetTradeSize(marketIndex, minimumTradeSize) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const state = this.getStateAccount();
-            return yield this.program.rpc.updateMarketMinimumQuoteAssetTradeSize(marketIndex, minimumTradeSize, {
-                accounts: {
-                    admin: this.wallet.publicKey,
-                    state: yield this.getStatePublicKey(),
-                    markets: state.markets,
-                },
-            });
-        });
-    }
-    updateMarketMinimumBaseAssetTradeSize(marketIndex, minimumTradeSize) {
+    updateMarketMinimumTradeSize(marketIndex, minimumTradeSize) {
         return __awaiter(this, void 0, void 0, function* () {
             const state = this.getStateAccount();
-            return yield this.program.rpc.updateMarketMinimumBaseAssetTradeSize(marketIndex, minimumTradeSize, {
+            return yield this.program.rpc.updateMarketMinimumTradeSize(marketIndex, minimumTradeSize, {
                 accounts: {
                     admin: this.wallet.publicKey,
                     state: yield this.getStatePublicKey(),

package/lib/assert/assert.d.ts

@@ -1 +1,2 @@
 export declare function assert(condition: boolean, error?: string): void;
+//# sourceMappingURL=assert.d.ts.map

package/lib/assert/assert.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../src/assert/assert.ts"],"names":[],"mappings":"AAAA,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAI/D"}

package/lib/clearingHouse.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="bn.js" />
 import { BN, Program, Provider } from '@project-serum/anchor';
-import { MarketsAccount, StateAccount, CurveHistoryAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, IWallet, LiquidationHistoryAccount, PositionDirection, TradeHistoryAccount, UserAccount, Market, OrderHistoryAccount, OrderStateAccount, OrderParams, Order } from './types';
+import { MarketsAccount, StateAccount, DepositHistoryAccount, FundingPaymentHistoryAccount, FundingRateHistoryAccount, IWallet, LiquidationHistoryAccount, PositionDirection, TradeHistoryAccount, UserAccount, Market, ExtendedCurveHistoryAccount } from './types';
 import { Connection, PublicKey, TransactionSignature, Keypair, ConfirmOptions, TransactionInstruction } from '@solana/web3.js';
 import { MockUSDCFaucet } from './mockUSDCFaucet';
 import { EventEmitter } from 'events';
@@ -56,11 +56,7 @@ export declare class ClearingHouse {
     getTradeHistoryAccount(): TradeHistoryAccount;
     getLiquidationHistoryAccount(): LiquidationHistoryAccount;
     getDepositHistoryAccount(): DepositHistoryAccount;
-    getCurveHistoryAccount(): CurveHistoryAccount;
-    getOrderHistoryAccount(): OrderHistoryAccount;
-    orderStatePublicKey?: PublicKey;
-    getOrderStatePublicKey(): Promise<PublicKey>;
-    getOrderStateAccount(): OrderStateAccount;
+    getCurveHistoryAccount(): ExtendedCurveHistoryAccount;
     /**
      * Update the wallet to use for clearing house transactions and linked user account
      * @param newWallet
@@ -73,10 +69,8 @@ export declare class ClearingHouse {
     getInitializeUserInstructions(): Promise<[
         Keypair,
         PublicKey,
-        TransactionInstruction,
         TransactionInstruction
     ]>;
-    getInitializeUserOrdersInstruction(userAccountPublicKey?: PublicKey): Promise<TransactionInstruction>;
     userAccountPublicKey?: PublicKey;
     /**
      * Get the address for the Clearing House User's account. NOT the user's wallet address.
@@ -85,12 +79,6 @@ export declare class ClearingHouse {
     getUserAccountPublicKey(): Promise<PublicKey>;
     userAccount?: UserAccount;
     getUserAccount(): Promise<UserAccount>;
-    userOrdersAccountPublicKey?: PublicKey;
-    /**
-     * Get the address for the Clearing House User Order's account. NOT the user's wallet address.
-     * @returns
-     */
-    getUserOrdersAccountPublicKey(): Promise<PublicKey>;
     depositCollateral(amount: BN, collateralAccountPublicKey: PublicKey, userPositionsAccountPublicKey?: PublicKey): Promise<TransactionSignature>;
     getDepositCollateralInstruction(amount: BN, collateralAccountPublicKey: PublicKey, userPositionsAccountPublicKey?: PublicKey): Promise<TransactionInstruction>;
     /**
@@ -106,14 +94,6 @@ export declare class ClearingHouse {
     getWithdrawCollateralIx(amount: BN, collateralAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
     openPosition(direction: PositionDirection, amount: BN, marketIndex: BN, limitPrice?: BN, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionSignature>;
     getOpenPositionIx(direction: PositionDirection, amount: BN, marketIndex: BN, limitPrice?: BN, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionInstruction>;
-    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>;
-    fillOrder(userAccountPublicKey: PublicKey, userOrdersAccountPublicKey: PublicKey, order: Order): Promise<TransactionSignature>;
-    getFillOrderIx(userAccountPublicKey: PublicKey, userOrdersAccountPublicKey: PublicKey, order: Order): Promise<TransactionInstruction>;
-    placeAndFillOrder(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionSignature>;
-    getPlaceAndFillOrderIx(orderParams: OrderParams, discountToken?: PublicKey, referrer?: PublicKey): Promise<TransactionInstruction>;
     /**
      * Close an entire position. If you want to reduce a position, use the {@link openPosition} method in the opposite direction of the current position.
      * @param marketIndex
@@ -131,3 +111,4 @@ export declare class ClearingHouse {
     getSettleFundingPaymentIx(userAccount: PublicKey, userPositionsAccount: PublicKey): Promise<TransactionInstruction>;
     triggerEvent(eventName: keyof ClearingHouseAccountEvents, data?: any): void;
 }
+//# sourceMappingURL=clearingHouse.d.ts.map

package/lib/clearingHouse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"clearingHouse.d.ts","sourceRoot":"","sources":["../src/clearingHouse.ts"],"names":[],"mappings":"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"}