@drift-labs/sdk 0.1.36-master.2 → 0.1.36-master.5

package/lib/mockUSDCFaucet.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import * as anchor from '@project-serum/anchor';
-import { Program, Provider } from '@project-serum/anchor';
+import { AnchorProvider, Program } from '@project-serum/anchor';
 import { AccountInfo } from '@solana/spl-token';
 import { ConfirmOptions, Connection, PublicKey, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { BN } from '.';
@@ -9,7 +9,7 @@ export declare class MockUSDCFaucet {
     connection: Connection;
     wallet: IWallet;
     program: Program;
-    provider: Provider;
+    provider: AnchorProvider;
     opts?: ConfirmOptions;
     constructor(connection: Connection, wallet: IWallet, programId: PublicKey, opts?: ConfirmOptions);
     getMockUSDCFaucetStatePublicKeyAndNonce(): Promise<[

package/lib/mockUSDCFaucet.js

@@ -45,8 +45,8 @@ class MockUSDCFaucet {
     constructor(connection, wallet, programId, opts) {
         this.connection = connection;
         this.wallet = wallet;
-        this.opts = opts || anchor_1.Provider.defaultOptions();
-        const provider = new anchor_1.Provider(connection, wallet, this.opts);
+        this.opts = opts || anchor_1.AnchorProvider.defaultOptions();
+        const provider = new anchor_1.AnchorProvider(connection, wallet, this.opts);
         this.provider = provider;
         this.program = new anchor_1.Program(mock_usdc_faucet_json_1.default, programId, provider);
     }
@@ -117,7 +117,7 @@ class MockUSDCFaucet {
         return __awaiter(this, void 0, void 0, function* () {
             const [associatedTokenPublicKey, createAssociatedAccountIx, mintToTx] = yield this.createAssociatedTokenAccountAndMintToInstructions(userPublicKey, amount);
             const tx = new web3_js_1.Transaction().add(createAssociatedAccountIx).add(mintToTx);
-            const txSig = yield this.program.provider.send(tx, [], this.opts);
+            const txSig = yield this.program.provider.sendAndConfirm(tx, [], this.opts);
             return [associatedTokenPublicKey, txSig];
         });
     }

package/lib/oracles/switchboardClient.js

@@ -64,7 +64,7 @@ function getSwitchboardProgram(env, connection) {
         const DEFAULT_KEYPAIR = web3_js_1.Keypair.fromSeed(new Uint8Array(32).fill(1));
         const programId = (0, switchboard_v2_1.getSwitchboardPid)(env);
         const wallet = new wallet_1.Wallet(DEFAULT_KEYPAIR);
-        const provider = new anchor_1.Provider(connection, wallet, {});
+        const provider = new anchor_1.AnchorProvider(connection, wallet, {});
         return new anchor_1.Program(switchboard_v2_json_1.default, programId, provider);
     });
 }

package/lib/tx/defaultTxSender.d.ts

@@ -1,8 +1,8 @@
 import { TxSender } from './types';
 import { ConfirmOptions, Signer, Transaction, TransactionSignature } from '@solana/web3.js';
-import { Provider } from '@project-serum/anchor';
+import { AnchorProvider } from '@project-serum/anchor';
 export declare class DefaultTxSender implements TxSender {
-    provider: Provider;
-    constructor(provider: Provider);
+    provider: AnchorProvider;
+    constructor(provider: AnchorProvider);
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TransactionSignature>;
 }

package/lib/tx/defaultTxSender.js

@@ -6,7 +6,7 @@ class DefaultTxSender {
         this.provider = provider;
     }
     send(tx, additionalSigners, opts) {
-        return this.provider.send(tx, additionalSigners, opts);
+        return this.provider.sendAndConfirm(tx, additionalSigners, opts);
     }
 }
 exports.DefaultTxSender = DefaultTxSender;

package/lib/tx/retryTxSender.d.ts

@@ -1,16 +1,16 @@
 /// <reference types="node" />
 import { TxSender } from './types';
 import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection } from '@solana/web3.js';
-import { Provider } from '@project-serum/anchor';
+import { AnchorProvider } from '@project-serum/anchor';
 declare type ResolveReference = {
     resolve?: () => void;
 };
 export declare class RetryTxSender implements TxSender {
-    provider: Provider;
+    provider: AnchorProvider;
     timeout: number;
     retrySleep: number;
     additionalConnections: Connection[];
-    constructor(provider: Provider, timeout?: number, retrySleep?: number, additionalConnections?: Connection[]);
+    constructor(provider: AnchorProvider, timeout?: number, retrySleep?: number, additionalConnections?: Connection[]);
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TransactionSignature>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.36-master.2",
+	"version": "0.1.36-master.5",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -28,7 +28,7 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@project-serum/anchor": "0.19.1-beta.1",
+		"@project-serum/anchor": "0.24.2",
 		"@pythnetwork/client": "^2.5.1",
 		"@solana/spl-token": "^0.1.6",
 		"@solana/web3.js": "^1.22.0",

package/src/accounts/webSocketAccountSubscriber.ts

@@ -1,5 +1,5 @@
 import { AccountData, AccountSubscriber } from './types';
-import { Program } from '@project-serum/anchor';
+import { AnchorProvider, Program } from '@project-serum/anchor';
 import { AccountInfo, Context, PublicKey } from '@solana/web3.js';
 import { capitalize } from './utils';
 import * as Buffer from 'buffer';
@@ -36,7 +36,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 			(accountInfo, context) => {
 				this.handleRpcResponse(context, accountInfo);
 			},
-			this.program.provider.opts.commitment
+			(this.program.provider as AnchorProvider).opts.commitment
 		);
 	}
 
