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

package/lib/node/driftClient.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -41,12 +18,11 @@ exports.DriftClient = void 0;
  *
  * Instruction → on-chain handler mapping: see ARCHITECTURE.md § SDK↔Instruction Mapping.
  */
-const anchor = __importStar(require("@coral-xyz/anchor"));
-const anchor_1 = require("@coral-xyz/anchor");
+const anchor_1 = require("./isomorphic/anchor");
 const bs58_1 = __importDefault(require("bs58"));
 const spl_token_1 = require("@solana/spl-token");
 const types_1 = require("./types");
-const drift_json_1 = __importDefault(require("./idl/drift.json"));
+const DriftCore_1 = require("./core/DriftCore");
 /** Client-side guardrail; mirrors on-chain `ErrorCode::SpotDlobTradingDisabled`. */
 const SPOT_DLOB_TRADING_DISABLED_MSG = 'Spot DLOB trading is disabled; spot balances, deposits, and swaps remain available.';
 const web3_js_1 = require("@solana/web3.js");
@@ -81,8 +57,6 @@ const utils_2 = require("./tx/utils");
 const grpcDriftClientAccountSubscriber_1 = require("./accounts/grpcDriftClientAccountSubscriber");
 const tweetnacl_1 = __importDefault(require("tweetnacl"));
 const oracleId_1 = require("./oracles/oracleId");
-// BN is already imported globally in this file via other imports
-const sha256_1 = require("@noble/hashes/sha256");
 const utils_3 = require("./oracles/utils");
 const orders_1 = require("./math/orders");
 const builder_1 = require("./math/builder");
@@ -138,7 +112,7 @@ class DriftClient {
         this.provider = new anchor_1.AnchorProvider(config.connection, 
         // @ts-ignore
         config.wallet, this.opts);
-        this.program = new anchor_1.Program(drift_json_1.default, this.provider, config.coder);
+        this.program = new anchor_1.Program(DriftCore_1.DriftCore.defaultIdl(), this.provider, config.coder);
         this.authority = (_d = config.authority) !== null && _d !== void 0 ? _d : this.wallet.publicKey;
         this.activeSubAccountId = (_e = config.activeSubAccountId) !== null && _e !== void 0 ? _e : 0;
         this.skipLoadUsers = (_f = config.skipLoadUsers) !== null && _f !== void 0 ? _f : false;
@@ -454,7 +428,7 @@ class DriftClient {
         const newProvider = new anchor_1.AnchorProvider(this.connection, 
         // @ts-ignore
         newWallet, this.opts);
-        const newProgram = new anchor_1.Program(drift_json_1.default, newProvider);
+        const newProgram = new anchor_1.Program(DriftCore_1.DriftCore.defaultIdl(), newProvider);
         this.skipLoadUsers = false;
         // Update provider for txSender with new wallet details
         this.txSender.wallet = newWallet;
@@ -664,8 +638,8 @@ class DriftClient {
                 userStats: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority),
                 authority,
                 payer,
-                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: web3_js_1.SystemProgram.programId,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -687,8 +661,8 @@ class DriftClient {
                 signedMsgUserOrders: signedMsgUserAccountPublicKey,
                 authority,
                 payer,
-                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
         });
         return [signedMsgUserAccountPublicKey, initializeUserAccountIx];
@@ -706,7 +680,7 @@ class DriftClient {
                 signedMsgUserOrders: signedMsgUserAccountPublicKey,
                 authority,
                 payer: this.wallet.publicKey,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                systemProgram: web3_js_1.SystemProgram.programId,
                 user: await (0, pda_1.getUserAccountPublicKey)(this.program.programId, authority, userSubaccountId),
             },
         });
@@ -724,8 +698,8 @@ class DriftClient {
             accounts: {
                 signedMsgWsDelegates,
                 authority: this.wallet.publicKey,
-                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
         });
         return ix;
@@ -744,8 +718,8 @@ class DriftClient {
                 revenueShare,
                 authority,
                 payer: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.payer) !== null && _a !== void 0 ? _a : this.wallet.publicKey,
-                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
         });
     }
