@drift-labs/vaults-sdk 0.6.30 → 0.6.32

package/cli/cli.ts

@@ -28,6 +28,9 @@ import { Command, Option } from 'commander';
 import { viewVaultDepositor } from "./commands/viewVaultDepositor";
 import { managerUpdatePoolId } from "./commands/managerUpdatePoolId";
 import { managerApplyProfitShare } from "./commands/managerApplyProfitShare";
+import { managerUpdateFees } from "./commands/managerUpdateFees";
+import { adminInitFeeUpdate } from "./commands/adminInitFeeUpdate";
+import { adminDeleteFeeUpdate } from "./commands/adminDeleteFeeUpdate";
 
 const program = new Command();
 program
@@ -94,8 +97,9 @@ program
     .option("-r, --redeem-period <number>", "The new redeem period (can only be lowered)")
     .option("-x, --max-tokens <number>", "The max tokens the vault can accept")
     .option("-a, --min-deposit-amount <number", "The minimum token amount allowed to deposit")
-    .option("-m, --management-fee <percent>", "The new management fee (can only be lowered)")
-    .option("-s, --profit-share <percent>", "The new profit share percentage (can only be lowered)")
+    .option("-m, --management-fee <percent>", "The new management fee (can only be lowered, use timelocked manager-update-fees to raise)")
+    .option("-s, --profit-share <percent>", "The new profit share percentage (can only be lowered, use timelocked manager-update-fees to raise)")
+    .option("-h, --hurdle-rate <percent>", "The new hurdle rate percentage (can only be raised, use timelocked manager-update-fees to lower)")
     .option("-p, --permissioned <boolean>", "Set the vault as permissioned (true) or open (false)")
     .addOption(new Option("--dump-transaction-message", "Dump the transaction message to the console").makeOptionMandatory(false))
     .action((opts) => managerUpdateVault(program, opts));
@@ -206,6 +210,31 @@ program
 
     .action((opts) => vaultInvariantChecks(program, opts));
 
+program
+    .command("manager-update-fees")
+    .description("Update vault fees for a manager")
+    .addOption(new Option("--vault-address <address>", "Address of the vault to update").makeOptionMandatory(true))
+    .option("-t, --timelock-duration <number>", "The new timelock duration in seconds, must be at least the greater of 1 day, or the current redeem period (default: minimum duration)")
+    .option("-m, --management-fee <percent>", "The new management fee percentage")
+    .option("-s, --profit-share <percent>", "The new profit share percentage")
+    .option("-h, --hurdle-rate <percent>", "The new hurdle rate percentage")
+    .addOption(new Option("--dump-transaction-message", "Dump the transaction message to the console").makeOptionMandatory(false))
+    .action((opts) => managerUpdateFees(program, opts));
+
+program
+    .command("admin-init-fee-update")
+    .description("Admin initialize a fee update for a vault")
+    .addOption(new Option("--vault-address <address>", "Address of the vault to initialize fee update for").makeOptionMandatory(true))
+    .addOption(new Option("--dump-transaction-message", "Dump the transaction message to the console").makeOptionMandatory(false))
+    .action((opts) => adminInitFeeUpdate(program, opts));
+
+program
+    .command("admin-delete-fee-update")
+    .description("Admin delete a fee update for a vault")
+    .addOption(new Option("--vault-address <address>", "Address of the vault to delete fee update for").makeOptionMandatory(true))
+    .addOption(new Option("--dump-transaction-message", "Dump the transaction message to the console").makeOptionMandatory(false))
+    .action((opts) => adminDeleteFeeUpdate(program, opts));
+
 program.parseAsync().then(() => {
     process.exit(0);
 });

package/cli/commands/adminDeleteFeeUpdate.ts

