@drift-labs/vaults-sdk 0.6.30 → 0.6.31

package/lib/vaultClient.js

@@ -6,9 +6,11 @@ const anchor_1 = require("@coral-xyz/anchor");
 const addresses_1 = require("./addresses");
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
+const types_1 = require("./types/types");
 const bytes_1 = require("@coral-xyz/anchor/dist/cjs/utils/bytes");
 const math_1 = require("./math");
 const utils_1 = require("./utils");
+const constants_1 = require("./constants");
 class VaultClient {
     constructor({ driftClient, program, metaplex, 
     // @deprecated, no longer used
@@ -31,7 +33,7 @@ class VaultClient {
             this.vaultUsers = new sdk_1.UserMap(userMapConfig);
         }
     }
-    getRemainingAccountsForUser(userAccounts, writableSpotMarketIndexes, vaultAccount, userStats) {
+    getRemainingAccountsForUser(userAccounts, writableSpotMarketIndexes, vaultAccount, userStats, skipVaultProtocol = false, skipFuelOverflow = false, skipFeeUpdate = false) {
         const remainingAccounts = this.driftClient.getRemainingAccounts({
             userAccounts,
             writableSpotMarketIndexes,
@@ -39,7 +41,17 @@ class VaultClient {
         const hasVaultProtocol = vaultAccount.vaultProtocol === true;
         const hasFuelOverflow = (userStats.fuelOverflowStatus & sdk_1.FuelOverflowStatus.Exists) ===
             sdk_1.FuelOverflowStatus.Exists;
-        if (hasFuelOverflow) {
+        const hasFeeUpdate = (vaultAccount.feeUpdateStatus & types_1.FeeUpdateStatus.PendingFeeUpdate) ===
+            types_1.FeeUpdateStatus.PendingFeeUpdate;
+        if (hasFeeUpdate && !skipFeeUpdate) {
+            const feeUpdate = (0, addresses_1.getFeeUpdateAddressSync)(this.program.programId, vaultAccount.pubkey);
+            remainingAccounts.push({
+                pubkey: feeUpdate,
+                isSigner: false,
+                isWritable: true,
+            });
+        }
+        if (hasFuelOverflow && !skipFuelOverflow) {
             const fuelOverflow = (0, sdk_1.getFuelOverflowAccountPublicKey)(this.driftClient.program.programId, vaultAccount.pubkey);
             remainingAccounts.push({
                 pubkey: fuelOverflow,
@@ -47,7 +59,7 @@ class VaultClient {
                 isWritable: false,
             });
         }
-        if (hasVaultProtocol) {
+        if (hasVaultProtocol && !skipVaultProtocol) {
             const vaultProtocol = this.getVaultProtocolAddress(vaultAccount.pubkey);
             remainingAccounts.push({
                 pubkey: vaultProtocol,
@@ -57,6 +69,16 @@ class VaultClient {
         }
         return remainingAccounts;
     }
+    async checkIfAccountExists(account) {
+        try {
+            const accountInfo = await this.driftClient.connection.getAccountInfo(account);
+            return accountInfo != null;
+        }
+        catch (e) {
+            // Doesn't already exist
+            return false;
+        }
+    }
     /**
      * Unsubscribes from the vault users map. Call this to clean up any dangling promises.
      */
@@ -68,6 +90,9 @@ class VaultClient {
     async getVault(vault) {
         return await this.program.account.vault.fetch(vault);
     }
+    async getFeeUpdate(feeUpdate) {
+        return await this.program.account.feeUpdate.fetch(feeUpdate);
+    }
     async getVaultAndSlot(vault) {
         const vaultAndSlot = await this.program.account.vault.fetchAndContext(vault);
         return {
@@ -536,7 +561,7 @@ class VaultClient {
         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));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, true, true);
         const accounts = {
             vault,
             vaultTokenAccount: vaultAccount.tokenAccount,
@@ -571,7 +596,7 @@ class VaultClient {
         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));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, true, true);
         const accounts = {
             vault,
             driftUser: vaultAccount.user,
@@ -602,7 +627,7 @@ 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 remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [], vaultAccount, userStats, false, true, true);
         return this.program.instruction.mangerCancelWithdrawRequest({
             accounts,
             remainingAccounts,
@@ -617,7 +642,7 @@ class VaultClient {
         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));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, false, false);
         const spotMarket = this.driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
         if (!spotMarket) {
             throw new Error(`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`);
@@ -678,7 +703,7 @@ class VaultClient {
         }
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, false, false);
         const accounts = {
             vault,
             vaultDepositor,
@@ -705,7 +730,7 @@ class VaultClient {
         }
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, true, true);
         const accounts = {
             vault,
             tokenizedVaultDepositor,
@@ -735,7 +760,7 @@ class VaultClient {
         }
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vault);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, true, true);
         const accounts = {
             vault,
             vaultDepositor,
@@ -838,7 +863,7 @@ class VaultClient {
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultDepositorAccount.vault);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, true, true);
         ixs.push(await this.program.methods
             // anchor idl bug: https://github.com/coral-xyz/anchor/issues/2914
             // @ts-ignore
@@ -870,7 +895,7 @@ class VaultClient {
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultDepositorAccount.vault);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, true, true);
         return await this.program.methods
             .redeemTokens(tokensToBurn)
             .accounts({
@@ -912,7 +937,7 @@ class VaultClient {
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultPubKey);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, false, false);
         const driftStateKey = await this.driftClient.getStatePublicKey();
         const spotMarket = this.driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
         if (!spotMarket) {
@@ -995,7 +1020,7 @@ class VaultClient {
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultDepositorAccount.vault);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, false, false);
         const accounts = {
             vault: vaultDepositorAccount.vault,
             vaultDepositor,
@@ -1027,7 +1052,7 @@ class VaultClient {
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultDepositorAccount.vault);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, false, false);
         const driftStateKey = await this.driftClient.getStatePublicKey();
         const spotMarket = this.driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
         if (!spotMarket) {
@@ -1090,7 +1115,7 @@ class VaultClient {
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
         const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultDepositorAccount.vault);
         const userStats = (await this.driftClient.program.account.userStats.fetch(userStatsKey));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, false, false);
         if (vaultAccount.vaultProtocol) {
             const vaultProtocol = this.getVaultProtocolAddress(vaultDepositorAccount.vault);
             remainingAccounts.push({
@@ -1149,7 +1174,7 @@ 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.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, false, false);
         if (this.cliMode) {
             return [
                 await this.program.methods
@@ -1182,13 +1207,16 @@ class VaultClient {
         return await this.createAndSendTxn([ix], txParams);
     }
     async getLiquidateIx(vaultDepositor) {
+        if (!this.driftClient.wallet.publicKey.equals(constants_1.VAULT_ADMIN_KEY)) {
+            throw new Error('Only vault admin can liquidate');
+        }
         const vaultDepositorAccount = await this.program.account.vaultDepositor.fetch(vaultDepositor);
         const vault = vaultDepositorAccount.vault;
         const vaultAccount = await this.program.account.vault.fetch(vault);
         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));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [vaultAccount.spotMarketIndex], vaultAccount, userStats, false, true, true);
         const driftStateKey = await this.driftClient.getStatePublicKey();
         const accounts = {
             vault,
@@ -1198,6 +1226,7 @@ class VaultClient {
             driftUser: vaultAccount.user,
             driftState: driftStateKey,
             driftProgram: this.driftClient.program.programId,
+            authority: vaultDepositorAccount.authority,
         };
         if (this.cliMode) {
             return await this.program.methods
@@ -1209,8 +1238,8 @@ class VaultClient {
         else {
             return this.program.instruction.liquidate({
                 accounts: {
-                    authority: this.driftClient.wallet.publicKey,
                     ...accounts,
+                    admin: this.driftClient.wallet.publicKey,
                 },
                 remainingAccounts,
             });
@@ -1465,7 +1494,7 @@ class VaultClient {
         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));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [], vaultAccount, userStats, false, true, true);
         const accounts = {
             vault,
             driftUserStats: userStatsKey,
@@ -1507,7 +1536,7 @@ 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 remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [], vaultAccount, userStats, false, true, true);
         if (this.cliMode) {
             return [
                 await this.program.methods
@@ -1540,7 +1569,7 @@ class VaultClient {
         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));
-        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [], vaultAccount, userStats);
+        const remainingAccounts = this.getRemainingAccountsForUser([user.getUserAccount()], [], vaultAccount, userStats, false, true, true);
         const spotMarket = this.driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
         if (!spotMarket) {
             throw new Error(`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`);
@@ -1756,5 +1785,69 @@ class VaultClient {
         })
             .instruction();
     }
+    async adminInitFeeUpdate(vault, uiTxParams) {
+        const ix = await this.getAdminInitFeeUpdateIx(vault);
+        return await this.createAndSendTxn([ix], uiTxParams);
+    }
+    async getAdminInitFeeUpdateIx(vault) {
+        const feeUpdate = (0, addresses_1.getFeeUpdateAddressSync)(this.program.programId, vault);
+        return this.program.instruction.adminInitFeeUpdate({
+            accounts: {
+                vault,
+                admin: this.driftClient.wallet.publicKey,
+                feeUpdate,
+                systemProgram: web3_js_1.SystemProgram.programId,
+            },
+        });
+    }
+    async adminDeleteFeeUpdate(vault, uiTxParams) {
+        const ix = await this.getAdminDeleteFeeUpdateIx(vault);
+        return await this.createAndSendTxn([ix], uiTxParams);
+    }
+    async getAdminDeleteFeeUpdateIx(vault) {
+        const feeUpdate = (0, addresses_1.getFeeUpdateAddressSync)(this.program.programId, vault);
+        return this.program.instruction.adminDeleteFeeUpdate({
+            accounts: {
+                vault,
+                admin: this.driftClient.wallet.publicKey,
+                feeUpdate,
+            },
+        });
+    }
+    async managerUpdateFees(vault, params, uiTxParams) {
+        const feeUpdate = (0, addresses_1.getFeeUpdateAddressSync)(this.program.programId, vault);
+        const ixs = [];
+        if (!(await this.checkIfAccountExists(feeUpdate))) {
+            throw new Error('Fee update account does not exist, it must be created by an admin first');
+        }
+        ixs.push(await this.getManagerUpdateFeesIx(vault, params));
+        return await this.createAndSendTxn(ixs, uiTxParams);
+    }
+    async getManagerUpdateFeesIx(vault, params) {
+        const vaultAccount = await this.program.account.vault.fetch(vault);
+        const feeUpdate = (0, addresses_1.getFeeUpdateAddressSync)(this.program.programId, vault);
+        return this.program.instruction.managerUpdateFees(params, {
+            accounts: {
+                vault,
+                manager: vaultAccount.manager,
+                feeUpdate,
+            },
+        });
+    }
+    async managerCancelFeeUpdate(vault, uiTxParams) {
+        const ix = await this.getManagerCancelFeeUpdateIx(vault);
+        return await this.createAndSendTxn([ix], uiTxParams);
+    }
+    async getManagerCancelFeeUpdateIx(vault) {
+        const vaultAccount = await this.program.account.vault.fetch(vault);
+        const feeUpdate = (0, addresses_1.getFeeUpdateAddressSync)(this.program.programId, vault);
+        return this.program.instruction.managerCancelFeeUpdate({
+            accounts: {
+                vault,
+                manager: vaultAccount.manager,
+                feeUpdate,
+            },
+        });
+    }
 }
 exports.VaultClient = VaultClient;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/vaults-sdk",
-	"version": "0.6.30",
+	"version": "0.6.31",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"directories": {

package/src/addresses.ts

@@ -99,3 +99,16 @@ export function getTokenizedVaultMintAddressSync(
 		programId
 	)[0];
 }
+
+export function getFeeUpdateAddressSync(
+	programId: PublicKey,
+	vault: PublicKey
+): PublicKey {
+	return PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(anchor.utils.bytes.utf8.encode('fee_update')),
+			vault.toBuffer(),
+		],
+		programId
+	)[0];
+}

package/src/constants/index.ts

@@ -1,4 +1,5 @@
 import { BN, TEN } from '@drift-labs/sdk';
+import { PublicKey } from '@solana/web3.js';
 
 export const VAULT_SHARES_PRECISION_EXP = new BN(6);
 
@@ -8,3 +9,7 @@ export const FUEL_SHARE_PRECISION = TEN.pow(FUEL_SHARE_PRECISION_EXP);
 
 // some arbitrary timestamp to identify VaultDepositors created after fuel distribution started.
 export const MAGIC_FUEL_START_TS = 123;
+
+export const VAULT_ADMIN_KEY = new PublicKey(
+	'4wbNjWbj3kPDbyKnSq8SXVEtAJw4uzE8mJ2QwuK1BCYZ'
+);