@@ -765,8 +739,8 @@ class DriftClient {
                 payer: (_a = overrides === null || overrides === void 0 ? void 0 : overrides.payer) !== null && _a !== void 0 ? _a : this.wallet.publicKey,
                 userStats: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority),
                 state: await this.getStatePublicKey(),
-                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
         });
     }
@@ -801,7 +775,7 @@ class DriftClient {
                 escrow,
                 authority,
                 payer: this.wallet.publicKey,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
         });
     }
@@ -840,7 +814,7 @@ class DriftClient {
                 escrow,
                 authority,
                 payer,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
         });
     }
@@ -856,7 +830,7 @@ class DriftClient {
             accounts: {
                 signedMsgWsDelegates,
                 authority: this.wallet.publicKey,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
         });
         return ix;
@@ -873,7 +847,7 @@ class DriftClient {
             accounts: {
                 signedMsgWsDelegates,
                 authority: this.wallet.publicKey,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
         });
         return ix;
@@ -891,8 +865,8 @@ class DriftClient {
                 userStats: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority !== null && authority !== void 0 ? authority : this.wallet.publicKey),
                 authority: authority !== null && authority !== void 0 ? authority : this.wallet.publicKey,
                 payer: this.wallet.publicKey,
-                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
         });
     }
@@ -956,8 +930,8 @@ class DriftClient {
                 userStats: this.getUserStatsAccountPublicKey(),
                 authority: accountAuthority,
                 payer: payer,
-                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: web3_js_1.SystemProgram.programId,
                 state: await this.getStatePublicKey(),
             },
             remainingAccounts,
@@ -986,8 +960,8 @@ class DriftClient {
                 authority: this.wallet.publicKey,
                 userStats: this.getUserStatsAccountPublicKey(),
                 payer: this.wallet.publicKey,
-                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: web3_js_1.SystemProgram.programId,
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -1351,7 +1325,7 @@ class DriftClient {
                 userStats: this.getUserStatsAccountPublicKey(),
                 authority: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                rent: anchor.web3.SYSVAR_RENT_PUBKEY,
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
             },
         });
     }
