@drift-labs/sdk-browser 2.163.0-beta.11 → 2.163.0-beta.13

package/lib/browser/core/remainingAccounts.d.ts

@@ -0,0 +1,27 @@
+import { PublicKey, type AccountMeta } from '@solana/web3.js';
+import type { UserAccount, SpotMarketAccount, PerpMarketAccount } from '../types';
+export type RemainingAccountParams = {
+    userAccounts: UserAccount[];
+    writablePerpMarketIndexes?: number[];
+    writableSpotMarketIndexes?: number[];
+    readablePerpMarketIndex?: number | number[];
+    readableSpotMarketIndexes?: number[];
+    useMarketLastSlotCache?: boolean;
+};
+export type RemainingAccountsContext = {
+    /** Used to resolve market accounts. */
+    getPerpMarketAccount: (marketIndex: number) => PerpMarketAccount;
+    getSpotMarketAccount: (marketIndex: number) => SpotMarketAccount;
+    /** Used to resolve user's last slot for cache invalidation. */
+    getUserAccountAndSlot: (subAccountId: number, authority: PublicKey) => {
+        slot: number;
+    } | undefined;
+    activeSubAccountId: number;
+    authority: PublicKey;
+    /** Mutable caches + forced-market sets (owned by caller). */
+    perpMarketLastSlotCache: Map<number, number>;
+    spotMarketLastSlotCache: Map<number, number>;
+    mustIncludePerpMarketIndexes: Set<number>;
+    mustIncludeSpotMarketIndexes: Set<number>;
+};
+export declare function getRemainingAccounts(ctx: RemainingAccountsContext, params: RemainingAccountParams): AccountMeta[];

