@zebec-network/solana-payroll-sdk 2.9.0 → 2.9.1

package/dist/services.js

@@ -1298,7 +1298,7 @@ export async function withdrawPayrollAndYieldDeposit(payrollProgram, configsProg
             return blocktime;
         }));
     }
-    const withdrawableAmount = calculateTotalWithdrawableAmount(BigNumber(payrollMetadataAccount.schedule.startTime.toString()), BigNumber(payrollMetadataAccount.financials.fullAmount.toString()), BigNumber(payrollMetadataAccount.schedule.duration.toString()), effectiveTime, BigNumber(payrollMetadataAccount.schedule.pausedInterval.toString())).shiftedBy(payrollTokenDecimals * -1);
+    const withdrawableAmount = calculateTotalWithdrawableAmount(BigNumber(payrollMetadataAccount.schedule.startTime.toString()), BigNumber(payrollMetadataAccount.financials.fullAmount.toString()), BigNumber(payrollMetadataAccount.financials.withdrawnAmount.toString()), BigNumber(payrollMetadataAccount.schedule.duration.toString()), effectiveTime, BigNumber(payrollMetadataAccount.schedule.pausedInterval.toString())).shiftedBy(payrollTokenDecimals * -1);
     if (withdrawableAmount.lt(params.depositAmount)) {
         throw new Error("Withdrawable payroll amount is less than asked Yield deposit amount");
     }

package/dist/utils.d.ts

@@ -14,4 +14,4 @@ export type ParsedTokenFeeItem = {
 };
 export declare function getFeeRateForMint(feeRateList: ParsedTokenFeeItem[], mint: PublicKey): number;
 export declare function deductFeeFromAmount(rawAmount: BigNumber.Value, feeRateInBps: BigNumber.Value): string;
-export declare function calculateTotalWithdrawableAmount(start_time: BigNumber, full_amount: BigNumber, duration: BigNumber, now: BigNumber, paused_interval: BigNumber): BigNumber;
+export declare function calculateTotalWithdrawableAmount(startTime: BigNumber, fullAmount: BigNumber, withdrawnAmount: BigNumber, duration: BigNumber, now: BigNumber, pausedInterval: BigNumber): BigNumber;

package/dist/utils.js

@@ -99,14 +99,16 @@ export function deductFeeFromAmount(rawAmount, feeRateInBps) {
     const fee = amount.times(feeRateInBps).div(BPS_DENOMINATOR);
     return amount.minus(fee).toFixed(0, BigNumber.ROUND_FLOOR);
 }
-export function calculateTotalWithdrawableAmount(start_time, full_amount, duration, now, paused_interval) {
-    if (now.lte(start_time)) {
+export function calculateTotalWithdrawableAmount(startTime, fullAmount, withdrawnAmount, duration, now, pausedInterval) {
+    if (now.lte(startTime)) {
         return BigNumber(0);
     }
-    const elapsed = BigNumber.max(0, now.minus(start_time).minus(paused_interval));
+    const elapsed = BigNumber.max(0, now.minus(startTime).minus(pausedInterval));
     const totalDuration = BigNumber.max(1, duration);
-    return BigNumber.min(elapsed
-        .times(full_amount)
+    const totalStreamed = BigNumber.min(elapsed
+        .times(fullAmount)
         .div(totalDuration)
-        .decimalPlaces(0, BigNumber.ROUND_FLOOR), full_amount);
+        .decimalPlaces(0, BigNumber.ROUND_FLOOR), fullAmount);
+    const withdrawable = totalStreamed.minus(withdrawnAmount);
+    return withdrawable.isNegative() ? BigNumber(0) : withdrawable;
 }

package/package.json

@@ -45,5 +45,5 @@
 	},
 	"type": "module",
 	"types": "dist/index.d.ts",
-	"version": "2.9.0"
+	"version": "2.9.1"
 }