@voltr/vault-sdk 1.0.21 → 1.1.0

package/dist/client.d.ts

@@ -1478,12 +1478,12 @@ export declare class VoltrClient extends AccountUtils {
         amountLpEscrowed: number;
         withdrawableFromTs: number;
     }[]>;
-    calculateLockedProfit(lastUpdatedLockedProfit: BN, lockedProfitDegradationDuration: BN, currentTime: BN): BN;
+    calculateLockedProfit(lastUpdatedLockedProfit: BN, lastReport: BN, lockedProfitDegradationDuration: BN, currentTime: BN): BN;
     /**
      * Helper to calculate only the pending (unrealised) LP fees based on time elapsed.
      */
     private calculateUnrealisedLpFees;
-    calculateAssetsForWithdrawHelper(vaultTotalValue: BN, vaultLastUpdatedLockedProfit: BN, vaultLockedProfitDegradationDuration: BN, vaultAccumulatedLpAdminFees: BN, vaultAccumulatedLpManagerFees: BN, vaultAccumulatedLpProtocolFees: BN, vaultRedemptionFeeBps: number, vaultManagementFeeBps: number, vaultLastManagementFeeUpdateTs: BN, lpSupply: BN, lpAmount: BN, deadWeight?: BN): BN;
+    calculateAssetsForWithdrawHelper(vaultTotalValue: BN, vaultLastUpdatedLockedProfit: BN, vaultLastReport: BN, vaultLockedProfitDegradationDuration: BN, vaultAccumulatedLpAdminFees: BN, vaultAccumulatedLpManagerFees: BN, vaultAccumulatedLpProtocolFees: BN, vaultRedemptionFeeBps: number, vaultManagementFeeBps: number, vaultLastManagementFeeUpdateTs: BN, lpSupply: BN, lpAmount: BN, deadWeight?: BN): BN;
     /**
      * Calculates the amount of assets that would be received for a given LP token amount
      *

package/dist/client.js

@@ -1697,7 +1697,7 @@ class VoltrClient extends AccountUtils {
         const amountAssetToWithdrawDecimal = (0, decimals_1.convertDecimalBitsToDecimal)(receipt.account.amountAssetToWithdrawDecimalBits);
         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, vaultAccount.feeConfiguration.managerManagementFee +
+        const amountAssetToWithdrawAtPresent = this.calculateAssetsForWithdrawHelper(vaultAccount.asset.totalValue, vaultAccount.lockedProfitState.lastUpdatedLockedProfit, vaultAccount.lockedProfitState.lastReport, vaultAccount.vaultConfiguration.lockedProfitDegradationDuration, vaultAccount.feeState.accumulatedLpAdminFees, vaultAccount.feeState.accumulatedLpManagerFees, vaultAccount.feeState.accumulatedLpProtocolFees, vaultAccount.feeConfiguration.redemptionFee, vaultAccount.feeConfiguration.managerManagementFee +
             vaultAccount.feeConfiguration.adminManagementFee +
             vaultAccount.feeConfiguration.protocolManagementFee, vaultAccount.feeUpdate.lastManagementFeeUpdateTs, lpSupply, amountLpEscrowed, vaultAccount.deadWeight).toNumber();
         // Cap the withdrawal amount to the initial request amount
@@ -1750,17 +1750,15 @@ class VoltrClient extends AccountUtils {
         const lpSupply = new bn_js_1.default(lp.supply.toString());
         return Promise.all(requestWithdrawVaultReceipts.map((receipt) => this.processWithdrawalReceipt(receipt, vaultAccount, lpSupply)));
     }
-    calculateLockedProfit(lastUpdatedLockedProfit, lockedProfitDegradationDuration, currentTime) {
+    calculateLockedProfit(lastUpdatedLockedProfit, lastReport, lockedProfitDegradationDuration, currentTime) {
         if (lockedProfitDegradationDuration.eq(new bn_js_1.default(0)))
             return new bn_js_1.default(0);
-        const duration = currentTime.sub(lastUpdatedLockedProfit);
-        const lockedProfit = lastUpdatedLockedProfit
-            .mul(lockedProfitDegradationDuration.sub(duration))
-            .div(lockedProfitDegradationDuration);
+        const duration = currentTime.sub(lastReport);
         if (duration.gt(lockedProfitDegradationDuration))
             return new bn_js_1.default(0);
-        else
-            return lockedProfit;
+        return lastUpdatedLockedProfit
+            .mul(lockedProfitDegradationDuration.sub(duration))
+            .div(lockedProfitDegradationDuration);
     }
     /**
      * Helper to calculate only the pending (unrealised) LP fees based on time elapsed.
@@ -1792,12 +1790,12 @@ class VoltrClient extends AccountUtils {
             .div(lpDenominator);
         return pendingLpToMint;
     }
-    calculateAssetsForWithdrawHelper(vaultTotalValue, vaultLastUpdatedLockedProfit, vaultLockedProfitDegradationDuration, vaultAccumulatedLpAdminFees, vaultAccumulatedLpManagerFees, vaultAccumulatedLpProtocolFees, vaultRedemptionFeeBps, vaultManagementFeeBps, vaultLastManagementFeeUpdateTs, lpSupply, lpAmount, deadWeight = new bn_js_1.default(0)) {
+    calculateAssetsForWithdrawHelper(vaultTotalValue, vaultLastUpdatedLockedProfit, vaultLastReport, vaultLockedProfitDegradationDuration, vaultAccumulatedLpAdminFees, vaultAccumulatedLpManagerFees, vaultAccumulatedLpProtocolFees, vaultRedemptionFeeBps, vaultManagementFeeBps, vaultLastManagementFeeUpdateTs, lpSupply, lpAmount, deadWeight = new bn_js_1.default(0)) {
         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 lockedProfit = this.calculateLockedProfit(vaultLastUpdatedLockedProfit, vaultLastReport, vaultLockedProfitDegradationDuration, new bn_js_1.default(Math.floor(Date.now() / 1000)));
         const totalUnlockedValue = vaultTotalValue.sub(lockedProfit);
         const unharvestedFeesLp = vaultAccumulatedLpAdminFees
             .add(vaultAccumulatedLpManagerFees)
@@ -1839,7 +1837,7 @@ class VoltrClient extends AccountUtils {
             const vault = await this.fetchVaultAccount(vaultPk);
             const lpMint = this.findVaultLpMint(vaultPk);
             const lp = await (0, spl_token_1.getMint)(this.conn, lpMint, this.provider.opts.commitment);
-            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, vault.feeConfiguration.managerManagementFee +
+            const amount = this.calculateAssetsForWithdrawHelper(vault.asset.totalValue, vault.lockedProfitState.lastUpdatedLockedProfit, vault.lockedProfitState.lastReport, vault.vaultConfiguration.lockedProfitDegradationDuration, vault.feeState.accumulatedLpAdminFees, vault.feeState.accumulatedLpManagerFees, vault.feeState.accumulatedLpProtocolFees, vault.feeConfiguration.redemptionFee, vault.feeConfiguration.managerManagementFee +
                 vault.feeConfiguration.adminManagementFee +
                 vault.feeConfiguration.protocolManagementFee, vault.feeUpdate.lastManagementFeeUpdateTs, new bn_js_1.default(lp.supply.toString()), lpAmount, vault.deadWeight);
             return amount;
@@ -1870,7 +1868,7 @@ class VoltrClient extends AccountUtils {
         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 lockedProfit = this.calculateLockedProfit(vault.lockedProfitState.lastUpdatedLockedProfit, vault.lockedProfitState.lastReport, vault.vaultConfiguration.lockedProfitDegradationDuration, new bn_js_1.default(Math.floor(Date.now() / 1000)));
             const totalUnlockedValue = totalValue.sub(lockedProfit);
             const lpMint = this.findVaultLpMint(vaultPk);
             const lp = await (0, spl_token_1.getMint)(this.conn, lpMint, this.provider.opts.commitment);

package/package.json

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