@gearbox-protocol/sdk 1.20.14 → 1.20.15

package/lib/apy/convexAPY.d.ts

@@ -20,15 +20,17 @@ export interface GetConvexAPYBulkCallsProps {
 }
 export declare function getConvexAPYBulkCalls({ pools, networkType, }: GetConvexAPYBulkCallsProps): {
     poolsInfo: (readonly [ConvexPoolParams, string, string, CurveLPToken, string[], Record<SupportedToken, string>])[];
-    calls: [MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/curve/ICurvePool").ICurvePoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IConvexToken").IConvexTokenInterface>, ...MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>[]][];
+    calls: [MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/curve/ICurvePool").ICurvePoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IConvexToken").IConvexTokenInterface>, ...MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>[]][];
 };
 export declare function getCVXMintAmount(crvAmount: BigNumber, cvxSupply: BigNumber): BigNumber;
 export interface CalculateConvexAPYProps {
+    baseRewardsFinish: BigNumber;
     basePoolRate: BigNumber;
     basePoolSupply: BigNumber;
     vPrice: BigNumber;
     cvxSupply: BigNumber;
     extra: Array<BigNumber>;
+    extraRewardsFinish: Array<BigNumber>;
     extraPoolAddresses: string[];
     poolParams: ConvexPoolParams;
     underlying: CurveLPToken;

package/lib/apy/convexAPY.js

@@ -26,14 +26,18 @@ function getConvexAPYBulk(_a) {
         return [acc, end];
     }, [[], 0])[0];
     var apyList = parsedResponse.map(function (_a, i) {
-        var basePoolRate = _a[0], basePoolSupply = _a[1], vPrice = _a[2], cvxSupply = _a[3], extra = _a.slice(4);
+        var baseRewardsFinish = _a[0], basePoolRate = _a[1], basePoolSupply = _a[2], vPrice = _a[3], cvxSupply = _a[4], rest = _a.slice(5);
         var _b = poolsInfo[i], poolParams = _b[0], underlying = _b[3], extraPoolAddresses = _b[4], tokenList = _b[5];
+        var extra = rest.slice(0, extraPoolAddresses.length);
+        var extraRewardsFinish = rest.slice(extraPoolAddresses.length);
         var apy = calculateConvexAPY({
+            baseRewardsFinish: baseRewardsFinish,
             basePoolRate: basePoolRate,
             basePoolSupply: basePoolSupply,
             vPrice: vPrice,
             cvxSupply: cvxSupply,
             extra: extra,
+            extraRewardsFinish: extraRewardsFinish,
             extraPoolAddresses: extraPoolAddresses,
             poolParams: poolParams,
             underlying: underlying,
@@ -83,7 +87,12 @@ function getConvexAPYBulkCalls(_a) {
 exports.getConvexAPYBulkCalls = getConvexAPYBulkCalls;
 function getPoolDataCalls(_a) {
     var basePoolAddress = _a.basePoolAddress, swapPoolAddress = _a.swapPoolAddress, cvxAddress = _a.cvxAddress, extraPoolAddresses = _a.extraPoolAddresses;
-    var calls = __spreadArray([
+    var calls = __spreadArray(__spreadArray([
+        {
+            address: basePoolAddress,
+            interface: types_1.IBaseRewardPool__factory.createInterface(),
+            method: "periodFinish()",
+        },
         {
             address: basePoolAddress,
             interface: types_1.IBaseRewardPool__factory.createInterface(),
@@ -108,6 +117,10 @@ function getPoolDataCalls(_a) {
         address: extraPoolAddress,
         interface: types_1.IBaseRewardPool__factory.createInterface(),
         method: "rewardRate()",
+    }); }), true), extraPoolAddresses.map(function (extraPoolAddress) { return ({
+        address: extraPoolAddress,
+        interface: types_1.IBaseRewardPool__factory.createInterface(),
+        method: "periodFinish()",
     }); }), true);
     return calls;
 }
@@ -125,11 +138,15 @@ function getCVXMintAmount(crvAmount, cvxSupply) {
     return ethers_1.BigNumber.from(0);
 }
 exports.getCVXMintAmount = getCVXMintAmount;
+function getTimestampInSeconds() {
+    return Math.floor(Date.now() / 1000);
+}
 var CURRENCY_LIST = {
     stkcvxsteCRV: "WETH",
 };
 function calculateConvexAPY(_a) {
-    var basePoolRate = _a.basePoolRate, basePoolSupply = _a.basePoolSupply, vPrice = _a.vPrice, cvxSupply = _a.cvxSupply, extra = _a.extra, extraPoolAddresses = _a.extraPoolAddresses, poolParams = _a.poolParams, underlying = _a.underlying, getTokenPrice = _a.getTokenPrice, curveAPY = _a.curveAPY, tokenList = _a.tokenList;
+    var baseRewardsFinish = _a.baseRewardsFinish, basePoolRate = _a.basePoolRate, basePoolSupply = _a.basePoolSupply, vPrice = _a.vPrice, cvxSupply = _a.cvxSupply, extra = _a.extra, extraRewardsFinish = _a.extraRewardsFinish, extraPoolAddresses = _a.extraPoolAddresses, poolParams = _a.poolParams, underlying = _a.underlying, getTokenPrice = _a.getTokenPrice, curveAPY = _a.curveAPY, tokenList = _a.tokenList;
+    var currentTimestamp = getTimestampInSeconds();
     var currencySymbol = CURRENCY_LIST[poolParams.stakedToken];
     var currency = currencySymbol && tokenList[currencySymbol || ""];
     var cvxPrice = getTokenPrice(tokenList.CVX, currency);
@@ -139,16 +156,23 @@ function calculateConvexAPY(_a) {
     var crvPerUnderlying = crvPerSecond.mul(constants_1.WAD).div(virtualSupply);
     var crvPerYear = crvPerUnderlying.mul(constants_1.SECONDS_PER_YEAR);
     var cvxPerYear = getCVXMintAmount(crvPerYear, cvxSupply);
-    var crvAPY = crvPerYear.mul(crvPrice).div(constants_1.PRICE_DECIMALS);
-    var cvxAPY = cvxPerYear.mul(cvxPrice).div(constants_1.PRICE_DECIMALS);
+    var baseFinished = baseRewardsFinish.lte(currentTimestamp);
+    var crvAPY = baseFinished
+        ? ethers_1.BigNumber.from(0)
+        : crvPerYear.mul(crvPrice).div(constants_1.PRICE_DECIMALS);
+    var cvxAPY = baseFinished
+        ? ethers_1.BigNumber.from(0)
+        : cvxPerYear.mul(cvxPrice).div(constants_1.PRICE_DECIMALS);
     var extraAPRs = extraPoolAddresses.map(function (_, index) {
         var extraRewardSymbol = poolParams.extraRewards[index].rewardToken;
         var extraPoolRate = extra[index];
+        var extraFinished = extraRewardsFinish[index];
         var perUnderlying = extraPoolRate.mul(constants_1.WAD).div(virtualSupply);
         var perYear = perUnderlying.mul(constants_1.SECONDS_PER_YEAR);
         var extraPrice = getTokenPrice(tokenList[extraRewardSymbol], currency);
         var extraAPY = perYear.mul(extraPrice).div(constants_1.PRICE_DECIMALS);
-        return extraAPY;
+        var finished = extraFinished.lte(currentTimestamp);
+        return finished ? ethers_1.BigNumber.from(0) : extraAPY;
     });
     var extraAPYTotal = extraAPRs.reduce(function (acc, apy) { return acc.add(apy); }, ethers_1.BigNumber.from(0));
     var baseApyWAD = curveAPY[underlying].base;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "1.20.14",
+  "version": "1.20.15",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",