@@ -1479,69 +1453,7 @@ class DriftClient {
         });
     }
     getRemainingAccounts(params) {
-        var _a;
-        const { oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap } = this.getRemainingAccountMapsForUsers(params.userAccounts);
-        if (params.useMarketLastSlotCache) {
-            const lastUserSlot = (_a = this.getUserAccountAndSlot(params.userAccounts.length > 0
-                ? params.userAccounts[0].subAccountId
-                : this.activeSubAccountId, params.userAccounts.length > 0
-                ? params.userAccounts[0].authority
-                : this.authority)) === null || _a === void 0 ? void 0 : _a.slot;
-            for (const [marketIndex, slot,] of this.perpMarketLastSlotCache.entries()) {
-                // if cache has more recent slot than user positions account slot, add market to remaining accounts
-                // otherwise remove from slot
-                if (slot > lastUserSlot) {
-                    this.addPerpMarketToRemainingAccountMaps(marketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
-                }
-                else {
-                    this.perpMarketLastSlotCache.delete(marketIndex);
-                }
-            }
-            for (const [marketIndex, slot,] of this.spotMarketLastSlotCache.entries()) {
-                // if cache has more recent slot than user positions account slot, add market to remaining accounts
-                // otherwise remove from slot
-                if (slot > lastUserSlot) {
-                    this.addSpotMarketToRemainingAccountMaps(marketIndex, false, oracleAccountMap, spotMarketAccountMap);
-                }
-                else {
-                    this.spotMarketLastSlotCache.delete(marketIndex);
-                }
-            }
-        }
-        if (params.readablePerpMarketIndex !== undefined) {
-            const readablePerpMarketIndexes = Array.isArray(params.readablePerpMarketIndex)
-                ? params.readablePerpMarketIndex
-                : [params.readablePerpMarketIndex];
-            for (const marketIndex of readablePerpMarketIndexes) {
-                this.addPerpMarketToRemainingAccountMaps(marketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
-            }
-        }
-        for (const perpMarketIndex of this.mustIncludePerpMarketIndexes.values()) {
-            this.addPerpMarketToRemainingAccountMaps(perpMarketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
-        }
-        if (params.readableSpotMarketIndexes !== undefined) {
-            for (const readableSpotMarketIndex of params.readableSpotMarketIndexes) {
-                this.addSpotMarketToRemainingAccountMaps(readableSpotMarketIndex, false, oracleAccountMap, spotMarketAccountMap);
-            }
-        }
-        for (const spotMarketIndex of this.mustIncludeSpotMarketIndexes.values()) {
-            this.addSpotMarketToRemainingAccountMaps(spotMarketIndex, false, oracleAccountMap, spotMarketAccountMap);
-        }
-        if (params.writablePerpMarketIndexes !== undefined) {
-            for (const writablePerpMarketIndex of params.writablePerpMarketIndexes) {
-                this.addPerpMarketToRemainingAccountMaps(writablePerpMarketIndex, true, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
-            }
-        }
-        if (params.writableSpotMarketIndexes !== undefined) {
-            for (const writableSpotMarketIndex of params.writableSpotMarketIndexes) {
-                this.addSpotMarketToRemainingAccountMaps(writableSpotMarketIndex, true, oracleAccountMap, spotMarketAccountMap);
-            }
-        }
-        return [
-            ...oracleAccountMap.values(),
-            ...spotMarketAccountMap.values(),
-            ...perpMarketAccountMap.values(),
-        ];
+        return DriftCore_1.DriftCore.remainingAccounts.getRemainingAccounts(this, params);
     }
     addPerpMarketToRemainingAccountMaps(marketIndex, writable, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap) {
         const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
@@ -1647,7 +1559,7 @@ class DriftClient {
                 { pubkey: owner, isSigner: false, isWritable: false },
                 { pubkey: mint, isSigner: false, isWritable: false },
                 {
-                    pubkey: anchor.web3.SystemProgram.programId,
+                    pubkey: web3_js_1.SystemProgram.programId,
                     isSigner: false,
                     isWritable: false,
                 },
@@ -1747,17 +1659,19 @@ class DriftClient {
         }
         const authority = (_a = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
         const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
-        return await this.program.instruction.deposit(marketIndex, amount, reduceOnly, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                spotMarket: spotMarketAccount.pubkey,
-                spotMarketVault: spotMarketAccount.vault,
-                user: userAccountPublicKey,
-                userStats: this.getUserStatsAccountPublicKey(),
-                userTokenAccount: userTokenAccount,
-                authority,
-                tokenProgram,
-            },
+        return await DriftCore_1.DriftCore.buildDepositInstruction({
+            program: this.program,
+            marketIndex,
+            amount,
+            reduceOnly,
+            state: await this.getStatePublicKey(),
+            spotMarket: spotMarketAccount.pubkey,
+            spotMarketVault: spotMarketAccount.vault,
+            user: userAccountPublicKey,
+            userStats: this.getUserStatsAccountPublicKey(),
+            userTokenAccount,
+            authority,
+            tokenProgram,
             remainingAccounts,
         });
     }
@@ -2050,18 +1964,20 @@ class DriftClient {
             await this.addExtraAccountMetasToRemainingAccounts(spotMarketAccount.mint, remainingAccounts);
         }
         const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
-        return await this.program.instruction.withdraw(marketIndex, amount, reduceOnly, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                spotMarket: spotMarketAccount.pubkey,
-                spotMarketVault: spotMarketAccount.vault,
-                driftSigner: this.getSignerPublicKey(),
-                user,
-                userStats: this.getUserStatsAccountPublicKey(),
-                userTokenAccount: userTokenAccount,
-                authority: this.wallet.publicKey,
-                tokenProgram,
-            },
+        return await DriftCore_1.DriftCore.buildWithdrawInstruction({
+            program: this.program,
+            marketIndex,
+            amount,
+            reduceOnly,
+            state: await this.getStatePublicKey(),
+            spotMarket: spotMarketAccount.pubkey,
+            spotMarketVault: spotMarketAccount.vault,
+            driftSigner: this.getSignerPublicKey(),
+            user,
+            userStats: this.getUserStatsAccountPublicKey(),
+            userTokenAccount,
+            authority: this.wallet.publicKey,
+            tokenProgram,
             remainingAccounts,
         });
     }
@@ -2566,13 +2482,13 @@ class DriftClient {
                 ? [depositToTradeArgs === null || depositToTradeArgs === void 0 ? void 0 : depositToTradeArgs.depositMarketIndex]
                 : undefined,
         });
-        return await this.program.instruction.placePerpOrder(orderParams, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user,
-                userStats: this.getUserStatsAccountPublicKey(),
-                authority: this.wallet.publicKey,
-            },
+        return await DriftCore_1.DriftCore.buildPlacePerpOrderInstruction({
+            program: this.program,
+            orderParams,
+            state: await this.getStatePublicKey(),
+            user,
+            userStats: this.getUserStatsAccountPublicKey(),
+            authority: this.wallet.publicKey,
             remainingAccounts,
         });
     }
@@ -2666,12 +2582,12 @@ class DriftClient {
             userAccounts: [this.getUserAccount(subAccountId)],
             useMarketLastSlotCache: true,
         });
-        return await this.program.instruction.cancelOrder(orderId !== null && orderId !== void 0 ? orderId : null, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user,
-                authority: this.wallet.publicKey,
-            },
+        return await DriftCore_1.DriftCore.buildCancelOrderInstruction({
+            program: this.program,
+            orderId: orderId !== null && orderId !== void 0 ? orderId : null,
+            state: await this.getStatePublicKey(),
+            user,
+            authority: this.wallet.publicKey,
             remainingAccounts,
         });
     }
@@ -2687,13 +2603,13 @@ class DriftClient {
             userAccounts: [this.getUserAccount(subAccountId)],
             useMarketLastSlotCache: true,
         });
