@drift-labs/vaults-sdk 0.5.7 → 0.5.9

package/.env.example

@@ -1,2 +1,3 @@
 RPC_URL=
 KEYPAIR_PATH=
+ENV=

package/README.md

@@ -2,14 +2,15 @@
 
 This repo has a simple CLI for interacting with the vault (run from this `package.json`):
 
-This CLI utility requires an RPC node and keypair to sign transactions (similar to solana cli). You can either provide these as environment variables or in a `.env` file, or use the `--keypair` and `--url` flags.
+This CLI utility requires an RPC node and keypair to sign transactions. You can either provide these as environment variables, in a `.env` file, or use cli flags (like `--keypair` and `--url`).
 
 Required Environment Variables or Flags:
 
 Environment Variable| command line flag | Description
 --------------------|-------------------|------------
 RPC_URL             | --url             | The RPC node to connect to for transactions
-KEYPAIR_PATH        | --keypair         | Path to keypair to sign transactions
+KEYPAIR_PATH        | --keypair         | Path to keypair (file or base58) to sign transactions. This may also be a ledger filepath (e.g. `usb://ledger/<wallet_id>?key=0/0`)
+ENV                 | --env             | 'devnet' or 'mainnet' (default: 'mainnet')
 
 
 View available commands, run with `--help` in nested commands to get available options for each command
@@ -17,6 +18,11 @@ View available commands, run with `--help` in nested commands to get available o
 yarn cli --help
 ```
 
+## Manager Commands
+
+The following commands are menat to be run by Vault Managers. `KEYPAIR_PATH` should be the manager's keypair.
+
+### Initialize a new vault
 
 Init a new vault. This will initialize a new vault and update you (the manager) as the delegate, unless `--delegate` is specified.
 ```
@@ -39,6 +45,8 @@ Options:
   -h, --help                        display help for command
 ```
 
+### Update Vault Params
+
 To update params in a vault:
 ```
 $ yarn cli manager-update-vault --help
@@ -57,39 +65,88 @@ Options:
   -h, --help                        display help for command
 ```
 
-Make a deposit into a vault (as a manager, `DEPOSIT_AMOUNT` in human precision):
+### Update Margin Trading Enabled
+
+If you wish to trade with spot margin on the vault, you must enable margin trading:
+```
+yarn cli manager-update-margin-trading-enabled --vault-address=<VAULT_ADDRESS> --enabled=<true|false>
+```
+
+### Manager Deposit
+
+Make a deposit into a vault as the manager (`DEPOSIT_AMOUNT` in human precision, e.g. 5 for 5 USDC):
 ```
 yarn cli manager-deposit --vault-address=<VAULT_ADDRESS> --amount=<DEPOSIT_AMOUNT>
 ```
 
-Make a withdraw request from a vault (as a manager, `SHARES` in raw precision):
+### Manager Withdraw
+
+Make a withdraw request from a vault as the manager (`SHARES` in raw precision):
 ```
 yarn cli manager-request-withdraw --vault-address=<VAULT_ADDRESS> --amount=<SHARES>
 ```
 
+After the redeem period has passed, the manager can complete the withdraw:
+```
+yarn cli manager-withdraw --vault-address=<VAULT_ADDRESS>
+```
+
+### Apply Profit Share
 Manager can trigger a profit share calculation (this looks up all `VaultDepositors` for a vault eligible for profit share and batch processes them):
 ```
 yarn cli apply-profit-share-all --vault-address=<VAULT_ADDRESS>
 ```
 
+## Depositor Commands
+
+
+### Deposit into a vault
+
+#### Permissioned Vaults
 
-For permissioned vaults, initialize a `VaultDepositor` for someone to deposit.
+Permissioned vaults require the __manager__ to initialize the `VaultDepositor` account before a depositor can deposit.
+
+Initialize a `VaultDepositor` account for `AUTHORITY_TO_ALLOW_DEPOSIT` to deposit:
 ```
 yarn cli init-vault-depositor --vault-address=<VAULT_ADDRESS> --deposit-authority=<AUTHORITY_TO_ALLOW_DEPOSIT>
 ```
-Then send them the `VAULT_DEPOSITOR_ADDRESS`
 
 
-Make a deposit into a vault (as a non-manager, `DEPOSIT_AMOUNT` in human precision):
+#### Permissioneless Vaults
+
+Permissionless vaults allow anyone to deposit. The `deposit` instruction will initialize a `VaultDepositor` account if one does not exist.
+`DEPOSIT_AMOUNT` in human precision of the deposit token (e.g. 5 for 5 USDC).
+
+```
+yarn cli deposit --vault-address=<VAULT_ADDRESS> --deposit-authority=<DEPOSIT_AUTHORITY> --amount=<DEPOSIT_AMOUNT>
+```
+
+Alternatively, you can pass in the `VaultDepositor` address directly:
 ```
 yarn cli deposit --vault-depositor-address=<VAULT_DEPOSITOR_ADDRESS> --amount=<DEPOSIT_AMOUNT>
 ```
 
+### Withdraw from a vault
 
-To print out the current state of a `Vault` or `VaultDepositor`:
+Request a withdraw from a vault:
+```
+yarn cli request-withdraw --vault-address=<VAULT_ADDRESS> --authority=<AUTHORITY> --amount=<WITHDRAW_AMOUNT>
+```
+
+After the redeem period has passed, the depositor can complete the withdraw:
+```
+yarn cli withdraw --vault-address=<VAULT_ADDRESS> --authority=<AUTHORITY>
+```
+
+## View only commands
+
+To print out the current state of a `Vault`:
 ```
 yarn cli view-vault --vault-address=<VAULT_ADDRESS>
