@drift-labs/sdk 0.2.0-master.32 → 0.2.0-master.34

package/lib/types.d.ts

@@ -251,7 +251,7 @@ export declare type NewUserRecord = {
     ts: BN;
     userAuthority: PublicKey;
     user: PublicKey;
-    userId: number;
+    subAccount: number;
     name: number[];
     referrer: PublicKey;
 };
@@ -347,8 +347,8 @@ export declare type FundingRateRecord = {
     oraclePriceTwap: BN;
     markPriceTwap: BN;
     periodRevenue: BN;
-    netBaseAssetAmount: BN;
-    netUnsettledLpBaseAssetAmount: BN;
+    baseAssetAmountWithAmm: BN;
+    baseAssetAmountWithUnsettledLp: BN;
 };
 export declare type FundingPaymentRecord = {
     ts: BN;
@@ -486,7 +486,6 @@ export declare type OrderActionRecord = {
     makerOrderBaseAssetAmount: BN | null;
     makerOrderCumulativeBaseAssetAmountFilled: BN | null;
     makerOrderCumulativeQuoteAssetAmountFilled: BN | null;
-    makerOrderFee: BN | null;
     oraclePrice: BN;
 };
 export declare type StateAccount = {
@@ -497,7 +496,6 @@ export declare type StateAccount = {
     oracleGuardRails: OracleGuardRails;
     numberOfMarkets: number;
     numberOfSpotMarkets: number;
-    minOrderQuoteAssetAmount: BN;
     minPerpAuctionDuration: number;
     defaultMarketOrderTimeInForce: number;
     defaultSpotAuctionDuration: number;
@@ -508,19 +506,18 @@ export declare type StateAccount = {
     srmVault: PublicKey;
     perpFeeStructure: FeeStructure;
     spotFeeStructure: FeeStructure;
+    lpCooldownTime: BN;
 };
 export declare type PerpMarketAccount = {
     status: MarketStatus;
     contractType: ContractType;
     expiryTs: BN;
-    settlementPrice: BN;
+    expiryPrice: BN;
     marketIndex: number;
     pubkey: PublicKey;
+    name: number[];
     amm: AMM;
-    baseAssetAmount: BN;
-    baseAssetAmountLong: BN;
-    baseAssetAmountShort: BN;
-    openInterest: BN;
+    numberOfUsers: BN;
     marginRatioInitial: number;
     marginRatioMaintenance: number;
     nextFillRecordId: BN;
@@ -528,15 +525,17 @@ export declare type PerpMarketAccount = {
     liquidatorFee: BN;
     ifLiquidationFee: BN;
     imfFactor: BN;
-    unrealizedImfFactor: BN;
-    unrealizedMaxImbalance: BN;
-    unrealizedInitialAssetWeight: number;
-    unrealizedMaintenanceAssetWeight: number;
-    revenueWithdrawSinceLastSettle: BN;
-    maxRevenueWithdrawPerPeriod: BN;
-    lastRevenueWithdrawTs: BN;
-    quoteSettledInsurance: BN;
-    quoteMaxInsurance: BN;
+    unrealizedPnlImfFactor: BN;
+    unrealizedPnlMaxImbalance: BN;
+    unrealizedPnlInitialAssetWeight: number;
+    unrealizedPnlMaintenanceAssetWeight: number;
+    insuranceClaim: {
+        revenueWithdrawSinceLastSettle: BN;
+        maxRevenueWithdrawPerPeriod: BN;
+        lastRevenueWithdrawTs: BN;
+        quoteSettledInsurance: BN;
+        quoteMaxInsurance: BN;
+    };
 };
 export declare type HistoricalOracleData = {
     lastOraclePrice: BN;
@@ -550,7 +549,7 @@ export declare type HistoricalIndexData = {
     lastIndexBidPrice: BN;
     lastIndexAskPrice: BN;
     lastIndexPriceTwap: BN;
-    lastIndexPriceTwap5Min: BN;
+    lastIndexPriceTwap5min: BN;
     lastIndexPriceTwapTs: BN;
 };
 export declare type SpotMarketAccount = {
@@ -564,13 +563,18 @@ export declare type SpotMarketAccount = {
     oracleSource: OracleSource;
     historicalOracleData: HistoricalOracleData;
     historicalIndexData: HistoricalIndexData;
-    insuranceFundVault: PublicKey;
-    insuranceWithdrawEscrowPeriod: BN;
+    insuranceFund: {
+        vault: PublicKey;
+        totalShares: BN;
+        userShares: BN;
+        sharesBase: BN;
+        unstakingPeriod: BN;
+        lastRevenueSettleTs: BN;
+        revenueSettlePeriod: BN;
+        totalFactor: number;
+        userFactor: number;
+    };
     revenuePool: PoolBalance;
-    totalIfShares: BN;
-    userIfShares: BN;
-    userIfFactor: number;
-    totalIfFactor: number;
     ifLiquidationFee: BN;
     decimals: number;
     optimalUtilization: number;
@@ -594,12 +598,13 @@ export declare type SpotMarketAccount = {
     borrowTokenTwap: BN;
     utilizationTwap: BN;
     orderStepSize: BN;
+    orderTickSize: BN;
     nextFillRecordId: BN;
     spotFeePool: PoolBalance;
     totalSpotFee: BN;
 };
 export declare type PoolBalance = {
-    balance: BN;
+    scaledBalance: BN;
     marketIndex: number;
 };
 export declare type AMM = {
@@ -629,14 +634,16 @@ export declare type AMM = {
     cumulativeFeePerLp: BN;
     cumulativeNetBaseAssetAmountPerLp: BN;
     userLpShares: BN;
-    netUnsettledLpBaseAssetAmount: BN;
-    minimumQuoteAssetTradeSize: BN;
-    baseAssetAmountStepSize: BN;
-    maxBaseAssetAmountRatio: number;
+    baseAssetAmountWithUnsettledLp: BN;
+    orderStepSize: BN;
+    orderTickSize: BN;
+    maxFillReserveFraction: number;
     maxSlippageRatio: number;
     baseSpread: number;
     curveUpdateIntensity: number;
-    netBaseAssetAmount: BN;
+    baseAssetAmountWithAmm: BN;
+    baseAssetAmountLong: BN;
+    baseAssetAmountShort: BN;
     quoteAssetAmountLong: BN;
     quoteAssetAmountShort: BN;
     terminalQuoteAssetReserve: BN;
@@ -651,8 +658,8 @@ export declare type AMM = {
     longSpread: BN;
     shortSpread: BN;
     maxSpread: number;
-    marketPosition: PerpPosition;
-    marketPositionPerLp: PerpPosition;
+    baseAssetAmountPerLp: BN;
+    quoteAssetAmountPerLp: BN;
     ammJitIntensity: number;
     maxBaseAssetReserve: BN;
     minBaseAssetReserve: BN;
@@ -674,7 +681,7 @@ export declare type PerpPosition = {
     lastNetQuoteAssetAmountPerLp: BN;
 };
 export declare type UserStatsAccount = {
-    numberOfUsers: number;
+    numberOfSubAccounts: number;
     makerVolume30D: BN;
     takerVolume30D: BN;
     fillerVolume30D: BN;
@@ -686,31 +693,36 @@ export declare type UserStatsAccount = {
         totalFeeRebate: BN;
         totalTokenDiscount: BN;
         totalRefereeDiscount: BN;
+        totalReferrerReward: BN;
+        current_epoch_referrer_reward: BN;
     };
     referrer: PublicKey;
     isReferrer: boolean;
-    totalReferrerReward: BN;
     authority: PublicKey;
-    stakedQuoteAssetAmount: BN;
+    ifStakedQuoteAssetAmount: BN;
 };
 export declare type UserAccount = {
     authority: PublicKey;
     delegate: PublicKey;
     name: number[];
-    userId: number;
+    subAccountId: number;
     spotPositions: SpotPosition[];
     perpPositions: PerpPosition[];
     orders: Order[];
-    beingLiquidated: boolean;
-    bankrupt: boolean;
+    isBeingLiquidated: boolean;
+    isBankrupt: boolean;
     nextLiquidationId: number;
     nextOrderId: number;
-    customMarginRatio: number;
+    maxMarginRatio: number;
+    lastAddPerpLpSharesTs: BN;
+    settledPerpPnl: BN;
+    totalDeposits: BN;
+    totalWithdraws: BN;
 };
 export declare type SpotPosition = {
     marketIndex: number;
     balanceType: SpotBalanceType;
-    balance: BN;
+    scaledBalance: BN;
     openOrders: number;
     openBids: BN;
     openAsks: BN;
@@ -720,7 +732,6 @@ export declare type Order = {
     status: OrderStatus;
     orderType: OrderType;
     marketType: MarketType;
-    ts: BN;
     slot: BN;
     orderId: number;
     userOrderId: number;
@@ -730,7 +741,6 @@ export declare type Order = {
     baseAssetAmountFilled: BN;
     quoteAssetAmount: BN;
     quoteAssetAmountFilled: BN;
-    fee: BN;
     direction: PositionDirection;
     reduceOnly: boolean;
     triggerPrice: BN;
@@ -739,11 +749,11 @@ export declare type Order = {
     existingPositionDirection: PositionDirection;
     postOnly: boolean;
     immediateOrCancel: boolean;
-    oraclePriceOffset: BN;
+    oraclePriceOffset: number;
     auctionDuration: number;
     auctionStartPrice: BN;
     auctionEndPrice: BN;
-    timeInForce: number;
+    maxTs: BN;
 };
 export declare type OrderParams = {
     orderType: OrderType;
@@ -759,10 +769,11 @@ export declare type OrderParams = {
     triggerPrice: BN | null;
     triggerCondition: OrderTriggerCondition;
     positionLimit: BN;
-    oraclePriceOffset: BN | null;
+    oraclePriceOffset: number | null;
     auctionDuration: number | null;
-    timeInForce: number | null;
+    maxTs: BN | null;
     auctionStartPrice: BN | null;
+    auctionEndPrice: BN | null;
 };
 export declare type NecessaryOrderParams = {
     orderType: OrderType;
@@ -773,33 +784,7 @@ export declare type NecessaryOrderParams = {
 export declare type OptionalOrderParams = {
     [Property in keyof OrderParams]?: OrderParams[Property];
 } & NecessaryOrderParams;
-export declare const DefaultOrderParams: {
-    orderType: {
-        market: {};
-    };
-    marketType: {
-        perp: {};
-    };
-    userOrderId: number;
-    direction: {
-        long: {};
-    };
-    baseAssetAmount: BN;
-    price: BN;
-    marketIndex: number;
-    reduceOnly: boolean;
-    postOnly: boolean;
-    immediateOrCancel: boolean;
-    triggerPrice: any;
-    triggerCondition: {
-        above: {};
-    };
-    positionLimit: BN;
-    oraclePriceOffset: any;
-    auctionDuration: any;
-    timeInForce: any;
-    auctionStartPrice: any;
-};
+export declare const DefaultOrderParams: OrderParams;
 export declare type MakerInfo = {
     maker: PublicKey;
     makerStats: PublicKey;

package/lib/types.js

@@ -193,6 +193,7 @@ exports.DefaultOrderParams = {
     positionLimit: _1.ZERO,
     oraclePriceOffset: null,
     auctionDuration: null,
-    timeInForce: null,
+    maxTs: null,
     auctionStartPrice: null,
+    auctionEndPrice: null,
 };

package/lib/userMap/userMap.d.ts

@@ -1,6 +1,16 @@
 import { ClearingHouseUser, ClearingHouse, OrderRecord, ClearingHouseUserAccountSubscriptionConfig } from '..';
 import { PublicKey } from '@solana/web3.js';
-export declare class UserMap {
+export interface UserMapInterface {
+    fetchAllUsers(): Promise<void>;
+    addPubkey(userAccountPublicKey: PublicKey): Promise<void>;
+    has(key: string): boolean;
+    get(key: string): ClearingHouseUser | undefined;
+    mustGet(key: string): Promise<ClearingHouseUser>;
+    getUserAuthority(key: string): PublicKey | undefined;
+    updateWithOrderRecord(record: OrderRecord): Promise<void>;
+    values(): IterableIterator<ClearingHouseUser>;
+}
+export declare class UserMap implements UserMapInterface {
     private userMap;
     private clearingHouse;
     private accountSubscription;
@@ -20,6 +30,12 @@ export declare class UserMap {
      * @returns  ClearingHouseUser
      */
     mustGet(key: string): Promise<ClearingHouseUser>;
+    /**
+     * gets the Authority for a particular userAccountPublicKey, if no ClearingHouseUser exists, undefined is returned
+     * @param key userAccountPublicKey to get ClearngHouseUserFor
+     * @returns authority PublicKey | undefined
+     */
+    getUserAuthority(key: string): PublicKey | undefined;
     updateWithOrderRecord(record: OrderRecord): Promise<void>;
     values(): IterableIterator<ClearingHouseUser>;
 }

package/lib/userMap/userMap.js

@@ -63,6 +63,18 @@ class UserMap {
         await user.fetchAccounts();
         return user;
     }
+    /**
+     * gets the Authority for a particular userAccountPublicKey, if no ClearingHouseUser exists, undefined is returned
+     * @param key userAccountPublicKey to get ClearngHouseUserFor
+     * @returns authority PublicKey | undefined
+     */
+    getUserAuthority(key) {
+        const chUser = this.userMap.get(key);
+        if (!chUser) {
+            return undefined;
+        }
+        return chUser.getUserAccount().authority;
+    }
     async updateWithOrderRecord(record) {
         await this.addPubkey(record.user);
     }

package/lib/userName.d.ts

@@ -1,4 +1,5 @@
 export declare const MAX_NAME_LENGTH = 32;
 export declare const DEFAULT_USER_NAME = "Main Account";
+export declare const DEFAULT_MARKET_NAME = "Default Market Name";
 export declare function encodeName(name: string): number[];
 export declare function decodeName(bytes: number[]): string;

package/lib/userName.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeName = exports.encodeName = exports.DEFAULT_USER_NAME = exports.MAX_NAME_LENGTH = void 0;
+exports.decodeName = exports.encodeName = exports.DEFAULT_MARKET_NAME = exports.DEFAULT_USER_NAME = exports.MAX_NAME_LENGTH = void 0;
 exports.MAX_NAME_LENGTH = 32;
 exports.DEFAULT_USER_NAME = 'Main Account';
+exports.DEFAULT_MARKET_NAME = 'Default Market Name';
 function encodeName(name) {
     if (name.length > exports.MAX_NAME_LENGTH) {
-        throw Error(`User name (${name}) longer than 32 characters`);
+        throw Error(`Name (${name}) longer than 32 characters`);
     }
     const buffer = Buffer.alloc(32);
     buffer.fill(name);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.2.0-master.32",
+	"version": "0.2.0-master.34",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/bulkAccountLoader.ts

@@ -222,7 +222,11 @@ export class BulkAccountLoader {
 			return;
 		}
 
-		this.intervalId = setInterval(this.load.bind(this), this.pollingFrequency);
+		if (this.pollingFrequency !== 0)
+			this.intervalId = setInterval(
+				this.load.bind(this),
+				this.pollingFrequency
+			);
 	}
 
 	public stopPolling(): void {

package/src/accounts/pollingClearingHouseAccountSubscriber.ts

@@ -18,7 +18,7 @@ import {
 import {
 	getClearingHouseStateAccountPublicKey,
 	getSpotMarketPublicKey,
-	getMarketPublicKey,
+	getPerpMarketPublicKey,
 } from '../addresses/pda';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { capitalize } from './utils';
@@ -121,26 +121,26 @@ export class PollingClearingHouseAccountSubscriber
 			eventType: 'stateAccountUpdate',
 		});
 
-		await this.updateMarketAccountsToPoll();
+		await this.updatePerpMarketAccountsToPoll();
 		await this.updateSpotMarketAccountsToPoll();
 	}
 
-	async updateMarketAccountsToPoll(): Promise<boolean> {
+	async updatePerpMarketAccountsToPoll(): Promise<boolean> {
 		for (const marketIndex of this.perpMarketIndexes) {
-			await this.addMarketAccountToPoll(marketIndex);
+			await this.addPerpMarketAccountToPoll(marketIndex);
 		}
 		return true;
 	}
 
-	async addMarketAccountToPoll(marketIndex: number): Promise<boolean> {
-		const marketPublicKey = await getMarketPublicKey(
+	async addPerpMarketAccountToPoll(marketIndex: number): Promise<boolean> {
+		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			marketIndex
 		);
 
-		this.accountsToPoll.set(marketPublicKey.toString(), {
+		this.accountsToPoll.set(perpMarketPublicKey.toString(), {
 			key: 'perpMarket',
-			publicKey: marketPublicKey,
+			publicKey: perpMarketPublicKey,
 			eventType: 'perpMarketAccountUpdate',
 			mapKey: marketIndex,
 		});
@@ -361,7 +361,7 @@ export class PollingClearingHouseAccountSubscriber
 	}
 
 	async addPerpMarket(marketIndex: number): Promise<boolean> {
-		await this.addMarketAccountToPoll(marketIndex);
+		await this.addPerpMarketAccountToPoll(marketIndex);
 		const accountToPoll = this.accountsToPoll.get(marketIndex.toString());
 		this.addAccountToAccountLoader(accountToPoll);
 		return true;

package/src/accounts/webSocketClearingHouseAccountSubscriber.ts

@@ -11,7 +11,7 @@ import { EventEmitter } from 'events';
 import {
 	getClearingHouseStateAccountPublicKey,
 	getSpotMarketPublicKey,
-	getMarketPublicKey,
+	getPerpMarketPublicKey,
 } from '../addresses/pda';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
 import { PublicKey } from '@solana/web3.js';
@@ -91,7 +91,7 @@ export class WebSocketClearingHouseAccountSubscriber
 		});
 
 		// subscribe to market accounts
-		await this.subscribeToMarketAccounts();
+		await this.subscribeToPerpMarketAccounts();
 
 		// subscribe to spot market accounts
 		await this.subscribeToSpotMarketAccounts();
@@ -108,22 +108,22 @@ export class WebSocketClearingHouseAccountSubscriber
 		return true;
 	}
 
-	async subscribeToMarketAccounts(): Promise<boolean> {
+	async subscribeToPerpMarketAccounts(): Promise<boolean> {
 		for (const marketIndex of this.perpMarketIndexes) {
-			await this.subscribeToMarketAccount(marketIndex);
+			await this.subscribeToPerpMarketAccount(marketIndex);
 		}
 		return true;
 	}
 
-	async subscribeToMarketAccount(marketIndex: number): Promise<boolean> {
-		const marketPublicKey = await getMarketPublicKey(
+	async subscribeToPerpMarketAccount(marketIndex: number): Promise<boolean> {
+		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			marketIndex
 		);
 		const accountSubscriber = new WebSocketAccountSubscriber<PerpMarketAccount>(
 			'perpMarket',
 			this.program,
-			marketPublicKey
+			perpMarketPublicKey
 		);
 		await accountSubscriber.subscribe((data: PerpMarketAccount) => {
 			this.eventEmitter.emit('perpMarketAccountUpdate', data);
@@ -257,7 +257,7 @@ export class WebSocketClearingHouseAccountSubscriber
 		if (this.perpMarketAccountSubscribers.has(marketIndex)) {
 			return true;
 		}
-		return this.subscribeToMarketAccount(marketIndex);
+		return this.subscribeToPerpMarketAccount(marketIndex);
 	}
 
 	async addOracle(oracleInfo: OracleInfo): Promise<boolean> {

package/src/addresses/marketAddresses.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from '@solana/web3.js';
-import { getMarketPublicKey } from './pda';
+import { getPerpMarketPublicKey } from './pda';
 
 const CACHE = new Map<string, PublicKey>();
 export async function getMarketAddress(
@@ -11,7 +11,7 @@ export async function getMarketAddress(
 		return CACHE.get(cacheKey);
 	}
 
-	const publicKey = await getMarketPublicKey(programId, marketIndex);
+	const publicKey = await getPerpMarketPublicKey(programId, marketIndex);
 	CACHE.set(cacheKey, publicKey);
 	return publicKey;
 }

package/src/addresses/pda.ts

@@ -5,7 +5,7 @@ import { BN } from '@project-serum/anchor';
 export async function getClearingHouseStateAccountPublicKeyAndNonce(
 	programId: PublicKey
 ): Promise<[PublicKey, number]> {
-	return anchor.web3.PublicKey.findProgramAddress(
+	return PublicKey.findProgramAddress(
 		[Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house'))],
 		programId
 	);
@@ -20,13 +20,13 @@ export async function getClearingHouseStateAccountPublicKey(
 export async function getUserAccountPublicKeyAndNonce(
 	programId: PublicKey,
 	authority: PublicKey,
-	userId = 0
+	subAccountId = 0
 ): Promise<[PublicKey, number]> {
-	return anchor.web3.PublicKey.findProgramAddress(
+	return PublicKey.findProgramAddress(
 		[
 			Buffer.from(anchor.utils.bytes.utf8.encode('user')),
 			authority.toBuffer(),
-			Uint8Array.from([userId]),
+			Uint8Array.from([subAccountId]),
 		],
 		programId
 	);
@@ -35,23 +35,23 @@ export async function getUserAccountPublicKeyAndNonce(
 export async function getUserAccountPublicKey(
 	programId: PublicKey,
 	authority: PublicKey,
-	userId = 0
+	subAccountId = 0
 ): Promise<PublicKey> {
 	return (
-		await getUserAccountPublicKeyAndNonce(programId, authority, userId)
+		await getUserAccountPublicKeyAndNonce(programId, authority, subAccountId)
 	)[0];
 }
 
 export function getUserAccountPublicKeySync(
 	programId: PublicKey,
 	authority: PublicKey,
-	userId = 0
+	subAccountId = 0
 ): PublicKey {
-	return anchor.web3.PublicKey.findProgramAddressSync(
+	return PublicKey.findProgramAddressSync(
 		[
 			Buffer.from(anchor.utils.bytes.utf8.encode('user')),
 			authority.toBuffer(),
-			Uint8Array.from([userId]),
+			Uint8Array.from([subAccountId]),
 		],
 		programId
 	)[0];
@@ -61,7 +61,7 @@ export function getUserStatsAccountPublicKey(
 	programId: PublicKey,
 	authority: PublicKey
 ): PublicKey {
-	return anchor.web3.PublicKey.findProgramAddressSync(
+	return PublicKey.findProgramAddressSync(
 		[
 			Buffer.from(anchor.utils.bytes.utf8.encode('user_stats')),
 			authority.toBuffer(),
@@ -70,14 +70,14 @@ export function getUserStatsAccountPublicKey(
 	)[0];
 }
 
-export async function getMarketPublicKey(
+export async function getPerpMarketPublicKey(
 	programId: PublicKey,
 	marketIndex: number
 ): Promise<PublicKey> {
 	return (
-		await anchor.web3.PublicKey.findProgramAddress(
+		await PublicKey.findProgramAddress(
 			[
-				Buffer.from(anchor.utils.bytes.utf8.encode('market')),
+				Buffer.from(anchor.utils.bytes.utf8.encode('perp_market')),
 				new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
 			],
 			programId
@@ -90,7 +90,7 @@ export async function getSpotMarketPublicKey(
 	marketIndex: number
 ): Promise<PublicKey> {
 	return (
-		await anchor.web3.PublicKey.findProgramAddress(
+		await PublicKey.findProgramAddress(
 			[
 				Buffer.from(anchor.utils.bytes.utf8.encode('spot_market')),
 				new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
@@ -105,7 +105,7 @@ export async function getSpotMarketVaultPublicKey(
 	marketIndex: number
 ): Promise<PublicKey> {
 	return (
-		await anchor.web3.PublicKey.findProgramAddress(
+		await PublicKey.findProgramAddress(
 			[
 				Buffer.from(anchor.utils.bytes.utf8.encode('spot_market_vault')),
 				new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
@@ -120,7 +120,7 @@ export async function getInsuranceFundVaultPublicKey(
 	marketIndex: number
 ): Promise<PublicKey> {
 	return (
-		await anchor.web3.PublicKey.findProgramAddress(
+		await PublicKey.findProgramAddress(
 			[
 				Buffer.from(anchor.utils.bytes.utf8.encode('insurance_fund_vault')),
 				new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
@@ -135,7 +135,7 @@ export function getInsuranceFundStakeAccountPublicKey(
 	authority: PublicKey,
 	marketIndex: number
 ): PublicKey {
-	return anchor.web3.PublicKey.findProgramAddressSync(
+	return PublicKey.findProgramAddressSync(
 		[
 			Buffer.from(anchor.utils.bytes.utf8.encode('insurance_fund_stake')),
 			authority.toBuffer(),
@@ -148,7 +148,7 @@ export function getInsuranceFundStakeAccountPublicKey(
 export function getClearingHouseSignerPublicKey(
 	programId: PublicKey
 ): PublicKey {
-	return anchor.web3.PublicKey.findProgramAddressSync(
+	return PublicKey.findProgramAddressSync(
 		[Buffer.from(anchor.utils.bytes.utf8.encode('clearing_house_signer'))],
 		programId
 	)[0];
@@ -158,7 +158,7 @@ export function getSerumOpenOrdersPublicKey(
 	programId: PublicKey,
 	market: PublicKey
 ): PublicKey {
-	return anchor.web3.PublicKey.findProgramAddressSync(
+	return PublicKey.findProgramAddressSync(
 		[
 			Buffer.from(anchor.utils.bytes.utf8.encode('serum_open_orders')),
 			market.toBuffer(),
@@ -182,7 +182,7 @@ export function getSerumFulfillmentConfigPublicKey(
 	programId: PublicKey,
 	market: PublicKey
 ): PublicKey {
-	return anchor.web3.PublicKey.findProgramAddressSync(
+	return PublicKey.findProgramAddressSync(
 		[
 			Buffer.from(anchor.utils.bytes.utf8.encode('serum_fulfillment_config')),
 			market.toBuffer(),