package/lib/browser/core/remainingAccounts.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRemainingAccounts = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const types_1 = require("../types");
+const numericConstants_1 = require("../constants/numericConstants");
+const spotPosition_1 = require("../math/spotPosition");
+const position_1 = require("../math/position");
+function getRemainingAccounts(ctx, params) {
+    var _a;
+    const { oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap } = getRemainingAccountMapsForUsers(ctx, params.userAccounts);
+    if (params.useMarketLastSlotCache) {
+        const lastUserSlot = (_a = ctx.getUserAccountAndSlot(params.userAccounts.length > 0
+            ? params.userAccounts[0].subAccountId
+            : ctx.activeSubAccountId, params.userAccounts.length > 0
+            ? params.userAccounts[0].authority
+            : ctx.authority)) === null || _a === void 0 ? void 0 : _a.slot;
+        for (const [marketIndex, slot] of ctx.perpMarketLastSlotCache.entries()) {
+            if (slot > lastUserSlot) {
+                addPerpMarketToRemainingAccountMaps(ctx, marketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
+            }
+            else {
+                ctx.perpMarketLastSlotCache.delete(marketIndex);
+            }
+        }
+        for (const [marketIndex, slot] of ctx.spotMarketLastSlotCache.entries()) {
+            if (slot > lastUserSlot) {
+                addSpotMarketToRemainingAccountMaps(ctx, marketIndex, false, oracleAccountMap, spotMarketAccountMap);
+            }
+            else {
+                ctx.spotMarketLastSlotCache.delete(marketIndex);
+            }
+        }
+    }
+    if (params.readablePerpMarketIndex !== undefined) {
+        const readablePerpMarketIndexes = Array.isArray(params.readablePerpMarketIndex)
+            ? params.readablePerpMarketIndex
+            : [params.readablePerpMarketIndex];
+        for (const marketIndex of readablePerpMarketIndexes) {
+            addPerpMarketToRemainingAccountMaps(ctx, marketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
+        }
+    }
+    for (const perpMarketIndex of ctx.mustIncludePerpMarketIndexes.values()) {
+        addPerpMarketToRemainingAccountMaps(ctx, perpMarketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
+    }
+    if (params.readableSpotMarketIndexes !== undefined) {
+        for (const readableSpotMarketIndex of params.readableSpotMarketIndexes) {
+            addSpotMarketToRemainingAccountMaps(ctx, readableSpotMarketIndex, false, oracleAccountMap, spotMarketAccountMap);
+        }
+    }
+    for (const spotMarketIndex of ctx.mustIncludeSpotMarketIndexes.values()) {
+        addSpotMarketToRemainingAccountMaps(ctx, spotMarketIndex, false, oracleAccountMap, spotMarketAccountMap);
+    }
+    if (params.writablePerpMarketIndexes !== undefined) {
+        for (const writablePerpMarketIndex of params.writablePerpMarketIndexes) {
+            addPerpMarketToRemainingAccountMaps(ctx, writablePerpMarketIndex, true, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
+        }
+    }
+    if (params.writableSpotMarketIndexes !== undefined) {
+        for (const writableSpotMarketIndex of params.writableSpotMarketIndexes) {
+            addSpotMarketToRemainingAccountMaps(ctx, writableSpotMarketIndex, true, oracleAccountMap, spotMarketAccountMap);
+        }
+    }
+    return [
+        ...oracleAccountMap.values(),
+        ...spotMarketAccountMap.values(),
+        ...perpMarketAccountMap.values(),
+    ];
+}
+exports.getRemainingAccounts = getRemainingAccounts;
+function addPerpMarketToRemainingAccountMaps(ctx, marketIndex, writable, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap) {
+    const perpMarketAccount = ctx.getPerpMarketAccount(marketIndex);
+    perpMarketAccountMap.set(marketIndex, {
+        pubkey: perpMarketAccount.pubkey,
+        isSigner: false,
+        isWritable: writable,
+    });
+    const oracleWritable = writable && (0, types_1.isVariant)(perpMarketAccount.amm.oracleSource, 'prelaunch');
+    oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+        pubkey: perpMarketAccount.amm.oracle,
+        isSigner: false,
+        isWritable: oracleWritable,
+    });
+    addSpotMarketToRemainingAccountMaps(ctx, perpMarketAccount.quoteSpotMarketIndex, false, oracleAccountMap, spotMarketAccountMap);
+}
+function addSpotMarketToRemainingAccountMaps(ctx, marketIndex, writable, oracleAccountMap, spotMarketAccountMap) {
+    const spotMarketAccount = ctx.getSpotMarketAccount(marketIndex);
+    spotMarketAccountMap.set(spotMarketAccount.marketIndex, {
+        pubkey: spotMarketAccount.pubkey,
+        isSigner: false,
+        isWritable: writable,
+    });
+    if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+        oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+            pubkey: spotMarketAccount.oracle,
+            isSigner: false,
+            isWritable: false,
+        });
+    }
+}
+function getRemainingAccountMapsForUsers(ctx, userAccounts) {
+    const oracleAccountMap = new Map();
+    const spotMarketAccountMap = new Map();
+    const perpMarketAccountMap = new Map();
+    for (const userAccount of userAccounts) {
+        for (const spotPosition of userAccount.spotPositions) {
+            if (!(0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
+                addSpotMarketToRemainingAccountMaps(ctx, spotPosition.marketIndex, false, oracleAccountMap, spotMarketAccountMap);
+                if (!spotPosition.openAsks.eq(numericConstants_1.ZERO) ||
+                    !spotPosition.openBids.eq(numericConstants_1.ZERO)) {
+                    addSpotMarketToRemainingAccountMaps(ctx, numericConstants_1.QUOTE_SPOT_MARKET_INDEX, false, oracleAccountMap, spotMarketAccountMap);
+                }
+            }
+        }
+        for (const position of userAccount.perpPositions) {
+            if (!(0, position_1.positionIsAvailable)(position)) {
+                addPerpMarketToRemainingAccountMaps(ctx, position.marketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
+            }
+        }
+    }
+    return { oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap };
+}

package/lib/browser/core/signedMsg.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import type { SignedMsgOrderParamsDelegateMessage, SignedMsgOrderParamsMessage } from '../types';
+export type AnchorTypesCoder = {
+    encode: (typeName: string, value: any) => Buffer;
+    decode: (typeName: string, buffer: Buffer) => any;
+};
+export declare function encodeSignedMsgOrderParamsMessage(args: {
+    coderTypes: AnchorTypesCoder;
+    orderParamsMessage: SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage;
+    delegateSigner?: boolean;
+}): Buffer;
+export declare function decodeSignedMsgOrderParamsMessage(args: {
+    coderTypes: AnchorTypesCoder;
+    encodedMessage: Buffer;
+    delegateSigner?: boolean;
+}): SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage;

package/lib/browser/core/signedMsg.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeSignedMsgOrderParamsMessage = exports.encodeSignedMsgOrderParamsMessage = void 0;
+const sha256_1 = require("@noble/hashes/sha256");
+function encodeSignedMsgOrderParamsMessage(args) {
+    const { coderTypes, delegateSigner } = args;
+    const orderParamsMessage = { ...args.orderParamsMessage };
+    if (orderParamsMessage.maxMarginRatio === undefined) {
+        orderParamsMessage.maxMarginRatio = null;
+    }
+    if (orderParamsMessage.isolatedPositionDeposit === undefined) {
+        orderParamsMessage.isolatedPositionDeposit = null;
+    }
+    const anchorIxName = delegateSigner
+        ? 'global' + ':' + 'SignedMsgOrderParamsDelegateMessage'
+        : 'global' + ':' + 'SignedMsgOrderParamsMessage';
+    const prefix = Buffer.from((0, sha256_1.sha256)(anchorIxName).slice(0, 8));
+    const withBuilderDefaults = {
+        ...orderParamsMessage,
+        builderIdx: orderParamsMessage.builderIdx !== undefined
+            ? orderParamsMessage.builderIdx
+            : null,
+        builderFeeTenthBps: orderParamsMessage.builderFeeTenthBps !== undefined
+            ? orderParamsMessage.builderFeeTenthBps
+            : null,
+    };
+    const body = delegateSigner
+        ? coderTypes.encode('signedMsgOrderParamsDelegateMessage', withBuilderDefaults)
+        : coderTypes.encode('signedMsgOrderParamsMessage', withBuilderDefaults);
+    return Buffer.concat([prefix, body]);
+}
+exports.encodeSignedMsgOrderParamsMessage = encodeSignedMsgOrderParamsMessage;
+function decodeSignedMsgOrderParamsMessage(args) {
+    const decodeStr = args.delegateSigner
+        ? 'signedMsgOrderParamsDelegateMessage'
+        : 'signedMsgOrderParamsMessage';
+    return args.coderTypes.decode(decodeStr, Buffer.concat([args.encodedMessage.slice(8), Buffer.alloc(128)]));
+}
+exports.decodeSignedMsgOrderParamsMessage = decodeSignedMsgOrderParamsMessage;

package/lib/browser/decode/customCoder.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { Buffer } from 'buffer';
-import { Idl, BorshEventCoder, BorshInstructionCoder } from '@coral-xyz/anchor';
+import { Idl, BorshEventCoder, BorshInstructionCoder } from '../isomorphic/anchor';
 export declare class CustomBorshCoder<A extends string = string, _T extends string = string> {
     readonly idl: Idl;
     /**

package/lib/browser/decode/customCoder.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomBorshAccountsCoder = exports.CustomBorshCoder = void 0;
 const buffer_1 = require("buffer");
-const anchor_1 = require("@coral-xyz/anchor");
+const anchor_1 = require("../isomorphic/anchor");
 class CustomBorshCoder {
     constructor(idl) {
         const baseCoder = new anchor_1.BorshCoder(idl);

package/lib/browser/decode/user.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeUser = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
+const anchor_1 = require("../isomorphic/anchor");
 const types_1 = require("../types");
 const web3_js_1 = require("@solana/web3.js");
 const numericConstants_1 = require("../constants/numericConstants");

package/lib/browser/dlob/DLOB.d.ts

@@ -12,7 +12,7 @@
  *   `orderBookLevels.ts`    — aggregated L2/L3 book level construction for quoting
  */
 import { NodeList } from './NodeList';
-import { BN } from '@coral-xyz/anchor';
+import { BN } from '../isomorphic/anchor';
 import { DLOBNode, DLOBNodeType, TriggerOrderNode } from './DLOBNode';
 import { DriftClient } from '../driftClient';
 import { MarketType, MarketTypeStr, Order, PerpMarketAccount, PositionDirection, SpotMarketAccount, StateAccount } from '../types';

package/lib/browser/dlob/DLOB.js

@@ -14,7 +14,7 @@ exports.DLOB = void 0;
  *   `orderBookLevels.ts`    — aggregated L2/L3 book level construction for quoting
  */
 const NodeList_1 = require("./NodeList");
-const anchor_1 = require("@coral-xyz/anchor");
+const anchor_1 = require("../isomorphic/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const userName_1 = require("../userName");
 const orders_1 = require("../math/orders");

package/lib/browser/dlob/DLOBNode.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
-import { BN } from '@coral-xyz/anchor';
+import { BN } from '../isomorphic/anchor';
 import { MarketTypeStr, Order, ProtectedMakerParams } from '../types';
 import { MMOraclePriceData, OraclePriceData } from '../oracles/types';
 export interface DLOBNode {

package/lib/browser/dlob/DLOBNode.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNode = exports.SignedMsgOrderNode = exports.TriggerOrderNode = exports.MarketOrderNode = exports.FloatingLimitOrderNode = exports.RestingLimitOrderNode = exports.TakingLimitOrderNode = exports.OrderNode = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
+const anchor_1 = require("../isomorphic/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const orders_1 = require("../math/orders");
 const types_1 = require("../types");

package/lib/browser/dlob/DLOBSubscriber.d.ts

@@ -7,7 +7,7 @@ import { DLOBSource, DLOBSubscriberEvents, DLOBSubscriptionConfig, ProtectMakerP
 import { DriftClient } from '../driftClient';
 import { MarketType } from '../types';
 import { L2OrderBook, L2OrderBookGenerator, L3OrderBook } from './orderBookLevels';
-import { BN } from '@coral-xyz/anchor';
+import { BN } from '../isomorphic/anchor';
 export declare class DLOBSubscriber {
     driftClient: DriftClient;
     dlobSource: DLOBSource;

package/lib/browser/dlob/NodeList.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="bn.js" />
 import { MarketTypeStr, Order, ProtectedMakerParams } from '../types';
 import { DLOBNode, DLOBNodeMap } from './DLOBNode';
-import { BN } from '@coral-xyz/anchor';
+import { BN } from '../isomorphic/anchor';
 export type SortDirection = 'asc' | 'desc';
 export declare function getOrderSignature(orderId: number, userAccount: string): string;
 export interface DLOBNodeGenerator {

package/lib/browser/dlob/orderBookLevels.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
-import { BN } from '@coral-xyz/anchor';
+import { BN } from '../isomorphic/anchor';
 import { DLOBNode } from './DLOBNode';
 import { PerpMarketAccount } from '../types';
 import { MMOraclePriceData, OraclePriceData } from '../oracles/types';

package/lib/browser/dlob/orderBookLevels.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uncrossL2 = exports.groupL2 = exports.getVammL2Generator = exports.createL2Levels = exports.mergeL2LevelGenerators = exports.getL2GeneratorFromDLOBNodes = exports.MAJORS_TOP_OF_BOOK_QUOTE_AMOUNTS = exports.DEFAULT_TOP_OF_BOOK_QUOTE_AMOUNTS = void 0;
-const anchor_1 = require("@coral-xyz/anchor");
+const anchor_1 = require("../isomorphic/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const amm_1 = require("../math/amm");
 const exchangeStatus_1 = require("../math/exchangeStatus");

package/lib/browser/driftClient.d.ts

@@ -16,8 +16,8 @@
  *
  * Instruction → on-chain handler mapping: see ARCHITECTURE.md § SDK↔Instruction Mapping.
  */
-import * as anchor from '@coral-xyz/anchor';
-import { AnchorProvider, BN, ProgramAccount } from '@coral-xyz/anchor';
+import { AnchorProvider, BN } from './isomorphic/anchor';
+import type { ProgramAccount } from '@coral-xyz/anchor';
 import { DriftClientMetricsEvents, IWallet, MakerInfo, MappedRecord, MarketType, ModifyOrderPolicy, OpenbookV2FulfillmentConfigAccount, OptionalOrderParams, OracleSource, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, ScaleOrderParams, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SignedMsgOrderParamsMessage, TxParams, UserAccount, UserStatsAccount, ProtectedMakerModeConfig, SignedMsgOrderParamsDelegateMessage, PostOnlyParams, LPPoolAccount, ConstituentAccount, ConstituentTargetBaseAccount, AmmCache } from './types';
 import { AccountMeta, AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, ConfirmOptions, Connection, Keypair, PublicKey, Signer, Transaction, TransactionInstruction, TransactionSignature, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
@@ -46,14 +46,7 @@ import { UnifiedSwapClient } from './swap/UnifiedSwapClient';
  * @deprecated Use UnifiedSwapClient class instead
  */
 export type SwapClient = TitanClient | JupiterClient;
-type RemainingAccountParams = {
-    userAccounts: UserAccount[];
-    writablePerpMarketIndexes?: number[];
-    writableSpotMarketIndexes?: number[];
-    readablePerpMarketIndex?: number | number[];
-    readableSpotMarketIndexes?: number[];
-    useMarketLastSlotCache?: boolean;
-};
+type RemainingAccountParams = import('./core/remainingAccounts').RemainingAccountParams;
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -279,12 +272,12 @@ export declare class DriftClient {
         reduceOnly: boolean;
         subAccountId: number;
     }[]): Promise<TransactionSignature>;
-    getUpdateUserReduceOnlyIx(reduceOnly: boolean, subAccountId: number): Promise<anchor.web3.TransactionInstruction>;
+    getUpdateUserReduceOnlyIx(reduceOnly: boolean, subAccountId: number): Promise<TransactionInstruction>;
     updateUserPoolId(updates: {
         poolId: number;
         subAccountId: number;
     }[]): Promise<TransactionSignature>;
-    getUpdateUserPoolIdIx(poolId: number, subAccountId: number): Promise<anchor.web3.TransactionInstruction>;
+    getUpdateUserPoolIdIx(poolId: number, subAccountId: number): Promise<TransactionInstruction>;
     fetchAllUserAccounts(includeIdle?: boolean): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
     getUserAccountsAndAddressesForAuthority(authority: PublicKey): Promise<ProgramAccount<UserAccount>[]>;
@@ -292,9 +285,9 @@ export declare class DriftClient {
     getReferredUserStatsAccountsByReferrer(referrer: PublicKey): Promise<UserStatsAccount[]>;
     getReferrerNameAccountsForAuthority(authority: PublicKey): Promise<ReferrerNameAccount[]>;
     deleteUser(subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
-    getUserDeletionIx(userAccountPublicKey: PublicKey): Promise<anchor.web3.TransactionInstruction>;
+    getUserDeletionIx(userAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
     forceDeleteUser(userAccountPublicKey: PublicKey, userAccount: UserAccount, txParams?: TxParams): Promise<TransactionSignature>;
-    getForceDeleteUserIx(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<anchor.web3.TransactionInstruction>;
+    getForceDeleteUserIx(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionInstruction>;
     deleteSignedMsgUserOrders(txParams?: TxParams): Promise<TransactionSignature>;
     getSignedMsgUserOrdersDeletionIx(authority: PublicKey): Promise<any>;
     /**
@@ -307,7 +300,7 @@ export declare class DriftClient {
      */
     isSignedMsgUserOrdersAccountInitialized(authority: PublicKey): Promise<boolean>;
     reclaimRent(subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
-    getReclaimRentIx(userAccountPublicKey: PublicKey): Promise<anchor.web3.TransactionInstruction>;
+    getReclaimRentIx(userAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
     getUser(subAccountId?: number, authority?: PublicKey): User;
     hasUser(subAccountId?: number, authority?: PublicKey): boolean;
     getUsers(): User[];
@@ -376,8 +369,8 @@ export declare class DriftClient {
      * @param useNative
      * @param tokenProgram
      */
-    getAssociatedTokenAccount(marketIndex: number, useNative?: boolean, tokenProgram?: anchor.web3.PublicKey, authority?: anchor.web3.PublicKey, allowOwnerOffCurve?: boolean): Promise<PublicKey>;
-    createAssociatedTokenAccountIdempotentInstruction(account: PublicKey, payer: PublicKey, owner: PublicKey, mint: PublicKey, tokenProgram?: anchor.web3.PublicKey): TransactionInstruction;
+    getAssociatedTokenAccount(marketIndex: number, useNative?: boolean, tokenProgram?: PublicKey, authority?: PublicKey, allowOwnerOffCurve?: boolean): Promise<PublicKey>;
+    createAssociatedTokenAccountIdempotentInstruction(account: PublicKey, payer: PublicKey, owner: PublicKey, mint: PublicKey, tokenProgram?: PublicKey): TransactionInstruction;
     getDepositTxnIx(amount: BN, marketIndex: number, associatedTokenAccount: PublicKey, subAccountId?: number, reduceOnly?: boolean, overrides?: {
         authority?: PublicKey;
     }): Promise<TransactionInstruction[]>;
@@ -412,7 +405,7 @@ export declare class DriftClient {
     getWrappedSolAccountCreationIxs(amount: BN, includeRent?: boolean, overrides?: {
         authority?: PublicKey;
     }): Promise<{
-        ixs: anchor.web3.TransactionInstruction[];
+        ixs: TransactionInstruction[];
         /** @deprecated - this array is always going to be empty, in the current implementation */
         signers: Signer[];
         pubkey: PublicKey;
@@ -422,7 +415,7 @@ export declare class DriftClient {
     isTransferHook(spotMarketAccount: SpotMarketAccount): boolean;
     addTokenMintToRemainingAccounts(spotMarketAccount: SpotMarketAccount, remainingAccounts: AccountMeta[]): void;
     addExtraAccountMetasToRemainingAccounts(mint: PublicKey, remainingAccounts: AccountMeta[]): Promise<void>;
-    getAssociatedTokenAccountCreationIx(tokenMintAddress: PublicKey, associatedTokenAddress: PublicKey, tokenProgram: PublicKey): anchor.web3.TransactionInstruction;
+    getAssociatedTokenAccountCreationIx(tokenMintAddress: PublicKey, associatedTokenAddress: PublicKey, tokenProgram: PublicKey): TransactionInstruction;
     createInitializeUserAccountAndDepositCollateralIxs(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, customMaxMarginRatio?: number, poolId?: number, overrides?: {
         /**
          * Optional external wallet to deposit from. If provided, the deposit will be made
@@ -580,7 +573,7 @@ export declare class DriftClient {
     }, placeOrderParams: OrderParams[], txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     placeOrders(params: OrderParams[], txParams?: TxParams, subAccountId?: number, optionalIxs?: TransactionInstruction[], isolatedPositionDepositAmount?: BN): Promise<TransactionSignature>;
     preparePlaceOrdersTx(params: OrderParams[], txParams?: TxParams, subAccountId?: number, optionalIxs?: TransactionInstruction[], isolatedPositionDepositAmount?: BN): Promise<{
-        placeOrdersTx: anchor.web3.Transaction | anchor.web3.VersionedTransaction;
+        placeOrdersTx: Transaction | VersionedTransaction;
     }>;
     getPlaceOrdersIx(params: OptionalOrderParams[], subAccountId?: number, overrides?: {
         authority?: PublicKey;
@@ -595,7 +588,7 @@ export declare class DriftClient {
      */
     placeScaleOrders(params: ScaleOrderParams, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     preparePlaceScaleOrdersTx(params: ScaleOrderParams, txParams?: TxParams, subAccountId?: number): Promise<{
-        placeScaleOrdersTx: anchor.web3.Transaction | anchor.web3.VersionedTransaction;
+        placeScaleOrdersTx: Transaction | VersionedTransaction;
     }>;
     getPlaceScaleOrdersIx(params: ScaleOrderParams, subAccountId?: number): Promise<TransactionInstruction>;
     fillPerpOrder(userAccountPublicKey: PublicKey, user: UserAccount, order?: Pick<Order, 'marketIndex' | 'orderId'>, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, txParams?: TxParams, fillerSubAccountId?: number, fillerAuthority?: PublicKey, hasBuilderFee?: boolean): Promise<TransactionSignature>;
@@ -1248,12 +1241,12 @@ export declare class DriftClient {
     sendTransaction(tx: Transaction | VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     buildTransaction(instructions: TransactionInstruction | TransactionInstruction[], txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean, recentBlockhash?: BlockhashWithExpiryBlockHeight, optionalIxs?: TransactionInstruction[]): Promise<Transaction | VersionedTransaction>;
     buildBulkTransactions(instructions: (TransactionInstruction | TransactionInstruction[])[], txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<(Transaction | VersionedTransaction)[]>;
-    buildTransactionsMap(instructionsMap: Record<string, TransactionInstruction | TransactionInstruction[]>, txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<MappedRecord<Record<string, anchor.web3.TransactionInstruction | anchor.web3.TransactionInstruction[]>, anchor.web3.Transaction | anchor.web3.VersionedTransaction>>;
+    buildTransactionsMap(instructionsMap: Record<string, TransactionInstruction | TransactionInstruction[]>, txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<MappedRecord<Record<string, TransactionInstruction | TransactionInstruction[]>, Transaction | VersionedTransaction>>;
     buildAndSignTransactionsMap(instructionsMap: Record<string, TransactionInstruction | TransactionInstruction[]>, txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[], forceVersionedTransaction?: boolean): Promise<{
-        signedTxMap: Record<string, anchor.web3.Transaction>;
+        signedTxMap: Record<string, Transaction>;
         signedTxData: SignedTxData[];
     } | {
-        signedTxMap: MappedRecord<Record<string, anchor.web3.TransactionInstruction | anchor.web3.TransactionInstruction[]>, anchor.web3.Transaction | anchor.web3.VersionedTransaction>;
+        signedTxMap: MappedRecord<Record<string, TransactionInstruction | TransactionInstruction[]>, Transaction | VersionedTransaction>;
         signedTxData: SignedTxData[];
     }>;
     isOrderIncreasingPosition(orderParams: OptionalOrderParams, subAccountId: number): boolean;