+```
 
+To print out the current state of a `VaultDepositor`:
+```
 yarn cli view-vault-depositor --vault-depositor-address=<VAULT_DEPOSITOR_ADDRESS>
 ```
 

package/cli/cli.ts

@@ -30,7 +30,8 @@ const program = new Command();
 program
     .addOption(new Option("-u, --url <url>", "RPC URL to use for requests").env("RPC_URL").makeOptionMandatory(true))
     .addOption(new Option("-k, --keypair <filepath>", "Path to keypair file").env("KEYPAIR_PATH"))
-    .addOption(new Option("--commitment <commitment>", "State commitment to use").default("confirmed"));
+    .addOption(new Option("--commitment <commitment>", "State commitment to use").default("confirmed"))
+    .addOption(new Option("--env <env>", "Environment to use (devnet, mainnet-beta)").default("mainnet-beta").env("ENV"));
 program
     .command("init-vault")
     .description("Initialize a new vault")
@@ -126,20 +127,25 @@ program
     .action((opts) => initVaultDepositor(program, opts));
 program
     .command("deposit")
-    .description("Deposit into a vault via VaultDepositor")
-    .addOption(new Option("--vault-depositor-address <vaultDepositorAddress>", "VaultDepositor address").makeOptionMandatory(true))
+    .description("Deposit into a vault via VaultDepositor (creates a VaultDepositor if one does not exist)")
+    .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))
     .action((opts) => deposit(program, opts));
 program
     .command("request-withdraw")
     .description("Make a request to withdraw shares from the vaultm, redeem period starts now")
-    .addOption(new Option("--vault-depositor-address <vaultDepositorAddress>", "VaultDepositor address").makeOptionMandatory(true))
+    .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("--authority <vaultDepositorAuthority>", "VaultDepositor authority address").makeOptionMandatory(false))
     .addOption(new Option("--amount <amount>", "Amount of shares to withdraw (raw format, as expected in the program)").makeOptionMandatory(true))
     .action((opts) => requestWithdraw(program, opts));
 program
     .command("withdraw")
     .description("Initiate the withdraw, after the redeem period has passed")
     .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("--authority <vaultDepositorAuthority>", "VaultDepositor authority address").makeOptionMandatory(false))
     .action((opts) => withdraw(program, opts));
 program

package/cli/commands/deposit.ts

@@ -5,15 +5,16 @@ import {
     Command
 } from "commander";
 import { getCommandContext } from "../utils";
+import { getVaultDepositorAddressSync, VAULT_PROGRAM_ID } from "../../src";
 
 export const deposit = async (program: Command, cmdOpts: OptionValues) => {
 
-    let vaultDepositorAddress: PublicKey;
-    try {
-        vaultDepositorAddress = new PublicKey(cmdOpts.vaultDepositorAddress as string);
-    } catch (err) {
-        console.error("Invalid vault depositor address");
-        process.exit(1);
+    // verify correct args provided
+    if (!cmdOpts.vaultDepositorAddress) {
+        if (!cmdOpts.vaultAddress || !cmdOpts.depositAuthority) {
+            console.error("Must provide --vault-address and --deposit-authority if not providing --vault-depositor-address");
+            process.exit(1);
+        }
     }
 
     const {
@@ -21,18 +22,55 @@ export const deposit = async (program: Command, cmdOpts: OptionValues) => {
         driftVault
     } = await getCommandContext(program, true);
 
-    const vaultDepositorAccount =
-        await driftVault.program.account.vaultDepositor.fetch(vaultDepositorAddress);
-    const vaultAddress = vaultDepositorAccount.vault;
-    const vaultAccount = await driftVault.program.account.vault.fetch(vaultAddress);
-    const spotMarket = driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
-    if (!spotMarket) {
-        throw new Error("No spot market found");
+    let vaultDepositorAddress: PublicKey;
+    let vaultAddress: PublicKey | undefined;
+    let depositAuthority: PublicKey | undefined;
+    if (cmdOpts.vaultDepositorAddress) {
+        vaultDepositorAddress = new PublicKey(cmdOpts.vaultDepositorAddress as string);
+    } else {
+        vaultAddress = new PublicKey(cmdOpts.vaultAddress as string);
+        depositAuthority = new PublicKey(cmdOpts.depositAuthority as string);
+        vaultDepositorAddress = getVaultDepositorAddressSync(VAULT_PROGRAM_ID, vaultAddress, depositAuthority);
     }
-    const spotPrecision = TEN.pow(new BN(spotMarket.decimals));
-    const depositBN = new BN(cmdOpts.amount * spotPrecision.toNumber());
 
-    console.log(`depositing: ${depositBN.toString()}`);
-    const tx = await driftVault.deposit(vaultDepositorAddress, depositBN);
-    console.log(`Deposited ${cmdOpts.amount} to vault as manager: ${tx}`);
+    const vaultDepositorAccount =
+        await driftVault.program.account.vaultDepositor.fetchNullable(vaultDepositorAddress);
+    if (!vaultDepositorAccount) {
+        if (!vaultAddress || !depositAuthority) {
+            console.error("Must provide --vault-address and --deposit-authority if not providing --vault-depositor-address, and VaultDepositor account does not exist");
+            process.exit(1);
+        }
+
+        const vaultAccount = await driftVault.program.account.vault.fetch(vaultAddress);
+        const spotMarket = driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
+        if (!spotMarket) {
+            throw new Error("No spot market found");
+        }
+        const spotPrecision = TEN.pow(new BN(spotMarket.decimals));
+        const depositBN = new BN(cmdOpts.amount * spotPrecision.toNumber());
+
+        console.log(`depositing (initializing VaultDepositor account): ${depositBN.toString()}`);
+        const tx = await driftVault.deposit(
+            vaultDepositorAddress,
+            depositBN,
+            {
+                authority: depositAuthority,
+                vault: vaultAddress
+            });
+        console.log(`Deposited ${cmdOpts.amount} to vault: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
+    } else {
+        // VaultDepositor exists
+        const vaultAddress = vaultDepositorAccount.vault;
+        const vaultAccount = await driftVault.program.account.vault.fetch(vaultAddress);
+        const spotMarket = driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
+        if (!spotMarket) {
+            throw new Error("No spot market found");
+        }
+        const spotPrecision = TEN.pow(new BN(spotMarket.decimals));
+        const depositBN = new BN(cmdOpts.amount * spotPrecision.toNumber());
+
+        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" : ""}`);
+    }
 };

