@voltr/vault-sdk 1.0.2 → 1.0.4

package/README.md

@@ -244,9 +244,11 @@ pendingWithdrawals.forEach((withdrawal, index) => {
 
 - `createInitializeVaultIx(vaultParams, params)`
 - `createUpdateVaultIx(vaultConfig, params)`
+- `createDepositVaultIx(amount, params)`
 - `createRequestWithdrawVaultIx(requestWithdrawArgs, params)`
 - `createCancelRequestWithdrawVaultIx(params)`
 - `createWithdrawVaultIx(params)`
+- `createHarvestFeeIx(params)`
 
 #### Strategy Management
 
@@ -261,10 +263,16 @@ pendingWithdrawals.forEach((withdrawal, index) => {
 #### Account Data
 
 - `fetchVaultAccount(vault)`
+- `fetchStrategyInitReceiptAccount(strategyInitReceipt)`
+- `fetchAdaptorAddReceiptAccount(adaptorAddReceipt)`
 - `fetchAllStrategyInitReceiptAccounts()`
 - `fetchAllStrategyInitReceiptAccountsOfVault(vault)`
 - `fetchAllAdaptorAddReceiptAccountsOfVault(vault)`
+- `fetchAllRequestWithdrawVaultReceiptsOfVault(vault)`
 - `getPositionAndTotalValuesForVault(vault)`
+- `getAccumulatedAdminFeesForVault(vault)`
+- `getAccumulatedManagerFeesForVault(vault)`
+- `getAllPendingWithdrawalsForVault(vault)`
 
 #### PDA Finding
 
@@ -274,6 +282,8 @@ pendingWithdrawals.forEach((withdrawal, index) => {
 - `findVaultStrategyAuth(vault, strategy)`
 - `findStrategyInitReceipt(vault, strategy)`
 - `findDirectWithdrawInitReceipt(vault, strategy)`
+- `findVaultStrategyAddresses(vault, strategy)`
+- `findRequestWithdrawVaultReceipt(vault, user)`
 
 #### Calculations
 

package/dist/client.d.ts

@@ -23,7 +23,7 @@ declare class AccountUtils {
  *
  * @example
  * ```typescript
- * import { VoltrClient } from '@voltr/sdk';
+ * import { VoltrClient } from '@voltr/vault-sdk';
  * import { Connection } from '@solana/web3.js';
  *
  * const connection = new Connection('https://api.mainnet-beta.solana.com');
@@ -179,7 +179,7 @@ export declare class VoltrClient extends AccountUtils {
      * ```
      */
     createInitializeVaultIx(vaultParams: VaultParams, { vault, vaultAssetMint, admin, manager, payer, }: {
-        vault: Keypair;
+        vault: PublicKey;
         vaultAssetMint: PublicKey;
         admin: PublicKey;
         manager: PublicKey;
@@ -616,6 +616,35 @@ export declare class VoltrClient extends AccountUtils {
             isWritable: boolean;
         }>;
     }): Promise<TransactionInstruction>;
+    /**
+     * Creates an instruction to harvest fees from a vault
+     * @param {Object} params - Parameters for harvesting fees
+     * @param {PublicKey} params.harvester - Public key of the harvester
+     * @param {PublicKey} params.vaultManager - Public key of the vault manager
+     * @param {PublicKey} params.vaultAdmin - Public key of the vault admin
+     * @param {PublicKey} params.protocolAdmin - Public key of the protocol admin
+     * @param {PublicKey} params.vault - Public key of the vault
+     * @returns {Promise<TransactionInstruction>} Transaction instruction for harvesting fees
+     * @throws {Error} If instruction creation fails
+     *
+     * @example
+     * ```typescript
+     * const ix = await client.createHarvestFeeIx({
+     *   harvester: harvesterPubkey,
+     *   vaultManager: vaultManagerPubkey,
+     *   vaultAdmin: vaultAdminPubkey,
+     *   protocolAdmin: protocolAdminPubkey,
+     *   vault: vaultPubkey,
+     * });
+     * ```
+     */
+    createHarvestFeeIx({ harvester, vaultManager, vaultAdmin, protocolAdmin, vault, }: {
+        harvester: PublicKey;
+        vaultManager: PublicKey;
+        vaultAdmin: PublicKey;
+        protocolAdmin: PublicKey;
+        vault: PublicKey;
+    }): Promise<TransactionInstruction>;
     /**
      * Fetches all strategy init receipt accounts
      * @returns Promise resolving to an array of strategy init receipt accounts
@@ -693,7 +722,6 @@ export declare class VoltrClient extends AccountUtils {
         adaptorProgram: PublicKey;
         version: number;
         bump: number;
-        isActive: boolean;
         padding0: number[];
         lastUpdatedEpoch: BN;
         reserved: number[];
@@ -801,11 +829,32 @@ export declare class VoltrClient extends AccountUtils {
         adaptorProgram: PublicKey;
         version: number;
         bump: number;
-        isActive: boolean;
         padding0: number[];
         lastUpdatedEpoch: BN;
         reserved: number[];
     }>;
+    /**
+     * Fetches the accumulated admin fees for a vault
+     * @param vault - Public key of the vault
+     * @returns Promise resolving to the accumulated admin fees
+     *
+     * @example
+     * ```typescript
+     * const accumulatedAdminFees = await client.getAccumulatedAdminFeesForVault(vaultPubkey);
+     * ```
+     */
+    getAccumulatedAdminFeesForVault(vault: PublicKey): Promise<BN>;
+    /**
+     * Fetches the accumulated manager fees for a vault
+     * @param vault - Public key of the vault
+     * @returns Promise resolving to the accumulated manager fees
+     *
+     * @example
+     * ```typescript
+     * const accumulatedManagerFees = await client.getAccumulatedManagerFeesForVault(vaultPubkey);
+     * ```
+     */
+    getAccumulatedManagerFeesForVault(vault: PublicKey): Promise<BN>;
     /**
      * Fetches all pending withdrawals for a vault
      * @param vault - Public key of the vault
@@ -817,10 +866,14 @@ export declare class VoltrClient extends AccountUtils {
      * ```
      */
     getAllPendingWithdrawalsForVault(vault: PublicKey): Promise<{
-        amountAssetToWithdraw: number;
+        amountAssetToWithdrawEffective: number;
+        amountAssetToWithdrawAtRequest: number;
+        amountAssetToWithdrawAtPresent: number;
+        amountLpEscrowed: number;
         withdrawableFromTs: number;
     }[]>;
     calculateLockedProfit(lastUpdatedLockedProfit: BN, lockedProfitDegradationDuration: BN, currentTime: BN): BN;
+    calculateAssetsForWithdrawHelper(vaultTotalValue: BN, vaultLastUpdatedLockedProfit: BN, vaultLockedProfitDegradationDuration: BN, vaultAccumulatedLpAdminFees: BN, vaultAccumulatedLpManagerFees: BN, vaultAccumulatedLpProtocolFees: BN, vaultRedemptionFee: number, lpSupply: BN, lpAmount: BN): BN;
     /**
      * Calculates the amount of assets that would be received for a given LP token amount
      *

package/dist/client.js

@@ -92,7 +92,7 @@ class AccountUtils {
  *
  * @example
  * ```typescript
- * import { VoltrClient } from '@voltr/sdk';
+ * import { VoltrClient } from '@voltr/vault-sdk';
  * import { Connection } from '@solana/web3.js';
  *
  * const connection = new Connection('https://api.mainnet-beta.solana.com');
@@ -303,18 +303,23 @@ class VoltrClient extends AccountUtils {
      * ```
      */
     async createInitializeVaultIx(vaultParams, { vault, vaultAssetMint, admin, manager, payer, }) {
-        const addresses = this.findVaultAddresses(vault.publicKey);
+        const addresses = this.findVaultAddresses(vault);
         const vaultAssetIdleAta = (0, spl_token_1.getAssociatedTokenAddressSync)(vaultAssetMint, addresses.vaultAssetIdleAuth, true);
+        const vaultAssetMintAccount = await this.provider.connection.getAccountInfo(vaultAssetMint);
+        const assetTokenProgram = vaultAssetMintAccount?.owner;
+        if (!assetTokenProgram) {
+            throw new Error("Vault asset mint not found");
+        }
         return await this.vaultProgram.methods
             .initializeVault(vaultParams.config, vaultParams.name, vaultParams.description)
             .accounts({
             payer,
             admin,
             manager,
-            vault: vault.publicKey,
+            vault,
             vaultAssetMint,
             vaultAssetIdleAta,
-            assetTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            assetTokenProgram,
         })
             .instruction();
     }
@@ -792,6 +797,40 @@ class VoltrClient extends AccountUtils {
             .remainingAccounts(remainingAccounts)
             .instruction();
     }
+    /**
+     * Creates an instruction to harvest fees from a vault
+     * @param {Object} params - Parameters for harvesting fees
+     * @param {PublicKey} params.harvester - Public key of the harvester
+     * @param {PublicKey} params.vaultManager - Public key of the vault manager
+     * @param {PublicKey} params.vaultAdmin - Public key of the vault admin
+     * @param {PublicKey} params.protocolAdmin - Public key of the protocol admin
+     * @param {PublicKey} params.vault - Public key of the vault
+     * @returns {Promise<TransactionInstruction>} Transaction instruction for harvesting fees
+     * @throws {Error} If instruction creation fails
+     *
+     * @example
+     * ```typescript
+     * const ix = await client.createHarvestFeeIx({
+     *   harvester: harvesterPubkey,
+     *   vaultManager: vaultManagerPubkey,
+     *   vaultAdmin: vaultAdminPubkey,
+     *   protocolAdmin: protocolAdminPubkey,
+     *   vault: vaultPubkey,
+     * });
+     * ```
+     */
+    async createHarvestFeeIx({ harvester, vaultManager, vaultAdmin, protocolAdmin, vault, }) {
+        return await this.vaultProgram.methods
+            .harvestFee()
+            .accounts({
+            harvester,
+            vaultManager,
+            vaultAdmin,
+            vault,
+            protocolAdmin,
+        })
+            .instruction();
+    }
     // --------------------------------------- Account Fetching All
     /**
      * Fetches all strategy init receipt accounts
@@ -914,6 +953,34 @@ class VoltrClient extends AccountUtils {
         return await this.vaultProgram.account.adaptorAddReceipt.fetch(adaptorAddReceipt, "confirmed");
     }
     // --------------------------------------- Helpers
+    /**
+     * Fetches the accumulated admin fees for a vault
+     * @param vault - Public key of the vault
+     * @returns Promise resolving to the accumulated admin fees
+     *
+     * @example
+     * ```typescript
+     * const accumulatedAdminFees = await client.getAccumulatedAdminFeesForVault(vaultPubkey);
+     * ```
+     */
+    async getAccumulatedAdminFeesForVault(vault) {
+        const vaultAccount = await this.fetchVaultAccount(vault);
+        return vaultAccount.feeState.accumulatedLpAdminFees;
+    }
+    /**
+     * Fetches the accumulated manager fees for a vault
+     * @param vault - Public key of the vault
+     * @returns Promise resolving to the accumulated manager fees
+     *
+     * @example
+     * ```typescript
+     * const accumulatedManagerFees = await client.getAccumulatedManagerFeesForVault(vaultPubkey);
+     * ```
+     */
+    async getAccumulatedManagerFeesForVault(vault) {
+        const vaultAccount = await this.fetchVaultAccount(vault);
+        return vaultAccount.feeState.accumulatedLpManagerFees;
+    }
     /**
      * Fetches all pending withdrawals for a vault
      * @param vault - Public key of the vault
@@ -926,11 +993,24 @@ class VoltrClient extends AccountUtils {
      */
     async getAllPendingWithdrawalsForVault(vault) {
         const requestWithdrawVaultReceipts = await this.fetchAllRequestWithdrawVaultReceiptsOfVault(vault);
+        const vaultAccount = await this.fetchVaultAccount(vault);
+        const lpMint = this.findVaultLpMint(vault);
+        const lp = await (0, spl_token_1.getMint)(this.conn, lpMint);
         return requestWithdrawVaultReceipts.map((receipt) => {
             const amountAssetToWithdrawDecimal = (0, decimals_1.convertDecimalBitsToDecimal)(receipt.account.amountAssetToWithdrawDecimalBits);
-            const amountAssetToWithdraw = amountAssetToWithdrawDecimal.toNumber();
+            const amountAssetToWithdrawAtRequest = amountAssetToWithdrawDecimal.toNumber();
+            const amountLpEscrowed = receipt.account.amountLpEscrowed;
+            const amountAssetToWithdrawAtPresent = this.calculateAssetsForWithdrawHelper(vaultAccount.asset.totalValue, vaultAccount.lockedProfitState.lastUpdatedLockedProfit, vaultAccount.vaultConfiguration.lockedProfitDegradationDuration, vaultAccount.feeState.accumulatedLpAdminFees, vaultAccount.feeState.accumulatedLpManagerFees, vaultAccount.feeState.accumulatedLpProtocolFees, vaultAccount.feeConfiguration.redemptionFee, new bn_js_1.default(lp.supply.toString()), amountLpEscrowed).toNumber();
+            // Get the capped amount of asset to withdraw
+            // If the latest amount of asset to withdraw is greater than the initial amount of asset to withdraw,
+            // then return the initial amount of asset to withdraw
+            // Otherwise, return the latest amount of asset to withdraw
+            const amountAssetToWithdrawEffective = Math.min(amountAssetToWithdrawAtPresent, amountAssetToWithdrawAtRequest);
             return {
-                amountAssetToWithdraw,
+                amountAssetToWithdrawEffective,
+                amountAssetToWithdrawAtRequest,
+                amountAssetToWithdrawAtPresent,
+                amountLpEscrowed: amountLpEscrowed.toNumber(),
                 withdrawableFromTs: receipt.account.withdrawableFromTs.toNumber(),
             };
         });
@@ -947,6 +1027,26 @@ class VoltrClient extends AccountUtils {
         else
             return lockedProfit;
     }
+    calculateAssetsForWithdrawHelper(vaultTotalValue, vaultLastUpdatedLockedProfit, vaultLockedProfitDegradationDuration, vaultAccumulatedLpAdminFees, vaultAccumulatedLpManagerFees, vaultAccumulatedLpProtocolFees, vaultRedemptionFee, lpSupply, lpAmount) {
+        if (lpSupply <= new bn_js_1.default(0))
+            throw new Error("Invalid LP supply");
+        if (vaultTotalValue <= new bn_js_1.default(0))
+            throw new Error("Invalid total assets");
+        const lockedProfit = this.calculateLockedProfit(vaultLastUpdatedLockedProfit, vaultLockedProfitDegradationDuration, new bn_js_1.default(Date.now() / 1000));
+        const totalUnlockedValue = vaultTotalValue.sub(lockedProfit);
+        const unharvestedFeesLp = vaultAccumulatedLpAdminFees
+            .add(vaultAccumulatedLpManagerFees)
+            .add(vaultAccumulatedLpProtocolFees);
+        const lpSupplyInclFees = lpSupply.add(unharvestedFeesLp);
+        // asset_to_redeem_pre_fee = amount * (total_asset_pre_withdraw / total_lp_supply_pre_withdraw)
+        // asset_to_redeem_post_fee = asset_to_redeem_pre_fee * (10000 - redemption_fee_bps) / 10000
+        const assetToRedeemNumerator = lpAmount
+            .mul(totalUnlockedValue)
+            .mul(new bn_js_1.default(10000 - vaultRedemptionFee));
+        const assetToRedeemDenominator = lpSupplyInclFees.mul(new bn_js_1.default(10000));
+        const amount = assetToRedeemNumerator.div(assetToRedeemDenominator);
+        return amount;
+    }
     /**
      * Calculates the amount of assets that would be received for a given LP token amount
      *
@@ -968,28 +1068,9 @@ class VoltrClient extends AccountUtils {
     async calculateAssetsForWithdraw(vaultPk, lpAmount) {
         try {
             const vault = await this.fetchVaultAccount(vaultPk);
-            const totalValue = vault.asset.totalValue;
-            const lockedProfit = this.calculateLockedProfit(vault.lockedProfitState.lastUpdatedLockedProfit, vault.vaultConfiguration.lockedProfitDegradationDuration, new bn_js_1.default(Date.now() / 1000));
-            const totalUnlockedValue = totalValue.sub(lockedProfit);
             const lpMint = this.findVaultLpMint(vaultPk);
             const lp = await (0, spl_token_1.getMint)(this.conn, lpMint);
-            const lpSupply = new bn_js_1.default(lp.supply.toString());
-            // Validate inputs
-            if (lpSupply <= new bn_js_1.default(0))
-                throw new Error("Invalid LP supply");
-            if (totalValue <= new bn_js_1.default(0))
-                throw new Error("Invalid total assets");
-            const unharvestedFeesLp = vault.feeState.accumulatedLpAdminFees
-                .add(vault.feeState.accumulatedLpManagerFees)
-                .add(vault.feeState.accumulatedLpProtocolFees);
-            const lpSupplyInclFees = lpSupply.add(unharvestedFeesLp);
-            // asset_to_redeem_pre_fee = amount * (total_asset_pre_withdraw / total_lp_supply_pre_withdraw)
-            // asset_to_redeem_post_fee = asset_to_redeem_pre_fee * (10000 - redemption_fee_bps) / 10000
-            const assetToRedeemNumerator = lpAmount
-                .mul(totalUnlockedValue)
-                .mul(new bn_js_1.default(10000 - vault.feeConfiguration.redemptionFee));
-            const assetToRedeemDenominator = lpSupplyInclFees.mul(new bn_js_1.default(10000));
-            const amount = assetToRedeemNumerator.div(assetToRedeemDenominator);
+            const amount = this.calculateAssetsForWithdrawHelper(vault.asset.totalValue, vault.lockedProfitState.lastUpdatedLockedProfit, vault.vaultConfiguration.lockedProfitDegradationDuration, vault.feeState.accumulatedLpAdminFees, vault.feeState.accumulatedLpManagerFees, vault.feeState.accumulatedLpProtocolFees, vault.feeConfiguration.redemptionFee, new bn_js_1.default(lp.supply.toString()), lpAmount);
             return amount;
         }
         catch (e) {

package/dist/idl/voltr_vault.json

@@ -1592,6 +1592,298 @@
                 }
             ]
         },
+        {
+            "name": "harvest_fee",
+            "discriminator": [
+                32,
+                59,
+                42,
+                128,
+                246,
+                73,
+                255,
+                47
+            ],
+            "accounts": [
+                {
+                    "name": "harvester",
+                    "signer": true
+                },
+                {
+                    "name": "vault_manager"
+                },
+                {
+                    "name": "vault_admin"
+                },
+                {
+                    "name": "protocol_admin"
+                },
+                {
+                    "name": "protocol",
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    112,
+                                    114,
+                                    111,
+                                    116,
+                                    111,
+                                    99,
+                                    111,
+                                    108
+                                ]
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "vault",
+                    "writable": true
+                },
+                {
+                    "name": "vault_lp_mint",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116,
+                                    95,
+                                    108,
+                                    112,
+                                    95,
+                                    109,
+                                    105,
+                                    110,
+                                    116
+                                ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "vault"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "vault_lp_mint_auth",
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116,
+                                    95,
+                                    108,
+                                    112,
+                                    95,
+                                    109,
+                                    105,
+                                    110,
+                                    116,
+                                    95,
+                                    97,
+                                    117,
+                                    116,
+                                    104
+                                ]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "vault"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "vault_manager_lp_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "vault_manager"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "lp_token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "vault_lp_mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "vault_admin_lp_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "vault_admin"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "lp_token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "vault_lp_mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "protocol_admin_lp_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "protocol_admin"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "lp_token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "vault_lp_mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "lp_token_program",
+                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                }
+            ],
+            "args": []
+        },
         {
             "name": "init_or_update_protocol",
             "discriminator": [
@@ -3514,78 +3806,63 @@
         },
         {
             "code": 6001,
-            "name": "InvalidAccountOwner",
-            "msg": "Invalid account owner."
-        },
-        {
-            "code": 6002,
-            "name": "AlreadyInitialized",
-            "msg": "Already initialized."
-        },
-        {
-            "code": 6003,
             "name": "InvalidTokenMint",
             "msg": "Invalid token mint."
         },
         {
-            "code": 6004,
+            "code": 6002,
             "name": "InvalidTokenAccount",
             "msg": "Invalid token account."
         },
         {
-            "code": 6005,
+            "code": 6003,
             "name": "InvalidAccountInput",
             "msg": "Invalid account input."
         },
         {
-            "code": 6006,
-            "name": "NotRentExempt",
-            "msg": "Not rent exempt."
-        },
-        {
-            "code": 6007,
+            "code": 6004,
             "name": "MathOverflow",
             "msg": "Math overflow."
         },
         {
-            "code": 6008,
+            "code": 6005,
             "name": "MaxCapExceeded",
             "msg": "Max cap exceeded."
         },
         {
-            "code": 6009,
-            "name": "StrategyNotEmpty",
-            "msg": "Strategy not empty."
-        },
-        {
-            "code": 6010,
+            "code": 6006,
             "name": "VaultNotActive",
             "msg": "Vault not active."
         },
         {
-            "code": 6011,
+            "code": 6007,
             "name": "ManagerNotAllowed",
             "msg": "Manager not allowed in remaining."
         },
         {
-            "code": 6012,
+            "code": 6008,
             "name": "OperationNotAllowed",
             "msg": "Operation not allowed."
         },
         {
-            "code": 6013,
+            "code": 6009,
             "name": "AdaptorEpochInvalid",
             "msg": "Adaptor epoch invalid."
         },
         {
-            "code": 6014,
+            "code": 6010,
             "name": "InvalidFeeConfiguration",
             "msg": "Fee configuration invalid."
         },
         {
-            "code": 6015,
+            "code": 6011,
             "name": "WithdrawalNotYetAvailable",
             "msg": "Withdrawal not yet available."
+        },
+        {
+            "code": 6012,
+            "name": "InvalidInput",
+            "msg": "Invalid input."
         }
     ],
     "types": [
@@ -3626,19 +3903,15 @@
                         ],
                         "type": "u8"
                     },
-                    {
-                        "name": "is_active",
-                        "type": "bool"
-                    },
                     {
                         "name": "_padding0",
                         "docs": [
-                            "6 bytes of padding to align future 8-byte fields on 8-byte boundaries."
+                            "7 bytes of padding to align future 8-byte fields on 8-byte boundaries."
                         ],
                         "type": {
                             "array": [
                                 "u8",
-                                6
+                                7
                             ]
                         }
                     },

package/dist/types/voltr_vault.d.ts

@@ -1598,6 +1598,298 @@ export type VoltrVault = {
                 }
             ];
         },
+        {
+            "name": "harvestFee";
+            "discriminator": [
+                32,
+                59,
+                42,
+                128,
+                246,
+                73,
+                255,
+                47
+            ];
+            "accounts": [
+                {
+                    "name": "harvester";
+                    "signer": true;
+                },
+                {
+                    "name": "vaultManager";
+                },
+                {
+                    "name": "vaultAdmin";
+                },
+                {
+                    "name": "protocolAdmin";
+                },
+                {
+                    "name": "protocol";
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const";
+                                "value": [
+                                    112,
+                                    114,
+                                    111,
+                                    116,
+                                    111,
+                                    99,
+                                    111,
+                                    108
+                                ];
+                            }
+                        ];
+                    };
+                },
+                {
+                    "name": "vault";
+                    "writable": true;
+                },
+                {
+                    "name": "vaultLpMint";
+                    "writable": true;
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const";
+                                "value": [
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116,
+                                    95,
+                                    108,
+                                    112,
+                                    95,
+                                    109,
+                                    105,
+                                    110,
+                                    116
+                                ];
+                            },
+                            {
+                                "kind": "account";
+                                "path": "vault";
+                            }
+                        ];
+                    };
+                },
+                {
+                    "name": "vaultLpMintAuth";
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const";
+                                "value": [
+                                    118,
+                                    97,
+                                    117,
+                                    108,
+                                    116,
+                                    95,
+                                    108,
+                                    112,
+                                    95,
+                                    109,
+                                    105,
+                                    110,
+                                    116,
+                                    95,
+                                    97,
+                                    117,
+                                    116,
+                                    104
+                                ];
+                            },
+                            {
+                                "kind": "account";
+                                "path": "vault";
+                            }
+                        ];
+                    };
+                },
+                {
+                    "name": "vaultManagerLpAta";
+                    "writable": true;
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account";
+                                "path": "vaultManager";
+                            },
+                            {
+                                "kind": "account";
+                                "path": "lpTokenProgram";
+                            },
+                            {
+                                "kind": "account";
+                                "path": "vaultLpMint";
+                            }
+                        ];
+                        "program": {
+                            "kind": "const";
+                            "value": [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    "name": "vaultAdminLpAta";
+                    "writable": true;
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account";
+                                "path": "vaultAdmin";
+                            },
+                            {
+                                "kind": "account";
+                                "path": "lpTokenProgram";
+                            },
+                            {
+                                "kind": "account";
+                                "path": "vaultLpMint";
+                            }
+                        ];
+                        "program": {
+                            "kind": "const";
+                            "value": [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    "name": "protocolAdminLpAta";
+                    "writable": true;
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account";
+                                "path": "protocolAdmin";
+                            },
+                            {
+                                "kind": "account";
+                                "path": "lpTokenProgram";
+                            },
+                            {
+                                "kind": "account";
+                                "path": "vaultLpMint";
+                            }
+                        ];
+                        "program": {
+                            "kind": "const";
+                            "value": [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    "name": "lpTokenProgram";
+                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
+                }
+            ];
+            "args": [];
+        },
         {
             "name": "initOrUpdateProtocol";
             "discriminator": [
@@ -3520,78 +3812,63 @@ export type VoltrVault = {
         },
         {
             "code": 6001;
-            "name": "invalidAccountOwner";
-            "msg": "Invalid account owner.";
-        },
-        {
-            "code": 6002;
-            "name": "alreadyInitialized";
-            "msg": "Already initialized.";
-        },
-        {
-            "code": 6003;
             "name": "invalidTokenMint";
             "msg": "Invalid token mint.";
         },
         {
-            "code": 6004;
+            "code": 6002;
             "name": "invalidTokenAccount";
             "msg": "Invalid token account.";
         },
         {
-            "code": 6005;
+            "code": 6003;
             "name": "invalidAccountInput";
             "msg": "Invalid account input.";
         },
         {
-            "code": 6006;
-            "name": "notRentExempt";
-            "msg": "Not rent exempt.";
-        },
-        {
-            "code": 6007;
+            "code": 6004;
             "name": "mathOverflow";
             "msg": "Math overflow.";
         },
         {
-            "code": 6008;
+            "code": 6005;
             "name": "maxCapExceeded";
             "msg": "Max cap exceeded.";
         },
         {
-            "code": 6009;
-            "name": "strategyNotEmpty";
-            "msg": "Strategy not empty.";
-        },
-        {
-            "code": 6010;
+            "code": 6006;
             "name": "vaultNotActive";
             "msg": "Vault not active.";
         },
         {
-            "code": 6011;
+            "code": 6007;
             "name": "managerNotAllowed";
             "msg": "Manager not allowed in remaining.";
         },
         {
-            "code": 6012;
+            "code": 6008;
             "name": "operationNotAllowed";
             "msg": "Operation not allowed.";
         },
         {
-            "code": 6013;
+            "code": 6009;
             "name": "adaptorEpochInvalid";
             "msg": "Adaptor epoch invalid.";
         },
         {
-            "code": 6014;
+            "code": 6010;
             "name": "invalidFeeConfiguration";
             "msg": "Fee configuration invalid.";
         },
         {
-            "code": 6015;
+            "code": 6011;
             "name": "withdrawalNotYetAvailable";
             "msg": "Withdrawal not yet available.";
+        },
+        {
+            "code": 6012;
+            "name": "invalidInput";
+            "msg": "Invalid input.";
         }
     ];
     "types": [
@@ -3632,19 +3909,15 @@ export type VoltrVault = {
                         ];
                         "type": "u8";
                     },
-                    {
-                        "name": "isActive";
-                        "type": "bool";
-                    },
                     {
                         "name": "padding0";
                         "docs": [
-                            "6 bytes of padding to align future 8-byte fields on 8-byte boundaries."
+                            "7 bytes of padding to align future 8-byte fields on 8-byte boundaries."
                         ];
                         "type": {
                             "array": [
                                 "u8",
-                                6
+                                7
                             ];
                         };
                     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltr/vault-sdk",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "SDK for interacting with Voltr Protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",