@drift-labs/vaults-sdk 0.6.29 → 0.6.31

package/src/vaultClient.ts

@@ -29,6 +29,7 @@ import {
 	getVaultAddressSync,
 	getVaultDepositorAddressSync,
 	getVaultProtocolAddressSync,
+	getFeeUpdateAddressSync,
 } from './addresses';
 import {
 	AccountMeta,
@@ -49,6 +50,8 @@ import {
 	TOKEN_PROGRAM_ID,
 } from '@solana/spl-token';
 import {
+	FeeUpdate,
+	FeeUpdateStatus,
 	FuelDistributionMode,
 	Vault,
 	VaultDepositor,
@@ -63,6 +66,7 @@ import { UserMapConfig } from '@drift-labs/sdk';
 import { calculateRealizedVaultDepositorEquity } from './math';
 import { Metaplex } from '@metaplex-foundation/js';
 import { getOrCreateATAInstruction } from './utils';
+import { VAULT_ADMIN_KEY } from './constants';
 
 type OracleFeedConfig = {
 	feed: PublicKey;
@@ -133,7 +137,10 @@ export class VaultClient {
 		userAccounts: UserAccount[],
 		writableSpotMarketIndexes: number[],
 		vaultAccount: Vault,
-		userStats: UserStatsAccount
+		userStats: UserStatsAccount,
+		skipVaultProtocol = false,
+		skipFuelOverflow = false,
+		skipFeeUpdate = false
 	) {
 		const remainingAccounts = this.driftClient.getRemainingAccounts({
 			userAccounts,
@@ -145,7 +152,23 @@ export class VaultClient {
 			(userStats.fuelOverflowStatus & FuelOverflowStatus.Exists) ===
 			FuelOverflowStatus.Exists;
 
-		if (hasFuelOverflow) {
+		const hasFeeUpdate =
+			(vaultAccount.feeUpdateStatus & FeeUpdateStatus.PendingFeeUpdate) ===
+			FeeUpdateStatus.PendingFeeUpdate;
+
+		if (hasFeeUpdate && !skipFeeUpdate) {
+			const feeUpdate = getFeeUpdateAddressSync(
+				this.program.programId,
+				vaultAccount.pubkey
+			);
+			remainingAccounts.push({
+				pubkey: feeUpdate,
+				isSigner: false,
+				isWritable: true,
+			});
+		}
+
+		if (hasFuelOverflow && !skipFuelOverflow) {
 			const fuelOverflow = getFuelOverflowAccountPublicKey(
 				this.driftClient.program.programId,
 				vaultAccount.pubkey
@@ -157,7 +180,7 @@ export class VaultClient {
 			});
 		}
 
-		if (hasVaultProtocol) {
+		if (hasVaultProtocol && !skipVaultProtocol) {
 			const vaultProtocol = this.getVaultProtocolAddress(vaultAccount.pubkey);
 			remainingAccounts.push({
 				pubkey: vaultProtocol,
@@ -169,6 +192,18 @@ export class VaultClient {
 		return remainingAccounts;
 	}
 
+	private async checkIfAccountExists(account: PublicKey): Promise<boolean> {
+		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.
 	 */
@@ -182,6 +217,10 @@ export class VaultClient {
 		return await this.program.account.vault.fetch(vault);
 	}
 
+	public async getFeeUpdate(feeUpdate: PublicKey): Promise<FeeUpdate> {
+		return await this.program.account.feeUpdate.fetch(feeUpdate);
+	}
+
 	public async getVaultAndSlot(
 		vault: PublicKey
 	): Promise<{ vault: Vault; slot: number }> {
@@ -909,7 +948,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			true,
+			true
 		);
 
 		const accounts = {
@@ -991,7 +1033,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			true,
+			true
 		);
 
 		const accounts = {
@@ -1047,7 +1092,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			true,
+			true
 		);
 
 		return this.program.instruction.mangerCancelWithdrawRequest({
@@ -1081,7 +1129,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			false,
+			false
 		);
 
 		const spotMarket = this.driftClient.getSpotMarketAccount(
@@ -1218,7 +1269,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			false,
+			false
 		);
 
 		const accounts = {
@@ -1274,7 +1328,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			true,
+			true
 		);
 
 		const accounts = {
@@ -1334,7 +1391,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			true,
+			true
 		);
 
 		const accounts = {
@@ -1551,7 +1611,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			true,
+			true
 		);
 
 		ixs.push(
@@ -1637,7 +1700,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			true,
+			true
 		);
 
 		return await this.program.methods
@@ -1715,7 +1781,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			false,
+			false
 		);
 
 		const driftStateKey = await this.driftClient.getStatePublicKey();
@@ -1890,7 +1959,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			false,
+			false
 		);
 
 		const accounts = {
@@ -1956,7 +2028,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			false,
+			false
 		);
 
 		const driftStateKey = await this.driftClient.getStatePublicKey();
@@ -2077,7 +2152,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			false,
+			false
 		);
 		if (vaultAccount.vaultProtocol) {
 			const vaultProtocol = this.getVaultProtocolAddress(
@@ -2188,7 +2266,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			false,
+			false
 		);
 
 		if (this.cliMode) {
@@ -2234,6 +2315,9 @@ export class VaultClient {
 	public async getLiquidateIx(
 		vaultDepositor: PublicKey
 	): Promise<TransactionInstruction> {
+		if (!this.driftClient.wallet.publicKey.equals(VAULT_ADMIN_KEY)) {
+			throw new Error('Only vault admin can liquidate');
+		}
 		const vaultDepositorAccount =
 			await this.program.account.vaultDepositor.fetch(vaultDepositor);
 		const vault = vaultDepositorAccount.vault;
@@ -2252,7 +2336,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[vaultAccount.spotMarketIndex],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			true,
+			true
 		);
 
 		const driftStateKey = await this.driftClient.getStatePublicKey();
@@ -2265,6 +2352,7 @@ export class VaultClient {
 			driftUser: vaultAccount.user,
 			driftState: driftStateKey,
 			driftProgram: this.driftClient.program.programId,
+			authority: vaultDepositorAccount.authority,
 		};
 
 		if (this.cliMode) {
@@ -2276,8 +2364,8 @@ export class VaultClient {
 		} else {
 			return this.program.instruction.liquidate({
 				accounts: {
-					authority: this.driftClient.wallet.publicKey,
 					...accounts,
+					admin: this.driftClient.wallet.publicKey,
 				},
 				remainingAccounts,
 			});
@@ -2745,7 +2833,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			true,
+			true
 		);
 
 		const accounts = {
@@ -2812,7 +2903,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			true,
+			true
 		);
 
 		if (this.cliMode) {
@@ -2866,7 +2960,10 @@ export class VaultClient {
 			[user.getUserAccount()],
 			[],
 			vaultAccount,
-			userStats
+			userStats,
+			false,
+			true,
+			true
 		);
 
 		const spotMarket = this.driftClient.getSpotMarketAccount(
@@ -3250,4 +3347,114 @@ export class VaultClient {
 			})
 			.instruction();
 	}
+
+	public async adminInitFeeUpdate(
+		vault: PublicKey,
+		uiTxParams?: TxParams
+	): Promise<TransactionSignature> {
+		const ix = await this.getAdminInitFeeUpdateIx(vault);
+		return await this.createAndSendTxn([ix], uiTxParams);
+	}
+
+	public async getAdminInitFeeUpdateIx(
+		vault: PublicKey
+	): Promise<TransactionInstruction> {
+		const feeUpdate = getFeeUpdateAddressSync(this.program.programId, vault);
+
+		return this.program.instruction.adminInitFeeUpdate({
+			accounts: {
+				vault,
+				admin: this.driftClient.wallet.publicKey,
+				feeUpdate,
+				systemProgram: SystemProgram.programId,
+			},
+		});
+	}
+
+	public async adminDeleteFeeUpdate(
+		vault: PublicKey,
+		uiTxParams?: TxParams
+	): Promise<TransactionSignature> {
+		const ix = await this.getAdminDeleteFeeUpdateIx(vault);
+		return await this.createAndSendTxn([ix], uiTxParams);
+	}
+
+	public async getAdminDeleteFeeUpdateIx(
+		vault: PublicKey
+	): Promise<TransactionInstruction> {
+		const feeUpdate = getFeeUpdateAddressSync(this.program.programId, vault);
+
+		return this.program.instruction.adminDeleteFeeUpdate({
+			accounts: {
+				vault,
+				admin: this.driftClient.wallet.publicKey,
+				feeUpdate,
+			},
+		});
+	}
+
+	public async managerUpdateFees(
+		vault: PublicKey,
+		params: {
+			timelockDuration: BN;
+			newManagementFee: BN | null;
+			newProfitShare: number | null;
+			newHurdleRate: number | null;
+		},
+		uiTxParams?: TxParams
+	): Promise<TransactionSignature> {
+		const feeUpdate = getFeeUpdateAddressSync(this.program.programId, vault);
+		const ixs: TransactionInstruction[] = [];
+		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);
+	}
+
+	public async getManagerUpdateFeesIx(
+		vault: PublicKey,
+		params: {
+			timelockDuration: BN;
+			newManagementFee: BN | null;
+			newProfitShare: number | null;
+			newHurdleRate: number | null;
+		}
+	): Promise<TransactionInstruction> {
+		const vaultAccount = await this.program.account.vault.fetch(vault);
+		const feeUpdate = getFeeUpdateAddressSync(this.program.programId, vault);
+
+		return this.program.instruction.managerUpdateFees(params, {
+			accounts: {
+				vault,
+				manager: vaultAccount.manager,
+				feeUpdate,
+			},
+		});
+	}
+
+	public async managerCancelFeeUpdate(
+		vault: PublicKey,
+		uiTxParams?: TxParams
+	): Promise<TransactionSignature> {
+		const ix = await this.getManagerCancelFeeUpdateIx(vault);
+		return await this.createAndSendTxn([ix], uiTxParams);
+	}
+
+	public async getManagerCancelFeeUpdateIx(
+		vault: PublicKey
+	): Promise<TransactionInstruction> {
+		const vaultAccount = await this.program.account.vault.fetch(vault);
+		const feeUpdate = getFeeUpdateAddressSync(this.program.programId, vault);
+
+		return this.program.instruction.managerCancelFeeUpdate({
+			accounts: {
+				vault,
+				manager: vaultAccount.manager,
+				feeUpdate,
+			},
+		});
+	}
 }