@drift-labs/vaults-sdk 0.8.29 → 0.8.30

package/cli/cli.ts

@@ -22,6 +22,10 @@ import {
     managerUpdateMarginTradingEnabled,
     decodeLogs,
     vaultInvariantChecks,
+    managerBorrow,
+    managerRepay,
+    managerUpdateBorrow,
+    adminUpdateVaultClass,
 } from "./commands";
 
 import { Command, Option } from 'commander';
@@ -80,7 +84,7 @@ program
     .command("manager-deposit")
     .description("Make a deposit to your vault")
     .addOption(new Option("--vault-address <address>", "Address of the vault to deposit to").makeOptionMandatory(true))
-    .addOption(new Option("--amount <amount>", "Amount to deposit (human format, 5 for 5 USDC)").makeOptionMandatory(true))
+    .addOption(new Option("--amount <amount>", "Amount to deposit (in deposit precision, 5 for 5 USDC)").makeOptionMandatory(true))
     .addOption(new Option("--dump-transaction-message", "Dump the transaction message to the console").makeOptionMandatory(false))
     .action((opts) => managerDeposit(program, opts));
 program
@@ -88,7 +92,7 @@ program
     .description("Make a withdraw request from your vault")
     .addOption(new Option("--vault-address <address>", "Address of the vault to withdraw from").makeOptionMandatory(true))
     .addOption(new Option("--shares <shares>", "Amount of shares to withdraw (raw precision, as expected by contract)").makeOptionMandatory(false))
-    .addOption(new Option("--amount <amount>", "Amount of spot asset to withdraw (human format, 5 for 5 USDC)").makeOptionMandatory(false))
+    .addOption(new Option("--amount <amount>", "Amount of spot asset to withdraw (in deposit precision, 5 for 5 USDC)").makeOptionMandatory(false))
     .addOption(new Option("--dump-transaction-message", "Dump the transaction message to the console").makeOptionMandatory(false))
     .action((opts) => managerRequestWithdraw(program, opts));
 program
@@ -169,7 +173,7 @@ program
     .addOption(new Option("--vault-depositor-address <vaultDepositorAddress>", "VaultDepositor address").makeOptionMandatory(false))
     .addOption(new Option("--vault-address <address>", "Address of the vault to deposit into").makeOptionMandatory(false))
     .addOption(new Option("--deposit-authority <vaultDepositorAuthority>", "VaultDepositor authority address").makeOptionMandatory(false))
-    .addOption(new Option("--amount <amount>", "Amount to deposit (human format, 5 for 5 USDC)").makeOptionMandatory(true))
+    .addOption(new Option("--amount <amount>", "Amount to deposit (in deposit precision, 5 for 5 USDC)").makeOptionMandatory(true))
     .action((opts) => deposit(program, opts));
 program
     .command("request-withdraw")
@@ -244,6 +248,43 @@ program
     .addOption(new Option("--dump-transaction-message", "Dump the transaction message to the console").makeOptionMandatory(false))
     .action((opts) => managerUpdateFuelDistributionMode(program, opts));
 