@@ -44,7 +44,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		const rpcResponse =
 			await this.program.provider.connection.getAccountInfoAndContext(
 				this.accountPublicKey,
-				this.program.provider.opts.commitment
+				(this.program.provider as AnchorProvider).opts.commitment
 			);
 		this.handleRpcResponse(rpcResponse.context, rpcResponse?.value);
 	}

package/src/admin.ts

@@ -12,7 +12,7 @@ import {
 	OracleSource,
 	OrderFillerRewardStructure,
 } from './types';
-import { BN, Provider } from '@project-serum/anchor';
+import { BN, AnchorProvider } from '@project-serum/anchor';
 import * as anchor from '@project-serum/anchor';
 import {
 	getClearingHouseStateAccountPublicKey,
@@ -34,7 +34,7 @@ export class Admin extends ClearingHouse {
 		connection: Connection,
 		wallet: IWallet,
 		clearingHouseProgramId: PublicKey,
-		opts: ConfirmOptions = Provider.defaultOptions()
+		opts: ConfirmOptions = AnchorProvider.defaultOptions()
 	): Admin {
 		const config = getWebSocketClearingHouseConfig(
 			connection,

package/src/clearingHouse.ts

@@ -1,4 +1,4 @@
-import { BN, Idl, Program, Provider } from '@project-serum/anchor';
+import { AnchorProvider, BN, Idl, Program } from '@project-serum/anchor';
 import {
 	ASSOCIATED_TOKEN_PROGRAM_ID,
 	Token,
@@ -71,7 +71,7 @@ export class ClearingHouse {
 	connection: Connection;
 	wallet: IWallet;
 	public program: Program;
-	provider: Provider;
+	provider: AnchorProvider;
 	opts?: ConfirmOptions;
 	accountSubscriber: ClearingHouseAccountSubscriber;
 	eventEmitter: StrictEventEmitter<EventEmitter, ClearingHouseAccountEvents>;
@@ -98,7 +98,7 @@ export class ClearingHouse {
 		connection: Connection,
 		wallet: IWallet,
 		clearingHouseProgramId: PublicKey,
-		opts: ConfirmOptions = Provider.defaultOptions()
+		opts: ConfirmOptions = AnchorProvider.defaultOptions()
 	): ClearingHouse {
 		const config = getWebSocketClearingHouseConfig(
 			connection,
@@ -245,7 +245,11 @@ export class ClearingHouse {
 	 * @param newWallet
 	 */
 	public updateWallet(newWallet: IWallet): void {
-		const newProvider = new Provider(this.connection, newWallet, this.opts);
+		const newProvider = new AnchorProvider(
+			this.connection,
+			newWallet,
+			this.opts
+		);
 		const newProgram = new Program(
 			clearingHouseIDL as Idl,
 			this.program.programId,
@@ -503,7 +507,7 @@ export class ClearingHouse {
 			.add(initializeUserOrdersAccountIx)
 			.add(depositCollateralIx);
 
-		const txSig = await this.program.provider.send(tx, [userPositionsAccount]);
+		const txSig = await this.txSender.send(tx, [userPositionsAccount]);
 
 		return [txSig, userAccountPublicKey];
 	}
@@ -538,7 +542,9 @@ export class ClearingHouse {
 			.add(initializeUserOrdersAccountIx)
 			.add(depositCollateralIx);
 
-		const txSig = await this.program.provider.send(tx, [userPositionsAccount]);
+		const txSig = await this.program.provider.sendAndConfirm(tx, [
+			userPositionsAccount,
+		]);
 
 		return [txSig, userAccountPublicKey];
 	}
@@ -911,17 +917,19 @@ export class ClearingHouse {
 	}
 
 	public async cancelAllOrders(
-		oracles?: PublicKey[]
+		oracles?: PublicKey[],
+		bestEffort?: boolean
 	): Promise<TransactionSignature> {
 		return await this.txSender.send(
-			wrapInTx(await this.getCancelAllOrdersIx(oracles)),
+			wrapInTx(await this.getCancelAllOrdersIx(oracles, bestEffort)),
 			[],
 			this.opts
 		);
 	}
 
 	public async getCancelAllOrdersIx(
-		oracles: PublicKey[]
+		oracles: PublicKey[],
+		bestEffort?: boolean
 	): Promise<TransactionInstruction> {
 		const userAccountPublicKey = await this.getUserAccountPublicKey();
 		const userAccount = await this.getUserAccount();
@@ -938,7 +946,7 @@ export class ClearingHouse {
 			});
 		}
 
-		return await this.program.instruction.cancelAllOrders({
+		return await this.program.instruction.cancelAllOrders(bestEffort, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				user: userAccountPublicKey,
@@ -955,6 +963,69 @@ export class ClearingHouse {
 		});
 	}
 
+	public async cancelOrdersByMarketAndSide(
+		oracles?: PublicKey[],
+		bestEffort?: boolean,
+		marketIndexOnly?: BN,
+		directionOnly?: PositionDirection
+	): Promise<TransactionSignature> {
+		return await this.txSender.send(
+			wrapInTx(
+				await this.getCancelOrdersByMarketAndSideIx(
+					oracles,
+					bestEffort,
+					marketIndexOnly,
+					directionOnly
+				)
+			),
+			[],
+			this.opts
+		);
+	}
+
+	public async getCancelOrdersByMarketAndSideIx(
+		oracles: PublicKey[],
+		bestEffort?: boolean,
+		marketIndexOnly?: BN,
+		directionOnly?: PositionDirection
+	): 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.cancelOrdersByMarketAndSide(
+			bestEffort,
+			marketIndexOnly,
+			directionOnly,
+			{
+				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,

package/src/examples/makeTradeExample.ts

@@ -1,4 +1,4 @@
-import { BN, Provider } from '@project-serum/anchor';
+import { AnchorProvider, BN } from '@project-serum/anchor';
 import { Wallet } from '..';
 import { Token, TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
@@ -43,7 +43,11 @@ const main = async () => {
 	const connection = new Connection(rpcAddress);
 
 	// Set up the Provider
-	const provider = new Provider(connection, wallet, Provider.defaultOptions());
+	const provider = new AnchorProvider(
+		connection,
+		wallet,
+		AnchorProvider.defaultOptions()
+	);
 
 	// Check SOL Balance
 	const lamportsBalance = await connection.getBalance(wallet.publicKey);

package/src/factory/clearingHouse.ts

@@ -2,7 +2,7 @@ import { ConfirmOptions, Connection, PublicKey } from '@solana/web3.js';
 import { IWallet } from '../types';
 import { BulkAccountLoader } from '../accounts/bulkAccountLoader';
 import { TxSender } from '../tx/types';
-import { Idl, Program, Provider } from '@project-serum/anchor';
+import { AnchorProvider, Idl, Program } from '@project-serum/anchor';
 import { ClearingHouse } from '../clearingHouse';
 import clearingHouseIDL from '../idl/clearing_house.json';
 import { WebSocketClearingHouseAccountSubscriber } from '../accounts/webSocketClearingHouseAccountSubscriber';
@@ -53,7 +53,7 @@ export function getWebSocketClearingHouseConfig(
 	connection: Connection,
 	wallet: IWallet,
 	programID: PublicKey,
-	opts: ConfirmOptions = Provider.defaultOptions(),
+	opts: ConfirmOptions = AnchorProvider.defaultOptions(),
 	txSenderConfig?: TxSenderConfig
 ): WebSocketClearingHouseConfiguration {
 	return {
@@ -71,7 +71,7 @@ export function getPollingClearingHouseConfig(
 	wallet: IWallet,
 	programID: PublicKey,
 	accountLoader: BulkAccountLoader,
-	opts: ConfirmOptions = Provider.defaultOptions(),
+	opts: ConfirmOptions = AnchorProvider.defaultOptions(),
 	txSenderConfig?: TxSenderConfig
 ): PollingClearingHouseConfiguration {
 	return {
@@ -86,7 +86,11 @@ export function getPollingClearingHouseConfig(
 }
 
 export function getClearingHouse(config: ClearingHouseConfig): ClearingHouse {
-	const provider = new Provider(config.connection, config.wallet, config.opts);
+	const provider = new AnchorProvider(
+		config.connection,
+		config.wallet,
+		config.opts
+	);
 	const program = new Program(
 		clearingHouseIDL as Idl,
 		config.programID,
@@ -126,7 +130,11 @@ export function getClearingHouse(config: ClearingHouseConfig): ClearingHouse {
 }
 
 export function getAdmin(config: ClearingHouseConfig): Admin {
-	const provider = new Provider(config.connection, config.wallet, config.opts);
+	const provider = new AnchorProvider(
+		config.connection,
+		config.wallet,
+		config.opts
+	);
 	const program = new Program(
 		clearingHouseIDL as Idl,
 		config.programID,