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

package/lib/pathfinder/v1/pathfinderv1.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PathFinderV1 = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const ethers_1 = require("ethers");
 const types_1 = require("../../types");
 const pathOptions_1 = require("../pathOptions");
 const MAX_GAS_PER_ROUTE = 200e6;
@@ -27,26 +26,26 @@ class PathFinderV1 {
     async findAllSwaps(creditAccount, swapOperation, tokenIn, tokenOut, amount, slippage) {
         const connectors = this.getAvailableConnectors(creditAccount.balances);
         const swapTask = {
-            swapOperation: swapOperation,
+            swapOperation: BigInt(swapOperation),
             creditAccount: creditAccount.addr,
             tokenIn: sdk_gov_1.tokenDataByNetwork[this.network][tokenIn] || tokenIn,
             tokenOut: sdk_gov_1.tokenDataByNetwork[this.network][tokenOut] ||
                 tokenOut,
             connectors,
-            amount: ethers_1.BigNumber.from(amount),
-            slippage: ethers_1.BigNumber.from(slippage),
+            amount: BigInt(amount),
+            slippage: BigInt(slippage),
             externalSlippage: false,
         };
-        const results = await this.pathFinder.callStatic.findAllSwaps(swapTask, {
+        const results = await this.pathFinder.findAllSwaps.staticCall(swapTask, {
             gasLimit: GAS_PER_BLOCK,
         });
         const unique = {};
         results.forEach(r => {
-            const key = `${r.amount.toHexString()}${r.calls
+            const key = `${r.amount}${r.calls
                 .map(c => `${c.target.toLowerCase()}${c.callData}`)
                 .join("-")}`;
             unique[key] = {
-                amount: (0, sdk_gov_1.toBigInt)(r.amount),
+                amount: r.amount,
                 calls: r.calls,
             };
         });
@@ -55,11 +54,11 @@ class PathFinderV1 {
     async findOneTokenPath(creditAccount, tokenIn, tokenOut, amount, slippage) {
         const tokenInAddr = sdk_gov_1.tokenDataByNetwork[this.network][tokenIn] || tokenIn;
         const connectors = this.getAvailableConnectors(creditAccount.balances);
-        const result = await this.pathFinder.callStatic.findOneTokenPath(tokenInAddr, amount, sdk_gov_1.tokenDataByNetwork[this.network][tokenOut] || tokenOut, creditAccount.addr, connectors, slippage, {
+        const result = await this.pathFinder.findOneTokenPath.staticCall(tokenInAddr, amount, sdk_gov_1.tokenDataByNetwork[this.network][tokenOut] || tokenOut, creditAccount.addr, connectors, slippage, {
             gasLimit: GAS_PER_BLOCK,
         });
         return {
-            amount: (0, sdk_gov_1.toBigInt)(result.amount),
+            amount: result.amount,
             calls: result.calls,
         };
     }
@@ -86,11 +85,11 @@ class PathFinderV1 {
             balance: expectedBalancesAddr[token] || 0,
         }));
         const connectors = this.getAvailableConnectors(cm.supportedTokens);
-        const result = await this.pathFinder.callStatic.findOpenStrategyPath(cm.address, balances, targetAddr, connectors, slippage, {
+        const result = await this.pathFinder.findOpenStrategyPath.staticCall(cm.address, balances, targetAddr, connectors, slippage, {
             gasLimit: GAS_PER_BLOCK,
         });
         const balancesAfter = result[0].reduce((acc, b) => {
-            acc[b.token.toLowerCase()] = (0, sdk_gov_1.toBigInt)(b.balance);
+            acc[b.token.toLowerCase()] = b.balance;
             return acc;
         }, {});
         return {
@@ -114,22 +113,22 @@ class PathFinderV1 {
         let results = [];
         if (noConcurency) {
             for (const po of pathOptions) {
-                results.push(await this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
+                results.push(await this.pathFinder.findBestClosePath.staticCall(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
                     gasLimit: GAS_PER_BLOCK,
                 }));
             }
         }
         else {
-            const requests = pathOptions.map(po => this.pathFinder.callStatic.findBestClosePath(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
+            const requests = pathOptions.map(po => this.pathFinder.findBestClosePath.staticCall(creditAccount.addr, connectors, slippage, po, loopsPerTx, false, {
                 gasLimit: GAS_PER_BLOCK,
             }));
             results = await Promise.all(requests);
         }
         const bestResult = results.reduce((best, [pathFinderResult, gasPriceRAY]) => PathFinderV1.compare(best, {
             calls: pathFinderResult.calls,
-            amount: (0, sdk_gov_1.toBigInt)(pathFinderResult.amount),
-            gasUsage: (0, sdk_gov_1.toBigInt)(pathFinderResult.gasUsage),
-        }, (0, sdk_gov_1.toBigInt)(gasPriceRAY)), {
+            amount: pathFinderResult.amount,
+            gasUsage: pathFinderResult.gasUsage,
+        }, gasPriceRAY), {
             amount: 0n,
             gasUsage: 0n,
             calls: [],

package/lib/pathfinder/v1/pathfinderv1.spec.js

@@ -22,7 +22,7 @@ describe("PathFinderV1 test", () => {
         (0, chai_1.expect)(result).to.be.eql(r1);
     });
     it("has all expected connectors", () => {
-        const pf = new pathfinderv1_1.PathFinderV1("", new ethers_1.providers.JsonRpcProvider(), "Mainnet");
+        const pf = new pathfinderv1_1.PathFinderV1("", new ethers_1.JsonRpcProvider(), "Mainnet");
         const allowedTokens = {
             [sdk_gov_1.tokenDataByNetwork.Mainnet.USDC.toLowerCase()]: true,
             [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: true,

package/lib/payload/creditAccount.d.ts

@@ -1,5 +1,5 @@
 import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
 import { CreditAccountDataStructOutput, TokenBalanceStructOutput } from "../types/IDataCompressorV3";
-import { BigintifyProps, PartialKeys } from "../utils/types";
-export type CaTokenBalance = BigintifyProps<ExcludeArrayProps<TokenBalanceStructOutput>>;
+import { PartialKeys } from "../utils/types";
+export type CaTokenBalance = ExcludeArrayProps<TokenBalanceStructOutput>;
 export type CreditAccountDataPayload = PartialKeys<ExcludeArrayProps<CreditAccountDataStructOutput>, "accruedInterest" | "accruedFees" | "healthFactor" | "totalValue">;

package/lib/payload/creditManager.d.ts

@@ -2,9 +2,8 @@ import { ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
 import { BigNumberish } from "ethers";
 import { ICreditFacadeV2 } from "../types";
 import { CreditManagerDataStructOutput, CreditManagerDebtParamsStructOutput, QuotaInfoStructOutput } from "../types/IDataCompressorV3";
-import { BigintifyProps } from "../utils/types";
-export type CreditManagerDebtParamsSDK = BigintifyProps<ExcludeArrayProps<CreditManagerDebtParamsStructOutput>>;
-export type QuotaInfo = BigintifyProps<ExcludeArrayProps<QuotaInfoStructOutput>>;
+export type CreditManagerDebtParamsSDK = ExcludeArrayProps<CreditManagerDebtParamsStructOutput>;
+export type QuotaInfo = ExcludeArrayProps<QuotaInfoStructOutput>;
 export interface AdapterPayload {
     allowedContract: string;
     adapter: string;

package/lib/payload/gauge.d.ts

@@ -1,8 +1,7 @@
 import { AwaitedRes, ExcludeArrayProps } from "@gearbox-protocol/sdk-gov";
 import { IGearStakingV3 } from "../types";
 import { GaugeInfoStructOutput, GaugeQuotaParamsStructOutput } from "../types/IDataCompressorV3";
-import { BigintifyProps } from "../utils/types";
-export type GaugeQuotaParams = BigintifyProps<ExcludeArrayProps<GaugeQuotaParamsStructOutput>>;
+export type GaugeQuotaParams = ExcludeArrayProps<GaugeQuotaParamsStructOutput>;
 export type GaugeDataPayload = ExcludeArrayProps<GaugeInfoStructOutput>;
 export interface GaugeStakingDataPayload {
     availableBalance: AwaitedRes<IGearStakingV3["availableBalance"]>;

package/lib/payload/pool.d.ts

@@ -3,10 +3,12 @@ import { BigNumberish } from "ethers";
 import { ZapperInfoStructOutput } from "../types/IDataCompressorV2_1";
 import { LinearModelStructOutput, PoolDataStructOutput } from "../types/IDataCompressorV3";
 export type PoolDataPayload = Omit<ExcludeArrayProps<PoolDataStructOutput>, "zappers"> & {
-    stakedDieselToken: Array<string>;
     zappers: Array<PoolZapper>;
-    supplyAPY7D: number | undefined;
 };
+export interface PoolDataExtraPayload {
+    stakedDieselToken: Array<string>;
+    supplyAPY7D: number | undefined;
+}
 export type LinearModel = Omit<ExcludeArrayProps<LinearModelStructOutput>, "version"> & {
     version: number;
 };