@drift-labs/sdk 0.1.29-master.1 → 0.1.30-master.1

package/src/accounts/pollingClearingHouseAccountSubscriber.ts

@@ -24,6 +24,8 @@ import { getClearingHouseStateAccountPublicKey } from '../addresses';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { capitalize } from './utils';
 import { ClearingHouseConfigType } from '../factory/clearingHouse';
+import { PublicKey } from '@solana/web3.js';
+import { CLEARING_HOUSE_STATE_ACCOUNTS } from '../constants/accounts';
 
 export class PollingClearingHouseAccountSubscriber
 	implements ClearingHouseAccountSubscriber
@@ -98,44 +100,38 @@ export class PollingClearingHouseAccountSubscriber
 			return;
 		}
 
-		const statePublicKey = await getClearingHouseStateAccountPublicKey(
-			this.program.programId
-		);
-
-		const state = (await this.program.account.state.fetch(
-			statePublicKey
-		)) as StateAccount;
+		const accounts = await this.getClearingHouseAccounts();
 
-		this.accountsToPoll.set(statePublicKey.toString(), {
+		this.accountsToPoll.set(accounts.state.toString(), {
 			key: 'state',
-			publicKey: statePublicKey,
+			publicKey: accounts.state,
 			eventType: 'stateAccountUpdate',
 		});
 
-		this.accountsToPoll.set(state.markets.toString(), {
+		this.accountsToPoll.set(accounts.markets.toString(), {
 			key: 'markets',
-			publicKey: state.markets,
+			publicKey: accounts.markets,
 			eventType: 'marketsAccountUpdate',
 		});
 
-		this.accountsToPoll.set(state.orderState.toString(), {
+		this.accountsToPoll.set(accounts.orderState.toString(), {
 			key: 'orderState',
-			publicKey: state.orderState,
+			publicKey: accounts.orderState,
 			eventType: 'orderStateAccountUpdate',
 		});
 
 		if (this.optionalExtraSubscriptions?.includes('tradeHistoryAccount')) {
-			this.accountsToPoll.set(state.tradeHistory.toString(), {
+			this.accountsToPoll.set(accounts.tradeHistory.toString(), {
 				key: 'tradeHistory',
-				publicKey: state.tradeHistory,
+				publicKey: accounts.tradeHistory,
 				eventType: 'tradeHistoryAccountUpdate',
 			});
 		}
 
 		if (this.optionalExtraSubscriptions?.includes('depositHistoryAccount')) {
-			this.accountsToPoll.set(state.depositHistory.toString(), {
+			this.accountsToPoll.set(accounts.depositHistory.toString(), {
 				key: 'depositHistory',
-				publicKey: state.depositHistory,
+				publicKey: accounts.depositHistory,
 				eventType: 'depositHistoryAccountUpdate',
 			});
 		}
@@ -143,9 +139,9 @@ export class PollingClearingHouseAccountSubscriber
 		if (
 			this.optionalExtraSubscriptions?.includes('fundingPaymentHistoryAccount')
 		) {
-			this.accountsToPoll.set(state.fundingPaymentHistory.toString(), {
+			this.accountsToPoll.set(accounts.fundingPaymentHistory.toString(), {
 				key: 'fundingPaymentHistory',
-				publicKey: state.fundingPaymentHistory,
+				publicKey: accounts.fundingPaymentHistory,
 				eventType: 'fundingPaymentHistoryAccountUpdate',
 			});
 		}
@@ -153,17 +149,17 @@ export class PollingClearingHouseAccountSubscriber
 		if (
 			this.optionalExtraSubscriptions?.includes('fundingRateHistoryAccount')
 		) {
-			this.accountsToPoll.set(state.fundingRateHistory.toString(), {
+			this.accountsToPoll.set(accounts.fundingRateHistory.toString(), {
 				key: 'fundingRateHistory',
-				publicKey: state.fundingRateHistory,
+				publicKey: accounts.fundingRateHistory,
 				eventType: 'fundingRateHistoryAccountUpdate',
 			});
 		}
 
 		if (this.optionalExtraSubscriptions?.includes('curveHistoryAccount')) {
-			this.accountsToPoll.set(state.extendedCurveHistory.toString(), {
+			this.accountsToPoll.set(accounts.extendedCurveHistory.toString(), {
 				key: 'extendedCurveHistory',
-				publicKey: state.extendedCurveHistory,
+				publicKey: accounts.extendedCurveHistory,
 				eventType: 'curveHistoryAccountUpdate',
 			});
 		}
@@ -171,24 +167,58 @@ export class PollingClearingHouseAccountSubscriber
 		if (
 			this.optionalExtraSubscriptions?.includes('liquidationHistoryAccount')
 		) {
-			this.accountsToPoll.set(state.liquidationHistory.toString(), {
+			this.accountsToPoll.set(accounts.liquidationHistory.toString(), {
 				key: 'liquidationHistory',
-				publicKey: state.liquidationHistory,
+				publicKey: accounts.liquidationHistory,
 				eventType: 'liquidationHistoryAccountUpdate',
 			});
 		}
 
+		if (this.optionalExtraSubscriptions?.includes('orderHistoryAccount')) {
+			this.accountsToPoll.set(accounts.orderHistory.toString(), {
+				key: 'orderHistory',
+				publicKey: accounts.orderHistory,
+				eventType: 'orderHistoryAccountUpdate',
+			});
+		}
+	}
+
+	async getClearingHouseAccounts(): Promise<ClearingHouseAccounts> {
+		// Skip extra calls to rpc if we already know all the accounts
+		if (CLEARING_HOUSE_STATE_ACCOUNTS[this.program.programId.toString()]) {
+			return CLEARING_HOUSE_STATE_ACCOUNTS[this.program.programId.toString()];
+		}
+
+		const statePublicKey = await getClearingHouseStateAccountPublicKey(
+			this.program.programId
+		);
+
+		const state = (await this.program.account.state.fetch(
+			statePublicKey
+		)) as StateAccount;
+
+		const accounts = {
+			state: statePublicKey,
+			markets: state.markets,
+			orderState: state.orderState,
+			tradeHistory: state.tradeHistory,
+			depositHistory: state.depositHistory,
+			fundingPaymentHistory: state.fundingPaymentHistory,
+			fundingRateHistory: state.fundingRateHistory,
+			extendedCurveHistory: state.extendedCurveHistory,
+			liquidationHistory: state.liquidationHistory,
+			orderHistory: undefined,
+		};
+
 		if (this.optionalExtraSubscriptions?.includes('orderHistoryAccount')) {
 			const orderState = (await this.program.account.orderState.fetch(
 				state.orderState
 			)) as OrderStateAccount;
 
-			this.accountsToPoll.set(orderState.orderHistory.toString(), {
-				key: 'orderHistory',
-				publicKey: orderState.orderHistory,
-				eventType: 'orderHistoryAccountUpdate',
-			});
+			accounts.orderHistory = orderState.orderHistory;
 		}
+
+		return accounts;
 	}
 
 	async addToAccountLoader(): Promise<void> {
@@ -324,3 +354,16 @@ export class PollingClearingHouseAccountSubscriber
 		return this.orderHistory;
 	}
 }
+
+type ClearingHouseAccounts = {
+	state: PublicKey;
+	markets: PublicKey;
+	orderState: PublicKey;
+	tradeHistory?: PublicKey;
+	depositHistory?: PublicKey;
+	fundingPaymentHistory?: PublicKey;
+	fundingRateHistory?: PublicKey;
+	extendedCurveHistory?: PublicKey;
+	liquidationHistory?: PublicKey;
+	orderHistory?: PublicKey;
+};

package/src/clearingHouse.ts

@@ -21,6 +21,7 @@ import {
 	OrderParams,
 	Order,
 	ExtendedCurveHistoryAccount,
+	UserPositionsAccount,
 } from './types';
 import * as anchor from '@project-serum/anchor';
 import clearingHouseIDL from './idl/clearing_house.json';
@@ -542,19 +543,6 @@ export class ClearingHouse {
 		return [txSig, userAccountPublicKey];
 	}
 
-	public async deleteUser(): Promise<TransactionSignature> {
-		const userAccountPublicKey = await this.getUserAccountPublicKey();
-		const user = await this.program.account.user.fetch(userAccountPublicKey);
-		const deleteUserTx = await this.program.transaction.deleteUser({
-			accounts: {
-				user: userAccountPublicKey,
-				userPositions: user.positions,
-				authority: this.wallet.publicKey,
-			},
-		});
-		return this.txSender.send(deleteUserTx, [], this.opts);
-	}
-
 	public async withdrawCollateral(
 		amount: BN,
 		collateralAccountPublicKey: PublicKey
@@ -922,6 +910,51 @@ export class ClearingHouse {
 		});
 	}
 
+	public async cancelAllOrders(
+		oracles?: PublicKey[]
+	): Promise<TransactionSignature> {
+		return await this.txSender.send(
+			wrapInTx(await this.getCancelAllOrdersIx(oracles)),
+			[],
+			this.opts
+		);
+	}
+
+	public async getCancelAllOrdersIx(
+		oracles: PublicKey[]
+	): Promise<TransactionInstruction> {
+		const userAccountPublicKey = await this.getUserAccountPublicKey();
+		const userAccount = await this.getUserAccount();
+
+		const state = this.getStateAccount();
+		const orderState = this.getOrderStateAccount();
+
+		const remainingAccounts = [];
+		for (const oracle of oracles) {
+			remainingAccounts.push({
+				pubkey: oracle,
+				isWritable: false,
+				isSigner: false,
+			});
+		}
+
+		return await this.program.instruction.cancelAllOrders({
+			accounts: {
+				state: await this.getStatePublicKey(),
+				user: userAccountPublicKey,
+				authority: this.wallet.publicKey,
+				markets: state.markets,
+				userOrders: await this.getUserOrdersAccountPublicKey(),
+				userPositions: userAccount.positions,
+				fundingPaymentHistory: state.fundingPaymentHistory,
+				fundingRateHistory: state.fundingRateHistory,
+				orderState: await this.getOrderStatePublicKey(),
+				orderHistory: orderState.orderHistory,
+			},
+			remainingAccounts,
+		});
+	}
+
 	public async fillOrder(
 		userAccountPublicKey: PublicKey,
 		userOrdersAccountPublicKey: PublicKey,
@@ -1160,6 +1193,31 @@ export class ClearingHouse {
 		);
 	}
 
+	public async closeAllPositions(
+		userPositionsAccount: UserPositionsAccount,
+		discountToken?: PublicKey,
+		referrer?: PublicKey
+	): Promise<TransactionSignature> {
+		const ixs: TransactionInstruction[] = [];
+		for (const userPosition of userPositionsAccount.positions) {
+			if (userPosition.baseAssetAmount.eq(ZERO)) {
+				continue;
+			}
+
+			ixs.push(
+				await this.getClosePositionIx(
+					userPosition.marketIndex,
+					discountToken,
+					referrer
+				)
+			);
+		}
+
+		const tx = new Transaction().add(...ixs);
+
+		return this.txSender.send(tx, [], this.opts);
+	}
+
 	public async liquidate(
 		liquidateeUserAccountPublicKey: PublicKey
 	): Promise<TransactionSignature> {

package/src/constants/accounts.ts

@@ -0,0 +1,26 @@
+import { PublicKey } from '@solana/web3.js';
+
+export const CLEARING_HOUSE_STATE_ACCOUNTS = {
+	dammHkt7jmytvbS3nHTxQNEcP59aE57nxwV21YdqEDN: {
+		state: new PublicKey('FExhvPycCCwYnZGeDsVtLhpEQ3yEkVY2k1HuPyfLj91L'),
+		markets: new PublicKey('773hq3SbGPKVj93TXi5qV5CREuhxobywfALjS3XVHhLH'),
+		orderState: new PublicKey('4cC34bWwTPGncBaX2S6v5mH3Lj4Nb3byPMrxQSDcY985'),
+		tradeHistory: new PublicKey('FCuCXEoQppoaCYdttA7rK3HNQfYkTNEGpwuBESzYcENp'),
+		depositHistory: new PublicKey(
+			'C7rF2Qy2rnDGQLRijBRRArJyaeuQcFi81BXDrUCQ45ya'
+		),
+		fundingPaymentHistory: new PublicKey(
+			'895iPhzwT2tBufLnRpYtBG3gif1HDDUfpH2AqbS5joo4'
+		),
+		fundingRateHistory: new PublicKey(
+			'BWiJLMbmrwfqHVpcPJa8715XamNyNYamDDKQVQMnduEC'
+		),
+		extendedCurveHistory: new PublicKey(
+			'7vBbqvMdtZLQdTVdzt5y63pZdAFE5W42kP3avngSJKCk'
+		),
+		liquidationHistory: new PublicKey(
+			'CSFaaf8yVoTx6NcXUKtNPYAewv76CH2jATqSVRBvUWKM'
+		),
+		orderHistory: new PublicKey('DZ7XfUqyHoRKnJLRApxmJ943xHJ7NDBUTqpbooviEtbU'),
+	},
+};

package/src/constants/markets.ts

@@ -187,6 +187,17 @@ export const Markets: MarketConfig[] = [
 		launchTs: 1648607439000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Near',
+		category: ['L1', 'Infra'],
+		symbol: 'NEAR-PERP',
+		baseAssetSymbol: 'NEAR',
+		marketIndex: new BN(16),
+		devnetPublicKey: '3gnSbT7bhoTdGkFVZc1dW1PvjreWzpUNUD5ppXwv1N59',
+		mainnetPublicKey: 'ECSFWQ1bnnpqPVvoy9237t2wddZAaHisW88mYxuEHKWf',
+		launchTs: 1649105516000,
+		oracleSource: OracleSource.PYTH,
+	},
 	// {
 	// 	symbol: 'mSOL-PERP',
 	// 	baseAssetSymbol: 'mSOL',

package/src/factory/clearingHouse.ts

@@ -10,6 +10,7 @@ import { DefaultTxSender } from '../tx/defaultTxSender';
 import { ClearingHouseAccountSubscriber } from '../accounts/types';
 import { PollingClearingHouseAccountSubscriber } from '../accounts/pollingClearingHouseAccountSubscriber';
 import { Admin } from '../admin';
+import { RetryTxSender } from '../tx/retryTxSender';
 
 export type ClearingHouseConfigType = 'websocket' | 'polling' | 'custom';
 
@@ -19,7 +20,7 @@ type BaseClearingHouseConfig = {
 	wallet: IWallet;
 	programID: PublicKey;
 	opts?: ConfirmOptions;
-	txSender?: TxSender;
+	txSenderConfig?: TxSenderConfig;
 };
 
 type WebSocketClearingHouseConfiguration = BaseClearingHouseConfig;
@@ -32,12 +33,28 @@ type ClearingHouseConfig =
 	| PollingClearingHouseConfiguration
 	| WebSocketClearingHouseConfiguration;
 
+export type TxSenderType = 'default' | 'retry';
+
+type BaseTxSenderConfig = {
+	type: TxSenderType;
+};
+
+type DefaultTxSenderConfig = BaseTxSenderConfig;
+
+type RetryTxSenderConfig = BaseTxSenderConfig & {
+	timeout?: number;
+	retrySleep?: number;
+	additionalConnections?: Connection[];
+};
+
+type TxSenderConfig = DefaultTxSenderConfig | RetryTxSenderConfig;
+
 export function getWebSocketClearingHouseConfig(
 	connection: Connection,
 	wallet: IWallet,
 	programID: PublicKey,
 	opts: ConfirmOptions = Provider.defaultOptions(),
-	txSender?: TxSender
+	txSenderConfig?: TxSenderConfig
 ): WebSocketClearingHouseConfiguration {
 	return {
 		type: 'websocket',
@@ -45,7 +62,7 @@ export function getWebSocketClearingHouseConfig(
 		wallet,
 		programID,
 		opts,
-		txSender,
+		txSenderConfig,
 	};
 }
 
@@ -55,7 +72,7 @@ export function getPollingClearingHouseConfig(
 	programID: PublicKey,
 	accountLoader: BulkAccountLoader,
 	opts: ConfirmOptions = Provider.defaultOptions(),
-	txSender?: TxSender
+	txSenderConfig?: TxSenderConfig
 ): PollingClearingHouseConfiguration {
 	return {
 		type: 'polling',
@@ -64,7 +81,7 @@ export function getPollingClearingHouseConfig(
 		programID,
 		accountLoader,
 		opts,
-		txSender,
+		txSenderConfig,
 	};
 }
 
@@ -85,7 +102,19 @@ export function getClearingHouse(config: ClearingHouseConfig): ClearingHouse {
 		);
 	}
 
-	const txSender = config.txSender || new DefaultTxSender(provider);
+	let txSender: TxSender;
+	if (config.txSenderConfig?.type === 'retry') {
+		const txSenderConfig = config.txSenderConfig as RetryTxSenderConfig;
+		txSender = new RetryTxSender(
+			provider,
+			txSenderConfig.timeout,
+			txSenderConfig.retrySleep,
+			txSenderConfig.additionalConnections
+		);
+	} else {
+		txSender = new DefaultTxSender(provider);
+	}
+
 	return new ClearingHouse(
 		config.connection,
 		config.wallet,
@@ -113,7 +142,18 @@ export function getAdmin(config: ClearingHouseConfig): Admin {
 		);
 	}
 
-	const txSender = config.txSender || new DefaultTxSender(provider);
+	let txSender: TxSender;
+	if (config.txSenderConfig?.type === 'retry') {
+		const txSenderConfig = config.txSenderConfig as RetryTxSenderConfig;
+		txSender = new RetryTxSender(
+			provider,
+			txSenderConfig.timeout,
+			txSenderConfig.retrySleep,
+			txSenderConfig.additionalConnections
+		);
+	} else {
+		txSender = new DefaultTxSender(provider);
+	}
 	return new Admin(
 		config.connection,
 		config.wallet,

package/src/idl/clearing_house.json

@@ -677,6 +677,57 @@
         }
       ]
     },
+    {
+      "name": "cancelAllOrders",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "orderState",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "markets",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "userPositions",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userOrders",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "fundingPaymentHistory",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "orderHistory",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "expireOrders",
       "accounts": [
@@ -1431,32 +1482,6 @@
         }
       ]
     },
-    {
-      "name": "deleteUser",
-      "accounts": [
-        {
-          "name": "user",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "userPositions",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "userOrders",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "authority",
-          "isMut": false,
-          "isSigner": true
-        }
-      ],
-      "args": []
-    },
     {
       "name": "settleFundingPayment",
       "accounts": [
@@ -3241,8 +3266,8 @@
             "type": "u128"
           },
           {
-            "name": "netRevenueSinceLastFunding",
-            "type": "i64"
+            "name": "padding1",
+            "type": "u64"
           },
           {
             "name": "padding2",
@@ -4249,11 +4274,6 @@
       "code": 6060,
       "name": "CantExpireOrders",
       "msg": "CantExpireOrders"
-    },
-    {
-      "code": 6061,
-      "name": "InvalidRepegPriceImpact",
-      "msg": "AMM repeg mark price impact vs oracle too large"
     }
   ]
 }