@@ -0,0 +1,73 @@
+import { PublicKey } from "@solana/web3.js";
+import {
+    OptionValues,
+    Command
+} from "commander";
+import { dumpTransactionMessage, getCommandContext } from "../utils";
+import { VAULT_ADMIN_KEY } from "../../src";
+
+export const adminDeleteFeeUpdate = async (program: Command, cmdOpts: OptionValues) => {
+    let vaultAddress: PublicKey;
+    try {
+        vaultAddress = new PublicKey(cmdOpts.vaultAddress as string);
+    } catch (err) {
+        console.error("Invalid vault address");
+        process.exit(1);
+    }
+
+    const {
+        driftVault,
+        driftClient,
+    } = await getCommandContext(program, true);
+
+    if (!driftClient.wallet.publicKey.equals(VAULT_ADMIN_KEY)) {
+        console.error("Only vault admin can delete fee update");
+        process.exit(1);
+    }
+
+    const vault = await driftVault.getVault(vaultAddress);
+
+    console.log(`Deleting fee update for vault:`);
+    console.log(`  Vault: ${vault.pubkey.toBase58()}`);
+
+    const readline = require('readline').createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+    console.log('');
+    const answer = await new Promise(resolve => {
+        readline.question('Are you sure you want to delete the fee update? (yes/no) ', (answer: string) => {
+            readline.close();
+            resolve(answer);
+        });
+    });
+    if ((answer as string).toLowerCase() !== 'yes') {
+        console.log('Fee update deletion canceled.');
+        process.exit(0);
+    }
+    console.log('Deleting fee update...');
+
+    let done = false;
+    while (!done) {
+        try {
+            if (cmdOpts.dumpTransactionMessage) {
+                const tx = await driftVault.getAdminDeleteFeeUpdateIx(vaultAddress);
+                console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
+            } else {
+                const tx = await driftVault.adminDeleteFeeUpdate(vaultAddress);
+                console.log(`Deleted fee update as admin: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
+                done = true;
+            }
+            break;
+        } catch (e) {
+            const err = e as Error;
+            if (err.message.includes('TransactionExpiredTimeoutError')) {
+                console.log(err.message);
+                console.log('Transaction timeout. Retrying...');
+                await new Promise(resolve => setTimeout(resolve, 5000));
+            } else {
+                throw err;
+            }
+        }
+    }
+}; 

package/cli/commands/adminInitFeeUpdate.ts

@@ -0,0 +1,73 @@
+import { PublicKey } from "@solana/web3.js";
+import {
+    OptionValues,
+    Command
+} from "commander";
+import { dumpTransactionMessage, getCommandContext } from "../utils";
+import { VAULT_ADMIN_KEY } from "../../src";
+
+export const adminInitFeeUpdate = async (program: Command, cmdOpts: OptionValues) => {
+    let vaultAddress: PublicKey;
+    try {
+        vaultAddress = new PublicKey(cmdOpts.vaultAddress as string);
+    } catch (err) {
+        console.error("Invalid vault address");
+        process.exit(1);
+    }
+
+    const {
+        driftVault,
+        driftClient,
+    } = await getCommandContext(program, true);
+
+    if (!driftClient.wallet.publicKey.equals(VAULT_ADMIN_KEY)) {
+        console.error("Only vault admin can initialize fee update");
+        process.exit(1);
+    }
+
+    const vault = await driftVault.getVault(vaultAddress);
+
+    console.log(`Initializing fee update for vault:`);
+    console.log(`  Vault: ${vault.pubkey.toBase58()}`);
+
+    const readline = require('readline').createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+    console.log('');
+    const answer = await new Promise(resolve => {
+        readline.question('Is the above information correct? (yes/no) ', (answer: string) => {
+            readline.close();
+            resolve(answer);
+        });
+    });
+    if ((answer as string).toLowerCase() !== 'yes') {
+        console.log('Fee update initialization canceled.');
+        process.exit(0);
+    }
+    console.log('Initializing fee update...');
+
+    let done = false;
+    while (!done) {
+        try {
+            if (cmdOpts.dumpTransactionMessage) {
+                const tx = await driftVault.getAdminInitFeeUpdateIx(vaultAddress);
+                console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
+            } else {
+                const tx = await driftVault.adminInitFeeUpdate(vaultAddress);
+                console.log(`Initialized fee update as admin: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
+                done = true;
+            }
+            break;
+        } catch (e) {
+            const err = e as Error;
+            if (err.message.includes('TransactionExpiredTimeoutError')) {
+                console.log(err.message);
+                console.log('Transaction timeout. Retrying...');
+                await new Promise(resolve => setTimeout(resolve, 5000));
+            } else {
+                throw err;
+            }
+        }
+    }
+}; 

package/cli/commands/applyProfitShare.ts

@@ -37,8 +37,11 @@ export const applyProfitShare = async (program: Command, cmdOpts: OptionValues)
     const thresholdBN = numberToSafeBN(thresholdNumber, spotMarketPrecision);
     let pendingProfitShareToRealize = ZERO;
     const vdWithPendingProfitShare = vdWithNoWithdrawRequests.filter((vd: ProgramAccount<VaultDepositor>) => {
+        if (vault.managementFee.gt(ZERO)) {
+            return true;
+        }
         const pendingProfitShares = calculateApplyProfitShare(vd.account, vaultEquitySpot, vault);
-        const doRealize = pendingProfitShares.profitShareAmount.gt(thresholdBN);
+        const doRealize = pendingProfitShares.profitShareAmount.gte(thresholdBN);
         if (doRealize) {
             pendingProfitShareToRealize = pendingProfitShareToRealize.add(pendingProfitShares.profitShareAmount);
             return true;
@@ -83,7 +86,7 @@ export const applyProfitShare = async (program: Command, cmdOpts: OptionValues)
 
             try {
                 const txid = await driftClient.connection.sendTransaction(tx);
-                console.log(`Sent chunk: ${txid}`);
+                console.log(`Sent chunk: https://solana.fm/tx/${txid}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
             } catch (e) {
                 console.error(`Error sending chunk: ${e}`);
                 console.log((e as SendTransactionError).logs);

package/cli/commands/decodeLogs.ts

@@ -30,10 +30,13 @@ export const decodeLogs = async (program: Command, cmdOpts: OptionValues) => {
         maxSupportedTransactionVersion: 0,
     });
 
+    let i = 0;
     // @ts-ignore
     for (const event of driftVault.program._events._eventParser.parseLogs(
         tx!.meta!.logMessages
     )) {
+        console.log(`--------------- Event: ${i} ${event.name} -----------------`);
+        i++;
 
         /* eslint-disable no-case-declarations */
         switch (event.name) {
@@ -63,12 +66,10 @@ export const decodeLogs = async (program: Command, cmdOpts: OptionValues) => {
                 console.log(` depositOraclePrice:  ${data.depositOraclePrice?.toNumber()}`);
                 break;
             default:
-                console.log(event);
         }
 
         console.log("----------Raw Event-------------");
         console.log(event);
-        console.log("--------------------------------");
     }
 
 };

package/cli/commands/deposit.ts

@@ -57,7 +57,7 @@ export const deposit = async (program: Command, cmdOpts: OptionValues) => {
                 authority: depositAuthority,
                 vault: vaultAddress
             });
-        console.log(`Deposited ${cmdOpts.amount} to vault: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+        console.log(`Deposited ${cmdOpts.amount} to vault: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
     } else {
         // VaultDepositor exists
         const vaultAddress = vaultDepositorAccount.vault;
@@ -71,6 +71,6 @@ export const deposit = async (program: Command, cmdOpts: OptionValues) => {
 
         console.log(`depositing (existing VaultDepositor account): ${depositBN.toString()}`);
         const tx = await driftVault.deposit(vaultDepositorAddress, depositBN);
-        console.log(`Deposited ${cmdOpts.amount} to vault: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+        console.log(`Deposited ${cmdOpts.amount} to vault: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
     }
 };

package/cli/commands/forceWithdrawAll.ts

@@ -97,7 +97,7 @@ export const forceWithdrawAll = async (program: Command, cmdOpts: OptionValues)
         console.log(`Sending chunk: ${bs58.encode(tx.signatures[0])}`);
         try {
             const txid = await driftClient.connection.sendTransaction(tx);
-            console.log(`Sent chunk: https://solscan.io/tx/${txid}`);
+            console.log(`Sent chunk: https://solana.fm/tx/${txid}`);
         } catch (e) {
             console.error(`Error sending chunk: ${e}`);
             console.log((e as SendTransactionError).logs);

package/cli/commands/index.ts

@@ -19,4 +19,6 @@ export * from './listDepositorsForVault';
 export * from './managerUpdateMarginTradingEnabled';
 export * from './decodeLogs';
 export * from './vaultInvariantChecks';
+export * from './adminInitFeeUpdate';
+export * from './adminDeleteFeeUpdate';
 

package/cli/commands/initVault.ts

@@ -5,6 +5,7 @@ import {
     TEN,
     convertToNumber,
     decodeName,
+    getSignedMsgUserAccountPublicKey,
 } from "@drift-labs/sdk";
 import {
     OptionValues,
@@ -122,8 +123,8 @@ export const initVault = async (program: Command, cmdOpts: OptionValues) => {
 
     const vaultAddress = getVaultAddressSync(VAULT_PROGRAM_ID, vaultNameBytes);
 
-    if (cmdOpts.dumpTransactionMessage) {
-        const initIx = await driftVault.getInitializeVaultIx({
+    const ixs = [
+        await driftVault.getInitializeVaultIx({
             name: vaultNameBytes,
             spotMarketIndex,
             redeemPeriod: new BN(redeemPeriodSec),
@@ -134,42 +135,41 @@ export const initVault = async (program: Command, cmdOpts: OptionValues) => {
             permissioned,
             minDepositAmount: minDepositAmountBN,
             manager: cmdOpts.manager,
-        });
-        const updateDelegateIx = await driftVault.getUpdateDelegateIx(vaultAddress, delegate);
-
-        console.log(`New vault address will be: ${vaultAddress.toBase58()}`);
-        console.log(`Setting trading delegate to: ${delegate.toBase58()}`);
+        }),
+        await driftVault.getUpdateDelegateIx(vaultAddress, delegate)
+    ];
+
+    const signedOrdersAccountAddress = getSignedMsgUserAccountPublicKey(
+        driftClient.program.programId,
+        vaultAddress,
+    );
+
+    let swiftUsersAccountExists = false;
+    try {
+        const acc = await driftClient.connection.getAccountInfo(signedOrdersAccountAddress);
+        swiftUsersAccountExists = acc !== null;
+    } catch (_err) {
+        // Error getting account info is non-critical, default to false
+    }
 
-        console.log('');
-        console.log(`Base 58 encoded transaction:`);
-        console.log(dumpTransactionMessage(cmdOpts.manager ? new PublicKey(cmdOpts.manager) : driftClient.wallet.publicKey, [initIx, updateDelegateIx]));
-    } else {
-        const initSignedOrdersAccIx = await driftClient.getInitializeSignedMsgUserOrdersAccountIx(
-            vaultAddress,
-            8
+    if (!swiftUsersAccountExists) {
+        ixs.push(
+            await driftClient.getInitializeSignedMsgUserOrdersAccountIx(
+                vaultAddress,
+                8
+            )[1]
         );
-        const initIx = await driftVault.getInitializeVaultIx({
-            name: vaultNameBytes,
-            spotMarketIndex,
-            redeemPeriod: new BN(redeemPeriodSec),
-            maxTokens: maxTokensBN,
-            managementFee: managementFeeBN,
-            profitShare: profitShareBN.toNumber(),
-            hurdleRate: 0,
-            permissioned,
-            minDepositAmount: minDepositAmountBN,
-            manager: cmdOpts.manager,
-        });
-        const initTx = await driftVault.createAndSendTxn([
-            initSignedOrdersAccIx[1],
-            initIx,
-        ]);
-        console.log(`Initialized vault, tx: https://solscan.io/tx/${initTx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+    }
 
-        console.log(`\nNew vault address: ${vaultAddress}\n`);
+    console.log(`New vault address will be: ${vaultAddress.toBase58()}`);
+    console.log(`Setting trading delegate to: ${delegate.toBase58()}`);
+    console.log('');
 
-        console.log(`Updating the drift account delegate to: ${delegate}...`);
-        const updateDelegateTx = await driftVault.updateDelegate(vaultAddress, delegate);
-        console.log(`update delegate tx: https://solscan.io/tx/${updateDelegateTx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+    if (cmdOpts.dumpTransactionMessage) {
+        console.log(`Base 58 encoded transaction:`);
+        console.log(dumpTransactionMessage(cmdOpts.manager ? new PublicKey(cmdOpts.manager) : driftClient.wallet.publicKey, ixs));
+    } else {
+        const initTx = await driftVault.createAndSendTxn(ixs);
+        console.log(`Initialized vault, tx: https://solana.fm/tx/${initTx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
     }
 };

package/cli/commands/managerApplyProfitShare.ts

@@ -27,6 +27,6 @@ export const managerApplyProfitShare = async (program: Command, cmdOpts: OptionV
         console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
     } else {
         const tx = await driftVault.applyProfitShare(vaultAddress, vaultDepositorAddress);
-        console.log(`Applied profit share: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+        console.log(`Applied profit share: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
     }
 };

package/cli/commands/managerCancelWithdraw.ts

@@ -25,6 +25,6 @@ export const managerCancelWithdraw = async (program: Command, cmdOpts: OptionVal
         console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
     } else {
         const tx = await driftVault.managerCancelWithdrawRequest(vaultAddress);
-        console.log(`Canceled withdraw as vault manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+        console.log(`Canceled withdraw as vault manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
     }
 };

package/cli/commands/managerDeposit.ts

@@ -34,6 +34,6 @@ export const managerDeposit = async (program: Command, cmdOpts: OptionValues) =>
         console.log(dumpTransactionMessage(driftClient.wallet.publicKey, txs));
     } else {
         const tx = await driftVault.managerDeposit(vaultAddress, depositBN);
-        console.log(`Deposited ${cmdOpts.amount} to vault as manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+        console.log(`Deposited ${cmdOpts.amount} to vault as manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
     }
 };

package/cli/commands/managerRequestWithdraw.ts

@@ -32,7 +32,7 @@ export const managerRequestWithdraw = async (program: Command, cmdOpts: OptionVa
             console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
         } else {
             const tx = await driftVault.managerRequestWithdraw(vaultAddress, new BN(cmdOpts.shares), WithdrawUnit.SHARES);
-            console.log(`Requested to withraw ${cmdOpts.shares} shares as vault manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+            console.log(`Requested to withraw ${cmdOpts.shares} shares as vault manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
         }
     } else if (cmdOpts.amount && !cmdOpts.shares) {
         const vault = await driftVault.getVault(vaultAddress);
@@ -50,7 +50,7 @@ export const managerRequestWithdraw = async (program: Command, cmdOpts: OptionVa
             console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
         } else {
             const tx = await driftVault.managerRequestWithdraw(vaultAddress, amountBN, WithdrawUnit.TOKEN);
-            console.log(`Requested to withdraw ${amount} ${decodeName(spotMarket.name)} as vault manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+            console.log(`Requested to withdraw ${amount} ${decodeName(spotMarket.name)} as vault manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
         }
 
 

package/cli/commands/managerUpdateFees.ts

@@ -0,0 +1,121 @@
+import { PublicKey } from "@solana/web3.js";
+import {
+    OptionValues,
+    Command
+} from "commander";
+import { dumpTransactionMessage, getCommandContext } from "../utils";
+import { BN, PERCENTAGE_PRECISION, convertToNumber } from "@drift-labs/sdk";
+
+export const managerUpdateFees = async (program: Command, cmdOpts: OptionValues) => {
+    let vaultAddress: PublicKey;
+    try {
+        vaultAddress = new PublicKey(cmdOpts.vaultAddress as string);
+    } catch (err) {
+        console.error("Invalid vault address");
+        process.exit(1);
+    }
+
+    const {
+        driftVault,
+        driftClient,
+    } = await getCommandContext(program, true);
+
+    const vault = await driftVault.getVault(vaultAddress);
+
+    const timelockDuration = cmdOpts.timelockDuration;
+    let timelockDurationBN: BN | null = null;
+    // const minTimelockDurationBN = new BN(Math.max(1 * 24 * 60 * 60, vault.redeemPeriod.toNumber()));
+    const minTimelockDurationBN = new BN(Math.max(1 * 60 * 60, vault.redeemPeriod.toNumber()));
+    if (timelockDuration !== undefined && timelockDuration !== null) {
+        timelockDurationBN = new BN(parseInt(timelockDuration));
+        if (timelockDurationBN.lt(minTimelockDurationBN)) {
+            throw new Error(`Timelock duration must be at least ${minTimelockDurationBN.toNumber()} seconds`);
+        }
+    } else {
+        timelockDurationBN = minTimelockDurationBN;
+    }
+
+    let managementFee = cmdOpts.managementFee;
+    let managementFeeBN: BN | null = null;
+    if (managementFee !== undefined && managementFee !== null) {
+        managementFee = parseInt(managementFee);
+        managementFeeBN = new BN(managementFee).mul(PERCENTAGE_PRECISION).div(new BN(100));
+    }
+
+    let profitShare = cmdOpts.profitShare;
+    let profitShareNumber: number | null = null;
+    if (profitShare !== undefined && profitShare !== null) {
+        profitShare = parseInt(profitShare);
+        profitShareNumber = profitShare * PERCENTAGE_PRECISION.toNumber() / 100.0;
+    }
+
+    let hurdleRate = cmdOpts.hurdleRate;
+    let hurdleRateNumber: number | null = null;
+    if (hurdleRate !== undefined && hurdleRate !== null) {
+        hurdleRate = parseInt(hurdleRate);
+        hurdleRateNumber = hurdleRate * PERCENTAGE_PRECISION.toNumber() / 100.0;
+    }
+
+    console.log(`Updating fees, effective in ${timelockDurationBN?.toNumber()} seconds`);
+
+    const managementFeeBefore = convertToNumber(vault.managementFee, PERCENTAGE_PRECISION) * 100.0;
+    const managementFeeAfter = managementFeeBN ? `${convertToNumber(managementFeeBN, PERCENTAGE_PRECISION) * 100.0}%` : 'unchanged';
+    console.log(`  ManagementFee:          ${managementFeeBefore}% -> ${managementFeeAfter}`);
+
+    const profitShareBefore = vault.profitShare / PERCENTAGE_PRECISION.toNumber() * 100.0;
+    const profitShareAfter = profitShareNumber !== null ? `${profitShareNumber / PERCENTAGE_PRECISION.toNumber() * 100.0}%` : 'unchanged';
+    console.log(`  ProfitShare:            ${profitShareBefore}% -> ${profitShareAfter}`);
+
+    const hurdleRateBefore = vault.hurdleRate / PERCENTAGE_PRECISION.toNumber() * 100.0;
+    const hurdleRateAfter = hurdleRateNumber !== null ? `${hurdleRateNumber / PERCENTAGE_PRECISION.toNumber() * 100.0}%` : 'unchanged';
+    console.log(`  HurdleRate:             ${hurdleRateBefore}% -> ${hurdleRateAfter}`);
+
+    const readline = require('readline').createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+    console.log('');
+    const answer = await new Promise(resolve => {
+        readline.question('Is the above information correct? (yes/no) ', (answer: string) => {
+            readline.close();
+            resolve(answer);
+        });
+    });
+    if ((answer as string).toLowerCase() !== 'yes') {
+        console.log('Fee update canceled.');
+        readline.close();
+        process.exit(0);
+    }
+    console.log('Updating fees...');
+
+    const newParams = {
+        timelockDuration: timelockDurationBN,
+        newManagementFee: managementFeeBN,
+        newProfitShare: profitShareNumber,
+        newHurdleRate: hurdleRateNumber,
+    };
+
+    let done = false;
+    while (!done) {
+        try {
+            if (cmdOpts.dumpTransactionMessage) {
+                const tx = await driftVault.getManagerUpdateFeesIx(vaultAddress, newParams);
+                console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
+            } else {
+                const tx = await driftVault.managerUpdateFees(vaultAddress, newParams);
+                console.log(`Updated vault fees as vault manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
+                done = true;
+            }
+            break;
+        } catch (e) {
+            const err = e as Error;
+            if (err.message.includes('TransactionExpiredTimeoutError')) {
+                console.log(err.message);
+                console.log('Transaction timeout. Retrying...');
+                await new Promise(resolve => setTimeout(resolve, 5000));
+            } else {
+                throw err;
+            }
+        }
+    }
+}; 

package/cli/commands/managerUpdateMarginTradingEnabled.ts

@@ -27,6 +27,6 @@ export const managerUpdateMarginTradingEnabled = async (program: Command, cmdOpt
         console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
     } else {
         const tx = await driftVault.updateMarginTradingEnabled(vaultAddress, enabled);
-        console.log(`Updated margin trading vault manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+        console.log(`Updated margin trading vault manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
     }
 };

package/cli/commands/managerUpdatePoolId.ts

@@ -31,6 +31,6 @@ export const managerUpdatePoolId = async (program: Command, cmdOpts: OptionValue
         console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
     } else {
         const tx = await driftVault.updateUserPoolId(vaultAddress, poolId);
-        console.log(`Updated pool id vault manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+        console.log(`Updated pool id vault manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
     }
 };

package/cli/commands/managerUpdateVault.ts

@@ -57,6 +57,13 @@ export const managerUpdateVault = async (program: Command, cmdOpts: OptionValues
         profitShareNumber = profitShare * PERCENTAGE_PRECISION.toNumber() / 100.0;
     }
 
+    let hurdleRate = cmdOpts.hurdleRate;
+    let hurdleRateNumber: number | null = null;
+    if (hurdleRate !== undefined && hurdleRate !== null) {
+        hurdleRate = parseInt(hurdleRate);
+        hurdleRateNumber = hurdleRate * PERCENTAGE_PRECISION.toNumber() / 100.0;
+    }
+
     let minDepositAmount = cmdOpts.minDepositAmount;
     let minDepositAmountBN: BN | null = null;
     if (minDepositAmount !== undefined && minDepositAmount !== null) {
@@ -85,6 +92,10 @@ export const managerUpdateVault = async (program: Command, cmdOpts: OptionValues
     const profitShareAfter = profitShareNumber !== null ? `${profitShareNumber / PERCENTAGE_PRECISION.toNumber() * 100.0}%` : 'unchanged';
     console.log(`  ProfitShare:            ${profitShareBefore}% -> ${profitShareAfter}`);
 
+    const hurdleRateBefore = vault.hurdleRate / PERCENTAGE_PRECISION.toNumber() * 100.0;
+    const hurdleRateAfter = hurdleRateNumber !== null ? `${hurdleRateNumber / PERCENTAGE_PRECISION.toNumber() * 100.0}%` : 'unchanged';
+    console.log(`  HurdleRate:             ${hurdleRateBefore}% -> ${hurdleRateAfter}`);
+
     const permissioned: boolean | null = (cmdOpts.permissioned === null || cmdOpts.permissioned === undefined) ? null : JSON.parse(cmdOpts.permissioned);
     const permissionedBefore = vault.permissioned;
     const permissionedAfter = permissioned !== null ? permissioned : 'unchanged';
@@ -115,7 +126,7 @@ export const managerUpdateVault = async (program: Command, cmdOpts: OptionValues
         minDepositAmount: minDepositAmountBN,
         managementFee: managementFeeBN,
         profitShare: profitShareNumber,
-        hurdleRate: null,
+        hurdleRate: hurdleRateNumber,
         permissioned,
     };
 
@@ -127,7 +138,7 @@ export const managerUpdateVault = async (program: Command, cmdOpts: OptionValues
                 console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
             } else {
                 const tx = await driftVault.managerUpdateVault(vaultAddress, newParams);
-                console.log(`Updated vault params as vault manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+                console.log(`Updated vault params as vault manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
                 done = true;
             }
             break;

package/cli/commands/managerUpdateVaultDelegate.ts

@@ -36,7 +36,7 @@ export const managerUpdateVaultDelegate = async (program: Command, cmdOpts: Opti
         console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
     } else {
         const tx = await driftVault.updateDelegate(vaultAddress, delegate);
-        console.log(`Updated vault delegate to ${delegate.toBase58()}: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+        console.log(`Updated vault delegate to ${delegate.toBase58()}: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
     }
 
 };

package/cli/commands/managerUpdateVaultManager.ts

@@ -59,7 +59,7 @@ export const managerUpdateVaultManager = async (program: Command, cmdOpts: Optio
                 console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
             } else {
                 const tx = await driftVault.managerUpdateVaultManager(vaultAddress, manager);
-                console.log(`Updated vault manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+                console.log(`Updated vault manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
                 done = true;
             }
             break;

package/cli/commands/managerWithdraw.ts

@@ -25,6 +25,6 @@ export const managerWithdraw = async (program: Command, cmdOpts: OptionValues) =
         console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
     } else {
         const tx = await driftVault.managerWithdraw(vaultAddress);
-        console.log(`Withrew as vault manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+        console.log(`Withrew as vault manager: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
     }
 };

package/cli/commands/requestWithdraw.ts

@@ -40,5 +40,5 @@ export const requestWithdraw = async (program: Command, cmdOpts: OptionValues) =
     const withdrawAmountBN = new BN(cmdOpts.amount);
 
     const tx = await driftVault.requestWithdraw(vaultDepositorAddress, withdrawAmountBN, WithdrawUnit.SHARES);
-    console.log(`Requested to withdraw ${cmdOpts.amount} shares from the vault: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+    console.log(`Requested to withdraw ${cmdOpts.amount} shares from the vault: https://solana.fm/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
 };