@gearbox-protocol/sdk 3.0.0-next.7 → 3.0.0-next.71

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_10__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_00__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.7",
+  "version": "3.0.0-next.71",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -30,9 +30,7 @@
     "test": "npx mocha -r ts-node/register -r dotenv/config src/**/*.spec.ts"
   },
   "dependencies": {
-    "@gearbox-protocol/integrations-v3": "^1.15.0",
-    "@gearbox-protocol/sdk-gov": "^1.5.26",
-    "@types/deep-eql": "^4.0.0",
+    "@gearbox-protocol/sdk-gov": "^1.15.2",
     "axios": "^1.2.6",
     "decimal.js-light": "^2.5.1",
     "deep-eql": "^4.1.0",
@@ -42,15 +40,18 @@
     "@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.39.0",
+    "@gearbox-protocol/core-v2": "1.19.0-base.17",
+    "@gearbox-protocol/core-v3": "^1.45.0",
     "@gearbox-protocol/eslint-config": "^1.4.1",
-    "@gearbox-protocol/oracles-v3": "^1.7.6",
-    "@gearbox-protocol/periphery-v3": "^1.0.9",
+    "@gearbox-protocol/integrations-v3": "^1.25.0",
+    "@gearbox-protocol/oracles-v3": "^1.8.1",
+    "@gearbox-protocol/periphery-v3": "^1.3.9",
     "@gearbox-protocol/prettier-config": "^1.4.1",
-    "@openzeppelin/contracts": "4.8.3",
+    "@gearbox-protocol/router-v3": "^1.6.0",
+    "@openzeppelin/contracts": "^4.9.3",
     "@typechain/ethers-v5": "^10.1.0",
     "@types/chai": "^4.3.3",
+    "@types/deep-eql": "^4.0.0",
     "@types/jest": "^28.1.7",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.7.6",

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/pool/index.js

@@ -1,17 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./data"), exports);

package/lib/types/AaveV2_WrappedAToken.sol/IWrappedATokenEvents.d.ts

@@ -1,60 +0,0 @@
-import type { BaseContract, BigNumber, Signer, utils } from "ethers";
-import type { EventFragment } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, PromiseOrValue } from "../common";
-export interface IWrappedATokenEventsInterface extends utils.Interface {
-    functions: {};
-    events: {
-        "Deposit(address,uint256,uint256)": EventFragment;
-        "Withdraw(address,uint256,uint256)": EventFragment;
-    };
-    getEvent(nameOrSignatureOrTopic: "Deposit"): EventFragment;
-    getEvent(nameOrSignatureOrTopic: "Withdraw"): EventFragment;
-}
-export interface DepositEventObject {
-    account: string;
-    assets: BigNumber;
-    shares: BigNumber;
-}
-export type DepositEvent = TypedEvent<[
-    string,
-    BigNumber,
-    BigNumber
-], DepositEventObject>;
-export type DepositEventFilter = TypedEventFilter<DepositEvent>;
-export interface WithdrawEventObject {
-    account: string;
-    assets: BigNumber;
-    shares: BigNumber;
-}
-export type WithdrawEvent = TypedEvent<[
-    string,
-    BigNumber,
-    BigNumber
-], WithdrawEventObject>;
-export type WithdrawEventFilter = TypedEventFilter<WithdrawEvent>;
-export interface IWrappedATokenEvents extends BaseContract {
-    connect(signerOrProvider: Signer | Provider | string): this;
-    attach(addressOrName: string): this;
-    deployed(): Promise<this>;
-    interface: IWrappedATokenEventsInterface;
-    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: {};
-    callStatic: {};
-    filters: {
-        "Deposit(address,uint256,uint256)"(account?: PromiseOrValue<string> | null, assets?: null, shares?: null): DepositEventFilter;
-        Deposit(account?: PromiseOrValue<string> | null, assets?: null, shares?: null): DepositEventFilter;
-        "Withdraw(address,uint256,uint256)"(account?: PromiseOrValue<string> | null, assets?: null, shares?: null): WithdrawEventFilter;
-        Withdraw(account?: PromiseOrValue<string> | null, assets?: null, shares?: null): WithdrawEventFilter;
-    };
-    estimateGas: {};
-    populateTransaction: {};
-}