@drift-labs/vaults-sdk 0.5.19 → 0.5.21

package/lib/vaultClient.js

@@ -341,6 +341,11 @@ class VaultClient {
         return (0, sdk_1.unstakeSharesToAmount)(vpAccount.protocolProfitAndFeeShares, vaultAccount.totalShares, vaultTotalEquity);
     }
     async initializeVault(params, uiTxParams) {
+        const ix = await this.getInitializeVaultIx(params);
+        return await this.createAndSendTxn([ix], uiTxParams);
+    }
+    async getInitializeVaultIx(params) {
+        var _a, _b, _c, _d;
         const { vaultProtocol: vaultProtocolParams, ...vaultParams } = params;
         const vault = (0, addresses_1.getVaultAddressSync)(this.program.programId, params.name);
         const tokenAccount = (0, addresses_1.getTokenVaultAddressSync)(this.program.programId, vault);
@@ -373,12 +378,11 @@ class VaultClient {
                 .accounts({
                 ...accounts,
                 vaultProtocol,
-                payer: uiAuthority,
-                manager: uiAuthority,
+                payer: (_a = params.manager) !== null && _a !== void 0 ? _a : uiAuthority,
+                manager: (_b = params.manager) !== null && _b !== void 0 ? _b : uiAuthority,
             })
                 .instruction();
-            const ixs = [initializeVaultWithProtocolIx];
-            return await this.createAndSendTxn(ixs, uiTxParams);
+            return initializeVaultWithProtocolIx;
         }
         else {
             const _params = vaultParams;
@@ -387,12 +391,11 @@ class VaultClient {
                 .initializeVault(_params)
                 .accounts({
                 ...accounts,
-                payer: uiAuthority,
-                manager: uiAuthority,
+                payer: (_c = params.manager) !== null && _c !== void 0 ? _c : uiAuthority,
+                manager: (_d = params.manager) !== null && _d !== void 0 ? _d : uiAuthority,
             })
                 .instruction();
-            const ixs = [initializeVaultIx];
-            return await this.createAndSendTxn(ixs, uiTxParams);
+            return initializeVaultIx;
         }
     }
     /**
@@ -403,17 +406,20 @@ class VaultClient {
      * @returns
      */
     async updateDelegate(vault, delegate, uiTxParams) {
+        const updateDelegateIx = await this.getUpdateDelegateIx(vault, delegate);
+        return await this.createAndSendTxn([updateDelegateIx], uiTxParams);
+    }
+    async getUpdateDelegateIx(vault, delegate) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const accounts = {
             vault: vault,
             driftUser: vaultAccount.user,
             driftProgram: this.driftClient.program.programId,
         };
-        const updateDelegateIx = await this.program.methods
+        return await this.program.methods
             .updateDelegate(delegate)
-            .accounts({ ...accounts, manager: this.driftClient.wallet.publicKey })
+            .accounts({ ...accounts, manager: vaultAccount.manager })
             .instruction();
-        return await this.createAndSendTxn([updateDelegateIx], uiTxParams);
     }
     /**
      * Updates the vault margin trading status.
@@ -422,6 +428,10 @@ class VaultClient {
      * @returns
      */
     async updateMarginTradingEnabled(vault, enabled, uiTxParams) {
+        const updateMarginTradingEnabledIx = await this.getUpdateMarginTradingEnabledIx(vault, enabled);
+        return await this.createAndSendTxn([updateMarginTradingEnabledIx], uiTxParams);
+    }
+    async getUpdateMarginTradingEnabledIx(vault, enabled) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const accounts = {
             vault: vault,
@@ -439,12 +449,11 @@ class VaultClient {
             console.error('failed to get remaining accounts', err);
             // do nothing
         }
-        const updateMarginTradingEnabledIx = await this.program.methods
+        return await this.program.methods
             .updateMarginTradingEnabled(enabled)
-            .accounts({ ...accounts, manager: this.driftClient.wallet.publicKey })
+            .accounts({ ...accounts, manager: vaultAccount.manager })
             .remainingAccounts(remainingAccounts)
             .instruction();
-        return await this.createAndSendTxn([updateMarginTradingEnabledIx], uiTxParams);
     }
     /**
      * Updates the vault's pool id (for isolated pools).
@@ -486,7 +495,7 @@ class VaultClient {
         }
         return await this.program.methods
             .updateUserPoolId(poolId)
-            .accounts({ ...accounts, manager: this.driftClient.wallet.publicKey })
+            .accounts({ ...accounts, manager: vaultAccount.manager })
             .remainingAccounts(remainingAccounts)
             .instruction();
     }
@@ -509,6 +518,16 @@ class VaultClient {
      * @returns
      */
     async managerDeposit(vault, amount, uiTxParams, managerTokenAccount) {
+        const managerDepositIxs = await this.getManagerDepositIx(vault, amount, managerTokenAccount);
+        return await this.createAndSendTxn(managerDepositIxs, uiTxParams);
+    }
+    /**
+     *
+     * @param vault vault address to deposit to
+     * @param amount amount to deposit
+     * @returns
+     */
+    async getManagerDepositIx(vault, amount, managerTokenAccount) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const driftSpotMarket = this.driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
         if (!driftSpotMarket) {
@@ -526,7 +545,7 @@ class VaultClient {
             driftProgram: this.driftClient.program.programId,
             driftState: await this.driftClient.getStatePublicKey(),
             driftSpotMarketVault: driftSpotMarket.vault,
-            userTokenAccount: managerTokenAccount !== null && managerTokenAccount !== void 0 ? managerTokenAccount : (0, spl_token_1.getAssociatedTokenAddressSync)(driftSpotMarket.mint, this.driftClient.wallet.publicKey),
+            userTokenAccount: managerTokenAccount !== null && managerTokenAccount !== void 0 ? managerTokenAccount : (0, spl_token_1.getAssociatedTokenAddressSync)(driftSpotMarket.mint, vaultAccount.manager, true),
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
         };
         const { userTokenAccount, preIxs, postIxs } = await this.handleWSolMovement(amount, driftSpotMarket, accounts.userTokenAccount);
@@ -535,19 +554,20 @@ class VaultClient {
             .accounts({
             ...accounts,
             userTokenAccount,
-            manager: this.driftClient.wallet.publicKey,
+            manager: vaultAccount.manager,
         })
             .remainingAccounts(remainingAccounts)
             .instruction();
-        return await this.createAndSendTxn([...preIxs, managerDepositIx, ...postIxs], uiTxParams);
+        return [...preIxs, managerDepositIx, ...postIxs];
     }
     async managerRequestWithdraw(vault, amount, withdrawUnit, uiTxParams) {
+        const requestWithdrawIx = await this.getManagerRequestWithdrawIx(vault, amount, withdrawUnit);
+        return await this.createAndSendTxn([requestWithdrawIx], uiTxParams);
+    }
+    async getManagerRequestWithdrawIx(vault, amount, withdrawUnit) {
         this.program.idl.types;
         // @ts-ignore
         const vaultAccount = (await this.program.account.vault.fetch(vault));
-        if (!this.driftClient.wallet.publicKey.equals(vaultAccount.manager)) {
-            throw new Error(`Only the manager of the vault can request a withdraw.`);
-        }
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
@@ -557,22 +577,25 @@ class VaultClient {
             driftUser: vaultAccount.user,
             driftUserStats: userStatsKey,
         };
-        const requestWithdrawIx = this.program.instruction.managerRequestWithdraw(
+        return this.program.instruction.managerRequestWithdraw(
         // @ts-ignore
         amount, withdrawUnit, {
             accounts: {
-                manager: this.driftClient.wallet.publicKey,
+                manager: vaultAccount.manager,
                 ...accounts,
             },
             remainingAccounts,
         });
-        return await this.createAndSendTxn([requestWithdrawIx], uiTxParams);
     }
     async managerCancelWithdrawRequest(vault, uiTxParams) {
+        const ix = await this.getManagerCancelWithdrawRequestIx(vault);
+        return await this.createAndSendTxn([ix], uiTxParams);
+    }
+    async getManagerCancelWithdrawRequestIx(vault) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
         const accounts = {
-            manager: this.driftClient.wallet.publicKey,
+            manager: vaultAccount.manager,
             vault,
             driftUser: vaultAccount.user,
             driftUserStats: userStatsKey,
@@ -580,17 +603,17 @@ class VaultClient {
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
         const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [], vaultAccount, userStats);
-        const cancelRequestWithdrawIx = this.program.instruction.mangerCancelWithdrawRequest({
+        return this.program.instruction.mangerCancelWithdrawRequest({
             accounts,
             remainingAccounts,
         });
-        return await this.createAndSendTxn([cancelRequestWithdrawIx], uiTxParams);
     }
     async managerWithdraw(vault, uiTxParams) {
+        const ix = await this.getManagerWithdrawIx(vault);
+        return this.createAndSendTxn([ix], uiTxParams);
+    }
+    async getManagerWithdrawIx(vault) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
-        if (!this.driftClient.wallet.publicKey.equals(vaultAccount.manager)) {
-            throw new Error(`Only the manager of the vault can request a withdraw.`);
-        }
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
@@ -599,31 +622,51 @@ class VaultClient {
         if (!spotMarket) {
             throw new Error(`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`);
         }
-        const ix = this.program.instruction.managerWithdraw({
+        return this.program.instruction.managerWithdraw({
             accounts: {
                 vault,
-                manager: this.driftClient.wallet.publicKey,
+                manager: vaultAccount.manager,
                 vaultTokenAccount: vaultAccount.tokenAccount,
                 driftUser: await (0, sdk_1.getUserAccountPublicKey)(this.driftClient.program.programId, vault),
                 driftProgram: this.driftClient.program.programId,
                 driftUserStats: (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault),
                 driftState: await this.driftClient.getStatePublicKey(),
                 driftSpotMarketVault: spotMarket.vault,
-                userTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarket.mint, this.driftClient.wallet.publicKey),
+                userTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarket.mint, vaultAccount.manager, true),
                 driftSigner: this.driftClient.getStateAccount().signer,
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
             remainingAccounts,
         });
-        return this.createAndSendTxn([ix], uiTxParams);
     }
     async managerUpdateVault(vault, params, uiTxParams) {
-        const ix = this.program.instruction.updateVault(params, {
+        const ix = await this.getManagerUpdateVaultIx(vault, params);
+        return this.createAndSendTxn([ix], uiTxParams);
+    }
+    async getManagerUpdateVaultIx(vault, params) {
+        const vaultAccount = await this.program.account.vault.fetch(vault);
+        return this.program.instruction.updateVault(params, {
             accounts: {
                 vault,
-                manager: this.driftClient.wallet.publicKey,
+                manager: vaultAccount.manager,
             },
         });
+    }
+    async managerUpdateVaultManager(vault, manager, uiTxParams) {
+        const ix = await this.getManagerUpdateVaultManagerIx(vault, manager);
+        return this.createAndSendTxn([ix], uiTxParams);
+    }
+    async getManagerUpdateVaultManagerIx(vault, manager) {
+        const vaultAccount = await this.program.account.vault.fetch(vault);
+        return this.program.instruction.updateVaultManager(manager, {
+            accounts: {
+                vault,
+                manager: vaultAccount.manager,
+            },
+        });
+    }
+    async applyProfitShare(vault, vaultDepositor, uiTxParams) {
+        const ix = await this.getApplyProfitShareIx(vault, vaultDepositor);
         return this.createAndSendTxn([ix], uiTxParams);
     }
     async getApplyProfitShareIx(vault, vaultDepositor) {
@@ -639,7 +682,7 @@ class VaultClient {
         const accounts = {
             vault,
             vaultDepositor,
-            manager: this.driftClient.wallet.publicKey,
+            manager: vaultAccount.manager,
             driftUserStats: (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault),
             driftUser: await (0, sdk_1.getUserAccountPublicKey)(this.driftClient.program.programId, vault),
             driftState: await this.driftClient.getStatePublicKey(),
@@ -757,6 +800,7 @@ class VaultClient {
             sharesBase = vault.sharesBase;
         }
         const mintAddress = (0, addresses_1.getTokenizedVaultMintAddressSync)(this.program.programId, params.vault, sharesBase);
+        const vaultAccount = await this.program.account.vault.fetch(params.vault);
         const accounts = {
             vault: params.vault,
             vaultDepositor: (0, addresses_1.getTokenizedVaultAddressSync)(this.program.programId, params.vault, sharesBase),
@@ -765,10 +809,10 @@ class VaultClient {
                 mint: mintAddress,
             }),
             tokenMetadataProgram: this.metaplex.programs().getTokenMetadata().address,
-            payer: this.driftClient.wallet.publicKey,
+            payer: vaultAccount.manager,
         };
         const vaultTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(mintAddress, params.vault, true);
-        const createAtaIx = (0, spl_token_1.createAssociatedTokenAccountInstruction)(this.driftClient.wallet.publicKey, vaultTokenAta, params.vault, mintAddress);
+        const createAtaIx = (0, spl_token_1.createAssociatedTokenAccountInstruction)(vaultAccount.manager, vaultTokenAta, params.vault, mintAddress);
         return await this.createAndSendTxn([
             await this.program.methods
                 .initializeTokenizedVaultDepositor({
@@ -942,6 +986,10 @@ class VaultClient {
         return this.sendTxn(depositTxn, txParams === null || txParams === void 0 ? void 0 : txParams.simulateTransaction);
     }
     async requestWithdraw(vaultDepositor, amount, withdrawUnit, txParams) {
+        const ixs = await this.getRequestWithdrawIx(vaultDepositor, amount, withdrawUnit, txParams === null || txParams === void 0 ? void 0 : txParams.oracleFeedsToCrank);
+        return await this.createAndSendTxn(ixs, txParams);
+    }
+    async getRequestWithdrawIx(vaultDepositor, amount, withdrawUnit, oracleFeedsToCrank) {
         const vaultDepositorAccount = await this.program.account.vaultDepositor.fetch(vaultDepositor);
         const vaultAccount = await this.program.account.vault.fetch(vaultDepositorAccount.vault);
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
@@ -954,7 +1002,7 @@ class VaultClient {
             driftUser: vaultAccount.user,
             driftUserStats: userStatsKey,
         };
-        const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(txParams === null || txParams === void 0 ? void 0 : txParams.oracleFeedsToCrank);
+        const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(oracleFeedsToCrank);
         const requestWithdrawIx = this.program.instruction.requestWithdraw(
         // @ts-ignore
         amount, withdrawUnit, {
@@ -964,10 +1012,16 @@ class VaultClient {
             },
             remainingAccounts,
         });
-        return await this.createAndSendTxn([...oracleFeedsToCrankIxs, requestWithdrawIx], txParams);
+        return [...oracleFeedsToCrankIxs, requestWithdrawIx];
     }
     async withdraw(vaultDepositor, txParams) {
-        var _a;
+        const ixs = await this.getWithdrawIx(vaultDepositor, txParams === null || txParams === void 0 ? void 0 : txParams.oracleFeedsToCrank);
+        return await this.createAndSendTxn(ixs, {
+            cuLimit: 850000, // overestimating to be safe
+            ...txParams,
+        });
+    }
+    async getWithdrawIx(vaultDepositor, oracleFeedsToCrank) {
         const vaultDepositorAccount = await this.program.account.vaultDepositor.fetch(vaultDepositor);
         const vaultAccount = await this.program.account.vault.fetch(vaultDepositorAccount.vault);
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
@@ -1010,7 +1064,7 @@ class VaultClient {
             driftProgram: this.driftClient.program.programId,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
         };
-        const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(txParams === null || txParams === void 0 ? void 0 : txParams.oracleFeedsToCrank);
+        const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(oracleFeedsToCrank);
         const ixs = [
             ...oracleFeedsToCrankIxs,
             ...preIxs,
@@ -1024,11 +1078,7 @@ class VaultClient {
                 .instruction(),
             ...postIxs,
         ];
-        const creationIxs = preIxs.concat(postIxs).length;
-        return await this.createAndSendTxn(ixs, {
-            cuLimit: ((_a = txParams === null || txParams === void 0 ? void 0 : txParams.cuLimit) !== null && _a !== void 0 ? _a : 650000) + (creationIxs > 0 ? 200000 : 0),
-            ...txParams,
-        });
+        return ixs;
     }
     async forceWithdraw(vaultDepositor) {
         const ix = await this.getForceWithdrawIx(vaultDepositor);
@@ -1059,7 +1109,7 @@ class VaultClient {
             console.log(`Creating ATA for ${vaultDepositorAccount.authority.toBase58()} to ${userTokenAccount.toBase58()}`);
         }
         const accounts = {
-            manager: this.driftClient.wallet.publicKey,
+            manager: vaultAccount.manager,
             vault: vaultDepositorAccount.vault,
             vaultDepositor,
             vaultTokenAccount: vaultAccount.tokenAccount,
@@ -1084,6 +1134,10 @@ class VaultClient {
         return ixs;
     }
     async cancelRequestWithdraw(vaultDepositor, txParams) {
+        const ixs = await this.getCancelRequestWithdrawIx(vaultDepositor, txParams === null || txParams === void 0 ? void 0 : txParams.oracleFeedsToCrank);
+        return await this.createAndSendTxn(ixs, txParams);
+    }
+    async getCancelRequestWithdrawIx(vaultDepositor, oracleFeedsToCrank) {
         const vaultDepositorAccount = await this.program.account.vaultDepositor.fetch(vaultDepositor);
         const vaultAccount = await this.program.account.vault.fetch(vaultDepositorAccount.vault);
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultDepositorAccount.vault);
@@ -1097,14 +1151,16 @@ class VaultClient {
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
         const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [], vaultAccount, userStats);
         if (this.cliMode) {
-            return await this.program.methods
-                .cancelRequestWithdraw()
-                .accounts(accounts)
-                .remainingAccounts(remainingAccounts)
-                .rpc();
+            return [
+                await this.program.methods
+                    .cancelRequestWithdraw()
+                    .accounts(accounts)
+                    .remainingAccounts(remainingAccounts)
+                    .instruction(),
+            ];
         }
         else {
-            const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(txParams === null || txParams === void 0 ? void 0 : txParams.oracleFeedsToCrank);
+            const oracleFeedsToCrankIxs = await this.getOracleFeedsToCrank(oracleFeedsToCrank);
             const cancelRequestWithdrawIx = this.program.instruction.cancelRequestWithdraw({
                 accounts: {
                     authority: this.driftClient.wallet.publicKey,
@@ -1112,7 +1168,7 @@ class VaultClient {
                 },
                 remainingAccounts,
             });
-            return await this.createAndSendTxn([...oracleFeedsToCrankIxs, cancelRequestWithdrawIx], txParams);
+            return [...oracleFeedsToCrankIxs, cancelRequestWithdrawIx];
         }
     }
     /**
@@ -1122,6 +1178,10 @@ class VaultClient {
      * @returns
      */
     async liquidate(vaultDepositor, txParams) {
+        const ix = await this.getLiquidateIx(vaultDepositor);
+        return await this.createAndSendTxn([ix], txParams);
+    }
+    async getLiquidateIx(vaultDepositor) {
         const vaultDepositorAccount = await this.program.account.vaultDepositor.fetch(vaultDepositor);
         const vault = vaultDepositorAccount.vault;
         const vaultAccount = await this.program.account.vault.fetch(vault);
@@ -1144,17 +1204,16 @@ class VaultClient {
                 .liquidate()
                 .accounts(accounts)
                 .remainingAccounts(remainingAccounts)
-                .rpc();
+                .instruction();
         }
         else {
-            const liquidateIx = this.program.instruction.liquidate({
+            return this.program.instruction.liquidate({
                 accounts: {
                     authority: this.driftClient.wallet.publicKey,
                     ...accounts,
                 },
                 remainingAccounts,
             });
-            return await this.createAndSendTxn([liquidateIx], txParams);
         }
     }
     async createTxn(vaultIxs, txParams) {
@@ -1238,7 +1297,11 @@ class VaultClient {
      * @param spotMarketIndex spot market index of the insurance fund stake
      * @returns
      */
-    async initializeInsuranceFundStake(vault, spotMarketIndex) {
+    async initializeInsuranceFundStake(vault, spotMarketIndex, txParams) {
+        const ixs = await this.getInitializeInsuranceFundStakeIx(vault, spotMarketIndex);
+        return await this.createAndSendTxn([ixs], txParams);
+    }
+    async getInitializeInsuranceFundStakeIx(vault, spotMarketIndex) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const ifStakeAccountPublicKey = (0, sdk_1.getInsuranceFundStakeAccountPublicKey)(this.driftClient.program.programId, vault, spotMarketIndex);
         const spotMarket = this.driftClient.getSpotMarketAccount(spotMarketIndex);
@@ -1258,7 +1321,7 @@ class VaultClient {
             driftState: await this.driftClient.getStatePublicKey(),
             driftProgram: this.driftClient.program.programId,
         })
-            .rpc();
+            .instruction();
     }
     /**
      * Adds an amount to an insurance fund stake for the vault.
@@ -1267,7 +1330,11 @@ class VaultClient {
      * @param amount amount to add to the insurance fund stake, in spotMarketIndex precision
      * @returns
      */
-    async addToInsuranceFundStake(vault, spotMarketIndex, amount, managerTokenAccount) {
+    async addToInsuranceFundStake(vault, spotMarketIndex, amount, managerTokenAccount, txParams) {
+        const ixs = await this.getAddToInsuranceFundStakeIx(vault, spotMarketIndex, amount, managerTokenAccount);
+        return await this.createAndSendTxn([ixs], txParams);
+    }
+    async getAddToInsuranceFundStakeIx(vault, spotMarketIndex, amount, managerTokenAccount) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         if (!vaultAccount.manager.equals(this.driftClient.wallet.publicKey)) {
             throw new Error(`Only the manager of the vault can add to the insurance fund stake.`);
@@ -1279,7 +1346,7 @@ class VaultClient {
             throw new Error(`Spot market ${spotMarketIndex} not found on driftClient`);
         }
         if (!managerTokenAccount) {
-            managerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarket.mint, this.driftClient.wallet.publicKey);
+            managerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarket.mint, vaultAccount.manager, true);
         }
         const ifVaultTokenAccount = (0, addresses_1.getInsuranceFundTokenVaultAddressSync)(this.program.programId, vault, spotMarketIndex);
         return await this.program.methods
@@ -1298,9 +1365,13 @@ class VaultClient {
             driftSigner: this.driftClient.getStateAccount().signer,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
         })
-            .rpc();
+            .instruction();
+    }
+    async requestRemoveInsuranceFundStake(vault, spotMarketIndex, amount, txParams) {
+        const ix = await this.getRequestRemoveInsuranceFundStakeIx(vault, spotMarketIndex, amount);
+        return await this.createAndSendTxn([ix], txParams);
     }
-    async requestRemoveInsuranceFundStake(vault, spotMarketIndex, amount) {
+    async getRequestRemoveInsuranceFundStakeIx(vault, spotMarketIndex, amount) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const ifStakeAccountPublicKey = (0, sdk_1.getInsuranceFundStakeAccountPublicKey)(this.driftClient.program.programId, vault, spotMarketIndex);
         const ifVaultPublicKey = await (0, sdk_1.getInsuranceFundVaultPublicKey)(this.driftClient.program.programId, spotMarketIndex);
@@ -1312,16 +1383,20 @@ class VaultClient {
             .requestRemoveInsuranceFundStake(spotMarketIndex, amount)
             .accounts({
             vault,
-            manager: this.driftClient.wallet.publicKey,
+            manager: vaultAccount.manager,
             driftSpotMarket: spotMarket.pubkey,
             insuranceFundStake: ifStakeAccountPublicKey,
             insuranceFundVault: ifVaultPublicKey,
             driftUserStats: vaultAccount.userStats,
             driftProgram: this.driftClient.program.programId,
         })
-            .rpc();
+            .instruction();
+    }
+    async cancelRequestRemoveInsuranceFundStake(vault, spotMarketIndex, txParams) {
+        const ix = await this.getCancelRequestRemoveInsuranceFundStakeIx(vault, spotMarketIndex);
+        return await this.createAndSendTxn([ix], txParams);
     }
-    async cancelRequestRemoveInsuranceFundStake(vault, spotMarketIndex) {
+    async getCancelRequestRemoveInsuranceFundStakeIx(vault, spotMarketIndex) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const ifStakeAccountPublicKey = (0, sdk_1.getInsuranceFundStakeAccountPublicKey)(this.driftClient.program.programId, vault, spotMarketIndex);
         const ifVaultPublicKey = await (0, sdk_1.getInsuranceFundVaultPublicKey)(this.driftClient.program.programId, spotMarketIndex);
@@ -1333,16 +1408,20 @@ class VaultClient {
             .cancelRequestRemoveInsuranceFundStake(spotMarketIndex)
             .accounts({
             vault: vault,
-            manager: this.driftClient.wallet.publicKey,
+            manager: vaultAccount.manager,
             driftSpotMarket: spotMarket.pubkey,
             insuranceFundStake: ifStakeAccountPublicKey,
             insuranceFundVault: ifVaultPublicKey,
             driftUserStats: vaultAccount.userStats,
             driftProgram: this.driftClient.program.programId,
         })
-            .rpc();
+            .instruction();
+    }
+    async removeInsuranceFundStake(vault, spotMarketIndex, managerTokenAccount, txParams) {
+        const ixs = await this.getRemoveInsuranceFundStakeIx(vault, spotMarketIndex, managerTokenAccount);
+        return await this.createAndSendTxn([ixs], txParams);
     }
-    async removeInsuranceFundStake(vault, spotMarketIndex, managerTokenAccount) {
+    async getRemoveInsuranceFundStakeIx(vault, spotMarketIndex, managerTokenAccount) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const ifStakeAccountPublicKey = (0, sdk_1.getInsuranceFundStakeAccountPublicKey)(this.driftClient.program.programId, vault, spotMarketIndex);
         const ifVaultPublicKey = await (0, sdk_1.getInsuranceFundVaultPublicKey)(this.driftClient.program.programId, spotMarketIndex);
@@ -1351,7 +1430,7 @@ class VaultClient {
             throw new Error(`Spot market ${spotMarketIndex} not found on driftClient`);
         }
         if (!managerTokenAccount) {
-            managerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarket.mint, this.driftClient.wallet.publicKey);
+            managerTokenAccount = (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarket.mint, vaultAccount.manager, true);
         }
         const ifVaultTokenAccount = (0, addresses_1.getInsuranceFundTokenVaultAddressSync)(this.program.programId, vault, spotMarketIndex);
         return await this.program.methods
@@ -1369,9 +1448,13 @@ class VaultClient {
             driftProgram: this.driftClient.program.programId,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
         })
-            .rpc();
+            .instruction();
     }
-    async protocolRequestWithdraw(vault, amount, withdrawUnit) {
+    async protocolRequestWithdraw(vault, amount, withdrawUnit, txParams) {
+        const ix = await this.getProtocolRequestWithdrawIx(vault, amount, withdrawUnit);
+        return await this.createAndSendTxn([ix], txParams);
+    }
+    async getProtocolRequestWithdrawIx(vault, amount, withdrawUnit) {
         // @ts-ignore
         const vaultAccount = (await this.program.account.vault.fetch(vault));
         const vp = this.getVaultProtocolAddress(vault);
@@ -1394,26 +1477,30 @@ class VaultClient {
                 .managerRequestWithdraw(amount, withdrawUnit)
                 .accounts(accounts)
                 .remainingAccounts(remainingAccounts)
-                .rpc();
+                .instruction();
         }
         else {
             const requestWithdrawIx = this.program.instruction.managerRequestWithdraw(
             // @ts-ignore
             amount, withdrawUnit, {
                 accounts: {
-                    manager: this.driftClient.wallet.publicKey,
+                    manager: vaultAccount.manager,
                     ...accounts,
                 },
                 remainingAccounts,
             });
-            return await this.createAndSendTxn([requestWithdrawIx]);
+            return requestWithdrawIx;
         }
     }
-    async protocolCancelWithdrawRequest(vault) {
+    async protocolCancelWithdrawRequest(vault, txParams) {
+        const ixs = await this.getProtocolCancelWithdrawRequestIx(vault);
+        return await this.createAndSendTxn(ixs, txParams);
+    }
+    async getProtocolCancelWithdrawRequestIx(vault) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
         const accounts = {
-            manager: this.driftClient.wallet.publicKey,
+            manager: vaultAccount.manager,
             vault,
             driftUserStats: userStatsKey,
             driftUser: vaultAccount.user,
@@ -1422,24 +1509,30 @@ class VaultClient {
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
         const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [], vaultAccount, userStats);
         if (this.cliMode) {
-            return await this.program.methods
-                .mangerCancelWithdrawRequest()
-                .accounts(accounts)
-                .remainingAccounts(remainingAccounts)
-                .rpc();
+            return [
+                await this.program.methods
+                    .mangerCancelWithdrawRequest()
+                    .accounts(accounts)
+                    .remainingAccounts(remainingAccounts)
+                    .instruction(),
+            ];
         }
         else {
             const cancelRequestWithdrawIx = this.program.instruction.mangerCancelWithdrawRequest({
                 accounts: {
                     ...accounts,
-                    manager: this.driftClient.wallet.publicKey,
+                    manager: vaultAccount.manager,
                 },
                 remainingAccounts,
             });
-            return await this.createAndSendTxn([cancelRequestWithdrawIx]);
+            return [cancelRequestWithdrawIx];
         }
     }
-    async protocolWithdraw(vault) {
+    async protocolWithdraw(vault, txParams) {
+        const ixs = await this.getProtocolWithdrawIx(vault);
+        return await this.createAndSendTxn(ixs, txParams);
+    }
+    async getProtocolWithdrawIx(vault) {
         const vaultAccount = await this.program.account.vault.fetch(vault);
         if (!this.driftClient.wallet.publicKey.equals(vaultAccount.manager)) {
             throw new Error(`Only the manager of the vault can request a withdraw.`);
@@ -1455,7 +1548,7 @@ class VaultClient {
         const ix = this.program.instruction.managerWithdraw({
             accounts: {
                 vault,
-                manager: this.driftClient.wallet.publicKey,
+                manager: vaultAccount.manager,
                 vaultTokenAccount: vaultAccount.tokenAccount,
                 driftUser: await (0, sdk_1.getUserAccountPublicKey)(this.driftClient.program.programId, vault),
                 driftProgram: this.driftClient.program.programId,
@@ -1468,9 +1561,7 @@ class VaultClient {
             },
             remainingAccounts,
         });
-        return this.createAndSendTxn([ix], {
-            cuLimit: 1000000,
-        });
+        return [ix];
     }
     async getOracleFeedsToCrank(oracleFeedsToCrank) {
         const oracleFeedsToCrankIxs = oracleFeedsToCrank
@@ -1485,14 +1576,17 @@ class VaultClient {
         return oracleFeedsToCrankIxs;
     }
     async updateVaultProtocol(vault, params, txParams) {
-        const ix = await this.program.methods
+        const ix = await this.getUpdateVaultProtocolIx(vault, params);
+        return await this.createAndSendTxn([ix], txParams);
+    }
+    async getUpdateVaultProtocolIx(vault, params) {
+        return this.program.methods
             .updateVaultProtocol(params)
             .accounts({
             vault,
             vaultProtocol: this.getVaultProtocolAddress(vault),
         })
             .instruction();
-        return await this.createAndSendTxn([ix], txParams);
     }
     async updateCumulativeFuelAmount(vaultDepositor, txParams) {
         return await this.createAndSendTxn([await this.getUpdateCumulativeFuelAmountIx(vaultDepositor)], txParams);
@@ -1567,11 +1661,12 @@ class VaultClient {
         ], txParams);
     }
     async getManagerUpdateFuelDistributionModeIx(vault, fuelDistributionMode) {
+        const vaultAccount = await this.program.account.vault.fetch(vault);
         return this.program.methods
             .managerUpdateFuelDistributionMode(fuelDistributionMode)
             .accounts({
             vault,
-            manager: this.driftClient.wallet.publicKey,
+            manager: vaultAccount.manager,
         })
             .instruction();
     }