@drift-labs/sdk-browser 2.104.0-beta.29 → 2.104.0-beta.31

package/VERSION

@@ -1 +1 @@
-2.104.0-beta.29
+2.104.0-beta.31

package/lib/browser/accounts/pollingDriftClientAccountSubscriber.js

@@ -244,6 +244,7 @@ class PollingDriftClientAccountSubscriber {
         this.accountsToPoll.clear();
         this.oraclesToPoll.clear();
         this.isSubscribed = false;
+        this.accountLoader.accountsToLoad = new Map();
     }
     async addSpotMarket(marketIndex) {
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);

package/lib/browser/adminClient.d.ts

@@ -195,16 +195,16 @@ export declare class AdminClient extends DriftClient {
     getUpdatePerpMarketFuelIx(perpMarketIndex: number, fuelBoostTaker?: number, fuelBoostMaker?: number, fuelBoostPosition?: number): Promise<TransactionInstruction>;
     initUserFuel(user: PublicKey, authority: PublicKey, fuelBonusDeposits?: number, fuelBonusBorrows?: number, fuelBonusTaker?: number, fuelBonusMaker?: number, fuelBonusInsurance?: number): Promise<TransactionSignature>;
     getInitUserFuelIx(user: PublicKey, authority: PublicKey, fuelBonusDeposits?: number, fuelBonusBorrows?: number, fuelBonusTaker?: number, fuelBonusMaker?: number, fuelBonusInsurance?: number): Promise<TransactionInstruction>;
-    initializePythPullOracle(feedId: string, isAdmin?: boolean): Promise<TransactionSignature>;
-    getInitializePythPullOracleIx(feedId: string, isAdmin?: boolean): Promise<TransactionInstruction>;
-    initializePythLazerOracle(feedId: number, isAdmin?: boolean): Promise<TransactionSignature>;
-    getInitializePythLazerOracleIx(feedId: number, isAdmin?: boolean): Promise<TransactionInstruction>;
+    initializePythPullOracle(feedId: string): Promise<TransactionSignature>;
+    getInitializePythPullOracleIx(feedId: string): Promise<TransactionInstruction>;
+    initializePythLazerOracle(feedId: number): Promise<TransactionSignature>;
+    getInitializePythLazerOracleIx(feedId: number): Promise<TransactionInstruction>;
     initializeHighLeverageModeConfig(maxUsers: number): Promise<TransactionSignature>;
     getInitializeHighLeverageModeConfigIx(maxUsers: number): Promise<TransactionInstruction>;
     updateUpdateHighLeverageModeConfig(maxUsers: number, reduceOnly: boolean): Promise<TransactionSignature>;
     getUpdateHighLeverageModeConfigIx(maxUsers: number, reduceOnly: boolean): Promise<TransactionInstruction>;
-    initializeProtectedMakerModeConfig(maxUsers: number): Promise<TransactionSignature>;
-    getInitializeProtectedMakerModeConfigIx(maxUsers: number): Promise<TransactionInstruction>;
+    initializeProtectedMakerModeConfig(maxUsers: number, stateAdmin?: boolean): Promise<TransactionSignature>;
+    getInitializeProtectedMakerModeConfigIx(maxUsers: number, stateAdmin?: boolean): Promise<TransactionInstruction>;
     updateProtectedMakerModeConfig(maxUsers: number, reduceOnly: boolean): Promise<TransactionSignature>;
     getUpdateProtectedMakerModeConfigIx(maxUsers: number, reduceOnly: boolean): Promise<TransactionInstruction>;
 }

package/lib/browser/adminClient.js

@@ -463,7 +463,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const tokenProgram = this.getTokenProgramForSpotMarket(spotMarket);
         return await this.program.instruction.depositIntoSpotMarketVault(amount, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.useHotWalletAdmin
+                    ? this.wallet.publicKey
+                    : this.getStateAccount().admin,
                 state: await this.getStatePublicKey(),
                 sourceVault,
                 spotMarket: spotMarket.pubkey,
@@ -525,7 +527,9 @@ class AdminClient extends driftClient_1.DriftClient {
             netUnsettledFundingPnl: netUnsettledFundingPnl !== null && netUnsettledFundingPnl !== void 0 ? netUnsettledFundingPnl : null,
         }, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.useHotWalletAdmin
+                    ? this.wallet.publicKey
+                    : this.getStateAccount().admin,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, numericConstants_1.QUOTE_SPOT_MARKET_INDEX),
@@ -1776,24 +1780,28 @@ class AdminClient extends driftClient_1.DriftClient {
         const userStats = await (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, authority);
         return await this.program.instruction.initUserFuel(fuelBonusDeposits || null, fuelBonusBorrows || null, fuelBonusTaker || null, fuelBonusMaker || null, fuelBonusInsurance || null, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.useHotWalletAdmin
+                    ? this.wallet.publicKey
+                    : this.getStateAccount().admin,
                 state: await this.getStatePublicKey(),
                 user,
                 userStats,
             },
         });
     }