package/cli/commands/initVault.ts

@@ -131,12 +131,12 @@ export const initVault = async (program: Command, cmdOpts: OptionValues) => {
         permissioned,
         minDepositAmount: minDepositAmountBN,
     });
-    console.log(`Initialized vault, tx: https://solscan.io/tx/${initTx}`);
+    console.log(`Initialized vault, tx: https://solscan.io/tx/${initTx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
 
     const vaultAddress = getVaultAddressSync(VAULT_PROGRAM_ID, vaultNameBytes);
     console.log(`\nNew vault address: ${vaultAddress}\n`);
 
     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}`);
+    console.log(`update delegate tx: https://solscan.io/tx/${updateDelegateTx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
 };

package/cli/commands/managerCancelWithdraw.ts

@@ -16,9 +16,10 @@ export const managerCancelWithdraw = async (program: Command, cmdOpts: OptionVal
     }
 
     const {
-        driftVault
+        driftVault,
+        driftClient
     } = await getCommandContext(program, true);
 
     const tx = await driftVault.managerCancelWithdrawRequest(vaultAddress);
-    console.log(`Canceled withdraw as vault manager: https://solscan.io/tx/${tx}`);
+    console.log(`Canceled withdraw as vault manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
 };

package/cli/commands/managerDeposit.ts

@@ -30,5 +30,5 @@ export const managerDeposit = async (program: Command, cmdOpts: OptionValues) =>
     const depositBN = new BN(cmdOpts.amount * spotPrecision.toNumber());
 
     const tx = await driftVault.managerDeposit(vaultAddress, depositBN);
-    console.log(`Deposited ${cmdOpts.amount} to vault as manager: ${tx}`);
+    console.log(`Deposited ${cmdOpts.amount} to vault as manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
 };

package/cli/commands/managerRequestWithdraw.ts

@@ -28,7 +28,7 @@ export const managerRequestWithdraw = async (program: Command, cmdOpts: OptionVa
 
     if (cmdOpts.shares && !cmdOpts.amount) {
         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}`);
+        console.log(`Requested to withraw ${cmdOpts.shares} shares as vault manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
     } else if (cmdOpts.amount && !cmdOpts.shares) {
         const vault = await driftVault.getVault(vaultAddress);
         const spotMarket = driftClient.getSpotMarketAccount(vault.spotMarketIndex);
@@ -39,10 +39,8 @@ export const managerRequestWithdraw = async (program: Command, cmdOpts: OptionVa
         const spotPrecision = TEN.pow(new BN(spotMarket.decimals));
         const amount = parseFloat(cmdOpts.amount);
         const amountBN = numberToSafeBN(amount, spotPrecision);
-        console.log(amount);
-        console.log(amountBN.toString());
         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}`);
+        console.log(`Requested to withdraw ${amount} ${decodeName(spotMarket.name)} as vault manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
 
     } else {
         console.error("Error: Either shares or amount must be provided, but not both.");

package/cli/commands/managerUpdateMarginTradingEnabled.ts

@@ -16,11 +16,12 @@ export const managerUpdateMarginTradingEnabled= async (program: Command, cmdOpts
     }
 
     const {
-        driftVault
+        driftVault,
+        driftClient
     } = await getCommandContext(program, true);
 
     const enabled = cmdOpts.enabled ? (cmdOpts.enabled as string).toLowerCase() === "true" : false;
 
     const tx = await driftVault.updateMarginTradingEnabled(vaultAddress, enabled);
-    console.log(`Updated margin trading vault manager: https://solscan.io/tx/${tx}`);
+    console.log(`Updated margin trading vault manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
 };

package/cli/commands/managerUpdateVaultDelegate.ts

@@ -16,7 +16,8 @@ export const managerUpdateVaultDelegate = async (program: Command, cmdOpts: Opti
     }
 
     const {
-        driftVault
+        driftVault,
+        driftClient
     } = await getCommandContext(program, true);
 
     let delegate = cmdOpts.delegate;
@@ -31,5 +32,5 @@ export const managerUpdateVaultDelegate = async (program: Command, cmdOpts: Opti
     }
 
     const tx = await driftVault.updateDelegate(vaultAddress, delegate);
-    console.log(`Updated vault delegate to ${delegate.toBase58()}: https://solscan.io/tx/${tx}`);
+    console.log(`Updated vault delegate to ${delegate.toBase58()}: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
 };

package/cli/commands/managerWithdraw.ts

@@ -16,9 +16,10 @@ export const managerWithdraw = async (program: Command, cmdOpts: OptionValues) =
     }
 
     const {
-        driftVault
+        driftVault,
+        driftClient
     } = await getCommandContext(program, true);
 
     const tx = await driftVault.managerWithdraw(vaultAddress);
-    console.log(`Withrew as vault manager: https://solscan.io/tx/${tx}`);
+    console.log(`Withrew as vault manager: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
 };

package/cli/commands/requestWithdraw.ts

@@ -6,23 +6,39 @@ import {
 } from "commander";
 import { getCommandContext } from "../utils";
 import { WithdrawUnit } from "../../src/types/types";
+import { getVaultDepositorAddressSync, VAULT_PROGRAM_ID } from "../../src";
 
 export const requestWithdraw = async (program: Command, cmdOpts: OptionValues) => {
 
-    let vaultDepositorAddress: PublicKey;
-    try {
-        vaultDepositorAddress = new PublicKey(cmdOpts.vaultDepositorAddress as string);
-    } catch (err) {
-        console.error("Invalid vault depositor address");
-        process.exit(1);
+    // verify correct args provided
+    if (!cmdOpts.vaultDepositorAddress) {
+        if (!cmdOpts.vaultAddress || !cmdOpts.authority) {
+            console.error("Must provide --vault-address and --authority if not providing --vault-depositor-address");
+            process.exit(1);
+        }
     }
 
     const {
-        driftVault
+        driftVault,
+        driftClient
     } = await getCommandContext(program, true);
 
+    let vaultDepositorAddress: PublicKey;
+    if (cmdOpts.vaultDepositorAddress) {
+        try {
+            vaultDepositorAddress = new PublicKey(cmdOpts.vaultDepositorAddress as string);
+        } catch (err) {
+            console.error("Invalid vault depositor address");
+            process.exit(1);
+        }
+    } else {
+        const vaultAddress = new PublicKey(cmdOpts.vaultAddress as string);
+        const authority = new PublicKey(cmdOpts.authority as string);
+        vaultDepositorAddress = getVaultDepositorAddressSync(VAULT_PROGRAM_ID, vaultAddress, authority);
+    }
+
     const withdrawAmountBN = new BN(cmdOpts.amount);
 
     const tx = await driftVault.requestWithdraw(vaultDepositorAddress, withdrawAmountBN, WithdrawUnit.SHARES);
-    console.log(`Requsted to withdraw ${cmdOpts.amount} shares from the vault: ${tx}`);
+    console.log(`Requested to withdraw ${cmdOpts.amount} shares from the vault: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
 };

package/cli/commands/withdraw.ts

@@ -4,21 +4,37 @@ import {
     Command
 } from "commander";
 import { getCommandContext } from "../utils";
+import { getVaultDepositorAddressSync, VAULT_PROGRAM_ID } from "../../src";
 
 export const withdraw = async (program: Command, cmdOpts: OptionValues) => {
 
-    let vaultDepositorAddress: PublicKey;
-    try {
-        vaultDepositorAddress = new PublicKey(cmdOpts.vaultDepositorAddress as string);
-    } catch (err) {
-        console.error("Invalid vault depositor address");
-        process.exit(1);
+    // verify correct args provided
+    if (!cmdOpts.vaultDepositorAddress) {
+        if (!cmdOpts.vaultAddress || !cmdOpts.authority) {
+            console.error("Must provide --vault-address and --authority if not providing --vault-depositor-address");
+            process.exit(1);
+        }
     }
 
     const {
-        driftVault
+        driftVault,
+        driftClient
     } = await getCommandContext(program, true);
 
+    let vaultDepositorAddress: PublicKey;
+    if (cmdOpts.vaultDepositorAddress) {
+        try {
+            vaultDepositorAddress = new PublicKey(cmdOpts.vaultDepositorAddress as string);
+        } catch (err) {
+            console.error("Invalid vault depositor address");
+            process.exit(1);
+        }
+    } else {
+        const vaultAddress = new PublicKey(cmdOpts.vaultAddress as string);
+        const authority = new PublicKey(cmdOpts.authority as string);
+        vaultDepositorAddress = getVaultDepositorAddressSync(VAULT_PROGRAM_ID, vaultAddress, authority);
+    }
+
     const tx = await driftVault.withdraw(vaultDepositorAddress);
-    console.log(`Withdrew from vault: ${tx}`);
+    console.log(`Withdrew from vault: https://solscan.io/tx/${tx}${driftClient.env === "devnet" ? "?cluster=devnet" : ""}`);
 };

package/cli/utils.ts

@@ -131,14 +131,17 @@ export async function getCommandContext(program: Command, needToSign: boolean):
         console.log("opts.keypair:", opts.keypair.replace(/./g, '*'));
     }
 
+    let loadedKeypair = false;
     wallet = new Wallet(Keypair.generate());
 
     if (isLedgerUrl) {
         wallet = await getLedgerWallet(opts.keypair) as unknown as Wallet;
+        loadedKeypair = true;
     } else if (opts.keypair) {
         try {
             const keypair = loadKeypair(opts.keypair as string);
             wallet = new Wallet(keypair);
+            loadedKeypair = true;
         } catch (e) {
             console.error(`Need to provide a valid keypair: ${e}`);
             process.exit(1);
@@ -149,13 +152,19 @@ export async function getCommandContext(program: Command, needToSign: boolean):
         }
     }
 
-    console.log(`Loaded wallet address: ${wallet.publicKey.toBase58()}`);
+
+    const driftEnv = opts.env as DriftEnv;
+    console.log("driftEnv:", driftEnv);
+
+    if (loadedKeypair) {
+        console.log(`Loaded wallet address: ${wallet.publicKey.toBase58()}`);
+    }
 
     const connection = new Connection(opts.url, {
         commitment: opts.commitment,
     });
 
-    const driftEnv = process.env.DRIFT_ENV ?? "mainnet-beta";
+
     const driftClient = new DriftClient({
         connection,
         wallet,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/vaults-sdk",
-	"version": "0.5.7",
+	"version": "0.5.9",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"directories": {
@@ -8,7 +8,7 @@
 	},
 	"dependencies": {
 		"@coral-xyz/anchor": "0.29.0",
-		"@drift-labs/sdk": "2.113.0-beta.4",
+		"@drift-labs/sdk": "2.113.0-beta.5",
 		"@metaplex-foundation/js": "0.20.1",
 		"@solana/web3.js": "1.92.3",
 		"commander": "11.1.0",