@drift-labs/sdk 0.1.18-orders.1 → 0.1.19-master.2

package/lib/types.d.ts

@@ -24,65 +24,6 @@ export declare class OracleSource {
         switchboard: {};
     };
 }
-export declare class OrderType {
-    static readonly LIMIT: {
-        limit: {};
-    };
-    static readonly STOP: {
-        stop: {};
-    };
-    static readonly STOP_LIMIT: {
-        stopLimit: {};
-    };
-    static readonly MARKET: {
-        market: {};
-    };
-}
-export declare class OrderStatus {
-    static readonly INIT: {
-        init: {};
-    };
-    static readonly OPEN: {
-        open: {};
-    };
-}
-export declare class OrderDiscountTier {
-    static readonly NONE: {
-        none: {};
-    };
-    static readonly FIRST: {
-        first: {};
-    };
-    static readonly SECOND: {
-        second: {};
-    };
-    static readonly THIRD: {
-        third: {};
-    };
-    static readonly FOURTH: {
-        fourth: {};
-    };
-}
-export declare class OrderAction {
-    static readonly PLACE: {
-        place: {};
-    };
-    static readonly CANCEL: {
-        cancel: {};
-    };
-    static readonly FILL: {
-        fill: {};
-    };
-}
-export declare class OrderTriggerCondition {
-    static readonly ABOVE: {
-        above: {};
-    };
-    static readonly BELOW: {
-        below: {};
-    };
-}
-export declare function isVariant(object: unknown, type: string): boolean;
 export declare enum TradeSide {
     None = 0,
     Buy = 1,
@@ -97,9 +38,9 @@ export declare type DepositHistoryAccount = {
     head: BN;
     depositRecords: DepositRecord[];
 };
-export declare type CurveHistoryAccount = {
+export declare type ExtendedCurveHistoryAccount = {
     head: BN;
-    curveRecords: CurveRecord[];
+    curveRecords: ExtendedCurveRecord[];
 };
 export declare type FundingRateHistoryAccount = {
     head: BN;
@@ -113,11 +54,6 @@ export declare type LiquidationHistoryAccount = {
     head: BN;
     liquidationRecords: LiquidationRecord[];
 };
-export declare type OrderHistoryAccount = {
-    head: BN;
-    lastOrderId: BN;
-    orderRecords: OrderRecord[];
-};
 export declare type DepositRecord = {
     ts: BN;
     recordId: BN;
@@ -131,7 +67,7 @@ export declare type DepositRecord = {
     cumulativeDepositsBefore: BN;
     amount: BN;
 };
-export declare type CurveRecord = {
+export declare type ExtendedCurveRecord = {
     ts: BN;
     recordId: BN;
     marketIndex: BN;
@@ -147,6 +83,8 @@ export declare type CurveRecord = {
     baseAssetAmountShort: BN;
     baseAssetAmount: BN;
     openInterest: BN;
+    oraclePrice: BN;
+    tradeId: BN;
 };
 export declare type TradeRecord = {
     ts: BN;
@@ -209,20 +147,6 @@ export declare type LiquidationRecord = {
     unrealizedPnl: BN;
     marginRatio: BN;
 };
-export declare type OrderRecord = {
-    ts: BN;
-    recordId: BN;
-    order: Order;
-    user: PublicKey;
-    authority: PublicKey;
-    action: OrderAction;
-    filler: PublicKey;
-    baseAssetAmountFilled: BN;
-    quoteAssetAmountFilled: BN;
-    fee: BN;
-    fillerReward: BN;
-    tradeRecordId: BN;
-};
 export declare type StateAccount = {
     admin: PublicKey;
     fundingPaused: boolean;
@@ -260,12 +184,7 @@ export declare type StateAccount = {
     discountMint: PublicKey;
     oracleGuardRails: OracleGuardRails;
     maxDeposit: BN;
-    orderState: PublicKey;
-};
-export declare type OrderStateAccount = {
-    orderHistory: PublicKey;
-    orderFillerRewardStructure: OrderFillerRewardStructure;
-    minOrderQuoteAssetAmount: BN;
+    extendedCurveHistory: PublicKey;
 };
 export declare type MarketsAccount = {
     accountIndex: BN;
@@ -301,15 +220,14 @@ export declare type AMM = {
     totalFeeMinusDistributions: BN;
     totalFeeWithdrawn: BN;
     totalFee: BN;
-    minimumQuoteAssetTradeSize: BN;
-    minimumBaseAssetTradeSize: BN;
+    minimumTradeSize: BN;
+    lastOraclePrice: BN;
 };
 export declare type UserPosition = {
     baseAssetAmount: BN;
     lastCumulativeFundingRate: BN;
     marketIndex: BN;
     quoteAssetAmount: BN;
-    openOrders: BN;
 };
 export declare type UserPositionsAccount = {
     positions: UserPosition[];
@@ -321,51 +239,6 @@ export declare type UserAccount = {
     cumulativeDeposits: BN;
     positions: PublicKey;
     totalFeePaid: BN;
-    totalTokenDiscount: BN;
-    totalReferralReward: BN;
-    totalRefereeDiscount: BN;
-};
-export declare type UserOrdersAccount = {
-    orders: Order[];
-    user: PublicKey;
-};
-export declare type Order = {
-    status: OrderStatus;
-    orderType: OrderType;
-    ts: BN;
-    orderId: BN;
-    marketIndex: BN;
-    price: BN;
-    baseAssetAmount: BN;
-    baseAssetAmountFilled: BN;
-    quoteAssetAmount: BN;
-    quoteAssetAmountFilled: BN;
-    fee: BN;
-    direction: PositionDirection;
-    reduceOnly: boolean;
-    triggerPrice: BN;
-    triggerCondition: OrderTriggerCondition;
-    discountTier: OrderDiscountTier;
-    referrer: PublicKey;
-    postOnly: boolean;
-    immediateOrCancel: boolean;
-};
-export declare type OrderParams = {
-    orderType: OrderType;
-    direction: PositionDirection;
-    quoteAssetAmount: BN;
-    baseAssetAmount: BN;
-    price: BN;
-    marketIndex: BN;
-    reduceOnly: boolean;
-    postOnly: boolean;
-    immediateOrCancel: boolean;
-    triggerPrice: BN;
-    triggerCondition: OrderTriggerCondition;
-    optionalAccounts: {
-        discountToken: boolean;
-        referrer: boolean;
-    };
 };
 export interface IWallet {
     signTransaction(tx: Transaction): Promise<Transaction>;
@@ -416,8 +289,4 @@ export declare type OracleGuardRails = {
     };
     useForLiquidations: boolean;
 };
-export declare type OrderFillerRewardStructure = {
-    rewardNumerator: BN;
-    rewardDenominator: BN;
-    timeBasedRewardLowerBound: BN;
-};
+//# sourceMappingURL=types.d.ts.map

package/lib/types.d.ts.map

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

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TradeSide = exports.isVariant = exports.OrderTriggerCondition = exports.OrderAction = exports.OrderDiscountTier = exports.OrderStatus = exports.OrderType = exports.OracleSource = exports.PositionDirection = exports.SwapDirection = void 0;
+exports.TradeSide = exports.OracleSource = exports.PositionDirection = exports.SwapDirection = void 0;
 // # Utility Types / Enums / Constants
 class SwapDirection {
 }
@@ -17,41 +17,6 @@ class OracleSource {
 exports.OracleSource = OracleSource;
 OracleSource.PYTH = { pyth: {} };
 OracleSource.SWITCHBOARD = { switchboard: {} };
-class OrderType {
-}
-exports.OrderType = OrderType;
-OrderType.LIMIT = { limit: {} };
-OrderType.STOP = { stop: {} };
-OrderType.STOP_LIMIT = { stopLimit: {} };
-OrderType.MARKET = { market: {} };
-class OrderStatus {
-}
-exports.OrderStatus = OrderStatus;
-OrderStatus.INIT = { init: {} };
-OrderStatus.OPEN = { open: {} };
-class OrderDiscountTier {
-}
-exports.OrderDiscountTier = OrderDiscountTier;
-OrderDiscountTier.NONE = { none: {} };
-OrderDiscountTier.FIRST = { first: {} };
-OrderDiscountTier.SECOND = { second: {} };
-OrderDiscountTier.THIRD = { third: {} };
-OrderDiscountTier.FOURTH = { fourth: {} };
-class OrderAction {
-}
-exports.OrderAction = OrderAction;
-OrderAction.PLACE = { place: {} };
-OrderAction.CANCEL = { cancel: {} };
-OrderAction.FILL = { fill: {} };
-class OrderTriggerCondition {
-}
-exports.OrderTriggerCondition = OrderTriggerCondition;
-OrderTriggerCondition.ABOVE = { above: {} };
-OrderTriggerCondition.BELOW = { below: {} };
-function isVariant(object, type) {
-    return object.hasOwnProperty(type);
-}
-exports.isVariant = isVariant;
 var TradeSide;
 (function (TradeSide) {
     TradeSide[TradeSide["None"] = 0] = "None";

package/lib/util/computeUnits.d.ts

@@ -1,2 +1,3 @@
 import { Connection, Finality, PublicKey } from '@solana/web3.js';
 export declare function findComputeUnitConsumption(programId: PublicKey, connection: Connection, txSignature: string, commitment?: Finality): Promise<number[]>;
+//# sourceMappingURL=computeUnits.d.ts.map

package/lib/util/computeUnits.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"computeUnits.d.ts","sourceRoot":"","sources":["../../src/util/computeUnits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAElE,wBAAsB,0BAA0B,CAC/C,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,WAAW,EAAE,MAAM,EACnB,UAAU,GAAE,QAAsB,GAChC,OAAO,CAAC,MAAM,EAAE,CAAC,CAanB"}

package/lib/util/tps.d.ts

@@ -1,2 +1,3 @@
 import { Connection, PublicKey } from '@solana/web3.js';
 export declare function estimateTps(programId: PublicKey, connection: Connection, failed: boolean): Promise<number>;
+//# sourceMappingURL=tps.d.ts.map

package/lib/util/tps.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tps.d.ts","sourceRoot":"","sources":["../../src/util/tps.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAExD,wBAAsB,WAAW,CAChC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,OAAO,GACb,OAAO,CAAC,MAAM,CAAC,CAoBjB"}

package/lib/wallet.d.ts

@@ -7,3 +7,4 @@ export declare class Wallet implements IWallet {
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
     get publicKey(): PublicKey;
 }
+//# sourceMappingURL=wallet.d.ts.map

package/lib/wallet.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet.d.ts","sourceRoot":"","sources":["../src/wallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,qBAAa,MAAO,YAAW,OAAO;IACzB,QAAQ,CAAC,KAAK,EAAE,OAAO;gBAAd,KAAK,EAAE,OAAO;IAE7B,eAAe,CAAC,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAKtD,mBAAmB,CAAC,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IAOrE,IAAI,SAAS,IAAI,SAAS,CAEzB;CACD"}

package/package.json

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

package/src/accounts/defaultClearingHouseAccountSubscriber.ts

@@ -5,14 +5,12 @@ import {
 } from './types';
 import { AccountSubscriber, NotSubscribedError } from './types';
 import {
-	CurveHistoryAccount,
 	DepositHistoryAccount,
+	ExtendedCurveHistoryAccount,
 	FundingPaymentHistoryAccount,
 	FundingRateHistoryAccount,
 	LiquidationHistoryAccount,
 	MarketsAccount,
-	OrderHistoryAccount,
-	OrderStateAccount,
 	StateAccount,
 	TradeHistoryAccount,
 } from '../types';
@@ -34,10 +32,8 @@ export class DefaultClearingHouseAccountSubscriber
 	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[] = [];
 
@@ -96,21 +92,6 @@ export class DefaultClearingHouseAccountSubscriber
 			this.eventEmitter.emit('update');
 		});
 
-		this.orderStateAccountSubscriber = new WebSocketAccountSubscriber(
-			'orderState',
-			this.program,
-			state.orderState
-		);
-
-		await this.orderStateAccountSubscriber.subscribe(
-			(data: OrderStateAccount) => {
-				this.eventEmitter.emit('orderStateAccountUpdate', data);
-				this.eventEmitter.emit('update');
-			}
-		);
-
-		const orderState = this.orderStateAccountSubscriber.data;
-
 		// create subscribers for other state accounts
 
 		this.tradeHistoryAccountSubscriber = new WebSocketAccountSubscriber(
@@ -145,15 +126,9 @@ export class DefaultClearingHouseAccountSubscriber
 		);
 
 		this.curveHistoryAccountSubscriber = new WebSocketAccountSubscriber(
-			'curveHistory',
+			'extendedCurveHistory',
 			this.program,
-			state.curveHistory
-		);
-
-		this.orderHistoryAccountSubscriber = new WebSocketAccountSubscriber(
-			'orderHistory',
-			this.program,
-			orderState.orderHistory
+			state.extendedCurveHistory
 		);
 
 		const extraSusbcribersToUse: {
@@ -197,12 +172,6 @@ export class DefaultClearingHouseAccountSubscriber
 				eventType: 'curveHistoryAccountUpdate',
 			});
 
-		if (optionalSubscriptions?.includes('orderHistoryAccount'))
-			extraSusbcribersToUse.push({
-				subscriber: this.orderHistoryAccountSubscriber,
-				eventType: 'orderHistoryAccountUpdate',
-			});
-
 		this.optionalExtraSubscriptions = optionalSubscriptions ?? [];
 
 		// await all subcriptions in parallel to boost performance
@@ -250,7 +219,6 @@ export class DefaultClearingHouseAccountSubscriber
 
 		await this.stateAccountSubscriber.unsubscribe();
 		await this.marketsAccountSubscriber.unsubscribe();
-		await this.orderStateAccountSubscriber.unsubscribe();
 
 		if (this.optionalExtraSubscriptions.includes('tradeHistoryAccount')) {
 			await this.tradeHistoryAccountSubscriber.unsubscribe();
@@ -278,10 +246,6 @@ export class DefaultClearingHouseAccountSubscriber
 			await this.liquidationHistoryAccountSubscriber.unsubscribe();
 		}
 
-		if (this.optionalExtraSubscriptions.includes('orderHistoryAccount')) {
-			await this.orderHistoryAccountSubscriber.unsubscribe();
-		}
-
 		this.isSubscribed = false;
 	}
 
@@ -343,7 +307,7 @@ export class DefaultClearingHouseAccountSubscriber
 		return this.fundingRateHistoryAccountSubscriber.data;
 	}
 
-	public getCurveHistoryAccount(): CurveHistoryAccount {
+	public getCurveHistoryAccount(): ExtendedCurveHistoryAccount {
 		this.assertIsSubscribed();
 		this.assertOptionalIsSubscribed('curveHistoryAccount');
 		return this.curveHistoryAccountSubscriber.data;
@@ -354,15 +318,4 @@ export class DefaultClearingHouseAccountSubscriber
 		this.assertOptionalIsSubscribed('liquidationHistoryAccount');
 		return this.liquidationHistoryAccountSubscriber.data;
 	}
-
-	public getOrderHistoryAccount(): OrderHistoryAccount {
-		this.assertIsSubscribed();
-		this.assertOptionalIsSubscribed('orderHistoryAccount');
-		return this.orderHistoryAccountSubscriber.data;
-	}
-
-	public getOrderStateAccount(): OrderStateAccount {
-		this.assertIsSubscribed();
-		return this.orderStateAccountSubscriber.data;
-	}
 }

package/src/accounts/defaultUserAccountSubscriber.ts

@@ -8,12 +8,9 @@ import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
-import {
-	getUserAccountPublicKey,
-	getUserOrdersAccountPublicKey,
-} from '../addresses';
+import { getUserAccountPublicKey } from '../addresses';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
-import { UserAccount, UserOrdersAccount, UserPositionsAccount } from '../types';
+import { UserAccount, UserPositionsAccount } from '../types';
 
 export class DefaultUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
@@ -23,7 +20,6 @@ export class DefaultUserAccountSubscriber implements UserAccountSubscriber {
 
 	userDataAccountSubscriber: AccountSubscriber<UserAccount>;
 	userPositionsAccountSubscriber: AccountSubscriber<UserPositionsAccount>;
-	userOrdersAccountSubscriber: AccountSubscriber<UserOrdersAccount>;
 
 	public constructor(program: Program, authority: PublicKey) {
 		this.isSubscribed = false;
@@ -65,23 +61,6 @@ export class DefaultUserAccountSubscriber implements UserAccountSubscriber {
 			}
 		);
 
-		const userOrdersPublicKey = await getUserOrdersAccountPublicKey(
-			this.program.programId,
-			this.authority
-		);
-
-		this.userOrdersAccountSubscriber = new WebSocketAccountSubscriber(
-			'userOrders',
-			this.program,
-			userOrdersPublicKey
-		);
-		await this.userOrdersAccountSubscriber.subscribe(
-			(data: UserOrdersAccount) => {
-				this.eventEmitter.emit('userOrdersData', data);
-				this.eventEmitter.emit('update');
-			}
-		);
-
 		this.eventEmitter.emit('update');
 		this.isSubscribed = true;
 		return true;
@@ -91,7 +70,6 @@ export class DefaultUserAccountSubscriber implements UserAccountSubscriber {
 		await Promise.all([
 			this.userDataAccountSubscriber.fetch(),
 			this.userPositionsAccountSubscriber.fetch(),
-			this.userOrdersAccountSubscriber.fetch(),
 		]);
 	}
 
@@ -100,9 +78,10 @@ export class DefaultUserAccountSubscriber implements UserAccountSubscriber {
 			return;
 		}
 
-		this.userDataAccountSubscriber.unsubscribe();
-		this.userPositionsAccountSubscriber.unsubscribe();
-		this.userOrdersAccountSubscriber.unsubscribe();
+		await Promise.all([
+			this.userDataAccountSubscriber.unsubscribe(),
+			this.userPositionsAccountSubscriber.unsubscribe(),
+		]);
 
 		this.isSubscribed = false;
 	}
@@ -124,8 +103,4 @@ export class DefaultUserAccountSubscriber implements UserAccountSubscriber {
 		this.assertIsSubscribed();
 		return this.userPositionsAccountSubscriber.data;
 	}
-
-	public getUserOrdersAccount(): UserOrdersAccount {
-		return this.userOrdersAccountSubscriber.data;
-	}
 }

package/src/accounts/types.ts

@@ -1,16 +1,13 @@
 import {
-	CurveHistoryAccount,
 	DepositHistoryAccount,
+	ExtendedCurveHistoryAccount,
 	FundingPaymentHistoryAccount,
 	FundingRateHistoryAccount,
 	LiquidationHistoryAccount,
 	MarketsAccount,
-	OrderHistoryAccount,
-	OrderStateAccount,
 	StateAccount,
 	TradeHistoryAccount,
 	UserAccount,
-	UserOrdersAccount,
 	UserPositionsAccount,
 } from '../types';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -20,7 +17,7 @@ export interface AccountSubscriber<T> {
 	data?: T;
 	subscribe(onChange: (data: T) => void): Promise<void>;
 	fetch(): Promise<void>;
-	unsubscribe(): void;
+	unsubscribe(): Promise<void>;
 }
 
 export class NotSubscribedError extends Error {
@@ -37,9 +34,7 @@ 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;
 }
 
@@ -49,8 +44,7 @@ export type ClearingHouseAccountTypes =
 	| 'fundingPaymentHistoryAccount'
 	| 'fundingRateHistoryAccount'
 	| 'curveHistoryAccount'
-	| 'liquidationHistoryAccount'
-	| 'orderHistoryAccount';
+	| 'liquidationHistoryAccount';
 
 export interface ClearingHouseAccountSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
@@ -70,43 +64,13 @@ 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;
 }
 
@@ -120,5 +84,4 @@ export interface UserAccountSubscriber {
 
 	getUserAccount(): UserAccount;
 	getUserPositionsAccount(): UserPositionsAccount;
-	getUserOrdersAccount(): UserOrdersAccount;
 }

package/src/addresses.ts

@@ -10,21 +10,6 @@ export async function getClearingHouseStateAccountPublicKeyAndNonce(
 	);
 }
 
-export async function getOrderStateAccountPublicKey(
-	programId: PublicKey
-): Promise<PublicKey> {
-	return (await getOrderStateAccountPublicKeyAndNonce(programId))[0];
-}
-
-export async function getOrderStateAccountPublicKeyAndNonce(
-	programId: PublicKey
-): Promise<[PublicKey, number]> {
-	return anchor.web3.PublicKey.findProgramAddress(
-		[Buffer.from(anchor.utils.bytes.utf8.encode('order_state'))],
-		programId
-	);
-}
-
 export async function getClearingHouseStateAccountPublicKey(
 	programId: PublicKey
 ): Promise<PublicKey> {
@@ -47,23 +32,3 @@ export async function getUserAccountPublicKey(
 ): Promise<PublicKey> {
 	return (await getUserAccountPublicKeyAndNonce(programId, authority))[0];
 }
-
-export async function getUserOrdersAccountPublicKeyAndNonce(
-	programId: PublicKey,
-	authority: PublicKey
-): Promise<[PublicKey, number]> {
-	return anchor.web3.PublicKey.findProgramAddress(
-		[
-			Buffer.from(anchor.utils.bytes.utf8.encode('user_orders')),
-			authority.toBuffer(),
-		],
-		programId
-	);
-}
-
-export async function getUserOrdersAccountPublicKey(
-	programId: PublicKey,
-	authority: PublicKey
-): Promise<PublicKey> {
-	return (await getUserOrdersAccountPublicKeyAndNonce(programId, authority))[0];
-}