-    async initializePythPullOracle(feedId, isAdmin = false) {
-        const initializePythPullOracleIx = await this.getInitializePythPullOracleIx(feedId, isAdmin);
+    async initializePythPullOracle(feedId) {
+        const initializePythPullOracleIx = await this.getInitializePythPullOracleIx(feedId);
         const tx = await this.buildTransaction(initializePythPullOracleIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getInitializePythPullOracleIx(feedId, isAdmin = false) {
+    async getInitializePythPullOracleIx(feedId) {
         const feedIdBuffer = (0, pythOracleUtils_1.getFeedIdUint8Array)(feedId);
         return await this.program.instruction.initializePythPullOracle(feedIdBuffer, {
             accounts: {
-                admin: isAdmin ? this.getStateAccount().admin : this.wallet.publicKey,
+                admin: this.useHotWalletAdmin
+                    ? this.wallet.publicKey
+                    : this.getStateAccount().admin,
                 state: await this.getStatePublicKey(),
                 systemProgram: web3_js_1.SystemProgram.programId,
                 priceFeed: (0, pda_1.getPythPullOraclePublicKey)(this.program.programId, feedIdBuffer),
@@ -1801,16 +1809,18 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
-    async initializePythLazerOracle(feedId, isAdmin = false) {
-        const initializePythPullOracleIx = await this.getInitializePythLazerOracleIx(feedId, isAdmin);
+    async initializePythLazerOracle(feedId) {
+        const initializePythPullOracleIx = await this.getInitializePythLazerOracleIx(feedId);
         const tx = await this.buildTransaction(initializePythPullOracleIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getInitializePythLazerOracleIx(feedId, isAdmin = false) {
+    async getInitializePythLazerOracleIx(feedId) {
         return await this.program.instruction.initializePythLazerOracle(feedId, {
             accounts: {
-                admin: isAdmin ? this.getStateAccount().admin : this.wallet.publicKey,
+                admin: this.useHotWalletAdmin
+                    ? this.wallet.publicKey
+                    : this.getStateAccount().admin,
                 state: await this.getStatePublicKey(),
                 systemProgram: web3_js_1.SystemProgram.programId,
                 lazerOracle: (0, pda_1.getPythLazerOraclePublicKey)(this.program.programId, feedId),
@@ -1854,16 +1864,16 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
-    async initializeProtectedMakerModeConfig(maxUsers) {
-        const initializeProtectedMakerModeConfigIx = await this.getInitializeProtectedMakerModeConfigIx(maxUsers);
+    async initializeProtectedMakerModeConfig(maxUsers, stateAdmin) {
+        const initializeProtectedMakerModeConfigIx = await this.getInitializeProtectedMakerModeConfigIx(maxUsers, stateAdmin);
         const tx = await this.buildTransaction(initializeProtectedMakerModeConfigIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getInitializeProtectedMakerModeConfigIx(maxUsers) {
+    async getInitializeProtectedMakerModeConfigIx(maxUsers, stateAdmin) {
         return await this.program.instruction.initializeProtectedMakerModeConfig(maxUsers, {
             accounts: {
-                admin: this.isSubscribed
+                admin: stateAdmin
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),

package/lib/browser/driftClient.d.ts

@@ -42,6 +42,7 @@ export declare class DriftClient {
     program: Program;
     provider: AnchorProvider;
     opts?: ConfirmOptions;
+    useHotWalletAdmin?: boolean;
     users: Map<string, User>;
     userStats?: UserStats;
     activeSubAccountId: number;
@@ -280,11 +281,11 @@ export declare class DriftClient {
     getTokenProgramForSpotMarket(spotMarketAccount: SpotMarketAccount): PublicKey;
     addTokenMintToRemainingAccounts(spotMarketAccount: SpotMarketAccount, remainingAccounts: AccountMeta[]): void;
     getAssociatedTokenAccountCreationIx(tokenMintAddress: PublicKey, associatedTokenAddress: PublicKey, tokenProgram: PublicKey): anchor.web3.TransactionInstruction;
-    createInitializeUserAccountAndDepositCollateralIxs(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, customMaxMarginRatio?: number): Promise<{
+    createInitializeUserAccountAndDepositCollateralIxs(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, customMaxMarginRatio?: number, poolId?: number): Promise<{
         ixs: TransactionInstruction[];
         userAccountPublicKey: PublicKey;
     }>;
-    createInitializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, txParams?: TxParams, customMaxMarginRatio?: number): Promise<[Transaction | VersionedTransaction, PublicKey]>;
+    createInitializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, txParams?: TxParams, customMaxMarginRatio?: number, poolId?: number): Promise<[Transaction | VersionedTransaction, PublicKey]>;
     /**
      * Creates the User account for a user, and deposits some initial collateral
      * @param amount
@@ -298,7 +299,7 @@ export declare class DriftClient {
      * @param txParams
      * @returns
      */
-    initializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, txParams?: TxParams, customMaxMarginRatio?: number): Promise<[TransactionSignature, PublicKey]>;
+    initializeUserAccountAndDepositCollateral(amount: BN, userTokenAccount: PublicKey, marketIndex?: number, subAccountId?: number, name?: string, fromSubAccountId?: number, referrerInfo?: ReferrerInfo, donateAmount?: BN, txParams?: TxParams, customMaxMarginRatio?: number, poolId?: number): Promise<[TransactionSignature, PublicKey]>;
     initializeUserAccountForDevnet(subAccountId: number, name: string, marketIndex: number, tokenFaucet: TokenFaucet, amount: BN, referrerInfo?: ReferrerInfo, txParams?: TxParams): Promise<[TransactionSignature, PublicKey]>;
     getWithdrawalIxs(amount: BN, marketIndex: number, associatedTokenAddress: PublicKey, reduceOnly?: boolean, subAccountId?: number, updateFuel?: boolean): Promise<TransactionInstruction[]>;
     /**

package/lib/browser/driftClient.js

@@ -83,7 +83,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -95,7 +95,8 @@ class DriftClient {
         this.opts = config.opts || {
             ...config_1.DEFAULT_CONFIRMATION_OPTS,
         };
-        if ((_a = config === null || config === void 0 ? void 0 : config.connection) === null || _a === void 0 ? void 0 : _a.commitment) {
+        this.useHotWalletAdmin = (_a = config.useHotWalletAdmin) !== null && _a !== void 0 ? _a : false;
+        if ((_b = config === null || config === void 0 ? void 0 : config.connection) === null || _b === void 0 ? void 0 : _b.commitment) {
             // At the moment this ensures that our transaction simulations (which use Connection object) will use the same commitment level as our Transaction blockhashes (which use these opts)
             this.opts.commitment = config.connection.commitment;
             this.opts.preflightCommitment = config.connection.commitment;
@@ -103,17 +104,17 @@ 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, (_b = config.programID) !== null && _b !== void 0 ? _b : new web3_js_1.PublicKey(config_1.DRIFT_PROGRAM_ID), this.provider);
-        this.authority = (_c = config.authority) !== null && _c !== void 0 ? _c : this.wallet.publicKey;
-        this.activeSubAccountId = (_d = config.activeSubAccountId) !== null && _d !== void 0 ? _d : 0;
-        this.skipLoadUsers = (_e = config.skipLoadUsers) !== null && _e !== void 0 ? _e : false;
-        this.txVersion = (_f = config.txVersion) !== null && _f !== void 0 ? _f : 'legacy';
+        this.program = new anchor_1.Program(drift_json_1.default, (_c = config.programID) !== null && _c !== void 0 ? _c : new web3_js_1.PublicKey(config_1.DRIFT_PROGRAM_ID), this.provider);
+        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;
+        this.txVersion = (_g = config.txVersion) !== null && _g !== void 0 ? _g : 'legacy';
         this.txParams = {
-            computeUnits: (_h = (_g = config.txParams) === null || _g === void 0 ? void 0 : _g.computeUnits) !== null && _h !== void 0 ? _h : 600000,
-            computeUnitsPrice: (_k = (_j = config.txParams) === null || _j === void 0 ? void 0 : _j.computeUnitsPrice) !== null && _k !== void 0 ? _k : 0,
+            computeUnits: (_j = (_h = config.txParams) === null || _h === void 0 ? void 0 : _h.computeUnits) !== null && _j !== void 0 ? _j : 600000,
+            computeUnitsPrice: (_l = (_k = config.txParams) === null || _k === void 0 ? void 0 : _k.computeUnitsPrice) !== null && _l !== void 0 ? _l : 0,
         };
         this.txHandler =
-            (_l = config === null || config === void 0 ? void 0 : config.txHandler) !== null && _l !== void 0 ? _l : new txHandler_1.TxHandler({
+            (_m = config === null || config === void 0 ? void 0 : config.txHandler) !== null && _m !== void 0 ? _m : new txHandler_1.TxHandler({
                 connection: this.connection,
                 // @ts-ignore
                 wallet: this.provider.wallet,
@@ -139,8 +140,8 @@ class DriftClient {
             : config.subAccountIds
                 ? new Map([[this.authority.toString(), config.subAccountIds]])
                 : new Map();
-        this.includeDelegates = (_m = config.includeDelegates) !== null && _m !== void 0 ? _m : false;
-        if (((_o = config.accountSubscription) === null || _o === void 0 ? void 0 : _o.type) === 'polling') {
+        this.includeDelegates = (_o = config.includeDelegates) !== null && _o !== void 0 ? _o : false;
+        if (((_p = config.accountSubscription) === null || _p === void 0 ? void 0 : _p.type) === 'polling') {
             this.userAccountSubscriptionConfig = {
                 type: 'polling',
                 accountLoader: config.accountSubscription.accountLoader,
@@ -150,32 +151,32 @@ class DriftClient {
                 accountLoader: config.accountSubscription.accountLoader,
             };
         }
-        else if (((_p = config.accountSubscription) === null || _p === void 0 ? void 0 : _p.type) === 'grpc') {
+        else if (((_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.type) === 'grpc') {
             this.userAccountSubscriptionConfig = {
                 type: 'grpc',
-                resubTimeoutMs: (_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.resubTimeoutMs,
-                logResubMessages: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.logResubMessages,
-                grpcConfigs: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.grpcConfigs,
+                resubTimeoutMs: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.resubTimeoutMs,
+                logResubMessages: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.logResubMessages,
+                grpcConfigs: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.grpcConfigs,
             };
             this.userStatsAccountSubscriptionConfig = {
                 type: 'grpc',
-                grpcConfigs: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.grpcConfigs,
-                resubTimeoutMs: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.resubTimeoutMs,
-                logResubMessages: (_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.logResubMessages,
+                grpcConfigs: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.grpcConfigs,
+                resubTimeoutMs: (_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.resubTimeoutMs,
+                logResubMessages: (_w = config.accountSubscription) === null || _w === void 0 ? void 0 : _w.logResubMessages,
             };
         }
         else {
             this.userAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_w = config.accountSubscription) === null || _w === void 0 ? void 0 : _w.resubTimeoutMs,
-                logResubMessages: (_x = config.accountSubscription) === null || _x === void 0 ? void 0 : _x.logResubMessages,
-                commitment: (_y = config.accountSubscription) === null || _y === void 0 ? void 0 : _y.commitment,
+                resubTimeoutMs: (_x = config.accountSubscription) === null || _x === void 0 ? void 0 : _x.resubTimeoutMs,
+                logResubMessages: (_y = config.accountSubscription) === null || _y === void 0 ? void 0 : _y.logResubMessages,
+                commitment: (_z = config.accountSubscription) === null || _z === void 0 ? void 0 : _z.commitment,
             };
             this.userStatsAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_z = config.accountSubscription) === null || _z === void 0 ? void 0 : _z.resubTimeoutMs,
-                logResubMessages: (_0 = config.accountSubscription) === null || _0 === void 0 ? void 0 : _0.logResubMessages,
-                commitment: (_1 = config.accountSubscription) === null || _1 === void 0 ? void 0 : _1.commitment,
+                resubTimeoutMs: (_0 = config.accountSubscription) === null || _0 === void 0 ? void 0 : _0.resubTimeoutMs,
+                logResubMessages: (_1 = config.accountSubscription) === null || _1 === void 0 ? void 0 : _1.logResubMessages,
+                commitment: (_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.commitment,
             };
         }
         if (config.userStats) {
@@ -193,20 +194,20 @@ class DriftClient {
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
-        if (((_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_3 = config.perpMarketIndexes) !== null && _3 !== void 0 ? _3 : [], (_4 = config.spotMarketIndexes) !== null && _4 !== void 0 ? _4 : [], (_5 = config.oracleInfos) !== null && _5 !== void 0 ? _5 : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
+        if (((_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.type) === 'polling') {
+            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_4 = config.perpMarketIndexes) !== null && _4 !== void 0 ? _4 : [], (_5 = config.spotMarketIndexes) !== null && _5 !== void 0 ? _5 : [], (_6 = config.oracleInfos) !== null && _6 !== void 0 ? _6 : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
         }
-        else if (((_6 = config.accountSubscription) === null || _6 === void 0 ? void 0 : _6.type) === 'grpc') {
-            this.accountSubscriber = new grpcDriftClientAccountSubscriber_1.gprcDriftClientAccountSubscriber(config.accountSubscription.grpcConfigs, this.program, (_7 = config.perpMarketIndexes) !== null && _7 !== void 0 ? _7 : [], (_8 = config.spotMarketIndexes) !== null && _8 !== void 0 ? _8 : [], (_9 = config.oracleInfos) !== null && _9 !== void 0 ? _9 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
-                resubTimeoutMs: (_10 = config.accountSubscription) === null || _10 === void 0 ? void 0 : _10.resubTimeoutMs,
-                logResubMessages: (_11 = config.accountSubscription) === null || _11 === void 0 ? void 0 : _11.logResubMessages,
+        else if (((_7 = config.accountSubscription) === null || _7 === void 0 ? void 0 : _7.type) === 'grpc') {
+            this.accountSubscriber = new grpcDriftClientAccountSubscriber_1.gprcDriftClientAccountSubscriber(config.accountSubscription.grpcConfigs, this.program, (_8 = config.perpMarketIndexes) !== null && _8 !== void 0 ? _8 : [], (_9 = config.spotMarketIndexes) !== null && _9 !== void 0 ? _9 : [], (_10 = config.oracleInfos) !== null && _10 !== void 0 ? _10 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_11 = config.accountSubscription) === null || _11 === void 0 ? void 0 : _11.resubTimeoutMs,
+                logResubMessages: (_12 = config.accountSubscription) === null || _12 === void 0 ? void 0 : _12.logResubMessages,
             });
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_12 = config.perpMarketIndexes) !== null && _12 !== void 0 ? _12 : [], (_13 = config.spotMarketIndexes) !== null && _13 !== void 0 ? _13 : [], (_14 = config.oracleInfos) !== null && _14 !== void 0 ? _14 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
-                resubTimeoutMs: (_15 = config.accountSubscription) === null || _15 === void 0 ? void 0 : _15.resubTimeoutMs,
-                logResubMessages: (_16 = config.accountSubscription) === null || _16 === void 0 ? void 0 : _16.logResubMessages,
-            }, (_17 = config.accountSubscription) === null || _17 === void 0 ? void 0 : _17.commitment);
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_13 = config.perpMarketIndexes) !== null && _13 !== void 0 ? _13 : [], (_14 = config.spotMarketIndexes) !== null && _14 !== void 0 ? _14 : [], (_15 = config.oracleInfos) !== null && _15 !== void 0 ? _15 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_16 = config.accountSubscription) === null || _16 === void 0 ? void 0 : _16.resubTimeoutMs,
+                logResubMessages: (_17 = config.accountSubscription) === null || _17 === void 0 ? void 0 : _17.logResubMessages,
+            }, (_18 = config.accountSubscription) === null || _18 === void 0 ? void 0 : _18.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.metricsEventEmitter = new events_1.EventEmitter();
@@ -214,14 +215,14 @@ class DriftClient {
             this.enableMetricsEvents = true;
         }
         this.txSender =
-            (_18 = config.txSender) !== null && _18 !== void 0 ? _18 : new retryTxSender_1.RetryTxSender({
+            (_19 = config.txSender) !== null && _19 !== void 0 ? _19 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,
                 txHandler: this.txHandler,
             });
         this.sbOnDemandProgramdId =
-            config_1.configs[(_19 = config.env) !== null && _19 !== void 0 ? _19 : 'mainnet-beta'].SB_ON_DEMAND_PID;
+            config_1.configs[(_20 = config.env) !== null && _20 !== void 0 ? _20 : 'mainnet-beta'].SB_ON_DEMAND_PID;
     }
     getUserMapKey(subAccountId, authority) {
         return `${subAccountId}_${authority.toString()}`;
@@ -1439,7 +1440,7 @@ class DriftClient {
     getAssociatedTokenAccountCreationIx(tokenMintAddress, associatedTokenAddress, tokenProgram) {
         return (0, spl_token_1.createAssociatedTokenAccountInstruction)(this.wallet.publicKey, associatedTokenAddress, this.wallet.publicKey, tokenMintAddress, tokenProgram);
     }
-    async createInitializeUserAccountAndDepositCollateralIxs(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, customMaxMarginRatio) {
+    async createInitializeUserAccountAndDepositCollateralIxs(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, customMaxMarginRatio, poolId) {
         const ixs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const spotMarket = this.getSpotMarketAccount(marketIndex);
@@ -1471,7 +1472,11 @@ class DriftClient {
                 ixs.push(await this.getInitializeUserStatsIx());
             }
         }
-        ixs.push(initializeUserAccountIx, depositCollateralIx);
+        ixs.push(initializeUserAccountIx);
+        if (poolId) {
+            ixs.push(await this.getUpdateUserPoolIdIx(poolId, subAccountId));
+        }
+        ixs.push(depositCollateralIx);
         if (!donateAmount.eq(numericConstants_1.ZERO)) {
             const donateIx = await this.getDepositIntoSpotMarketRevenuePoolIx(1, donateAmount, wsolTokenAccount);
             ixs.push(donateIx);
@@ -1490,8 +1495,8 @@ class DriftClient {
             userAccountPublicKey,
         };
     }
-    async createInitializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio) {
-        const { ixs, userAccountPublicKey } = await this.createInitializeUserAccountAndDepositCollateralIxs(amount, userTokenAccount, marketIndex, subAccountId, name, fromSubAccountId, referrerInfo, donateAmount, customMaxMarginRatio);
+    async createInitializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio, poolId) {
+        const { ixs, userAccountPublicKey } = await this.createInitializeUserAccountAndDepositCollateralIxs(amount, userTokenAccount, marketIndex, subAccountId, name, fromSubAccountId, referrerInfo, donateAmount, customMaxMarginRatio, poolId);
         const tx = await this.buildTransaction(ixs, txParams);
         return [tx, userAccountPublicKey];
     }
@@ -1508,8 +1513,8 @@ class DriftClient {
      * @param txParams
      * @returns
      */
-    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio) {
-        const [tx, userAccountPublicKey] = await this.createInitializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex, subAccountId, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio);
+    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio, poolId) {
+        const [tx, userAccountPublicKey] = await this.createInitializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex, subAccountId, name, fromSubAccountId, referrerInfo, donateAmount, txParams, customMaxMarginRatio, poolId);
         const additionalSigners = [];
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
@@ -4505,8 +4510,7 @@ class DriftClient {
     }
     getPostPythLazerOracleUpdateIxs(feedIds, pythMessageHex, precedingIxs = [], overrideIxCount) {
         const pythMessageBytes = Buffer.from(pythMessageHex, 'hex');
-        const updateData = new Uint8Array(pythMessageBytes);
-        const verifyIx = (0, pythOracleUtils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 0, updateData);
+        const verifyIx = (0, pythOracleUtils_1.createMinimalEd25519VerifyIx)(overrideIxCount || precedingIxs.length + 1, 12, pythMessageBytes);
         const remainingAccountsMeta = feedIds.map((feedId) => {
             return {
                 pubkey: (0, pda_1.getPythLazerOraclePublicKey)(this.program.programId, feedId),

package/lib/browser/driftClientConfig.d.ts

@@ -31,6 +31,7 @@ export type DriftClientConfig = {
     enableMetricsEvents?: boolean;
     txHandlerConfig?: TxHandlerConfig;
     delistedMarketSetting?: DelistedMarketSetting;
+    useHotWalletAdmin?: boolean;
 };
 export type DriftClientSubscriptionConfig = {
     type: 'grpc';

package/lib/browser/idl/drift.json

@@ -14315,7 +14315,7 @@
         {
             "code": 6288,
             "name": "InvalidSwiftOrderParam",
-            "msg": "Swift only available for market/oracle perp orders"
+            "msg": "Invalid swift order param"
         },
         {
             "code": 6289,

package/lib/browser/util/pythOracleUtils.d.ts

@@ -1,10 +1,11 @@
 import { TransactionInstruction } from '@solana/web3.js';
 export declare function trimFeedId(feedId: string): string;
 export declare function getFeedIdUint8Array(feedId: string): Uint8Array;
-export declare function getEd25519ArgsFromHex(hex: string): {
+export declare function getEd25519ArgsFromHex(hex: string, customInstructionIndex?: number): {
     publicKey: Uint8Array;
     signature: Uint8Array;
     message: Uint8Array;
+    instructionIndex?: number;
 };
 /**
  * Constructs a minimal Ed25519 verification instruction that references the data

package/lib/browser/util/pythOracleUtils.js

@@ -1,7 +1,31 @@
 "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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createMinimalEd25519VerifyIx = exports.getEd25519ArgsFromHex = exports.getFeedIdUint8Array = exports.trimFeedId = void 0;
 const web3_js_1 = require("@solana/web3.js");
+const BufferLayout = __importStar(require("@solana/buffer-layout"));
 function trimFeedId(feedId) {
     if (feedId.startsWith('0x')) {
         return feedId.slice(2);
@@ -18,7 +42,7 @@ const SIGNATURE_LEN = 64;
 const PUBKEY_LEN = 32;
 const MAGIC_LEN = 4;
 const MESSAGE_SIZE_LEN = 2;
-function getEd25519ArgsFromHex(hex) {
+function getEd25519ArgsFromHex(hex, customInstructionIndex) {
     const cleanedHex = hex.startsWith('0x') ? hex.slice(2) : hex;
     const buffer = new Uint8Array(Buffer.from(cleanedHex, 'hex'));
     const signatureOffset = MAGIC_LEN;
@@ -39,9 +63,24 @@ function getEd25519ArgsFromHex(hex) {
         publicKey,
         signature,
         message,
+        instructionIndex: customInstructionIndex,
     };
 }
 exports.getEd25519ArgsFromHex = getEd25519ArgsFromHex;
+const readUint16LE = (data, offset) => {
+    return data[offset] | (data[offset + 1] << 8);
+};
+const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct([
+    BufferLayout.u8('numSignatures'),
+    BufferLayout.u8('padding'),
+    BufferLayout.u16('signatureOffset'),
+    BufferLayout.u16('signatureInstructionIndex'),
+    BufferLayout.u16('publicKeyOffset'),
+    BufferLayout.u16('publicKeyInstructionIndex'),
+    BufferLayout.u16('messageDataOffset'),
+    BufferLayout.u16('messageDataSize'),
+    BufferLayout.u16('messageInstructionIndex'),
+]);
 /**
  * Constructs a minimal Ed25519 verification instruction that references the data
  * inside the main instruction (postPythLazerOracleUpdate).
@@ -55,53 +94,23 @@ function createMinimalEd25519VerifyIx(customInstructionIndex, messageOffset, cus
     const publicKeyOffset = signatureOffset + SIGNATURE_LEN;
     const messageDataSizeOffset = publicKeyOffset + PUBKEY_LEN;
     const messageDataOffset = messageDataSizeOffset + MESSAGE_SIZE_LEN;
-    if (messageDataOffset > customInstructionData.length) {
-        throw new Error('Not enough data in main instruction to read message size');
-    }
-    const messageSize = customInstructionData[messageDataSizeOffset] |
-        (customInstructionData[messageDataSizeOffset + 1] << 8);
-    // Construct Ed25519SignatureOffsets
-    // struct Ed25519SignatureOffsets (14 bytes):
-    // u16 signature_offset
-    // u16 signature_instruction_index
-    // u16 public_key_offset
-    // u16 public_key_instruction_index
-    // u16 message_data_offset
-    // u16 message_data_size
-    // u16 message_instruction_index
-    const offsets = new Uint8Array(14);
-    const dv = new DataView(offsets.buffer);
-    let byteOffset = 0;
-    dv.setUint16(byteOffset, signatureOffset, true);
-    byteOffset += 2;
-    dv.setUint16(byteOffset, customInstructionIndex, true);
-    byteOffset += 2;
-    dv.setUint16(byteOffset, publicKeyOffset, true);
-    byteOffset += 2;
-    dv.setUint16(byteOffset, customInstructionIndex, true);
-    byteOffset += 2;
-    dv.setUint16(byteOffset, messageDataOffset, true);
-    byteOffset += 2;
-    dv.setUint16(byteOffset, messageSize, true);
-    byteOffset += 2;
-    dv.setUint16(byteOffset, customInstructionIndex, true);
-    byteOffset += 2;
-    const numSignatures = 1;
-    const padding = 0;
-    const ixData = new Uint8Array(2 + offsets.length);
-    ixData[0] = numSignatures;
-    ixData[1] = padding;
-    ixData.set(offsets, 2);
+    const messageDataSize = readUint16LE(customInstructionData, messageDataSizeOffset - messageOffset);
+    const instructionData = Buffer.alloc(16);
+    ED25519_INSTRUCTION_LAYOUT.encode({
+        numSignatures: 1,
+        padding: 0,
+        signatureOffset,
+        signatureInstructionIndex: customInstructionIndex,
+        publicKeyOffset,
+        publicKeyInstructionIndex: customInstructionIndex,
+        messageDataOffset,
+        messageDataSize: messageDataSize,
+        messageInstructionIndex: customInstructionIndex,
+    }, instructionData);
     return new web3_js_1.TransactionInstruction({
-        keys: [
-            {
-                pubkey: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-                isSigner: false,
-                isWritable: false,
-            },
-        ],
+        keys: [],
         programId: web3_js_1.Ed25519Program.programId,
-        data: Buffer.from(ixData),
+        data: instructionData,
     });
 }
 exports.createMinimalEd25519VerifyIx = createMinimalEd25519VerifyIx;

package/lib/node/accounts/pollingDriftClientAccountSubscriber.js

@@ -244,6 +244,7 @@ class PollingDriftClientAccountSubscriber {
         this.accountsToPoll.clear();
         this.oraclesToPoll.clear();
         this.isSubscribed = false;
+        this.accountLoader.accountsToLoad = new Map();
     }
     async addSpotMarket(marketIndex) {
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);

package/lib/node/adminClient.d.ts

@@ -195,16 +195,16 @@ export declare class AdminClient extends DriftClient {
     getUpdatePerpMarketFuelIx(perpMarketIndex: number, fuelBoostTaker?: number, fuelBoostMaker?: number, fuelBoostPosition?: number): Promise<TransactionInstruction>;
     initUserFuel(user: PublicKey, authority: PublicKey, fuelBonusDeposits?: number, fuelBonusBorrows?: number, fuelBonusTaker?: number, fuelBonusMaker?: number, fuelBonusInsurance?: number): Promise<TransactionSignature>;
     getInitUserFuelIx(user: PublicKey, authority: PublicKey, fuelBonusDeposits?: number, fuelBonusBorrows?: number, fuelBonusTaker?: number, fuelBonusMaker?: number, fuelBonusInsurance?: number): Promise<TransactionInstruction>;
-    initializePythPullOracle(feedId: string, isAdmin?: boolean): Promise<TransactionSignature>;
-    getInitializePythPullOracleIx(feedId: string, isAdmin?: boolean): Promise<TransactionInstruction>;
-    initializePythLazerOracle(feedId: number, isAdmin?: boolean): Promise<TransactionSignature>;
-    getInitializePythLazerOracleIx(feedId: number, isAdmin?: boolean): Promise<TransactionInstruction>;
+    initializePythPullOracle(feedId: string): Promise<TransactionSignature>;
+    getInitializePythPullOracleIx(feedId: string): Promise<TransactionInstruction>;
+    initializePythLazerOracle(feedId: number): Promise<TransactionSignature>;
+    getInitializePythLazerOracleIx(feedId: number): Promise<TransactionInstruction>;
     initializeHighLeverageModeConfig(maxUsers: number): Promise<TransactionSignature>;
     getInitializeHighLeverageModeConfigIx(maxUsers: number): Promise<TransactionInstruction>;
     updateUpdateHighLeverageModeConfig(maxUsers: number, reduceOnly: boolean): Promise<TransactionSignature>;
     getUpdateHighLeverageModeConfigIx(maxUsers: number, reduceOnly: boolean): Promise<TransactionInstruction>;
-    initializeProtectedMakerModeConfig(maxUsers: number): Promise<TransactionSignature>;
-    getInitializeProtectedMakerModeConfigIx(maxUsers: number): Promise<TransactionInstruction>;
+    initializeProtectedMakerModeConfig(maxUsers: number, stateAdmin?: boolean): Promise<TransactionSignature>;
+    getInitializeProtectedMakerModeConfigIx(maxUsers: number, stateAdmin?: boolean): Promise<TransactionInstruction>;
     updateProtectedMakerModeConfig(maxUsers: number, reduceOnly: boolean): Promise<TransactionSignature>;
     getUpdateProtectedMakerModeConfigIx(maxUsers: number, reduceOnly: boolean): Promise<TransactionInstruction>;
 }