-        return await this.program.instruction.cancelOrderByUserId(userOrderId, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user,
-                authority: this.wallet.publicKey,
-                oracle,
-            },
+        return await DriftCore_1.DriftCore.buildCancelOrderByUserIdInstruction({
+            program: this.program,
+            userOrderId,
+            state: await this.getStatePublicKey(),
+            user,
+            authority: this.wallet.publicKey,
+            oracle,
             remainingAccounts,
         });
     }
@@ -2727,12 +2643,12 @@ class DriftClient {
             useMarketLastSlotCache: true,
         });
         const authority = (_c = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _c !== void 0 ? _c : this.wallet.publicKey;
-        return await this.program.instruction.cancelOrdersByIds(orderIds, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user: userAccountPubKey,
-                authority,
-            },
+        return await DriftCore_1.DriftCore.buildCancelOrdersByIdsInstruction({
+            program: this.program,
+            orderIds,
+            state: await this.getStatePublicKey(),
+            user: userAccountPubKey,
+            authority,
             remainingAccounts,
         });
     }
@@ -2758,12 +2674,15 @@ class DriftClient {
             readableSpotMarketIndexes,
             useMarketLastSlotCache: true,
         });
-        return await this.program.instruction.cancelOrders(marketType !== null && marketType !== void 0 ? marketType : null, marketIndex !== null && marketIndex !== void 0 ? marketIndex : null, direction !== null && direction !== void 0 ? direction : null, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user,
-                authority: this.wallet.publicKey,
-            },
+        return await DriftCore_1.DriftCore.buildCancelOrdersInstruction({
+            program: this.program,
+            marketType: marketType !== null && marketType !== void 0 ? marketType : null,
+            marketIndex: marketIndex !== null && marketIndex !== void 0 ? marketIndex : null,
+            direction: direction !== null && direction !== void 0 ? direction : null,
+            user,
+            state: await this.getStatePublicKey(),
+            userStats: this.getUserStatsAccountPublicKey(),
+            authority: this.wallet.publicKey,
             remainingAccounts,
         });
     }
@@ -2821,13 +2740,13 @@ class DriftClient {
         });
         const formattedParams = params.map((item) => (0, orderParams_1.getOrderParams)(item));
         const authority = (_a = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
-        return await this.program.instruction.placeOrders(formattedParams, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user,
-                userStats: this.getUserStatsAccountPublicKey(),
-                authority,
-            },
+        return await DriftCore_1.DriftCore.buildPlaceOrdersInstruction({
+            program: this.program,
+            formattedParams,
+            state: await this.getStatePublicKey(),
+            user,
+            userStats: this.getUserStatsAccountPublicKey(),
+            authority,
             remainingAccounts,
         });
     }