+program
+    .command("manager-borrow")
+    .description("Manager borrow from a spot market")
+    .addOption(new Option("--vault-address <address>", "Address of the vault").makeOptionMandatory(true))
+    .addOption(new Option("--borrow-spot-market-index <index>", "Spot market index to borrow from").makeOptionMandatory(true))
+    .addOption(new Option("--borrow-amount <amount>", "Amount to borrow (in borrow precision, 5 for 5 USDC)").makeOptionMandatory(true))
+    .addOption(new Option("--manager-token-account <address>", "Manager token account address (optional, ATA will be used if not provided)").makeOptionMandatory(false))
+    .addOption(new Option("--dump-transaction-message", "Dump the transaction message to the console").makeOptionMandatory(false))
+    .action((opts) => managerBorrow(program, opts));
+
+program
+    .command("manager-repay")
+    .description("Manager repay to a spot market")
+    .addOption(new Option("--vault-address <address>", "Address of the vault").makeOptionMandatory(true))
+    .addOption(new Option("--repay-spot-market-index <index>", "Spot market index to repay to").makeOptionMandatory(true))
+    .addOption(new Option("--repay-amount <amount>", "Amount to repay (in repay market precision, 5 for 5 USDC)").makeOptionMandatory(true))
+    .addOption(new Option("--repay-value <value>", "Value (in deposit precision, 5 for 5 USDC) of the repay (optional, if not provided will assume repaying the full outstanding amount)").makeOptionMandatory(false))
+    .addOption(new Option("--manager-token-account <address>", "Manager token account address to receive repay tokens from (optional, ATA will be used if not provided)").makeOptionMandatory(false))
+    .addOption(new Option("--dump-transaction-message", "Dump the transaction message to the console").makeOptionMandatory(false))
+    .action((opts) => managerRepay(program, opts));
+
+program
+    .command("manager-update-borrow")
+    .description("Update the manager borrow value for a vault")
+    .addOption(new Option("--vault-address <address>", "Address of the vault").makeOptionMandatory(true))
+    .addOption(new Option("--new-borrow-value <value>", "New borrow value (in deposit precision, 5 for 5 USDC)").makeOptionMandatory(true))
+    .addOption(new Option("--dump-transaction-message", "Dump the transaction message to the console").makeOptionMandatory(false))
+    .action((opts) => managerUpdateBorrow(program, opts));
+
+program
+    .command("admin-update-vault-class")
+    .description("Admin update the vault class")
+    .addOption(new Option("--vault-address <address>", "Address of the vault").makeOptionMandatory(true))
+    .addOption(new Option("--vault-class <class>", "New vault class (trusted)").makeOptionMandatory(true))
+    .addOption(new Option("--dump-transaction-message", "Dump the transaction message to the console").makeOptionMandatory(false))
+    .action((opts) => adminUpdateVaultClass(program, opts));
+
 program.parseAsync().then(() => {
     process.exit(0);
 });

package/cli/commands/adminUpdateVaultClass.ts

