@gearbox-protocol/sdk 3.0.0-next.17 → 3.0.0-next.170

package/lib/watchers/creditAccountWatcher.spec.js

@@ -55,7 +55,7 @@ const newConfiguratorLog = (managerAddr = CREDIT_MANAGER_ADDRESS, configuratorAd
 ]);
 describe("CreditAccountTracker test", () => {
     it("detects update events correctly", () => {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog()], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([openLog()], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -63,7 +63,7 @@ describe("CreditAccountTracker test", () => {
             creditFacadeInterface.getEventTopic("IncreaseBorrowedAmount"),
             encode("address", BORROWER),
         ], ethers_1.utils.defaultAbiCoder.encode(["uint256"], [10]));
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -71,7 +71,7 @@ describe("CreditAccountTracker test", () => {
             creditFacadeInterface.getEventTopic("DecreaseBorrowedAmount"),
             encode("address", BORROWER),
         ], ethers_1.utils.defaultAbiCoder.encode(["uint256"], [10]));
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -80,7 +80,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", BORROWER),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ], ethers_1.utils.defaultAbiCoder.encode(["uint256"], [10]));
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -88,7 +88,7 @@ describe("CreditAccountTracker test", () => {
             creditFacadeInterface.getEventTopic("MultiCallStarted"),
             encode("address", BORROWER),
         ]);
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -97,7 +97,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", BORROWER),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -106,7 +106,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", BORROWER),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -115,7 +115,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", BORROWER),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
@@ -124,7 +124,7 @@ describe("CreditAccountTracker test", () => {
     // DELETED
     //
     it("detects delete events correctly", () => {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([closeLog()], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([closeLog()], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
@@ -135,7 +135,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", sdk_gov_1.DUMB_ADDRESS),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ], ethers_1.utils.defaultAbiCoder.encode(["uint256"], [10]));
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
@@ -146,27 +146,27 @@ describe("CreditAccountTracker test", () => {
             encode("address", sdk_gov_1.DUMB_ADDRESS),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ], ethers_1.utils.defaultAbiCoder.encode(["uint256"], [10]));
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([log], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([log], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
     });
     it("doesn't make duplicated", () => {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog(), openLog(), openLog()], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([openLog(), openLog(), openLog()], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [],
         });
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([closeLog(), closeLog(), closeLog()], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([closeLog(), closeLog(), closeLog()], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
     });
     it("updates accounts were created and deleted in the batch", () => {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog(), closeLog()], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([openLog(), closeLog()], [cmDumb])).to.be.eql({
             updated: [],
             deleted: [expectedHash],
         });
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog(), closeLog(), openLog()], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([openLog(), closeLog(), openLog()], [cmDumb])).to.be.eql({
             updated: [expectedHash],
             deleted: [expectedHash],
         });
@@ -177,7 +177,7 @@ describe("CreditAccountTracker test", () => {
             encode("address", BORROWER),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([openLog(), transferLog], [cmDumb])).to.be.eql({
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([openLog(), transferLog], [cmDumb])).to.be.eql({
             updated: [
                 `${CREDIT_MANAGER_ADDRESS.toLowerCase()}:${sdk_gov_1.DUMB_ADDRESS.toLowerCase()}`,
             ],
@@ -185,7 +185,7 @@ describe("CreditAccountTracker test", () => {
         });
     });
     it("correctly handles credit configurator change", () => {
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([
             openLog(),
             newConfiguratorLog(),
             upgradeFacadeLog(),
@@ -194,7 +194,7 @@ describe("CreditAccountTracker test", () => {
             updated: [],
             deleted: [expectedHash],
         });
-        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcher.detectChanges([
+        (0, chai_1.expect)(creditAccountWatcher_1.CreditAccountWatcherV2.detectChanges([
             openLog(),
             closeLog(),
             newConfiguratorLog(),

package/lib/watchers/creditManagerWatcher.d.ts

@@ -1,8 +1,10 @@
 import { providers, Signer } from "ethers";
 import { CreditManagerData } from "../core/creditManager";
 export declare class CreditManagerWatcher {
-    static creditManagerInterface: import("../types/ICreditManagerV2.sol/ICreditManagerV2").ICreditManagerV2Interface;
-    static creditConfiguratorInterface: import("../types/ICreditConfiguratorV2.sol/ICreditConfiguratorV2").ICreditConfiguratorV2Interface;
-    static getV2CreditManagers(dataCompressor: string, signer: Signer | providers.Provider, atBlock?: number): Promise<Record<string, CreditManagerData>>;
+    private static newConfiguratorV2Topic;
+    private static newConfiguratorV3Topic;
+    static getAllCreditManagers(addressProvider: string, signer: Signer | providers.Provider, atBlock?: number): Promise<Record<string, CreditManagerData>>;
+    static getV2CreditManagers(dataCompressorV210: string, signer: Signer | providers.Provider, atBlock?: number): Promise<Record<string, CreditManagerData>>;
+    static getV3CreditManagers(dataCompressorV300: string, signer: Signer | providers.Provider, atBlock?: number): Promise<Record<string, CreditManagerData>>;
     static detectConfigChanges(freshLogs: Array<providers.Log>, creditManagers: Array<CreditManagerData>): boolean;
 }

package/lib/watchers/creditManagerWatcher.js

@@ -1,18 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreditManagerWatcher = void 0;
-const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
+const utils_1 = require("ethers/lib/utils");
 const creditManager_1 = require("../core/creditManager");
 const types_1 = require("../types");
 class CreditManagerWatcher {
-    static creditManagerInterface = types_1.ICreditManagerV2__factory.createInterface();
-    static creditConfiguratorInterface = types_1.ICreditConfiguratorV2__factory.createInterface();
-    static async getV2CreditManagers(dataCompressor, signer, atBlock) {
+    static newConfiguratorV2Topic = types_1.ICreditManagerV2__factory.createInterface().getEventTopic("NewConfigurator");
+    static newConfiguratorV3Topic = types_1.ICreditManagerV3__factory.createInterface().getEventTopic("SetCreditConfigurator");
+    static async getAllCreditManagers(addressProvider, signer, atBlock) {
+        const ap = types_1.IAddressProviderV3__factory.connect(addressProvider, signer);
+        const [dc210, dc300] = await Promise.all([
+            ap.getAddressOrRevert((0, utils_1.formatBytes32String)("DATA_COMPRESSOR"), 210, {
+                blockTag: atBlock,
+            }),
+            ap.getAddressOrRevert((0, utils_1.formatBytes32String)("DATA_COMPRESSOR"), 300, {
+                blockTag: atBlock,
+            }),
+        ]);
+        const [cms2, cms3] = await Promise.all([
+            CreditManagerWatcher.getV2CreditManagers(dc210, signer, atBlock),
+            CreditManagerWatcher.getV3CreditManagers(dc300, signer, atBlock),
+        ]);
+        return { ...cms2, ...cms3 };
+    }
+    static async getV2CreditManagers(dataCompressorV210, signer, atBlock) {
+        const creditManagers = {};
+        const creditManagersPayload = await types_1.IDataCompressorV2_1__factory.connect(dataCompressorV210, signer).getCreditManagersV2List({ blockTag: atBlock });
+        creditManagersPayload.forEach(c => {
+            creditManagers[c.addr.toLowerCase()] = new creditManager_1.CreditManagerData(c);
+        });
+        return creditManagers;
+    }
+    static async getV3CreditManagers(dataCompressorV300, signer, atBlock) {
         const creditManagers = {};
-        const creditManagersPayload = await types_1.IDataCompressorV2_10__factory.connect(dataCompressor, signer).getCreditManagersV2List({ blockTag: atBlock });
-        creditManagersPayload
-            .filter(c => (0, sdk_gov_1.toBigInt)(c.cfVersion) === 2n || (0, sdk_gov_1.toBigInt)(c.cfVersion) === 210n)
-            .forEach(c => {
+        const creditManagersPayload = await types_1.IDataCompressorV3__factory.connect(dataCompressorV300, signer).getCreditManagersV3List({ blockTag: atBlock });
+        creditManagersPayload.forEach(c => {
             creditManagers[c.addr.toLowerCase()] = new creditManager_1.CreditManagerData(c);
         });
         return creditManagers;
@@ -22,8 +44,8 @@ class CreditManagerWatcher {
         const ccs = creditManagers.map(c => c.creditConfigurator);
         for (let log of freshLogs) {
             if (cms.includes(log.address.toLowerCase())) {
-                const { name } = CreditManagerWatcher.creditManagerInterface.parseLog(log);
-                if (name === "NewConfigurator") {
+                if (log.topics[0] === CreditManagerWatcher.newConfiguratorV2Topic ||
+                    log.topics[0] === CreditManagerWatcher.newConfiguratorV3Topic) {
                     return true;
                 }
             }

package/lib/watchers/creditManagerWatcher.spec.js

@@ -26,20 +26,28 @@ const makeLog = (address, topics, data = sdk_gov_1.ADDRESS_0X0) => {
     };
 };
 describe("CreditManagerTracker test", () => {
-    it("detects CreditManager events correctly", () => {
-        const creditManagerInterface = types_1.ICreditManagerV2__factory.createInterface();
+    it("detects CreditManagerV2 events correctly", () => {
+        const cmV2Interface = types_1.ICreditManagerV2__factory.createInterface();
         let log = makeLog(CREDIT_MANAGER_ADDRESS, [
-            creditManagerInterface.getEventTopic("NewConfigurator"),
+            cmV2Interface.getEventTopic("NewConfigurator"),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
         (0, chai_1.expect)(creditManagerWatcher_1.CreditManagerWatcher.detectConfigChanges([log], [cmDumb])).to.be.eq(true);
         log = makeLog(CREDIT_MANAGER_ADDRESS, [
-            creditManagerInterface.getEventTopic("ExecuteOrder"),
+            cmV2Interface.getEventTopic("ExecuteOrder"),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
             encode("address", sdk_gov_1.DUMB_ADDRESS),
         ]);
         (0, chai_1.expect)(creditManagerWatcher_1.CreditManagerWatcher.detectConfigChanges([log], [cmDumb])).to.be.eq(false);
     });
+    it("detects CreditManagerV3 events correctly", () => {
+        const cmV3Interface = types_1.ICreditManagerV3__factory.createInterface();
+        let log = makeLog(CREDIT_MANAGER_ADDRESS, [
+            cmV3Interface.getEventTopic("SetCreditConfigurator"),
+            encode("address", sdk_gov_1.DUMB_ADDRESS),
+        ]);
+        (0, chai_1.expect)(creditManagerWatcher_1.CreditManagerWatcher.detectConfigChanges([log], [cmDumb])).to.be.eq(true);
+    });
     it("detects CreditConfigurator events correctly", () => {
         const ccInterface = types_1.ICreditConfiguratorV2__factory.createInterface();
         let log = makeLog(CREDIT_CONFIGIURATOR_ADDRESS, [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-next.17",
+  "version": "3.0.0-next.170",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -27,27 +27,32 @@
     "lint": "eslint \"**/*.ts\" --fix",
     "lint:ci": "eslint \"**/*.ts\"",
     "typecheck:ci": "tsc --noEmit",
-    "test": "npx mocha -r ts-node/register -r dotenv/config src/**/*.spec.ts"
+    "test": "npx mocha -r ts-node/register -r dotenv/config 'src/**/*.spec.ts'"
   },
   "dependencies": {
-    "@gearbox-protocol/sdk-gov": "^1.5.27",
+    "@gearbox-protocol/bots-v3": "^1.5.1",
+    "@gearbox-protocol/sdk-gov": "^1.62.2",
     "axios": "^1.2.6",
     "decimal.js-light": "^2.5.1",
     "deep-eql": "^4.1.0",
     "moment": "^2.29.4"
   },
   "devDependencies": {
+    "@1inch/farming": "^3.1.0",
     "@1inch/solidity-utils": "^2.2.27",
     "@commitlint/cli": "^17.6.3",
     "@commitlint/config-conventional": "^17.0.3",
-    "@gearbox-protocol/core-v2": "1.19.0-base.15",
-    "@gearbox-protocol/core-v3": "^1.40.2",
+    "@gearbox-protocol/core-v2": "1.19.0-base.17",
+    "@gearbox-protocol/core-v3": "^1.49.6",
     "@gearbox-protocol/eslint-config": "^1.4.1",
-    "@gearbox-protocol/integrations-v3": "^1.17.0",
-    "@gearbox-protocol/oracles-v3": "^1.7.6",
-    "@gearbox-protocol/periphery-v3": "^1.2.11",
+    "@gearbox-protocol/integrations-v3": "^1.40.3",
+    "@gearbox-protocol/oracles-v3": "^1.10.3",
+    "@gearbox-protocol/periphery-v3": "^1.6.1",
     "@gearbox-protocol/prettier-config": "^1.4.1",
+    "@gearbox-protocol/router": "^1.5.5",
+    "@gearbox-protocol/router-v3": "^1.22.0",
     "@openzeppelin/contracts": "^4.9.3",
+    "@redstone-finance/evm-connector": "^0.3.6",
     "@typechain/ethers-v5": "^10.1.0",
     "@types/chai": "^4.3.3",
     "@types/deep-eql": "^4.0.0",

package/contracts/IRouter.sol

@@ -1,100 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-// Gearbox Protocol. Generalized leverage for DeFi protocols
-// (c) Gearbox Holdings, 2021
-pragma solidity ^0.8.10;
-
-import {Balance} from "@gearbox-protocol/core-v2/contracts/libraries/Balances.sol";
-import {IVersion} from "@gearbox-protocol/core-v2/contracts/interfaces/IVersion.sol";
-import {MultiCall} from "@gearbox-protocol/core-v2/contracts/libraries/MultiCall.sol";
-
-struct PathOption {
-    address target;
-    uint8 option;
-    uint8 totalOptions;
-}
-
-enum SwapOperation {
-    EXACT_INPUT,
-    EXACT_INPUT_ALL,
-    EXACT_OUTPUT
-}
-
-struct SwapTask {
-    SwapOperation swapOperation;
-    address creditAccount;
-    address tokenIn;
-    address tokenOut;
-    address[] connectors;
-    uint256 amount;
-    uint256 slippage;
-    bool externalSlippage;
-}
-
-struct RouterResult {
-    uint256 amount;
-    uint256 gasUsage;
-    MultiCall[] calls;
-}
-
-interface IRouter is IVersion {
-    /// @dev Emits each time when routerComponent is set / updated
-    event RouterComponentUpdate(uint8 indexed, address indexed);
-
-    /// @dev Emits each time when resolver is set / updated
-    event ResolverUpdate(uint8 indexed ttIn, uint8 indexed ttOut, uint8 indexed rc);
-
-    event TokenTypeUpdate(address indexed tokenAddress, uint8 indexed tt);
-
-    /// @dev Finds all available swaps for NORMAL tokens
-    function findAllSwaps(SwapTask memory swapTask) external returns (RouterResult[] memory);
-
-    /// @dev Finds best path to swap all Normal tokens and tokens "on the way" to target one and vice versa
-    function findOneTokenPath(
-        address tokenIn,
-        uint256 amount,
-        address tokenOut,
-        address creditAccount,
-        address[] calldata connectors,
-        uint256 slippage
-    ) external returns (RouterResult memory);
-
-    /// @dev Finds the best swap to deposit (or swap) all provided tokens into target one
-    /// Currently it takes ALL Normal tokens and all LP "on the way" tokens into target one.
-    /// It some token is not "on the way" it would be skipped.
-    /// @param creditManager Address of creditManager
-    /// @param balances Expected balances on credit account
-    /// @param target Address of target token
-    /// @param connectors Addresses of "connectors" - internidiatery tokens which're used for swap operations
-    /// @param slippage Slippage in PERCENTAGE_FORMAT
-    function findOpenStrategyPath(
-        address creditManager,
-        Balance[] calldata balances,
-        address target,
-        address[] calldata connectors,
-        uint256 slippage
-    ) external returns (Balance[] memory, RouterResult memory);
-
-    /// @dev Finds the best close path - withdraw all tokens and swap them into underlying one
-    /// @param creditAccount Address of closing creditAccount
-    /// @param connectors Addresses of "connectors" - internidiatery tokens which're used for swap operations
-    /// @param slippage Slippage in PERCENTAGE_FORMAT
-    /// @param pathOptions Starting point for iterating routes. More info in PathOption file
-    /// @param iterations How many iterations algo should compute starting from PathOptions
-    function findBestClosePath(
-        address creditAccount,
-        address[] memory connectors,
-        uint256 slippage,
-        PathOption[] memory pathOptions,
-        uint256 iterations,
-        bool force
-    ) external returns (RouterResult memory result, uint256 gasPriceTargetRAY);
-
-    /// @dev Returns TokenType for provided token
-    function tokenTypes(address) external view returns (uint8);
-
-    /// @dev Returns current address for RouterComponent. Used for self-discovery
-    function componentAddressById(uint8) external view returns (address);
-
-    /// @dev @return True if address is router configurator, otherwise false
-    function isRouterConfigurator(address account) external view returns (bool);
-}

package/lib/core/pool/index.d.ts

@@ -1 +0,0 @@
-export * from "./data";

package/lib/core/strategy.spec.js

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const chai_1 = require("chai");
-const contractsRegister_1 = require("../contracts/contractsRegister");
-const formatter_1 = require("../utils/formatter");
-const strategy_1 = require("./strategy");
-const lidoPayload = {
-    name: "Lido",
-    lpToken: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
-    apy: 38434,
-    creditManagers: [contractsRegister_1.creditManagerByNetwork.Mainnet.WETH_V2],
-    unleveragableCollateral: [
-        sdk_gov_1.tokenDataByNetwork.Mainnet.USDC,
-        sdk_gov_1.tokenDataByNetwork.Mainnet.DAI,
-        sdk_gov_1.tokenDataByNetwork.Mainnet.WBTC,
-    ],
-    leveragableCollateral: [],
-    baseAssets: [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH],
-};
-const lidoStrategy = new strategy_1.Strategy(lidoPayload);
-const pools = {
-    "0x1": {
-        borrowRate: 27543,
-    },
-    "0x2": {
-        borrowRate: 5736,
-    },
-};
-const prices = {
-    [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: (0, formatter_1.toBN)("1738.11830000", sdk_gov_1.PRICE_DECIMALS_POW),
-    [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: (0, formatter_1.toBN)("0.99941103", sdk_gov_1.PRICE_DECIMALS_POW),
-    [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH.toLowerCase()]: (0, formatter_1.toBN)("1703.87588096", sdk_gov_1.PRICE_DECIMALS_POW),
-};
-const liquidationThresholds = {
-    [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: 9300n,
-    [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: 8500n,
-    [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH.toLowerCase()]: 9000n,
-};
-describe("Strategy test", () => {
-    it("maxAPY calculation is correct", () => {
-        const result = lidoStrategy.maxAPY(53203, 10 * Number(sdk_gov_1.LEVERAGE_DECIMALS), pools["0x1"].borrowRate);
-        (0, chai_1.expect)(result).to.be.eq(284143);
-    });
-    it("liquidationPrice calculation is correct", () => {
-        const result = strategy_1.Strategy.liquidationPrice({
-            liquidationThresholds,
-            prices,
-            borrowed: (0, formatter_1.toBN)("350", sdk_gov_1.decimals.WETH),
-            underlyingToken: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH,
-            lpAmount: (0, formatter_1.toBN)("400", sdk_gov_1.decimals.STETH),
-            lpToken: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH,
-        });
-        (0, chai_1.expect)(Number((0, formatter_1.toSignificant)(result, sdk_gov_1.WAD_DECIMALS_POW)).toFixed(3)).to.be.eq("0.992");
-    });
-    it("maxLeverage is correct", () => {
-        const result = strategy_1.Strategy.maxLeverage(sdk_gov_1.tokenDataByNetwork.Mainnet.STETH, [
-            { address: "0x1", liquidationThresholds },
-        ]);
-        (0, chai_1.expect)(result).to.be.eq(9 * Number(sdk_gov_1.LEVERAGE_DECIMALS));
-    });
-});

package/lib/types/ILidoV1Adapter.sol/index.d.ts

@@ -1,3 +0,0 @@
-export type { ILidoV1Adapter } from "./ILidoV1Adapter";
-export type { ILidoV1AdapterEvents } from "./ILidoV1AdapterEvents";
-export type { ILidoV1AdapterExceptions } from "./ILidoV1AdapterExceptions";

package/lib/types/IWERC20Zapper.d.ts

@@ -1,166 +0,0 @@
-import type { BaseContract, BigNumber, BigNumberish, BytesLike, CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, Signer, utils } from "ethers";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from "./common";
-export interface IWERC20ZapperInterface extends utils.Interface {
-    functions: {
-        "deposit(uint256,address)": FunctionFragment;
-        "depositWithReferral(uint256,address,uint16)": FunctionFragment;
-        "pool()": FunctionFragment;
-        "previewDeposit(uint256)": FunctionFragment;
-        "previewRedeem(uint256)": FunctionFragment;
-        "redeem(uint256,address,address)": FunctionFragment;
-        "redeemWithPermit(uint256,address,address,uint256,uint8,bytes32,bytes32)": FunctionFragment;
-        "tokenOut()": FunctionFragment;
-        "unwrappedToken()": FunctionFragment;
-        "wrappedToken()": FunctionFragment;
-    };
-    getFunction(nameOrSignatureOrTopic: "deposit" | "depositWithReferral" | "pool" | "previewDeposit" | "previewRedeem" | "redeem" | "redeemWithPermit" | "tokenOut" | "unwrappedToken" | "wrappedToken"): FunctionFragment;
-    encodeFunctionData(functionFragment: "deposit", values: [PromiseOrValue<BigNumberish>, PromiseOrValue<string>]): string;
-    encodeFunctionData(functionFragment: "depositWithReferral", values: [
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<string>,
-        PromiseOrValue<BigNumberish>
-    ]): string;
-    encodeFunctionData(functionFragment: "pool", values?: undefined): string;
-    encodeFunctionData(functionFragment: "previewDeposit", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "previewRedeem", values: [PromiseOrValue<BigNumberish>]): string;
-    encodeFunctionData(functionFragment: "redeem", values: [
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<string>,
-        PromiseOrValue<string>
-    ]): string;
-    encodeFunctionData(functionFragment: "redeemWithPermit", values: [
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<string>,
-        PromiseOrValue<string>,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BigNumberish>,
-        PromiseOrValue<BytesLike>,
-        PromiseOrValue<BytesLike>
-    ]): string;
-    encodeFunctionData(functionFragment: "tokenOut", values?: undefined): string;
-    encodeFunctionData(functionFragment: "unwrappedToken", values?: undefined): string;
-    encodeFunctionData(functionFragment: "wrappedToken", values?: undefined): string;
-    decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "depositWithReferral", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "pool", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "previewDeposit", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "previewRedeem", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "redeem", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "redeemWithPermit", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "tokenOut", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "unwrappedToken", data: BytesLike): Result;
-    decodeFunctionResult(functionFragment: "wrappedToken", data: BytesLike): Result;
-    events: {};
-}
-export interface IWERC20Zapper extends BaseContract {
-    connect(signerOrProvider: Signer | Provider | string): this;
-    attach(addressOrName: string): this;
-    deployed(): Promise<this>;
-    interface: IWERC20ZapperInterface;
-    queryFilter<TEvent extends TypedEvent>(event: TypedEventFilter<TEvent>, fromBlockOrBlockhash?: string | number | undefined, toBlock?: string | number | undefined): Promise<Array<TEvent>>;
-    listeners<TEvent extends TypedEvent>(eventFilter?: TypedEventFilter<TEvent>): Array<TypedListener<TEvent>>;
-    listeners(eventName?: string): Array<Listener>;
-    removeAllListeners<TEvent extends TypedEvent>(eventFilter: TypedEventFilter<TEvent>): this;
-    removeAllListeners(eventName?: string): this;
-    off: OnEvent<this>;
-    on: OnEvent<this>;
-    once: OnEvent<this>;
-    removeListener: OnEvent<this>;
-    functions: {
-        deposit(amount: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
-        depositWithReferral(amount: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, referralCode: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
-        pool(overrides?: CallOverrides): Promise<[string]>;
-        previewDeposit(amount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber] & {
-            shares: BigNumber;
-        }>;
-        previewRedeem(shares: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<[BigNumber] & {
-            amount: BigNumber;
-        }>;
-        redeem(shares: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, owner: PromiseOrValue<string>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
-        redeemWithPermit(shares: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, owner: PromiseOrValue<string>, deadline: PromiseOrValue<BigNumberish>, v: PromiseOrValue<BigNumberish>, r: PromiseOrValue<BytesLike>, s: PromiseOrValue<BytesLike>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<ContractTransaction>;
-        tokenOut(overrides?: CallOverrides): Promise<[string]>;
-        unwrappedToken(overrides?: CallOverrides): Promise<[string]>;
-        wrappedToken(overrides?: CallOverrides): Promise<[string]>;
-    };
-    deposit(amount: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
-    depositWithReferral(amount: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, referralCode: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
-    pool(overrides?: CallOverrides): Promise<string>;
-    previewDeposit(amount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-    previewRedeem(shares: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-    redeem(shares: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, owner: PromiseOrValue<string>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
-    redeemWithPermit(shares: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, owner: PromiseOrValue<string>, deadline: PromiseOrValue<BigNumberish>, v: PromiseOrValue<BigNumberish>, r: PromiseOrValue<BytesLike>, s: PromiseOrValue<BytesLike>, overrides?: Overrides & {
-        from?: PromiseOrValue<string>;
-    }): Promise<ContractTransaction>;
-    tokenOut(overrides?: CallOverrides): Promise<string>;
-    unwrappedToken(overrides?: CallOverrides): Promise<string>;
-    wrappedToken(overrides?: CallOverrides): Promise<string>;
-    callStatic: {
-        deposit(amount: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
-        depositWithReferral(amount: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, referralCode: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        pool(overrides?: CallOverrides): Promise<string>;
-        previewDeposit(amount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        previewRedeem(shares: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        redeem(shares: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, owner: PromiseOrValue<string>, overrides?: CallOverrides): Promise<BigNumber>;
-        redeemWithPermit(shares: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, owner: PromiseOrValue<string>, deadline: PromiseOrValue<BigNumberish>, v: PromiseOrValue<BigNumberish>, r: PromiseOrValue<BytesLike>, s: PromiseOrValue<BytesLike>, overrides?: CallOverrides): Promise<BigNumber>;
-        tokenOut(overrides?: CallOverrides): Promise<string>;
-        unwrappedToken(overrides?: CallOverrides): Promise<string>;
-        wrappedToken(overrides?: CallOverrides): Promise<string>;
-    };
-    filters: {};
-    estimateGas: {
-        deposit(amount: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
-        depositWithReferral(amount: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, referralCode: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
-        pool(overrides?: CallOverrides): Promise<BigNumber>;
-        previewDeposit(amount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        previewRedeem(shares: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<BigNumber>;
-        redeem(shares: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, owner: PromiseOrValue<string>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
-        redeemWithPermit(shares: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, owner: PromiseOrValue<string>, deadline: PromiseOrValue<BigNumberish>, v: PromiseOrValue<BigNumberish>, r: PromiseOrValue<BytesLike>, s: PromiseOrValue<BytesLike>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<BigNumber>;
-        tokenOut(overrides?: CallOverrides): Promise<BigNumber>;
-        unwrappedToken(overrides?: CallOverrides): Promise<BigNumber>;
-        wrappedToken(overrides?: CallOverrides): Promise<BigNumber>;
-    };
-    populateTransaction: {
-        deposit(amount: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
-        depositWithReferral(amount: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, referralCode: PromiseOrValue<BigNumberish>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
-        pool(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        previewDeposit(amount: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        previewRedeem(shares: PromiseOrValue<BigNumberish>, overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        redeem(shares: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, owner: PromiseOrValue<string>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
-        redeemWithPermit(shares: PromiseOrValue<BigNumberish>, receiver: PromiseOrValue<string>, owner: PromiseOrValue<string>, deadline: PromiseOrValue<BigNumberish>, v: PromiseOrValue<BigNumberish>, r: PromiseOrValue<BytesLike>, s: PromiseOrValue<BytesLike>, overrides?: Overrides & {
-            from?: PromiseOrValue<string>;
-        }): Promise<PopulatedTransaction>;
-        tokenOut(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        unwrappedToken(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-        wrappedToken(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-    };
-}