@@ -3009,15 +2928,15 @@ class DriftClient {
             });
         }
         const orderId = isSignedMsg ? null : order.orderId;
-        return await this.program.instruction.fillPerpOrder(orderId, null, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                filler,
-                fillerStats: fillerStatsPublicKey,
-                user: userAccountPublicKey,
-                userStats: userStatsPublicKey,
-                authority: this.wallet.publicKey,
-            },
+        return await DriftCore_1.DriftCore.buildFillPerpOrderInstruction({
+            program: this.program,
+            orderId,
+            state: await this.getStatePublicKey(),
+            filler,
+            fillerStats: fillerStatsPublicKey,
+            user: userAccountPublicKey,
+            userStats: userStatsPublicKey,
+            authority: this.wallet.publicKey,
             remainingAccounts,
         });
     }
@@ -3573,7 +3492,7 @@ class DriftClient {
                 outTokenAccount,
                 tokenProgram: inTokenProgram,
                 driftSigner: this.getStateAccount().signer,
-                instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
             remainingAccounts,
         });
@@ -3589,7 +3508,7 @@ class DriftClient {
                 outTokenAccount,
                 tokenProgram: inTokenProgram,
                 driftSigner: this.getStateAccount().signer,
-                instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
             remainingAccounts,
         });
@@ -3721,13 +3640,13 @@ class DriftClient {
         }
         const remainingAccounts = this.getRemainingAccounts(remainingAccountsParams);
         const orderId = order.orderId;
-        return await this.program.instruction.triggerOrder(orderId, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                filler,
-                user: userAccountPublicKey,
-                authority: this.wallet.publicKey,
-            },
+        return await DriftCore_1.DriftCore.buildTriggerOrderInstruction({
+            program: this.program,
+            orderId,
+            state: await this.getStatePublicKey(),
+            filler,
+            user: userAccountPublicKey,
+            authority: this.wallet.publicKey,
             remainingAccounts,
         });
     }
@@ -3992,13 +3911,14 @@ class DriftClient {
                 ((auctionDurationPercentage !== null && auctionDurationPercentage !== void 0 ? auctionDurationPercentage : 100) << 8) | (successCondition !== null && successCondition !== void 0 ? successCondition : 0);
         }
         const authority = (_a = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
-        return await this.program.instruction.placeAndTakePerpOrder(orderParams, optionalParams, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user,
-                userStats: userStatsPublicKey,
-                authority,
-            },
+        return await DriftCore_1.DriftCore.buildPlaceAndTakePerpOrderInstruction({
+            program: this.program,
+            orderParams,
+            optionalParams,
+            state: await this.getStatePublicKey(),
+            user,
+            userStats: userStatsPublicKey,
+            authority,
             remainingAccounts,
         });
     }
@@ -4039,15 +3959,16 @@ class DriftClient {
                 isSigner: false,
             });
         }
-        return await this.program.instruction.placeAndMakePerpOrder(orderParams, takerOrderId, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user,
-                userStats: userStatsPublicKey,
-                taker: takerInfo.taker,
-                takerStats: takerInfo.takerStats,
-                authority: this.wallet.publicKey,
-            },
+        return await DriftCore_1.DriftCore.buildPlaceAndMakePerpOrderInstruction({
+            program: this.program,
+            orderParams,
+            takerOrderId,
+            state: await this.getStatePublicKey(),
+            user,
+            userStats: userStatsPublicKey,
+            taker: takerInfo.taker,
+            takerStats: takerInfo.takerStats,
+            authority: this.wallet.publicKey,
             remainingAccounts,
         });
     }