@@ -0,0 +1,49 @@
+import { Command, OptionValues } from "commander";
+import { PublicKey } from "@solana/web3.js";
+import { VaultClass } from "../../src";
+import { dumpTransactionMessage, getCommandContext } from "../utils";
+
+export async function adminUpdateVaultClass(program: Command, cmdOpts: OptionValues): Promise<void> {
+    const { vaultAddress, vaultClass, dumpTransactionMessage: dumpTx } = cmdOpts;
+
+    const {
+        driftClient,
+        driftVault
+    } = await getCommandContext(program, true);
+
+    if (!vaultAddress) {
+        throw new Error("Must provide vault address with --vault-address");
+    }
+
+    if (!vaultClass) {
+        throw new Error("Must provide vault class with --vault-class");
+    }
+
+    const vault = new PublicKey(vaultAddress);
+    
+    // Parse vault class from string input
+    let newVaultClass: VaultClass;
+    switch (vaultClass.toLowerCase()) {
+        case 'trusted':
+            newVaultClass = VaultClass.TRUSTED;
+            break;
+        default:
+            throw new Error(`Invalid vault class: ${vaultClass}. Must be 'trusted'`);
+    }
+
+    try {
+        if (dumpTx) {
+            const ix = await driftVault.getAdminUpdateVaultClassIx(vault, newVaultClass);
+            console.log("Transaction Instruction:");
+            console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [ix]));
+            return;
+        }
+
+        const txSig = await driftVault.adminUpdateVaultClass(vault, newVaultClass);
+        console.log(`Admin update vault class transaction signature: ${txSig}`);
+        console.log(`Transaction: https://solana.fm/tx/${txSig}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
+    } catch (error) {
+        console.error("Error updating vault class:", error);
+        throw error;
+    }
+} 

package/cli/commands/index.ts

@@ -21,4 +21,8 @@ export * from './decodeLogs';
 export * from './vaultInvariantChecks';
 export * from './adminInitFeeUpdate';
 export * from './adminDeleteFeeUpdate';
+export * from './managerBorrow';
+export * from './managerRepay';
+export * from './managerUpdateBorrow';
+export * from './adminUpdateVaultClass';
 

package/cli/commands/initVault.ts

@@ -6,6 +6,7 @@ import {
     convertToNumber,
     decodeName,
     getSignedMsgUserAccountPublicKey,
+    getUserAccountPublicKey,
 } from "@drift-labs/sdk";
 import {
     OptionValues,
@@ -122,6 +123,7 @@ export const initVault = async (program: Command, cmdOpts: OptionValues) => {
     }
 
     const vaultAddress = getVaultAddressSync(VAULT_PROGRAM_ID, vaultNameBytes);
+    const vaultDriftUser = await getUserAccountPublicKey(driftClient.program.programId, vaultAddress, 0);
 
     const ixs = [
         await driftVault.getInitializeVaultIx({
@@ -136,7 +138,7 @@ export const initVault = async (program: Command, cmdOpts: OptionValues) => {
             minDepositAmount: minDepositAmountBN,
             manager: cmdOpts.manager,
         }),
-        await driftVault.getUpdateDelegateIx(vaultAddress, delegate)
+        await driftVault.getUpdateDelegateIx(vaultAddress, delegate, vaultDriftUser, cmdOpts.manager)
     ];
 
     const signedOrdersAccountAddress = getSignedMsgUserAccountPublicKey(

package/cli/commands/managerBorrow.ts

@@ -0,0 +1,53 @@
+import { Command, OptionValues } from "commander";
+import { PublicKey } from "@solana/web3.js";
+import { BN, TEN } from "@drift-labs/sdk";
+import { dumpTransactionMessage, getCommandContext } from "../utils";
+
+export async function managerBorrow(program: Command, cmdOpts: OptionValues): Promise<void> {
+    const { vaultAddress, borrowSpotMarketIndex, borrowAmount, managerTokenAccount, dumpTransactionMessage: dumpTx } = cmdOpts;
+
+    const {
+        driftClient,
+        driftVault
+    } = await getCommandContext(program, true);
+
+    if (!vaultAddress) {
+        throw new Error("Must provide vault address with --vault-address");
+    }
+
+    if (!borrowSpotMarketIndex) {
+        throw new Error("Must provide borrow spot market index with --borrow-spot-market-index");
+    }
+
+    if (!borrowAmount) {
+        throw new Error("Must provide borrow amount with --borrow-amount");
+    }
+
+    const vault = new PublicKey(vaultAddress);
+    const borrowIndex = parseInt(borrowSpotMarketIndex);
+
+    const borrowSpotMarket = driftClient.getSpotMarketAccount(borrowIndex);
+    if (!borrowSpotMarket) {
+        throw new Error("No borrow spot market found");
+    }
+    const borrowPrecision = TEN.pow(new BN(borrowSpotMarket.decimals));
+    const borrowBN = new BN(borrowAmount * borrowPrecision.toNumber());
+    
+    const managerTokenAccountPubkey = managerTokenAccount ? new PublicKey(managerTokenAccount) : undefined;
+
+    try {
+        if (dumpTx) {
+            const ixs = await driftVault.getManagerBorrowIx(vault, borrowIndex, borrowBN, managerTokenAccountPubkey);
+            console.log("Transaction Instructions:");
+            console.log(dumpTransactionMessage(driftClient.wallet.publicKey, ixs));
+            return;
+        }
+
+        const txSig = await driftVault.managerBorrow(vault, borrowIndex, borrowBN, managerTokenAccountPubkey);
+        console.log(`Manager borrow transaction signature: ${txSig}`);
+        console.log(`Transaction: https://solana.fm/tx/${txSig}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
+    } catch (error) {
+        console.error("Error borrowing:", error);
+        throw error;
+    }
+} 

package/cli/commands/managerRepay.ts

