@gearbox-protocol/sdk 3.0.0-next.178 → 3.0.0-next.179

package/lib/apy/auraAbi.d.ts

@@ -1,4 +1,4 @@
-import { Interface } from "ethers/lib/utils";
+import { Interface } from "ethers";
 export declare const AURA_BOOSTER_ABI: {
     inputs: {
         internalType: string;

package/lib/apy/auraAbi.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AURA_BOOSTER_INTERFACE = exports.AURA_BOOSTER_ABI = void 0;
-const utils_1 = require("ethers/lib/utils");
+const ethers_1 = require("ethers");
 exports.AURA_BOOSTER_ABI = [
     {
         inputs: [
@@ -23,4 +23,4 @@ exports.AURA_BOOSTER_ABI = [
         type: "function",
     },
 ];
-exports.AURA_BOOSTER_INTERFACE = new utils_1.Interface(exports.AURA_BOOSTER_ABI);
+exports.AURA_BOOSTER_INTERFACE = new ethers_1.Interface(exports.AURA_BOOSTER_ABI);

package/lib/apy/convexAPY.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCVXMintAmount = exports.getConvexAPYBulkCalls = exports.getConvexAPYBulk = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const token_1 = require("@gearbox-protocol/sdk-gov/lib/tokens/token");
-const utils_1 = require("ethers/lib/utils");
+const ethers_1 = require("ethers");
 const types_1 = require("../types");
 const V2_POOLS = { 20: true };
 function getConvexAPYBulk(props) {
@@ -119,7 +119,7 @@ function getPoolDataCalls(props) {
             ? [
                 {
                     address: props.crvPoolAddress,
-                    interface: new utils_1.Interface([
+                    interface: new ethers_1.Interface([
                         "function lp_price() view returns (uint256)",
                     ]),
                     method: "lp_price()",

package/lib/core/creditAccount.js

@@ -49,42 +49,38 @@ class CreditAccountData {
         this.creditManager = payload.creditManager.toLowerCase();
         this.creditFacade = payload.creditFacade.toLowerCase();
         this.underlyingToken = payload.underlying.toLowerCase();
-        this.since = Number((0, sdk_gov_1.toBigInt)(payload.since));
-        this.expirationDate = Number((0, sdk_gov_1.toBigInt)(payload.expirationDate));
-        this.version = payload.cfVersion?.toNumber();
+        this.since = Number(payload.since);
+        this.expirationDate = Number(payload.expirationDate);
+        this.version = Number(payload.cfVersion);
         this.cmName = payload.cmName;
-        this.healthFactor = Number((0, sdk_gov_1.toBigInt)(payload.healthFactor || 0n));
-        this.enabledTokenMask = (0, sdk_gov_1.toBigInt)(payload.enabledTokensMask);
+        this.healthFactor = Number(payload.healthFactor || 0n);
+        this.enabledTokenMask = payload.enabledTokensMask;
         this.isDeleting = false;
-        this.borrowedAmount = (0, sdk_gov_1.toBigInt)(payload.debt);
-        this.accruedInterest = (0, sdk_gov_1.toBigInt)(payload.accruedInterest || 0n);
-        this.accruedFees = (0, sdk_gov_1.toBigInt)(payload.accruedFees || 0n);
+        this.borrowedAmount = payload.debt;
+        this.accruedInterest = payload.accruedInterest || 0n;
+        this.accruedFees = payload.accruedFees || 0n;
         this.borrowedAmountPlusInterestAndFees =
             this.borrowedAmount + this.accruedInterest + this.accruedFees;
-        this.totalDebtUSD = (0, sdk_gov_1.toBigInt)(payload.totalDebtUSD);
-        this.totalValue = (0, sdk_gov_1.toBigInt)(payload.totalValue || 0n);
-        this.totalValueUSD = (0, sdk_gov_1.toBigInt)(payload.totalValueUSD);
-        this.twvUSD = (0, sdk_gov_1.toBigInt)(payload.twvUSD);
-        this.baseBorrowRateWithoutFee = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.baseBorrowRate) *
-            sdk_gov_1.PERCENTAGE_DECIMALS *
-            sdk_gov_1.PERCENTAGE_FACTOR);
-        this.borrowRateWithoutFee = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.aggregatedBorrowRate) *
-            sdk_gov_1.PERCENTAGE_DECIMALS *
-            sdk_gov_1.PERCENTAGE_FACTOR);
-        this.cumulativeIndexLastUpdate = (0, sdk_gov_1.toBigInt)(payload.cumulativeIndexLastUpdate);
-        this.cumulativeQuotaInterest = (0, sdk_gov_1.toBigInt)(payload.cumulativeQuotaInterest);
+        this.totalDebtUSD = payload.totalDebtUSD;
+        this.totalValue = payload.totalValue || 0n;
+        this.totalValueUSD = payload.totalValueUSD;
+        this.twvUSD = payload.twvUSD;
+        this.baseBorrowRateWithoutFee = (0, formatter_1.rayToNumber)(payload.baseBorrowRate * sdk_gov_1.PERCENTAGE_DECIMALS * sdk_gov_1.PERCENTAGE_FACTOR);
+        this.borrowRateWithoutFee = (0, formatter_1.rayToNumber)(payload.aggregatedBorrowRate * sdk_gov_1.PERCENTAGE_DECIMALS * sdk_gov_1.PERCENTAGE_FACTOR);
+        this.cumulativeIndexLastUpdate = payload.cumulativeIndexLastUpdate;
+        this.cumulativeQuotaInterest = payload.cumulativeQuotaInterest;
         this.activeBots = Object.fromEntries(payload.activeBots.map(b => [b.toLowerCase(), true]));
         payload.balances.forEach(b => {
             const token = b.token.toLowerCase();
             const balance = {
                 token,
-                balance: (0, sdk_gov_1.toBigInt)(b.balance),
+                balance: b.balance,
                 isForbidden: b.isForbidden,
                 isEnabled: b.isEnabled,
                 isQuoted: b.isQuoted,
-                quota: (0, sdk_gov_1.toBigInt)(b.quota),
-                quotaRate: Number((0, sdk_gov_1.toBigInt)(b.quotaRate) * sdk_gov_1.PERCENTAGE_DECIMALS),
-                quotaCumulativeIndexLU: (0, sdk_gov_1.toBigInt)(b.quotaCumulativeIndexLU),
+                quota: b.quota,
+                quotaRate: b.quotaRate * sdk_gov_1.PERCENTAGE_DECIMALS,
+                quotaCumulativeIndexLU: b.quotaCumulativeIndexLU,
             };
             if (!b.isForbidden) {
                 this.balances[token] = balance.balance;
@@ -178,11 +174,11 @@ class CreditAccountData {
             const tokenDecimals = sdk_gov_1.decimals[symbol];
             const money = price_1.PriceUtils.calcTotalPrice(price, amount, tokenDecimals);
             const apyMoney = money * BigInt(apy);
-            const { rate: quotaAPY = 0, isActive = false } = quotaRates?.[tokenAddressLC] || {};
+            const { rate: quotaAPY = 0n, isActive = false } = quotaRates?.[tokenAddressLC] || {};
             const { balance: quotaBalance = 0n } = quotas[tokenAddressLC] || {};
             const quotaAmount = isActive ? quotaBalance : 0n;
             const quotaMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice || 0n, quotaAmount, underlyingTokenDecimals);
-            const quotaRate = ((0, sdk_gov_1.toBigInt)(quotaAPY) * (BigInt(feeInterest) + sdk_gov_1.PERCENTAGE_FACTOR)) /
+            const quotaRate = (quotaAPY * (BigInt(feeInterest) + sdk_gov_1.PERCENTAGE_FACTOR)) /
                 sdk_gov_1.PERCENTAGE_FACTOR;
             const quotaAPYMoney = quotaMoney * quotaRate;
             return acc + apyMoney - quotaAPYMoney;

package/lib/core/creditAccount.spec.js

@@ -35,7 +35,7 @@ const caWithoutLP = {
     },
     rates: {
         [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: {
-            rate: 38434,
+            rate: 38434n,
             isActive: true,
         },
     },
@@ -63,7 +63,7 @@ const caWithLP = {
     },
     rates: {
         [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH.toLowerCase()]: {
-            rate: 38434,
+            rate: 38434n,
             isActive: true,
         },
     },
@@ -1305,15 +1305,15 @@ describe("CreditAccount calcAvgQuotaBorrowRate test", () => {
             },
             quotaRates: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                    rate: 5,
+                    rate: 5n,
                     isActive: true,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                    rate: 10,
+                    rate: 10n,
                     isActive: true,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                    rate: 15,
+                    rate: 15n,
                     isActive: true,
                 },
             },
@@ -1338,15 +1338,15 @@ describe("CreditAccount calcAvgQuotaBorrowRate test", () => {
             },
             quotaRates: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                    rate: 10,
+                    rate: 10n,
                     isActive: true,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                    rate: 10,
+                    rate: 10n,
                     isActive: true,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                    rate: 10,
+                    rate: 10n,
                     isActive: true,
                 },
             },
@@ -1371,15 +1371,15 @@ describe("CreditAccount calcAvgQuotaBorrowRate test", () => {
             },
             quotaRates: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                    rate: 10,
+                    rate: 10n,
                     isActive: true,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH]: {
-                    rate: 10,
+                    rate: 10n,
                     isActive: false,
                 },
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH]: {
-                    rate: 10,
+                    rate: 10n,
                     isActive: true,
                 },
             },
@@ -1398,7 +1398,7 @@ describe("CreditAccount calcQuotaBorrowRate test", () => {
             },
             quotaRates: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                    rate: 5,
+                    rate: 5n,
                     isActive: true,
                 },
             },
@@ -1415,7 +1415,7 @@ describe("CreditAccount calcQuotaBorrowRate test", () => {
             },
             quotaRates: {
                 [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI]: {
-                    rate: 5,
+                    rate: 5n,
                     isActive: true,
                 },
             },

package/lib/core/creditManager.js

@@ -48,24 +48,24 @@ class CreditManagerData {
         this.creditConfigurator = payload.creditConfigurator.toLowerCase();
         this.degenNFT = payload.degenNFT.toLowerCase();
         this.isDegenMode = payload.isDegenMode;
-        this.version = payload.cfVersion?.toNumber();
+        this.version = Number(payload.cfVersion);
         this.isPaused = payload.isPaused;
-        this.forbiddenTokenMask = (0, sdk_gov_1.toBigInt)(payload.forbiddenTokenMask);
-        this.maxEnabledTokensLength = payload.maxEnabledTokensLength;
-        this.baseBorrowRate = Number(((0, sdk_gov_1.toBigInt)(payload.baseBorrowRate) *
-            ((0, sdk_gov_1.toBigInt)(payload.feeInterest) + sdk_gov_1.PERCENTAGE_FACTOR) *
+        this.forbiddenTokenMask = payload.forbiddenTokenMask;
+        this.maxEnabledTokensLength = Number(payload.maxEnabledTokensLength);
+        this.baseBorrowRate = Number((payload.baseBorrowRate *
+            (payload.feeInterest + sdk_gov_1.PERCENTAGE_FACTOR) *
             sdk_gov_1.PERCENTAGE_DECIMALS) /
             sdk_gov_1.RAY);
-        this.minDebt = (0, sdk_gov_1.toBigInt)(payload.minDebt);
-        this.maxDebt = (0, sdk_gov_1.toBigInt)(payload.maxDebt);
-        this.availableToBorrow = (0, sdk_gov_1.toBigInt)(payload.availableToBorrow);
-        this.totalDebt = (0, sdk_gov_1.toBigInt)(payload.totalDebt);
-        this.totalDebtLimit = (0, sdk_gov_1.toBigInt)(payload.totalDebtLimit);
-        this.feeInterest = payload.feeInterest;
-        this.feeLiquidation = payload.feeLiquidation;
-        this.liquidationDiscount = payload.liquidationDiscount;
-        this.feeLiquidationExpired = payload.feeLiquidationExpired;
-        this.liquidationDiscountExpired = payload.liquidationDiscountExpired;
+        this.minDebt = payload.minDebt;
+        this.maxDebt = payload.maxDebt;
+        this.availableToBorrow = payload.availableToBorrow;
+        this.totalDebt = payload.totalDebt;
+        this.totalDebtLimit = payload.totalDebtLimit;
+        this.feeInterest = Number(payload.feeInterest);
+        this.feeLiquidation = Number(payload.feeLiquidation);
+        this.liquidationDiscount = Number(payload.liquidationDiscount);
+        this.feeLiquidationExpired = Number(payload.feeLiquidationExpired);
+        this.liquidationDiscountExpired = Number(payload.liquidationDiscountExpired);
         payload.collateralTokens.forEach(t => {
             const tLc = t.toLowerCase();
             this.collateralTokens.push(tLc);
@@ -82,17 +82,17 @@ class CreditManagerData {
         this.liquidationThresholds = payload.liquidationThresholds.reduce((acc, threshold, index) => {
             const address = payload.collateralTokens[index];
             if (address)
-                acc[address.toLowerCase()] = (0, sdk_gov_1.toBigInt)(threshold);
+                acc[address.toLowerCase()] = threshold;
             return acc;
         }, {});
         this.quotas = Object.fromEntries(payload.quotas.map(q => [
             q.token.toLowerCase(),
             {
                 token: q.token.toLowerCase(),
-                rate: Number((0, sdk_gov_1.toBigInt)(q.rate) * sdk_gov_1.PERCENTAGE_DECIMALS),
+                rate: q.rate * sdk_gov_1.PERCENTAGE_DECIMALS,
                 quotaIncreaseFee: q.quotaIncreaseFee,
-                totalQuoted: (0, sdk_gov_1.toBigInt)(q.totalQuoted),
-                limit: (0, sdk_gov_1.toBigInt)(q.limit),
+                totalQuoted: q.totalQuoted,
+                limit: q.limit,
                 isActive: q.isActive,
             },
         ]));
@@ -104,7 +104,7 @@ class CreditManagerData {
             R_slope1: payload.lirm.R_slope1,
             R_slope2: payload.lirm.R_slope2,
             R_slope3: payload.lirm.R_slope3,
-            version: payload?.lirm?.version?.toNumber(),
+            version: Number(payload?.lirm?.version),
             isBorrowingMoreU2Forbidden: payload?.lirm?.isBorrowingMoreU2Forbidden,
         };
         txParser_1.TxParser.addCreditManager(this.address, this.version);

package/lib/core/gauge.d.ts

@@ -5,7 +5,7 @@ export declare class GaugeData {
     readonly poolUnderlying: string;
     readonly name: string;
     readonly symbol: string;
-    readonly currentEpoch: number;
+    readonly currentEpoch: bigint;
     readonly epochFrozen: boolean;
     readonly quotaParams: Record<string, GaugeQuotaParams>;
     constructor(payload: GaugeDataPayload);
@@ -17,7 +17,7 @@ interface WithDrawableGaugeItem {
 export declare class GaugeStakingData {
     readonly availableBalance: bigint;
     readonly totalBalance: bigint;
-    readonly epoch: number;
+    readonly epoch: bigint;
     readonly withdrawableNow: bigint;
     readonly withdrawableInEpochsTotal: bigint;
     readonly withdrawableInEpochs: Array<WithDrawableGaugeItem>;

package/lib/core/gauge.js

@@ -24,16 +24,16 @@ class GaugeData {
             {
                 token: q.token.toLowerCase(),
                 isActive: q.isActive,
-                rate: Number((0, sdk_gov_1.toBigInt)(q.rate) * sdk_gov_1.PERCENTAGE_DECIMALS),
-                minRate: Number((0, sdk_gov_1.toBigInt)(q.minRate) * sdk_gov_1.PERCENTAGE_DECIMALS),
-                maxRate: Number((0, sdk_gov_1.toBigInt)(q.maxRate) * sdk_gov_1.PERCENTAGE_DECIMALS),
+                rate: q.rate * sdk_gov_1.PERCENTAGE_DECIMALS,
+                minRate: q.minRate * sdk_gov_1.PERCENTAGE_DECIMALS,
+                maxRate: q.maxRate * sdk_gov_1.PERCENTAGE_DECIMALS,
                 quotaIncreaseFee: q.quotaIncreaseFee,
-                totalQuoted: (0, sdk_gov_1.toBigInt)(q.totalQuoted),
-                limit: (0, sdk_gov_1.toBigInt)(q.limit),
-                totalVotesLpSide: (0, sdk_gov_1.toBigInt)(q.totalVotesLpSide),
-                totalVotesCaSide: (0, sdk_gov_1.toBigInt)(q.totalVotesCaSide),
-                stakerVotesLpSide: (0, sdk_gov_1.toBigInt)(q.stakerVotesLpSide),
-                stakerVotesCaSide: (0, sdk_gov_1.toBigInt)(q.stakerVotesCaSide),
+                totalQuoted: q.totalQuoted,
+                limit: q.limit,
+                totalVotesLpSide: q.totalVotesLpSide,
+                totalVotesCaSide: q.totalVotesCaSide,
+                stakerVotesLpSide: q.stakerVotesLpSide,
+                stakerVotesCaSide: q.stakerVotesCaSide,
             },
         ]));
     }
@@ -47,12 +47,12 @@ class GaugeStakingData {
     withdrawableInEpochsTotal;
     withdrawableInEpochs;
     constructor(payload) {
-        this.availableBalance = (0, sdk_gov_1.toBigInt)(payload.availableBalance);
-        this.totalBalance = (0, sdk_gov_1.toBigInt)(payload.totalBalance);
+        this.availableBalance = payload.availableBalance;
+        this.totalBalance = payload.totalBalance;
         this.epoch = payload.epoch;
-        this.withdrawableNow = (0, sdk_gov_1.toBigInt)(payload.withdrawableAmounts.withdrawableNow);
+        this.withdrawableNow = payload.withdrawableAmounts.withdrawableNow;
         const { total, list } = payload.withdrawableAmounts.withdrawableInEpochs.reduce(({ total, list }, a, i) => {
-            const bn = (0, sdk_gov_1.toBigInt)(a);
+            const bn = a;
             list.push({ amount: bn, epochsLeft: i + 1 });
             return { total: total + bn, list };
         }, { total: 0n, list: [] });

package/lib/core/gaugeMath.d.ts

@@ -35,6 +35,6 @@ export declare class GaugeMath {
     private static removeVotes;
     static revertVote({ balanceAfter, initialVote, nextVoteType, voteAfter, }: UnvoteProps): bigint | undefined;
     static getBaseVote: (v: GaugeQuotaParams) => BaseVote | undefined;
-    static getGaugeApy({ quota, voteAfter, vote }: GetGaugeApyProps): number | null;
+    static getGaugeApy({ quota, voteAfter, vote }: GetGaugeApyProps): number | bigint | null;
 }
 export {};

package/lib/core/gaugeMath.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GaugeMath = void 0;
-const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const math_1 = require("../utils/math");
 class GaugeMath {
     static vote({ change, ...rest }) {
@@ -89,10 +88,8 @@ class GaugeMath {
         const removeLpPart = isRemove && vote?.type === "raise" ? first?.amount || 0n : 0n;
         const caPart = last?.type === "lower" ? last?.amount || 0n : 0n;
         const lpPart = last?.type === "raise" ? last?.amount || 0n : 0n;
-        const caImpact = (0, sdk_gov_1.toBigInt)(quota.minRate) *
-            (quota.totalVotesCaSide + caPart - removeCaPart);
-        const lpImpact = (0, sdk_gov_1.toBigInt)(quota.maxRate) *
-            (quota.totalVotesLpSide + lpPart - removeLpPart);
+        const caImpact = quota.minRate * (quota.totalVotesCaSide + caPart - removeCaPart);
+        const lpImpact = quota.maxRate * (quota.totalVotesLpSide + lpPart - removeLpPart);
         const total = quota.totalVotesCaSide +
             quota.totalVotesLpSide +
             caPart +

package/lib/core/gaugeMath.spec.js

@@ -281,13 +281,13 @@ describe("GaugeMath getGaugeApy() test", () => {
             totalVotesLpSide: 0n,
             stakerVotesCaSide: 0n,
             stakerVotesLpSide: 0n,
-            minRate: 12,
-            maxRate: 12345,
+            minRate: 12n,
+            maxRate: 12345n,
         };
         const r = gaugeMath_1.GaugeMath.getGaugeApy({
             quota,
         });
-        (0, chai_1.expect)(r).to.be.eql(12);
+        (0, chai_1.expect)(r).to.be.eql(12n);
     });
     it("should calculate quota without votes", () => {
         const quota = {
@@ -295,8 +295,8 @@ describe("GaugeMath getGaugeApy() test", () => {
             totalVotesLpSide: 100n,
             stakerVotesCaSide: 10n,
             stakerVotesLpSide: 0n,
-            minRate: 0,
-            maxRate: 10000,
+            minRate: 0n,
+            maxRate: 10000n,
         };
         const r = gaugeMath_1.GaugeMath.getGaugeApy({
             quota,
@@ -309,8 +309,8 @@ describe("GaugeMath getGaugeApy() test", () => {
             totalVotesLpSide: 100n,
             stakerVotesCaSide: 10n,
             stakerVotesLpSide: 0n,
-            minRate: 0,
-            maxRate: 10000,
+            minRate: 0n,
+            maxRate: 10000n,
         };
         const vote = { amount: 10n, type: "lower" };
         const r = gaugeMath_1.GaugeMath.getGaugeApy({
@@ -325,8 +325,8 @@ describe("GaugeMath getGaugeApy() test", () => {
             totalVotesLpSide: 100n,
             stakerVotesCaSide: 10n,
             stakerVotesLpSide: 0n,
-            minRate: 0,
-            maxRate: 10000,
+            minRate: 0n,
+            maxRate: 10000n,
         };
         const vote = { amount: 10n, type: "lower" };
         const voteAfter = {
@@ -346,8 +346,8 @@ describe("GaugeMath getGaugeApy() test", () => {
             totalVotesLpSide: 100n,
             stakerVotesCaSide: 20n,
             stakerVotesLpSide: 0n,
-            minRate: 0,
-            maxRate: 10000,
+            minRate: 0n,
+            maxRate: 10000n,
         };
         const vote = { amount: 30n, type: "lower" };
         const voteAfter = {
@@ -370,8 +370,8 @@ describe("GaugeMath getGaugeApy() test", () => {
             totalVotesLpSide: 100n,
             stakerVotesCaSide: 20n,
             stakerVotesLpSide: 0n,
-            minRate: 0,
-            maxRate: 10000,
+            minRate: 0n,
+            maxRate: 10000n,
         };
         const vote = { amount: 20n, type: "lower" };
         const voteAfter = {

package/lib/core/pool.d.ts

@@ -1,6 +1,6 @@
-import { providers, Signer } from "ethers";
+import { Provider, Signer } from "ethers";
 import { CreditManagerDebtParamsSDK, QuotaInfo } from "../payload/creditManager";
-import { ChartsPoolDataPayload, LinearModel, PoolDataPayload, PoolZapper, UserPoolPayload } from "../payload/pool";
+import { ChartsPoolDataPayload, LinearModel, PoolDataExtraPayload, PoolDataPayload, PoolZapper, UserPoolPayload } from "../payload/pool";
 import { IPoolService, IPoolV3 } from "../types";
 export type PoolType = "universal" | "trade" | "farm";
 export declare class PoolData {
@@ -35,15 +35,15 @@ export declare class PoolData {
     readonly dieselRateRay: bigint;
     readonly withdrawFee: number;
     readonly lastBaseInterestUpdate: bigint;
-    constructor(payload: PoolDataPayload);
+    constructor(payload: PoolDataPayload, extra: PoolDataExtraPayload);
     getPoolContractV1(signer: Signer): IPoolService;
     getPoolContractV3(signer: Signer): IPoolV3;
-    calculateBorrowRate({ provider, expectedLiquidity, availableLiquidity, }: CalculateBorrowRateProps): Promise<import("ethers").BigNumber>;
+    calculateBorrowRate({ provider, expectedLiquidity, availableLiquidity, }: CalculateBorrowRateProps): Promise<bigint>;
     static getPoolType(name: string): PoolType;
     static calculateUtilization(expected: bigint, available: bigint): number;
 }
 interface CalculateBorrowRateProps {
-    provider: providers.Provider;
+    provider: Provider;
     expectedLiquidity: bigint;
     availableLiquidity: bigint;
 }

package/lib/core/pool.js

@@ -37,37 +37,37 @@ class PoolData {
     dieselRateRay;
     withdrawFee;
     lastBaseInterestUpdate;
-    constructor(payload) {
+    constructor(payload, extra) {
         this.address = payload.addr.toLowerCase();
         this.type = PoolData.getPoolType(payload.name || "");
         this.underlyingToken = payload.underlying.toLowerCase();
         this.dieselToken = payload.dieselToken.toLowerCase();
-        this.stakedDieselToken = (payload.stakedDieselToken || []).map(t => t.toLowerCase());
+        this.stakedDieselToken = (extra.stakedDieselToken || []).map(t => t.toLowerCase());
         this.isPaused = payload.isPaused;
-        this.version = payload.version.toNumber();
+        this.version = Number(payload.version);
         this.poolQuotaKeeper = payload.poolQuotaKeeper.toLowerCase();
         this.gauge = payload.gauge.toLowerCase();
         this.name = payload.name;
         this.symbol = payload.symbol;
-        const expected = (0, sdk_gov_1.toBigInt)(payload.expectedLiquidity);
-        const available = (0, sdk_gov_1.toBigInt)(payload.availableLiquidity);
+        const expected = payload.expectedLiquidity;
+        const available = payload.availableLiquidity;
         this.expectedLiquidity = expected;
         this.availableLiquidity = available;
         this.expectedLiquidityLimit =
             this.expectedLiquidity + this.availableLiquidity;
-        this.baseInterestIndex = (0, sdk_gov_1.toBigInt)(payload.baseInterestIndex);
+        this.baseInterestIndex = payload.baseInterestIndex;
         this.utilization = PoolData.calculateUtilization(expected, available);
-        this.totalBorrowed = (0, sdk_gov_1.toBigInt)(payload.totalBorrowed);
-        this.totalDebtLimit = (0, sdk_gov_1.toBigInt)(payload.totalDebtLimit);
+        this.totalBorrowed = payload.totalBorrowed;
+        this.totalDebtLimit = payload.totalDebtLimit;
         this.creditManagerDebtParams = Object.fromEntries(payload.creditManagerDebtParams.map(p => {
             const creditManager = p.creditManager.toLowerCase();
             return [
                 creditManager,
                 {
                     creditManager,
-                    borrowed: (0, sdk_gov_1.toBigInt)(p.borrowed),
-                    limit: (0, sdk_gov_1.toBigInt)(p.limit),
-                    availableToBorrow: (0, sdk_gov_1.toBigInt)(p.availableToBorrow),
+                    borrowed: p.borrowed,
+                    limit: p.limit,
+                    availableToBorrow: p.availableToBorrow,
                 },
             ];
         }));
@@ -77,10 +77,10 @@ class PoolData {
                 token,
                 {
                     token,
-                    rate: Number((0, sdk_gov_1.toBigInt)(q.rate) * sdk_gov_1.PERCENTAGE_DECIMALS),
+                    rate: q.rate * sdk_gov_1.PERCENTAGE_DECIMALS,
                     quotaIncreaseFee: q.quotaIncreaseFee,
-                    totalQuoted: (0, sdk_gov_1.toBigInt)(q.totalQuoted),
-                    limit: (0, sdk_gov_1.toBigInt)(q.limit),
+                    totalQuoted: q.totalQuoted,
+                    limit: q.limit,
                     isActive: q.isActive,
                 },
             ];
@@ -97,11 +97,11 @@ class PoolData {
                 },
             };
         }, {});
-        this.totalAssets = (0, sdk_gov_1.toBigInt)(payload.totalAssets);
-        this.totalSupply = (0, sdk_gov_1.toBigInt)(payload.totalSupply);
-        this.depositAPY = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.supplyRate) * sdk_gov_1.PERCENTAGE_DECIMALS);
-        this.borrowAPY = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.baseInterestRate) * sdk_gov_1.PERCENTAGE_DECIMALS);
-        this.supplyAPY7D = payload.supplyAPY7D;
+        this.totalAssets = payload.totalAssets;
+        this.totalSupply = payload.totalSupply;
+        this.depositAPY = (0, formatter_1.rayToNumber)(payload.supplyRate * sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.borrowAPY = (0, formatter_1.rayToNumber)(payload.baseInterestRate * sdk_gov_1.PERCENTAGE_DECIMALS);
+        this.supplyAPY7D = extra.supplyAPY7D;
         this.interestModel = {
             interestModel: payload.lirm.interestModel.toLowerCase(),
             U_1: payload.lirm.U_1,
@@ -110,14 +110,14 @@ class PoolData {
             R_slope1: payload.lirm.R_slope1,
             R_slope2: payload.lirm.R_slope2,
             R_slope3: payload.lirm.R_slope3,
-            version: payload?.lirm?.version?.toNumber(),
+            version: Number(payload?.lirm?.version),
             isBorrowingMoreU2Forbidden: payload?.lirm?.isBorrowingMoreU2Forbidden,
         };
         this.dieselRate = (0, formatter_1.rayToNumber)(payload.dieselRate_RAY);
-        this.dieselRateRay = (0, sdk_gov_1.toBigInt)(payload.dieselRate_RAY);
-        this.lastBaseInterestUpdate = (0, sdk_gov_1.toBigInt)(payload.lastBaseInterestUpdate);
+        this.dieselRateRay = payload.dieselRate_RAY;
+        this.lastBaseInterestUpdate = payload.lastBaseInterestUpdate;
         this.withdrawFee =
-            Number((0, sdk_gov_1.toBigInt)(payload.withdrawFee)) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
+            Number(payload.withdrawFee) / Number(sdk_gov_1.PERCENTAGE_DECIMALS);
     }
     getPoolContractV1(signer) {
         return types_1.IPoolService__factory.connect(this.address, signer);

package/lib/core/rewardClaimer.d.ts

@@ -1,5 +1,5 @@
 import { NetworkType, PartialRecord, Protocols, SupportedContract, SupportedToken } from "@gearbox-protocol/sdk-gov";
-import { providers } from "ethers";
+import { Provider } from "ethers";
 import { MultiCall } from "../pathfinder/core";
 import { CreditAccountData } from "./creditAccount";
 import { CreditManagerData } from "./creditManager";
@@ -16,5 +16,5 @@ export interface AdapterWithType {
     contract: SupportedContract;
 }
 export declare class RewardClaimer {
-    static findRewards(ca: CreditAccountData, cm: CreditManagerData, network: NetworkType, provider: providers.Provider): Promise<Array<Rewards>>;
+    static findRewards(ca: CreditAccountData, cm: CreditManagerData, network: NetworkType, provider: Provider): Promise<Array<Rewards>>;
 }

package/lib/core/rewardConvex.d.ts

@@ -1,6 +1,5 @@
 import { MCall, NetworkType, Protocols, SupportedToken } from "@gearbox-protocol/sdk-gov";
-import { BigNumber, providers } from "ethers";
-import { Interface } from "ethers/lib/utils";
+import { Interface, Provider } from "ethers";
 import { IBaseRewardPoolInterface } from "../types/IBaseRewardPool";
 import { IConvexTokenInterface } from "../types/IConvexToken";
 import { CreditAccountData } from "./creditAccount";
@@ -16,16 +15,16 @@ export interface RewardDistribution {
     contractAddress: string;
 }
 interface ParseProps {
-    convexResponse: Array<BigNumber>;
+    convexResponse: Array<bigint>;
     convexDistribution: DistributionList;
     convexTotalSupply: bigint;
-    auraResponse: Array<BigNumber>;
+    auraResponse: Array<bigint>;
     auraDistribution: DistributionList;
     auraTotalSupply: bigint;
 }
 export declare class RewardConvex {
     static poolInterface: IBaseRewardPoolInterface;
-    static findRewards(ca: CreditAccountData, cm: CreditManagerData, network: NetworkType, provider: providers.Provider): Promise<Array<Rewards>>;
+    static findRewards(ca: CreditAccountData, cm: CreditManagerData, network: NetworkType, provider: Provider): Promise<Array<Rewards>>;
     static findAdapters(cm: CreditManagerData): AdapterWithType[];
     static prepareMultiCalls(creditAccount: string, cm: CreditManagerData, network: NetworkType): {
         convexDistribution: DistributionList;
@@ -34,7 +33,7 @@ export declare class RewardConvex {
         auraCalls: CallsList;
     } | undefined;
     static parseResults({ convexDistribution, convexResponse, convexTotalSupply, auraDistribution, auraResponse, auraTotalSupply, }: ParseProps): Array<Rewards>;
-    static getRewardObject(baseReward: bigint, baseDistribution: RewardDistribution, boostedRewardToken: SupportedToken, extraDistribution: Array<RewardDistribution>, rewardsResp: Array<BigNumber>, totalSupply: bigint, callData: string, multiplier: bigint): Rewards | undefined;
+    static getRewardObject(baseReward: bigint, baseDistribution: RewardDistribution, boostedRewardToken: SupportedToken, extraDistribution: Array<RewardDistribution>, rewardsResp: Array<bigint>, totalSupply: bigint, callData: string, multiplier: bigint): Rewards | undefined;
     static getBaseRewardToken(protocol: Protocols): SupportedToken | undefined;
     static getBBoostedRewardToken(protocol: Protocols): SupportedToken | undefined;
 }