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

package/lib/core/rewardConvex.js

@@ -27,10 +27,10 @@ class RewardConvex {
         const results = RewardConvex.parseResults({
             auraDistribution,
             auraResponse,
-            auraTotalSupply: (0, sdk_gov_1.toBigInt)(auraTotalSupply),
+            auraTotalSupply: auraTotalSupply,
             convexDistribution,
             convexResponse,
-            convexTotalSupply: (0, sdk_gov_1.toBigInt)(convexTotalSupply),
+            convexTotalSupply: convexTotalSupply,
         });
         return results;
     }
@@ -150,7 +150,7 @@ class RewardConvex {
                 throw new Error(`Unknown rewards protocol: ${baseDistribution.protocol}`);
             }
             // create base
-            const rewardObject = this.getRewardObject((0, sdk_gov_1.toBigInt)(baseRewardResp || 0n), baseDistribution, boostedRewardToken, extraDistribution, rewardsResp, convexTotalSupply, callData, 0n);
+            const rewardObject = this.getRewardObject(baseRewardResp || 0n, baseDistribution, boostedRewardToken, extraDistribution, rewardsResp, convexTotalSupply, callData, 0n);
             if (rewardObject)
                 rewardsRecord[baseDistribution.contract] = rewardObject;
         });
@@ -160,7 +160,7 @@ class RewardConvex {
             const end = start + list.length + 1;
             const [mp, baseRewardResp, ...rewardsResp] = auraResponse.slice(start, end);
             start = end;
-            const multiplier = (0, sdk_gov_1.toBigInt)(mp);
+            const multiplier = mp;
             const [baseDistribution, ...extraDistribution] = list;
             const boostedRewardToken = this.getBBoostedRewardToken(baseDistribution.protocol);
             if (rewardsResp.length !== extraDistribution.length ||
@@ -172,7 +172,7 @@ class RewardConvex {
                 throw new Error(`Unknown rewards protocol: ${baseDistribution.protocol}`);
             }
             // create base
-            const rewardObject = this.getRewardObject((0, sdk_gov_1.toBigInt)(baseRewardResp || 0n), baseDistribution, boostedRewardToken, extraDistribution, rewardsResp, auraTotalSupply, callData, multiplier);
+            const rewardObject = this.getRewardObject(baseRewardResp || 0n, baseDistribution, boostedRewardToken, extraDistribution, rewardsResp, auraTotalSupply, callData, multiplier);
             if (rewardObject)
                 rewardsRecord[baseDistribution.contract] = rewardObject;
         });