@@ -4082,33 +4003,11 @@ class DriftClient {
      * Borsh encode signedMsg taker order params
      */
     encodeSignedMsgOrderParamsMessage(orderParamsMessage, delegateSigner) {
-        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));
-        // Backwards-compat: normalize optional builder fields to null for encoding
-        const withBuilderDefaults = {
-            ...orderParamsMessage,
-            builderIdx: orderParamsMessage.builderIdx !== undefined
-                ? orderParamsMessage.builderIdx
-                : null,
-            builderFeeTenthBps: orderParamsMessage.builderFeeTenthBps !== undefined
-                ? orderParamsMessage.builderFeeTenthBps
-                : null,
-        };
-        const buf = Buffer.concat([
-            prefix,
-            delegateSigner
-                ? this.program.coder.types.encode('signedMsgOrderParamsDelegateMessage', withBuilderDefaults)
-                : this.program.coder.types.encode('signedMsgOrderParamsMessage', withBuilderDefaults),
-        ]);
-        return buf;
+        return DriftCore_1.DriftCore.signedMsg.encodeSignedMsgOrderParamsMessage({
+            coderTypes: this.program.coder.types,
+            orderParamsMessage,
+            delegateSigner,
+        });
     }
     /*
      * Decode signedMsg taker order params from borsh buffer. Zero pads the message in case the
@@ -4117,13 +4016,11 @@ class DriftClient {
      * larger than the message we are receiving (unlikely, especially if all new fields are Options).
      */
     decodeSignedMsgOrderParamsMessage(encodedMessage, delegateSigner) {
-        const decodeStr = delegateSigner
-            ? 'signedMsgOrderParamsDelegateMessage'
-            : 'signedMsgOrderParamsMessage';
-        return this.program.coder.types.decode(decodeStr, Buffer.concat([
-            encodedMessage.slice(8), // strip out discriminator
-            Buffer.alloc(128), // pad on 128 bytes, this is most efficient way to messages that are too small
-        ]));
+        return DriftCore_1.DriftCore.signedMsg.decodeSignedMsgOrderParamsMessage({
+            coderTypes: this.program.coder.types,
+            encodedMessage,
+            delegateSigner,
+        });
     }
     signMessage(message, keypair = this.wallet.payer) {
         return Buffer.from(tweetnacl_1.default.sign.detached(message, keypair.secretKey));
@@ -4356,13 +4253,14 @@ class DriftClient {
             maxTs: maxTs || null,
         };
         const authority = (_g = (_e = overrides === null || overrides === void 0 ? void 0 : overrides.authority) !== null && _e !== void 0 ? _e : (_f = overrides === null || overrides === void 0 ? void 0 : overrides.user) === null || _f === void 0 ? void 0 : _f.getUserAccount().authority) !== null && _g !== void 0 ? _g : this.wallet.publicKey;
-        return await this.program.instruction.modifyOrder(orderId, orderParams, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user: userPubKey,
-                userStats: this.getUserStatsAccountPublicKey(),
-                authority,
-            },
+        return await DriftCore_1.DriftCore.buildModifyOrderInstruction({
+            program: this.program,
+            orderId,
+            modifyParams: orderParams,
+            state: await this.getStatePublicKey(),
+            user: userPubKey,
+            userStats: this.getUserStatsAccountPublicKey(),
+            authority,
             remainingAccounts,
         });
     }
@@ -4410,13 +4308,14 @@ class DriftClient {
             policy: policy || null,
             maxTs: maxTs || null,
         };
-        return await this.program.instruction.modifyOrderByUserId(userOrderId, orderParams, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                user,
-                userStats: this.getUserStatsAccountPublicKey(),
-                authority: this.wallet.publicKey,
-            },
+        return await DriftCore_1.DriftCore.buildModifyOrderByUserIdInstruction({
+            program: this.program,
+            userOrderId,
+            modifyParams: orderParams,
+            state: await this.getStatePublicKey(),
+            user,
+            userStats: this.getUserStatsAccountPublicKey(),
+            authority: this.wallet.publicKey,
             remainingAccounts,
         });
     }
@@ -4525,14 +4424,14 @@ class DriftClient {
                 }
             }
         }
-        return await this.program.instruction.settlePnl(marketIndex, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                authority: this.wallet.publicKey,
-                user: settleeUserAccountPublicKey,
-                spotMarketVault: this.getQuoteSpotMarketAccount().vault,
-            },
-            remainingAccounts: remainingAccounts,
+        return await DriftCore_1.DriftCore.buildSettlePnlInstruction({
+            program: this.program,
+            marketIndex,
+            state: await this.getStatePublicKey(),
+            authority: this.wallet.publicKey,
+            user: settleeUserAccountPublicKey,
+            spotMarketVault: this.getQuoteSpotMarketAccount().vault,
+            remainingAccounts,
         });
     }
     async settleMultiplePNLs(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode, revenueShareEscrowMap, txParams) {
@@ -4680,16 +4579,18 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writablePerpMarketIndexes: [marketIndex],
         });
