@drift-labs/vaults-sdk 0.6.31 → 0.6.33

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);
+        }),
+        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(`New vault address will be: ${vaultAddress.toBase58()}`);
-        console.log(`Setting trading delegate to: ${delegate.toBase58()}`);
+    if (!swiftUsersAccountExists) {
+        ixs.push(
+            await driftClient.getInitializeSignedMsgUserOrdersAccountIx(
+                vaultAddress,
+                8
+            )[1]
+        );
+    }
 
-        console.log('');
+    console.log(`New vault address will be: ${vaultAddress.toBase58()}`);
+    console.log(`Setting trading delegate to: ${delegate.toBase58()}`);
+    console.log('');
+
+    if (cmdOpts.dumpTransactionMessage) {
         console.log(`Base 58 encoded transaction:`);
-        console.log(dumpTransactionMessage(cmdOpts.manager ? new PublicKey(cmdOpts.manager) : driftClient.wallet.publicKey, [initIx, updateDelegateIx]));
+        console.log(dumpTransactionMessage(cmdOpts.manager ? new PublicKey(cmdOpts.manager) : driftClient.wallet.publicKey, ixs));
     } else {
-        const initSignedOrdersAccIx = await driftClient.getInitializeSignedMsgUserOrdersAccountIx(
-            vaultAddress,
-            8
-        );
-        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,
-        ]);
+        const initTx = await driftVault.createAndSendTxn(ixs);
         console.log(`Initialized vault, tx: https://solana.fm/tx/${initTx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
-
-        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://solana.fm/tx/${updateDelegateTx}${driftClient.env === "devnet" ? "?cluster=devnet-solana" : ""}`);
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/vaults-sdk",
-	"version": "0.6.31",
+	"version": "0.6.33",
 	"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.119.0-beta.1",
+		"@drift-labs/sdk": "2.119.0-beta.2",
 		"@metaplex-foundation/js": "0.20.1",
 		"@solana/web3.js": "1.92.3",
 		"commander": "11.1.0",