@@ -207,7 +207,7 @@ class RewardConvex {
         extraDistribution.forEach((distribution, j) => {
             const token = distribution.token;
             const prevReward = base.rewards[token] || 0n;
-            const reward = (0, sdk_gov_1.toBigInt)(rewardsResp[j] || 0n);
+            const reward = rewardsResp[j] || 0n;
             base.rewards = {
                 ...base.rewards,
                 [token]: prevReward + reward,

package/lib/core/rewardConvex.spec.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const chai_1 = require("chai");
-const ethers_1 = require("ethers");
 const types_1 = require("../types");
 const rewardConvex_1 = require("./rewardConvex");
 const ADAPTER_CONVEX_3CRV_POOL = sdk_gov_1.DUMB_ADDRESS;
@@ -67,7 +66,7 @@ describe("RewardConvex test", () => {
         (0, chai_1.expect)(result?.convexCalls).to.be.eql(calls);
     });
     it("parseResults parse data correctly", () => {
-        const rewards = [ethers_1.BigNumber.from(1000n)];
+        const rewards = [1000n];
         const distribution = [
             {
                 adapter: ADAPTER_CONVEX_3CRV_POOL,

package/lib/gearboxRewards/abi.d.ts

@@ -1,2 +1,2 @@
-import { Interface } from "ethers/lib/utils";
+import { Interface } from "ethers";
 export declare const MULTICALL_EXTENDED_INTERFACE: Interface;

package/lib/gearboxRewards/abi.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MULTICALL_EXTENDED_INTERFACE = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const utils_1 = require("ethers/lib/utils");
+const ethers_1 = require("ethers");
 const MULTICALL_GET_ABI = [
     ...sdk_gov_1.multicallInterface.fragments,
     {
@@ -51,4 +51,4 @@ const MULTICALL_GET_ABI = [
         type: "function",
     },
 ];
-exports.MULTICALL_EXTENDED_INTERFACE = new utils_1.Interface(MULTICALL_GET_ABI);
+exports.MULTICALL_EXTENDED_INTERFACE = new ethers_1.Interface(MULTICALL_GET_ABI);

package/lib/gearboxRewards/api.d.ts

@@ -1,7 +1,6 @@
 import { ExcludeArrayProps, NetworkType, SupportedToken } from "@gearbox-protocol/sdk-gov";
-import { ethers, providers, Signer } from "ethers";
+import { BytesLike, Provider, Signer } from "ethers";
 import { FarmAccounting } from "../types/IFarmingPool";
-import { BigintifyProps } from "../utils/types";
 export interface GearboxExtraMerkleLmReward {
     poolToken: string;
     rewardToken: string;
@@ -27,30 +26,30 @@ export interface MerkleDistributorInfo {
     claims: Record<string, {
         index: number;
         amount: string;
-        proof: Array<ethers.utils.BytesLike>;
+        proof: Array<BytesLike>;
     }>;
 }
 type FarmInfoOutput = ExcludeArrayProps<FarmAccounting.InfoStructOutput>;
-export type FarmInfo = BigintifyProps<FarmInfoOutput> & {
+export type FarmInfo = FarmInfoOutput & {
     symbol: SupportedToken;
 };
 export interface GetLmRewardsInfoProps {
     currentTokenData: Record<SupportedToken, string>;
-    provider: providers.Provider | Signer;
+    provider: Provider | Signer;
     multicallAddress: string;
 }
 export interface GetLmRewardsProps {
     baseRewardPoolsInfo: Record<string, FarmInfo>;
     currentTokenData: Record<SupportedToken, string>;
     account: string;
-    provider: providers.Provider | Signer;
+    provider: Provider | Signer;
     airdropDistributorAddress: string | undefined;
     network: NetworkType;
 }
 export interface ClaimLmRewardsV2Props {
     signer: Signer;
     account: string;
-    provider: providers.Provider;
+    provider: Provider;
     airdropDistributorAddress: string | undefined;
     network: NetworkType;
 }
@@ -74,8 +73,8 @@ export declare class GearboxRewardsApi {
         rewards: GearboxLmReward[][];
         totalAvailable: bigint;
     }>;
-    static claimLmRewardsV2({ signer, account, provider, network, airdropDistributorAddress, }: ClaimLmRewardsV2Props): Promise<ethers.ContractTransaction>;
-    static claimLmRewardsV3({ reward, signer }: ClaimLmRewardsV3Props): Promise<ethers.ContractTransaction>;
+    static claimLmRewardsV2({ signer, account, provider, network, airdropDistributorAddress, }: ClaimLmRewardsV2Props): Promise<import("ethers").TransactionResponse | import("../utils/calls").MinimalTxInfo>;
+    static claimLmRewardsV3({ reward, signer }: ClaimLmRewardsV3Props): Promise<import("ethers").TransactionResponse | import("../utils/calls").MinimalTxInfo>;
     private static getMerkle;
     private static getClaimed;
     private static getAmountOnContract;

package/lib/gearboxRewards/api.js

@@ -6,9 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GearboxRewardsApi = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const axios_1 = __importDefault(require("axios"));
-const utils_1 = require("ethers/lib/utils");
+const ethers_1 = require("ethers");
 const endpoint_1 = require("../core/endpoint");
 const types_1 = require("../types");
+const calls_1 = require("../utils/calls");
 const formatter_1 = require("../utils/formatter");
 const math_1 = require("../utils/math");
 const abi_1 = require("./abi");
@@ -30,8 +31,8 @@ const EXTRA_LM_MINING = {
             : REWARDS_SECOND_END;
         return {
             balance: 0n,
-            duration: REWARD_PERIOD,
-            finished,
+            duration: BigInt(REWARD_PERIOD),
+            finished: BigInt(finished),
             reward: reward,
             symbol: "GHO",
         };
@@ -82,8 +83,8 @@ class GearboxRewardsApi {
             const baseReward = {
                 duration: currentInfo.duration,
                 finished: currentInfo.finished,
-                reward: (0, sdk_gov_1.toBigInt)(currentInfo.reward),
-                balance: (0, sdk_gov_1.toBigInt)(currentInfo.balance),
+                reward: currentInfo.reward,
+                balance: currentInfo.balance,
                 symbol: symbol,
             };
             const extraReward = otherRewards
@@ -95,7 +96,7 @@ class GearboxRewardsApi {
         }, { base: {}, all: {} });
         const rewardPoolsSupply = Object.fromEntries(poolTokens.map(([, address], i) => [
             address,
-            (0, sdk_gov_1.toBigInt)(farmSupply[i] || 0),
+            farmSupply[i] || 0n,
         ]));
         return {
             rewardPoolsInfo: rewardPoolsInfo.all,
@@ -142,9 +143,9 @@ class GearboxRewardsApi {
                 ? axios_1.default.get(MerkleXYZApi.getRewardsUrl({
                     params: {
                         chainId: 1,
-                        user: (0, utils_1.getAddress)(account),
-                        mainParameter: (0, utils_1.getAddress)(currentTokenData.sdGHOV3),
-                        rewardToken: (0, utils_1.getAddress)(currentTokenData.GHO),
+                        user: (0, ethers_1.getAddress)(account),
+                        mainParameter: (0, ethers_1.getAddress)(currentTokenData.sdGHOV3),
+                        rewardToken: (0, ethers_1.getAddress)(currentTokenData.GHO),
                     },
                 }))
                 : undefined,
@@ -159,7 +160,7 @@ class GearboxRewardsApi {
             return {
                 poolToken: address,
                 rewardToken: currentTokenData[baseRewardPoolsInfo[address].symbol],
-                amount: (0, sdk_gov_1.toBigInt)(gearboxLm[i] || 0n),
+                amount: gearboxLm[i] || 0n,
                 type: "stakedV3",
             };
         });
@@ -205,11 +206,16 @@ class GearboxRewardsApi {
         const rewardFromMerkle = merkleData?.claims[account];
         if (!rewardFromMerkle)
             throw new Error("No rewards found");
-        return distributor.claim(rewardFromMerkle.index, account, (0, sdk_gov_1.toBigInt)(rewardFromMerkle.amount), rewardFromMerkle.proof);
+        return (0, calls_1.makeTransactionCall)(distributor.claim, [
+            rewardFromMerkle.index,
+            account,
+            rewardFromMerkle.amount,
+            rewardFromMerkle.proof,
+        ], signer);
     }
     static async claimLmRewardsV3({ reward, signer }) {
         const pool = types_1.IFarmingPool__factory.connect(reward.poolToken, signer);
-        return pool.claim();
+        return (0, calls_1.makeTransactionCall)(pool.claim, [], signer);
     }
     static async getMerkle(provider, distributorAddress, network, account) {
         const distributor = types_1.IAirdropDistributor__factory.connect(distributorAddress, provider);
@@ -221,7 +227,7 @@ class GearboxRewardsApi {
     }
     static async getClaimed({ distributor, account, }) {
         const claimedRewardsResponse = await distributor.queryFilter(distributor.filters.Claimed(account, undefined, false));
-        const claimedRewards = (claimedRewardsResponse || []).reduce((acc, r) => acc + (0, sdk_gov_1.toBigInt)(r.args.amount), 0n);
+        const claimedRewards = (claimedRewardsResponse || []).reduce((acc, r) => acc + r.args.amount, 0n);
         return claimedRewards;
     }
     static getAmountOnContract({ account, merkleData, }) {
@@ -250,4 +256,4 @@ const POOL_REWARDS_ABI = [
         type: "function",
     },
 ];
-const POOL_REWARD_INTERFACE = new utils_1.Interface(POOL_REWARDS_ABI);
+const POOL_REWARD_INTERFACE = new ethers_1.Interface(POOL_REWARDS_ABI);

package/lib/gearboxRewards/apy.js

@@ -53,11 +53,11 @@ class GearboxRewardsApy {
             return 0;
         if (supply.price === 0n || reward.price === 0n)
             return 0;
-        if (info.duration === 0)
+        if (info.duration === 0n)
             return 0;
         const supplyMoney = price_1.PriceUtils.calcTotalPrice(supply.price, supply.amount, supply.decimals);
         const rewardMoney = price_1.PriceUtils.calcTotalPrice(reward.price, info.reward, reward.decimals);
-        const durationRatio = ((0, sdk_gov_1.toBigInt)(sdk_gov_1.SECONDS_PER_YEAR) * sdk_gov_1.WAD) / (0, sdk_gov_1.toBigInt)(info.duration);
+        const durationRatio = ((0, sdk_gov_1.toBigInt)(sdk_gov_1.SECONDS_PER_YEAR) * sdk_gov_1.WAD) / info.duration;
         const apyBn = (((rewardMoney * ONE) / supplyMoney) * durationRatio) / sdk_gov_1.WAD;
         return Math.round(Number(apyBn) / 10);
     }

package/lib/gearboxRewards/extraAPY.js

@@ -52,7 +52,7 @@ const TOKENS = sdk_gov_1.TypedObjectUtils.fromEntries(sdk_gov_1.TypedObjectUtils
     return [network, r];
 }));
 const REWARD = (0, formatter_1.toBN)("7.7", sdk_gov_1.decimals.wstETH);
-const REWARD_PERIOD = 30 * 24 * 60 * 60;
+const REWARD_PERIOD = BigInt(30 * 24 * 60 * 60);
 class GearboxRewardsExtraApy {
     static async getTotalTokensOnProtocol({ currentTokenData, chainId, tokensList, network, }) {
         const currTokens = TOKENS[network];
@@ -111,7 +111,7 @@ class GearboxRewardsExtraApy {
             balance: 0n,
             duration: REWARD_PERIOD,
             // !& + STETH
-            finished: Math.floor(Date.now() / 1000) + 10000,
+            finished: BigInt(Math.floor(Date.now() / 1000) + 10000),
             reward: REWARD,
             symbol: "STETH",
         },

package/lib/index.d.ts

@@ -30,14 +30,12 @@ export * from "./payload/pool";
 export * from "./payload/token";
 export * from "./tokens/tokenData";
 export * from "./types";
+export { callRepeater } from "./utils/calls";
 export * from "./utils/errors";
 export * from "./utils/formatter";
 export * from "./utils/loading";
 export * from "./utils/math";
 export * from "./utils/price";
-export { callRepeater } from "./utils/repeater";
 export * from "./utils/types";
 export * from "./utils/validate";
-export * from "./watchers/creditAccountWatcher";
-export * from "./watchers/creditManagerWatcher";
 export * from "@gearbox-protocol/sdk-gov";

package/lib/index.js

@@ -47,15 +47,13 @@ __exportStar(require("./payload/pool"), exports);
 __exportStar(require("./payload/token"), exports);
 __exportStar(require("./tokens/tokenData"), exports);
 __exportStar(require("./types"), exports);
+var calls_1 = require("./utils/calls");
+Object.defineProperty(exports, "callRepeater", { enumerable: true, get: function () { return calls_1.callRepeater; } });
 __exportStar(require("./utils/errors"), exports);
 __exportStar(require("./utils/formatter"), exports);
 __exportStar(require("./utils/loading"), exports);
 __exportStar(require("./utils/math"), exports);
 __exportStar(require("./utils/price"), exports);
-var repeater_1 = require("./utils/repeater");
-Object.defineProperty(exports, "callRepeater", { enumerable: true, get: function () { return repeater_1.callRepeater; } });
 __exportStar(require("./utils/types"), exports);
 __exportStar(require("./utils/validate"), exports);
-__exportStar(require("./watchers/creditAccountWatcher"), exports);
-__exportStar(require("./watchers/creditManagerWatcher"), exports);
 __exportStar(require("@gearbox-protocol/sdk-gov"), exports);

package/lib/parsers/abstractParser.d.ts

@@ -1,6 +1,5 @@
-import { FunctionFragment, Result } from "@ethersproject/abi";
 import { SupportedToken, TickerToken } from "@gearbox-protocol/sdk-gov";
-import { BigNumberish, BytesLike, utils } from "ethers";
+import { BigNumberish, BytesLike, FunctionFragment, Interface, Result } from "ethers";
 interface ParseSelectorResult {
     functionFragment: FunctionFragment;
     functionName: string;
@@ -12,7 +11,7 @@ export interface ParsedObject {
 }
 export declare class AbstractParser {
     readonly contract: string;
-    protected ifc: utils.Interface;
+    protected ifc: Interface;
     adapterName: string;
     constructor(contract: string);
     parseSelector(calldata: BytesLike): ParseSelectorResult;

package/lib/parsers/abstractParser.js

@@ -12,8 +12,10 @@ class AbstractParser {
         this.adapterName = "Contract";
     }
     parseSelector(calldata) {
-        const functionFragment = this.ifc.getFunction(ethers_1.utils.hexDataSlice(calldata, 0, 4));
-        const functionName = `${this.adapterName}[${this.contract}].${functionFragment.name}`;
+        const functionFragment = this.ifc.getFunction((0, ethers_1.dataSlice)(calldata, 0, 4));
+        if (!functionFragment)
+            throw new Error("Function fragment not found");
+        const functionName = `${this.adapterName}[${this.contract}].${functionFragment?.name}`;
         return { functionFragment, functionName };
     }
     decodeFunctionData(functionFragment, data) {

package/lib/parsers/iParser.d.ts

@@ -1,4 +1,4 @@
-import { FunctionFragment } from "ethers/lib/utils";
+import { FunctionFragment } from "ethers";
 export interface IParser {
     parse: (calldata: string) => string;
     parseToObject?: (address: string, calldata: string) => {

package/lib/parsers/txParser.d.ts

@@ -16,7 +16,7 @@ export declare class TxParser {
     static parseToObject(address: string, calldata: string): {
         callObject: {
             address: string;
-            functionFragment: import("ethers/lib/utils").FunctionFragment;
+            functionFragment: import("ethers").FunctionFragment;
             args: any;
         };
         parser: IParser & AbstractParser;
@@ -26,7 +26,7 @@ export declare class TxParser {
     static parseToObjectMultiCall(calls: Array<MultiCall>): ({
         callObject: {
             address: string;
-            functionFragment: import("ethers/lib/utils").FunctionFragment;
+            functionFragment: import("ethers").FunctionFragment;
             args: any;
         };
         parser: IParser & AbstractParser;

package/lib/pathfinder/core.d.ts

@@ -1,6 +1,5 @@
 import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
 import { MultiCallStructOutput, RouterResultStructOutput, SwapTaskStruct } from "../types/IRouterV3";
-import { BigintifyProps } from "../utils/types";
 export declare enum SwapOperation {
     EXACT_INPUT = 0,
     EXACT_INPUT_ALL = 1,
@@ -8,7 +7,7 @@ export declare enum SwapOperation {
 }
 export type MultiCall = ExcludeArrayProps<MultiCallStructOutput>;
 export type SwapTask = ExcludeArrayProps<SwapTaskStruct>;
-export type PathFinderResult = Omit<BigintifyProps<ExcludeArrayProps<RouterResultStructOutput>>, "calls"> & {
+export type PathFinderResult = Omit<ExcludeArrayProps<RouterResultStructOutput>, "calls"> & {
     calls: Array<MultiCall>;
 };
 export interface PathFinderOpenStrategyResult extends PathFinderResult {

package/lib/pathfinder/index.d.ts

@@ -2,4 +2,3 @@ export * from "./core";
 export * from "./pathfinder";
 export * from "./pathOptions";
 export * from "./utils";
-export * from "./v1/pathfinderv1";

package/lib/pathfinder/index.js

@@ -18,4 +18,3 @@ __exportStar(require("./core"), exports);
 __exportStar(require("./pathfinder"), exports);
 __exportStar(require("./pathOptions"), exports);
 __exportStar(require("./utils"), exports);
-__exportStar(require("./v1/pathfinderv1"), exports);

package/lib/pathfinder/pathOptions.js

@@ -37,7 +37,7 @@ class PathOptionFactory {
         return result;
     }
     static getCurvePools(balances) {
-        const nonZeroBalances = Object.entries(balances).filter(([, balance]) => (0, sdk_gov_1.toBigInt)(balance.balance) > 1);
+        const nonZeroBalances = Object.entries(balances).filter(([, balance]) => balance.balance > 1);
         const curvePools = nonZeroBalances
             .map(([token]) => sdk_gov_1.tokenSymbolByAddress[token.toLowerCase()])
             .filter(symbol => (0, sdk_gov_1.isCurveLPToken)(symbol));
@@ -63,7 +63,7 @@ class PathOptionFactory {
         return Array.from(curveSet.values());
     }
     static getBalancerPools(balances) {
-        const nonZeroBalances = Object.entries(balances).filter(([, balance]) => (0, sdk_gov_1.toBigInt)(balance.balance) > 1);
+        const nonZeroBalances = Object.entries(balances).filter(([, balance]) => balance.balance > 1);
         const balancerPools = nonZeroBalances
             .map(([token]) => sdk_gov_1.tokenSymbolByAddress[token.toLowerCase()])
             .filter(symbol => (0, sdk_gov_1.isBalancerLPToken)(symbol));

package/lib/pathfinder/pathfinder.d.ts

@@ -1,5 +1,5 @@
 import { NetworkType } from "@gearbox-protocol/sdk-gov";
-import { providers, Signer } from "ethers";
+import { Provider, Signer } from "ethers";
 import { Asset } from "../core/assets";
 import { CreditAccountData } from "../core/creditAccount";
 import { CreditManagerData } from "../core/creditManager";
@@ -41,7 +41,7 @@ export declare class PathFinder {
     pathFinder: IRouterV3;
     network: NetworkType;
     protected readonly _connectors: Array<string>;
-    constructor(address: string, provider: Signer | providers.Provider, network?: NetworkType);
+    constructor(address: string, provider: Signer | Provider, network?: NetworkType);
     findAllSwaps({ creditAccount, swapOperation, tokenIn, tokenOut, amount, leftoverAmount, slippage, }: FindAllSwapsProps): Promise<Array<PathFinderResult>>;
     findOneTokenPath({ creditAccount, tokenIn, tokenOut, amount, slippage, }: FindOneTokenPathProps): Promise<PathFinderResult>;
     /**

package/lib/pathfinder/pathfinder.js

@@ -26,17 +26,17 @@ class PathFinder {
             amount,
             leftoverAmount,
         };
-        const results = await this.pathFinder.callStatic.findAllSwaps(swapTask, slippage, {
+        const results = await this.pathFinder.findAllSwaps.staticCall(swapTask, slippage, {
             gasLimit: GAS_PER_BLOCK,
         });
         const unique = {};
         results.forEach(r => {
-            const key = `${r.minAmount.toHexString()}${r.calls
+            const key = `${r.minAmount.toString()}${r.calls
                 .map(c => `${c.target.toLowerCase()}${c.callData}`)
                 .join("-")}`;
             unique[key] = {
-                amount: (0, sdk_gov_1.toBigInt)(r.amount),
-                minAmount: (0, sdk_gov_1.toBigInt)(r.minAmount),
+                amount: r.amount,
+                minAmount: r.minAmount,
                 calls: r.calls,
             };
         });
@@ -44,12 +44,12 @@ class PathFinder {
     }
     async findOneTokenPath({ creditAccount, tokenIn, tokenOut, amount, slippage, }) {
         const connectors = this.getAvailableConnectors(creditAccount.balances);
-        const result = await this.pathFinder.callStatic.findOneTokenPath(tokenIn, amount, tokenOut, creditAccount.addr, connectors, slippage, {
+        const result = await this.pathFinder.findOneTokenPath.staticCall(tokenIn, amount, tokenOut, creditAccount.addr, connectors, slippage, {
             gasLimit: GAS_PER_BLOCK,
         });
         return {
-            amount: (0, sdk_gov_1.toBigInt)(result.amount),
-            minAmount: (0, sdk_gov_1.toBigInt)(result.minAmount),
+            amount: result.amount,
+            minAmount: result.minAmount,
             calls: result.calls,
         };
     }
@@ -74,26 +74,25 @@ class PathFinder {
             balance: leftoverBalances[token]?.balance || 1n,
         }));
         const connectors = this.getAvailableConnectors(cm.supportedTokens);
-        const [outBalances, result] = await this.pathFinder.callStatic.findOpenStrategyPath(cm.address, input, leftover, target, connectors, slippage, {
+        const [outBalances, result] = await this.pathFinder.findOpenStrategyPath.staticCall(cm.address, input, leftover, target, connectors, slippage, {
             gasLimit: GAS_PER_BLOCK,
         });
         const balancesAfter = outBalances.reduce((acc, b) => {
-            acc[b.token.toLowerCase()] = (0, sdk_gov_1.toBigInt)(b.balance);
+            acc[b.token.toLowerCase()] = b.balance;
             return acc;
         }, {});
         return {
             balances: {
                 ...balancesAfter,
-                [target]: (expectedBalances[target]?.balance || 0n) + (0, sdk_gov_1.toBigInt)(result.amount),
+                [target]: (expectedBalances[target]?.balance || 0n) + result.amount,
             },
             minBalances: {
                 ...balancesAfter,
-                [target]: (expectedBalances[target]?.balance || 0n) +
-                    (0, sdk_gov_1.toBigInt)(result.minAmount),
+                [target]: (expectedBalances[target]?.balance || 0n) + result.minAmount,
             },
             calls: result.calls,
-            minAmount: (0, sdk_gov_1.toBigInt)(result.minAmount),
-            amount: (0, sdk_gov_1.toBigInt)(result.amount),
+            minAmount: result.minAmount,
+            amount: result.amount,
         };
     }
     /**
@@ -126,21 +125,21 @@ class PathFinder {
         let results = [];
         if (noConcurrency) {
             for (const po of pathOptions) {
-                results.push(await this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, expected, leftover, connectors, slippage, po, loopsPerTx, false, {
+                results.push(await this.pathFinder.findBestClosePath.staticCall(creditAccount.addr, expected, leftover, connectors, slippage, po, loopsPerTx, false, {
                     gasLimit: GAS_PER_BLOCK,
                 }));
             }
         }
         else {
-            const requests = pathOptions.map(po => this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, expected, leftover, connectors, slippage, po, loopsPerTx, false, {
+            const requests = pathOptions.map(po => this.pathFinder.findBestClosePath.staticCall(creditAccount.addr, expected, leftover, connectors, slippage, po, loopsPerTx, false, {
                 gasLimit: GAS_PER_BLOCK,
             }));
             results = await Promise.all(requests);
         }
         const bestResult = results.reduce((best, pathFinderResult) => PathFinder.compare(best, {
             calls: pathFinderResult.calls,
-            amount: (0, sdk_gov_1.toBigInt)(pathFinderResult.amount),
-            minAmount: (0, sdk_gov_1.toBigInt)(pathFinderResult.minAmount),
+            amount: pathFinderResult.amount,
+            minAmount: pathFinderResult.minAmount,
         }), {
             amount: 0n,
             minAmount: 0n,

package/lib/pathfinder/pathfinder.spec.js

@@ -20,7 +20,7 @@ describe("PathFinder test", () => {
         (0, chai_1.expect)(result).to.be.eql(r2);
     });
     it("has all expected connectors", () => {
-        const pf = new pathfinder_1.PathFinder("", new ethers_1.providers.JsonRpcProvider(), "Mainnet");
+        const pf = new pathfinder_1.PathFinder("", new ethers_1.JsonRpcProvider(), "Mainnet");
         const allowedTokens = {
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: true,
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: true,
@@ -37,7 +37,7 @@ describe("PathFinder test", () => {
         ]);
     });
     it("has all expected connectors, when gew are disabled", () => {
-        const pf = new pathfinder_1.PathFinder("", new ethers_1.providers.JsonRpcProvider(), "Mainnet");
+        const pf = new pathfinder_1.PathFinder("", new ethers_1.JsonRpcProvider(), "Mainnet");
         const allowedTokens = {
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: true,
             [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: true,

package/lib/pathfinder/utils.d.ts

@@ -1,5 +1,4 @@
-import { providers } from "ethers";
-import { Interface } from "ethers/lib/utils";
+import { Interface, Provider } from "ethers";
 import { MultiCall } from "./core";
 export interface FeeInfo {
     type: KnownFeeTypes;
@@ -20,7 +19,7 @@ export declare const BALANCER_VAULT_ABI: {
 export declare const BALANCER_VAULT_INTERFACE: Interface;
 interface FindPathFeesProps {
     calls: Array<MultiCall>;
-    provider: providers.Provider;
+    provider: Provider;
     contractsByAdapter: Record<string, string>;
 }
 export declare class PathFinderUtils {

package/lib/pathfinder/utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathFinderUtils = exports.BALANCER_VAULT_INTERFACE = exports.BALANCER_VAULT_ABI = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const utils_1 = require("ethers/lib/utils");
+const ethers_1 = require("ethers");
 const balancerV2VaultParser_1 = require("../parsers/balancerV2VaultParser");
 const curveAdapterParser_1 = require("../parsers/curveAdapterParser");
 const lidoAdapterParser_1 = require("../parsers/lidoAdapterParser");
@@ -28,7 +28,7 @@ exports.BALANCER_VAULT_ABI = [
         type: "function",
     },
 ];
-exports.BALANCER_VAULT_INTERFACE = new utils_1.Interface(exports.BALANCER_VAULT_ABI);
+exports.BALANCER_VAULT_INTERFACE = new ethers_1.Interface(exports.BALANCER_VAULT_ABI);
 class PathFinderUtils {
     static async findPathFees({ calls, provider, contractsByAdapter, }) {
         const pathObjects = txParser_1.TxParser.parseToObjectMultiCall(calls);
@@ -139,7 +139,7 @@ class PathFinderUtils {
         }
     }
     static getCurveFee({ value }) {
-        const feeOriginal = (0, sdk_gov_1.toBigInt)(value || 0n);
+        const feeOriginal = value || 0n;
         return {
             type: "curve",
             value: (feeOriginal * sdk_gov_1.PERCENTAGE_FACTOR) / CURVE_FEE_DECIMALS,
@@ -165,7 +165,7 @@ class PathFinderUtils {
         }
     }
     static getBalancerFee({ value }) {
-        const feeOriginal = (0, sdk_gov_1.toBigInt)(value || 0n);
+        const feeOriginal = value || 0n;
         return {
             type: "balancer",
             value: (feeOriginal * sdk_gov_1.PERCENTAGE_FACTOR) / BALANCER_FEE_DECIMALS,

package/lib/pathfinder/v1/pathfinderv1.d.ts

@@ -1,5 +1,5 @@
 import { NetworkType, SupportedToken } from "@gearbox-protocol/sdk-gov";
-import { BigNumberish, providers, Signer } from "ethers";
+import { BigNumberish, Provider, Signer } from "ethers";
 import { CreditAccountData } from "../../core/creditAccount";
 import { CreditManagerData } from "../../core/creditManager";
 import { IRouter } from "../../types";
@@ -15,7 +15,7 @@ export declare class PathFinderV1 {
     network: NetworkType;
     static connectors: Array<SupportedToken>;
     protected readonly _connectors: Array<string>;
-    constructor(address: string, provider: Signer | providers.Provider, network?: NetworkType, connectors?: SupportedToken[]);
+    constructor(address: string, provider: Signer | Provider, network?: NetworkType, connectors?: SupportedToken[]);
     findAllSwaps(creditAccount: CreditAccountData, swapOperation: SwapOperation, tokenIn: SupportedToken | string, tokenOut: SupportedToken | string, amount: BigNumberish, slippage: number): Promise<Array<PathFinderV1Result>>;
     findOneTokenPath(creditAccount: CreditAccountData, tokenIn: SupportedToken | string, tokenOut: SupportedToken | string, amount: BigNumberish, slippage: number): Promise<PathFinderV1Result>;
     /**