-        return await this.program.instruction.liquidatePerp(marketIndex, maxBaseAssetAmount, limitPrice !== null && limitPrice !== void 0 ? limitPrice : null, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                authority: this.wallet.publicKey,
-                user: userAccountPublicKey,
-                userStats: userStatsPublicKey,
-                liquidator,
-                liquidatorStats: liquidatorStatsPublicKey,
-            },
-            remainingAccounts: remainingAccounts,
+        return await DriftCore_1.DriftCore.buildLiquidatePerpInstruction({
+            program: this.program,
+            marketIndex,
+            maxBaseAssetAmount,
+            limitPrice: limitPrice !== null && limitPrice !== void 0 ? limitPrice : null,
+            state: await this.getStatePublicKey(),
+            authority: this.wallet.publicKey,
+            user: userAccountPublicKey,
+            userStats: userStatsPublicKey,
+            liquidator,
+            liquidatorStats: liquidatorStatsPublicKey,
+            remainingAccounts,
         });
     }
     async liquidatePerpWithFill(userAccountPublicKey, userAccount, marketIndex, makerInfos, txParams, liquidatorSubAccountId) {
@@ -4756,7 +4657,7 @@ class DriftClient {
                 liquidator,
                 liquidatorStats: liquidatorStatsPublicKey,
             },
-            remainingAccounts: remainingAccounts,
+            remainingAccounts,
         });
     }
     async getJupiterLiquidateSpotWithSwapIxV6({ jupiterClient, liabilityMarketIndex, assetMarketIndex, swapAmount, assetTokenAccount, liabilityTokenAccount, slippageBps, swapMode, onlyDirectRoutes, quote, userAccount, userAccountPublicKey, userStatsAccountPublicKey, liquidatorSubAccountId, maxAccounts, }) {
@@ -4886,7 +4787,7 @@ class DriftClient {
                 liabilityTokenAccount: liabilityTokenAccount,
                 tokenProgram: assetTokenProgram,
                 driftSigner: this.getStateAccount().signer,
-                instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
             remainingAccounts,
         });
@@ -4904,7 +4805,7 @@ class DriftClient {
                 liabilityTokenAccount: liabilityTokenAccount,
                 tokenProgram: assetTokenProgram,
                 driftSigner: this.getStateAccount().signer,
-                instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
             remainingAccounts,
         });
@@ -4947,7 +4848,7 @@ class DriftClient {
                 ifRebalanceConfig: ifRebalanceConfig,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 driftSigner: this.getStateAccount().signer,
-                instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
             remainingAccounts,
         });
@@ -4962,7 +4863,7 @@ class DriftClient {
                 ifRebalanceConfig: ifRebalanceConfig,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                 driftSigner: this.getStateAccount().signer,
-                instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+                instructions: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
             remainingAccounts,
         });
@@ -5092,12 +4993,12 @@ class DriftClient {
     }
     async getUpdateFundingRateIx(perpMarketIndex, oracle) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        return await this.program.instruction.updateFundingRate(perpMarketIndex, {
-            accounts: {
-                state: await this.getStatePublicKey(),
-                perpMarket: perpMarketPublicKey,
-                oracle: oracle,
-            },
+        return await DriftCore_1.DriftCore.buildUpdateFundingRateInstruction({
+            program: this.program,
+            perpMarketIndex,
+            state: await this.getStatePublicKey(),
+            perpMarket: perpMarketPublicKey,
+            oracle,
         });
     }
     async updatePrelaunchOracle(perpMarketIndex, txParams) {
@@ -5244,8 +5145,8 @@ class DriftClient {
             ),
             authority: this.wallet.publicKey,
             payer: this.wallet.publicKey,
-            rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-            systemProgram: anchor.web3.SystemProgram.programId,
+            rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+            systemProgram: web3_js_1.SystemProgram.programId,
             state: await this.getStatePublicKey(),
         };
         return await this.program.instruction.initializeInsuranceFundStake(marketIndex, {