@gearbox-protocol/sdk 3.0.0-next.19 → 3.0.0-next.190

package/lib/utils/{repeater.js → calls.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callRepeater = void 0;
+exports.makeTransactionCall = exports.callRepeater = void 0;
 async function callRepeater(call, step = 0) {
     return new Promise((resolve, reject) => {
         call()
@@ -17,3 +17,13 @@ async function callRepeater(call, step = 0) {
     });
 }
 exports.callRepeater = callRepeater;
+async function makeTransactionCall(m, args, signer) {
+    const tx = await m.populateTransaction(...args);
+    if ("sendUncheckedTransaction" in signer) {
+        const hash = await signer.sendUncheckedTransaction(tx);
+        const r = { hash };
+        return r;
+    }
+    return await signer.sendTransaction(tx);
+}
+exports.makeTransactionCall = makeTransactionCall;

package/lib/utils/formatter.d.ts

@@ -1,7 +1,7 @@
 import { BigNumberish } from "ethers";
 export declare function rayToNumber(num: BigNumberish): number;
 export declare function formatRAY(num?: bigint): string;
-export declare function toSignificant(num: bigint, decimals: number): string;
+export declare function toSignificant(num: bigint, decimals: number, precision?: number): string;
 export declare function toBN(num: string, decimals: number): bigint;
 export declare function shortAddress(address?: string): string;
 export declare function shortHash(address?: string): string;

package/lib/utils/formatter.js

@@ -12,12 +12,12 @@ function formatRAY(num = 0n) {
     return toSignificant(num, 27);
 }
 exports.formatRAY = formatRAY;
-function toSignificant(num, decimals) {
+function toSignificant(num, decimals, precision = 6) {
     if (num === 1n)
         return "0";
     const divider = new decimal_js_light_1.Decimal(10).toPower(decimals);
     const number = new decimal_js_light_1.Decimal(num.toString()).div(divider);
-    return number.toSignificantDigits(6, 4).toString();
+    return number.toSignificantDigits(precision, 4).toString();
 }
 exports.toSignificant = toSignificant;
 function toBN(num, decimals) {

package/lib/utils/math.d.ts

@@ -6,7 +6,7 @@ export declare function sqrt(x: bigint): bigint;
 export declare const nonNegativeBn: (v: bigint) => bigint;
 export declare class BigIntMath {
     static abs: (x: bigint) => bigint;
-    static toHexString: (x: bigint) => string;
     static max: (a: bigint, b: bigint) => bigint;
     static min: (a: bigint, b: bigint) => bigint;
+    static neg: (a: bigint) => bigint;
 }

package/lib/utils/math.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BigIntMath = exports.nonNegativeBn = exports.sqrt = exports.percentMul = exports.rayDiv = exports.rayMul = exports.revertRay = void 0;
 const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
-const ethers_1 = require("ethers");
 function revertRay(num) {
     if (!num)
         return undefined;
@@ -40,8 +39,8 @@ const nonNegativeBn = (v) => (v < 0 ? 0n : v);
 exports.nonNegativeBn = nonNegativeBn;
 class BigIntMath {
     static abs = (x) => (x < 0n ? -x : x);
-    static toHexString = (x) => ethers_1.BigNumber.from(x).toHexString();
     static max = (a, b) => (a > b ? a : b);
     static min = (a, b) => (a < b ? a : b);
+    static neg = (a) => (a > 0 ? a * -1n : a);
 }
 exports.BigIntMath = BigIntMath;

package/lib/utils/types.d.ts

@@ -1,5 +1 @@
-import { BigNumber } from "ethers";
-export type BigintifyProps<T extends {}> = {
-    [K in keyof T]: T[K] extends BigNumber ? bigint : T[K];
-};
 export type PartialKeys<T, K extends keyof T> = Partial<Pick<T, K>> & Omit<T, K>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.0-next.19",
+  "version": "3.0.0-next.190",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -19,7 +19,7 @@
     "pub": "rm -rf ./src/types/hardhat.ts && cp ./src/types/*.d.ts ./lib/types && tsc --p tsconfig.build.json && yarn publish",
     "types:clean": "rm -rf forge-out src/types",
     "types:build": "forge build",
-    "types:generate": "typechain --target ethers-v5 --out-dir src/types ./forge-out/**/*.json",
+    "types:generate": "typechain --target ethers-v6 --out-dir src/types ./forge-out/**/*.json",
     "types": "yarn types:clean && yarn types:build && yarn types:generate",
     "prepare": "husky install",
     "prettier": "prettier --write .",
@@ -27,29 +27,33 @@
     "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.10.3",
+    "@gearbox-protocol/bots-v3": "^1.5.1",
+    "@gearbox-protocol/sdk-gov": "^2.2.8",
     "axios": "^1.2.6",
     "decimal.js-light": "^2.5.1",
     "deep-eql": "^4.1.0",
-    "moment": "^2.29.4",
-    "zod": "^3.22.2"
+    "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.16",
-    "@gearbox-protocol/core-v3": "^1.41.0",
+    "@gearbox-protocol/core-v2": "1.19.0-base.17",
+    "@gearbox-protocol/core-v3": "^1.49.7",
     "@gearbox-protocol/eslint-config": "^1.4.1",
-    "@gearbox-protocol/integrations-v3": "^1.18.0",
-    "@gearbox-protocol/oracles-v3": "^1.7.6",
-    "@gearbox-protocol/periphery-v3": "^1.2.13",
+    "@gearbox-protocol/integrations-v3": "^1.40.4",
+    "@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.27.1",
     "@openzeppelin/contracts": "^4.9.3",
-    "@typechain/ethers-v5": "^10.1.0",
+    "@redstone-finance/evm-connector": "^0.3.6",
+    "@typechain/ethers-v6": "^0.5.1",
     "@types/chai": "^4.3.3",
     "@types/deep-eql": "^4.0.0",
     "@types/jest": "^28.1.7",
@@ -59,7 +63,7 @@
     "chai": "^4.3.6",
     "dotenv": "^16.0.1",
     "eslint": "^8.22.0",
-    "ethers": "5.6.9",
+    "ethers": "6.12.1",
     "husky": ">=6",
     "jest": "^28.1.3",
     "lint-staged": ">=10",

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));
-    });
-});