@@ -0,0 +1,63 @@
+import { Command, OptionValues } from "commander";
+import { PublicKey } from "@solana/web3.js";
+import { BN, TEN } from "@drift-labs/sdk";
+import { dumpTransactionMessage, getCommandContext } from "../utils";
+
+export async function managerRepay(program: Command, cmdOpts: OptionValues): Promise<void> {
+    const { vaultAddress, repaySpotMarketIndex, repayAmount, repayValue, managerTokenAccount, dumpTransactionMessage: dumpTx } = cmdOpts;
+
+    const {
+        driftClient,
+        driftVault
+    } = await getCommandContext(program, true);
+
+    if (!vaultAddress) {
+        throw new Error("Must provide vault address with --vault-address");
+    }
+
+    if (!repaySpotMarketIndex) {
+        throw new Error("Must provide repay spot market index with --repay-spot-market-index");
+    }
+
+    if (!repayAmount) {
+        throw new Error("Must provide repay amount with --repay-amount");
+    }
+
+    const vault = new PublicKey(vaultAddress);
+    const repayIndex = parseInt(repaySpotMarketIndex);
+
+    const repaySpotMarket = driftClient.getSpotMarketAccount(repayIndex);
+    if (!repaySpotMarket) {
+        throw new Error("No repay spot market found");
+    }
+
+    const vaultAccount = await driftVault.program.account.vault.fetch(vault);
+    const depositSpotMarket = driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
+    if (!depositSpotMarket) {
+        throw new Error("No deposit spot market found");
+    }
+    const depositPrecision = TEN.pow(new BN(depositSpotMarket.decimals));
+
+    const repayPrecision = TEN.pow(new BN(repaySpotMarket.decimals));
+    const repayBN = new BN(repayAmount * repayPrecision.toNumber());
+
+    const valueBN = repayValue ? new BN(repayValue * depositPrecision.toNumber()) : null;
+    
+    const managerTokenAccountPubkey = managerTokenAccount ? new PublicKey(managerTokenAccount) : undefined;
+
+    try {
+        if (dumpTx) {
+            const ixs = await driftVault.getManagerRepayIxs(vault, repayIndex, repayBN, valueBN, managerTokenAccountPubkey);
+            console.log("Transaction Instructions:");
+            console.log(dumpTransactionMessage(driftClient.wallet.publicKey, ixs));
+            return;
+        }
+
+        const txSig = await driftVault.managerRepay(vault, repayIndex, repayBN, valueBN, managerTokenAccountPubkey);
+        console.log(`Manager repay transaction signature: ${txSig}`);
+        console.log(`Transaction: https://solana.fm/tx/${txSig}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
+    } catch (error) {
+        console.error("Error repaying:", error);
+        throw error;
+    }
+} 

package/cli/commands/managerUpdateBorrow.ts

@@ -0,0 +1,46 @@
+import { Command, OptionValues } from "commander";
+import { PublicKey } from "@solana/web3.js";
+import { BN, TEN } from "@drift-labs/sdk";
+import { dumpTransactionMessage, getCommandContext } from "../utils";
+
+export async function managerUpdateBorrow(program: Command, cmdOpts: OptionValues): Promise<void> {
+    const { vaultAddress, newBorrowValue, dumpTransactionMessage: dumpTx } = cmdOpts;
+
+    const {
+        driftClient,
+        driftVault
+    } = await getCommandContext(program, true);
+
+    if (!vaultAddress) {
+        throw new Error("Must provide vault address with --vault-address");
+    }
+
+    if (!newBorrowValue) {
+        throw new Error("Must provide new borrow value with --new-borrow-value");
+    }
+
+    const vault = new PublicKey(vaultAddress);
+    const vaultAccount = await driftVault.program.account.vault.fetch(vault);
+    const depositSpotMarket = driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
+    if (!depositSpotMarket) {
+        throw new Error("No deposit spot market found");
+    }
+    const depositPrecision = TEN.pow(new BN(depositSpotMarket.decimals));
+    const borrowValue = new BN(newBorrowValue * depositPrecision.toNumber());
+
+    try {
+        if (dumpTx) {
+            const ix = await driftVault.getManagerUpdateBorrowIx(vault, borrowValue);
+            console.log("Transaction Instruction:");
+            console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [ix]));
+            return;
+        }
+
+        const txSig = await driftVault.managerUpdateBorrow(vault, borrowValue);
+        console.log(`Manager update borrow transaction signature: ${txSig}`);
+        console.log(`Transaction: https://solana.fm/tx/${txSig}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
+    } catch (error) {
+        console.error("Error updating borrow:", error);
+        throw error;
+    }
+} 

package/cli/commands/managerUpdateVaultDelegate.ts

@@ -32,7 +32,8 @@ export const managerUpdateVaultDelegate = async (program: Command, cmdOpts: Opti
     }
 
     if (cmdOpts.dumpTransactionMessage) {
-        const tx = await driftVault.getUpdateDelegateIx(vaultAddress, delegate);
+        const vaultAccount = await driftVault.program.account.vault.fetch(vaultAddress);
+        const tx = await driftVault.getUpdateDelegateIx(vaultAddress, delegate, vaultAccount.user, vaultAccount.manager);
         console.log(dumpTransactionMessage(driftClient.wallet.publicKey, [tx]));
     } else {
         const tx = await driftVault.updateDelegate(vaultAddress, delegate);

package/cli/utils.ts

@@ -1,5 +1,5 @@
 import { BASE_PRECISION, BN, DriftClient, DriftEnv, OraclePriceData, PRICE_PRECISION, QUOTE_PRECISION, SpotMarketAccount, TEN, User, Wallet, WhileValidTxSender, convertToNumber, getSignedTokenAmount, getTokenAmount, loadKeypair } from "@drift-labs/sdk";
-import { FeeUpdate, VAULT_PROGRAM_ID, Vault, VaultClient, VaultDepositor, decodeName } from "../src";
+import { FeeUpdate, VAULT_PROGRAM_ID, Vault, VaultClass, VaultClient, VaultDepositor, decodeName } from "../src";
 import { Command } from "commander";
 import { Connection, Keypair, PublicKey, Transaction, TransactionInstruction } from "@solana/web3.js";
 import { AnchorProvider, Wallet as AnchorWallet } from "@coral-xyz/anchor";
@@ -18,6 +18,10 @@ export async function printVault(slot: number, driftClient: DriftClient, vault:
 
     console.log(`slot: ${slot}`);
     console.log(`vault: ${decodeName(vault.name)}`);
+    console.log(`vaultClass:     ${vault.vaultClass}`);
+    if (vault.vaultClass === VaultClass.TRUSTED) {
+        console.log(`  managerBorrowedValue: ${convertToNumber(vault.managerBorrowedValue, spotPrecision)} ${spotSymbol}`);
+    }
     console.log(`pubkey:         ${vault.pubkey.toBase58()}`);
     console.log(`manager:         ${vault.manager.toBase58()}`);
     console.log(`tokenAccount:    ${vault.tokenAccount.toBase58()}`);
@@ -41,7 +45,7 @@ export async function printVault(slot: number, driftClient: DriftClient, vault:
     console.log(`initTs:                  ${vault.initTs.toString()}`);
     console.log(`netDeposits:             ${convertToNumber(vault.netDeposits, spotPrecision)} ${spotSymbol} (${vault.netDeposits.toString()})`);
     console.log(`totalDeposits:           ${convertToNumber(vault.totalDeposits, spotPrecision)} ${spotSymbol} (${vault.totalDeposits.toString()})`);
-    console.log(`totalWithdraws:           ${convertToNumber(vault.totalWithdraws, spotPrecision)} ${spotSymbol} (${vault.totalWithdraws.toString()})`);
+    console.log(`totalWithdraws:          ${convertToNumber(vault.totalWithdraws, spotPrecision)} ${spotSymbol} (${vault.totalWithdraws.toString()})`);
     console.log(`managerNetDeposits:      ${convertToNumber(vault.managerNetDeposits, spotPrecision)} ${spotSymbol} (${vault.managerNetDeposits.toString()})`);
     console.log(`managerTotalDeposits:    ${convertToNumber(vault.managerTotalDeposits, spotPrecision)} ${spotSymbol} (${vault.managerTotalDeposits.toString()})`);
     console.log(`managerTotalWithdraws:   ${convertToNumber(vault.managerTotalWithdraws, spotPrecision)} ${spotSymbol} (${vault.managerTotalWithdraws.toString()})`);