@gearbox-protocol/sdk 1.7.11 → 1.8.0

package/lib/apy/convexAPY.d.ts

@@ -10,3 +10,4 @@ export interface GetConvexAPYProps {
     curveAPY: CurveAPYResult;
 }
 export declare function getConvexAPY({ pool, provider, networkType, getTokenPrice, curveAPY, }: GetConvexAPYProps): Promise<BigNumber>;
+export declare function getCVXMintAmount(crvAmount: BigNumber, cvxSupply: BigNumber): BigNumber;

package/lib/apy/convexAPY.js

@@ -45,7 +45,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConvexAPY = void 0;
+exports.getCVXMintAmount = exports.getConvexAPY = void 0;
 var ethers_1 = require("ethers");
 var contracts_1 = require("../contracts/contracts");
 var constants_1 = require("../core/constants");
@@ -123,6 +123,7 @@ function getCVXMintAmount(crvAmount, cvxSupply) {
     }
     return ethers_1.BigNumber.from(0);
 }
+exports.getCVXMintAmount = getCVXMintAmount;
 function getPoolData(_a) {
     var basePoolAddress = _a.basePoolAddress, swapPoolAddress = _a.swapPoolAddress, cvxAddress = _a.cvxAddress, extraPoolAddresses = _a.extraPoolAddresses, provider = _a.provider;
     return __awaiter(this, void 0, void 0, function () {

package/lib/contracts/adapters.d.ts

@@ -13,5 +13,6 @@ export declare enum AdapterInterface {
     CONVEX_V1_BOOSTER = 11,
     CONVEX_V1_CLAIM_ZAP = 12,
     LIDO_V1 = 13,
-    UNIVERSAL = 14
+    UNIVERSAL = 14,
+    LIDO_WSTETH = 15
 }

package/lib/contracts/adapters.js

@@ -18,4 +18,5 @@ var AdapterInterface;
     AdapterInterface[AdapterInterface["CONVEX_V1_CLAIM_ZAP"] = 12] = "CONVEX_V1_CLAIM_ZAP";
     AdapterInterface[AdapterInterface["LIDO_V1"] = 13] = "LIDO_V1";
     AdapterInterface[AdapterInterface["UNIVERSAL"] = 14] = "UNIVERSAL";
+    AdapterInterface[AdapterInterface["LIDO_WSTETH"] = 15] = "LIDO_WSTETH";
 })(AdapterInterface = exports.AdapterInterface || (exports.AdapterInterface = {}));

package/lib/core/constants.d.ts

@@ -23,3 +23,6 @@ export declare const LEVERAGE_DECIMALS = 100;
 export declare const SLIPPAGE_DECIMALS = 100;
 export declare const ADDRESS_0X0 = "0x0000000000000000000000000000000000000000";
 export declare const DUMB_ADDRESS = "0xC4375B7De8af5a38a93548eb8453a498222C4fF2";
+export declare const DUMB_ADDRESS2 = "0x93548eB8453a498222C4FF2C4375b7De8af5A38a";
+export declare const DUMB_ADDRESS3 = "0x822293548EB8453A49c4fF2c4375B7DE8AF5a38A";
+export declare const DUMB_ADDRESS4 = "0x498222C4Ff2C4393548eb8453a75B7dE8AF5A38a";

package/lib/core/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DUMB_ADDRESS = exports.ADDRESS_0X0 = exports.SLIPPAGE_DECIMALS = exports.LEVERAGE_DECIMALS = exports.timeRanges = exports.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD = exports.LIQUIDATION_DISCOUNTED_SUM = exports.PERCENTAGE_FACTOR = exports.PERCENTAGE_DECIMALS = exports.SECONDS_PER_YEAR = exports.PRICE_DECIMALS = exports.PRICE_DECIMALS_POW = exports.WAD = exports.WAD_DECIMALS_POW = exports.halfRAY = exports.RAY = exports.RAY_DECIMALS_POW = exports.getNetworkType = exports.HARDHAT_NETWORK = exports.LOCAL_NETWORK = exports.GOERLI_NETWORK = exports.MAINNET_NETWORK = exports.MAX_INT = void 0;
+exports.DUMB_ADDRESS4 = exports.DUMB_ADDRESS3 = exports.DUMB_ADDRESS2 = exports.DUMB_ADDRESS = exports.ADDRESS_0X0 = exports.SLIPPAGE_DECIMALS = exports.LEVERAGE_DECIMALS = exports.timeRanges = exports.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD = exports.LIQUIDATION_DISCOUNTED_SUM = exports.PERCENTAGE_FACTOR = exports.PERCENTAGE_DECIMALS = exports.SECONDS_PER_YEAR = exports.PRICE_DECIMALS = exports.PRICE_DECIMALS_POW = exports.WAD = exports.WAD_DECIMALS_POW = exports.halfRAY = exports.RAY = exports.RAY_DECIMALS_POW = exports.getNetworkType = exports.HARDHAT_NETWORK = exports.LOCAL_NETWORK = exports.GOERLI_NETWORK = exports.MAINNET_NETWORK = exports.MAX_INT = void 0;
 var ethers_1 = require("ethers");
 exports.MAX_INT = ethers_1.BigNumber.from("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 exports.MAINNET_NETWORK = 1;
@@ -43,3 +43,6 @@ exports.SLIPPAGE_DECIMALS = 100;
 exports.ADDRESS_0X0 = "0x0000000000000000000000000000000000000000";
 // Used in tests
 exports.DUMB_ADDRESS = "0xC4375B7De8af5a38a93548eb8453a498222C4fF2";
+exports.DUMB_ADDRESS2 = "0x93548eB8453a498222C4FF2C4375b7De8af5A38a";
+exports.DUMB_ADDRESS3 = "0x822293548EB8453A49c4fF2c4375B7DE8AF5a38A";
+exports.DUMB_ADDRESS4 = "0x498222C4Ff2C4393548eb8453a75B7dE8AF5A38a";

package/lib/core/creditManager.d.ts

@@ -24,6 +24,7 @@ export declare class CreditManagerData {
     readonly degenNFT: string;
     readonly isIncreaseDebtForbidden: boolean;
     readonly forbiddenTokenMask: BigNumber;
+    readonly maxEnabledTokensLength: number;
     readonly feeInterest: number;
     readonly feeLiquidation: number;
     readonly liquidationDiscount: number;

package/lib/core/creditManager.js

@@ -43,6 +43,7 @@ var CreditManagerData = /** @class */ (function () {
         this.pool = payload.pool.toLowerCase();
         this.isWETH = payload.isWETH;
         this.canBorrow = payload.canBorrow;
+        this.maxEnabledTokensLength = payload.maxEnabledTokensLength;
         this.borrowRate = payload.borrowRate
             .mul(payload.feeInterest + constants_1.PERCENTAGE_FACTOR)
             .mul(constants_1.PERCENTAGE_DECIMALS)

package/lib/core/rewardClaimer.d.ts

@@ -0,0 +1,19 @@
+import { BigNumber, providers } from "ethers";
+import { SupportedContract } from "../contracts/contracts";
+import { MultiCall } from "../pathfinder/core";
+import { SupportedToken } from "../tokens/token";
+import { NetworkType } from "./constants";
+import { CreditAccountData } from "./creditAccount";
+import { CreditManagerData } from "./creditManager";
+export interface Rewards {
+    contract: SupportedContract;
+    rewards: Partial<Record<SupportedToken, BigNumber>>;
+    calls: Array<MultiCall>;
+}
+export interface AdapterWithType {
+    adapter: string;
+    contract: SupportedContract;
+}
+export declare class RewardClaimer {
+    static findRewards(ca: CreditAccountData, cm: CreditManagerData, network: NetworkType, provider: providers.Provider): Promise<Array<Rewards>>;
+}

package/lib/core/rewardClaimer.js

@@ -0,0 +1,53 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RewardClaimer = void 0;
+var rewardConvex_1 = require("./rewardConvex");
+var RewardClaimer = /** @class */ (function () {
+    function RewardClaimer() {
+    }
+    RewardClaimer.findRewards = function (ca, cm, network, provider) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, rewardConvex_1.RewardConvex.findRewards(ca, cm, network, provider)];
+            });
+        });
+    };
+    return RewardClaimer;
+}());
+exports.RewardClaimer = RewardClaimer;

package/lib/core/rewardConvex.d.ts

@@ -0,0 +1,26 @@
+import { BigNumber, providers } from "ethers";
+import { SupportedContract } from "../contracts/contracts";
+import { SupportedToken } from "../tokens/token";
+import { IConvexV1BaseRewardPoolAdapterInterface } from "../types/contracts/interfaces/adapters/convex/IConvexV1BaseRewardPoolAdapter.sol/IConvexV1BaseRewardPoolAdapter";
+import { MCall } from "../utils/multicall";
+import { NetworkType } from "./constants";
+import { CreditAccountData } from "./creditAccount";
+import { CreditManagerData } from "./creditManager";
+import { AdapterWithType, Rewards } from "./rewardClaimer";
+export interface RewardDistribution {
+    adapter: string;
+    contract: SupportedContract;
+    token: SupportedToken;
+}
+interface MCallPreparation {
+    calls: Array<MCall<IConvexV1BaseRewardPoolAdapterInterface>>;
+    distribution: Array<RewardDistribution>;
+}
+export declare class RewardConvex {
+    static poolInterface: IConvexV1BaseRewardPoolAdapterInterface;
+    static findRewards(ca: CreditAccountData, cm: CreditManagerData, network: NetworkType, provider: providers.Provider): Promise<Array<Rewards>>;
+    static findAdapters(cm: CreditManagerData): Array<AdapterWithType>;
+    static prepareMultiCalls(creditAccount: string, cm: CreditManagerData, network: NetworkType): MCallPreparation;
+    static parseResults(creditAccount: string, rewards: Array<BigNumber>, distribution: Array<RewardDistribution>): Array<Rewards>;
+}
+export {};

package/lib/core/rewardConvex.js

@@ -0,0 +1,161 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RewardConvex = void 0;
+var ethers_1 = require("ethers");
+var apy_1 = require("../apy");
+var adapters_1 = require("../contracts/adapters");
+var contracts_1 = require("../contracts/contracts");
+var token_1 = require("../tokens/token");
+var types_1 = require("../types");
+var multicall_1 = require("../utils/multicall");
+var RewardConvex = /** @class */ (function () {
+    function RewardConvex() {
+    }
+    RewardConvex.findRewards = function (ca, cm, network, provider) {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, calls, distribution, mcalls, rewards, totalSupply, results;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = RewardConvex.prepareMultiCalls(ca.addr, cm, network), calls = _a.calls, distribution = _a.distribution;
+                        mcalls = calls;
+                        mcalls.push({
+                            address: token_1.tokenDataByNetwork[network].CVX,
+                            interface: types_1.IConvexToken__factory.createInterface(),
+                            method: "totalSupply()",
+                        });
+                        return [4 /*yield*/, (0, multicall_1.multicall)(mcalls, provider)];
+                    case 1:
+                        rewards = _b.sent();
+                        totalSupply = rewards.pop();
+                        results = RewardConvex.parseResults(ca.addr, rewards, distribution);
+                        results.forEach(function (r) {
+                            r.rewards.CVX = (0, apy_1.getCVXMintAmount)(r.rewards.CRV || ethers_1.BigNumber.from(0), totalSupply);
+                        });
+                        return [2 /*return*/, results];
+                }
+            });
+        });
+    };
+    RewardConvex.findAdapters = function (cm) {
+        var convexPools = Object.entries(contracts_1.contractParams)
+            .filter(function (_a) {
+            var _ = _a[0], params = _a[1];
+            return params.type === adapters_1.AdapterInterface.CONVEX_V1_BASE_REWARD_POOL;
+        })
+            .map(function (_a) {
+            var contract = _a[0];
+            return contract;
+        });
+        return Object.entries(cm.adapters)
+            .map(function (_a) {
+            var adapter = _a[0], contact = _a[1];
+            return ({
+                adapter: adapter,
+                contract: contracts_1.contractsByAddress[contact.toLowerCase()],
+            });
+        })
+            .filter(function (a) { return convexPools.includes(a.contract); });
+    };
+    RewardConvex.prepareMultiCalls = function (creditAccount, cm, network) {
+        var calls = [];
+        var distribution = [];
+        var adapters = this.findAdapters(cm);
+        for (var _i = 0, adapters_2 = adapters; _i < adapters_2.length; _i++) {
+            var a = adapters_2[_i];
+            calls.push({
+                address: a.adapter,
+                interface: RewardConvex.poolInterface,
+                method: "earned(address)",
+                params: [creditAccount],
+            });
+            distribution.push({
+                adapter: a.adapter,
+                contract: a.contract,
+                token: "CRV",
+            });
+            var params = contracts_1.contractParams[a.contract];
+            for (var _a = 0, _b = params.extraRewards; _a < _b.length; _a++) {
+                var er = _b[_a];
+                calls.push({
+                    address: er.poolAddress[network],
+                    interface: RewardConvex.poolInterface,
+                    method: "earned(address)",
+                    params: [creditAccount],
+                });
+                distribution.push({
+                    adapter: a.adapter,
+                    contract: a.contract,
+                    token: er.rewardToken,
+                });
+            }
+        }
+        return {
+            calls: calls,
+            distribution: distribution,
+        };
+    };
+    RewardConvex.parseResults = function (creditAccount, rewards, distribution) {
+        var result = {};
+        var callData = RewardConvex.poolInterface.encodeFunctionData("getReward(address,bool)", [creditAccount, true]);
+        for (var i = 0; i < rewards.length; i++) {
+            var _a = distribution[i], contract = _a.contract, adapter = _a.adapter, token = _a.token;
+            var reward = rewards[i];
+            if (!reward.isZero()) {
+                if (!result[contract]) {
+                    result[contract] = {
+                        contract: contract,
+                        rewards: {},
+                        calls: [
+                            {
+                                target: adapter,
+                                callData: callData,
+                            },
+                        ],
+                    };
+                }
+                result[contract].rewards[token] = reward;
+            }
+        }
+        return Object.values(result);
+    };
+    RewardConvex.poolInterface = types_1.IConvexV1BaseRewardPoolAdapter__factory.createInterface();
+    return RewardConvex;
+}());
+exports.RewardConvex = RewardConvex;

package/lib/core/rewardConvex.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/core/rewardConvex.spec.js

@@ -0,0 +1,140 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var chai_1 = require("chai");
+var ethers_1 = require("ethers");
+var contracts_1 = require("../contracts/contracts");
+var constants_1 = require("./constants");
+var rewardConvex_1 = require("./rewardConvex");
+var ADAPTER_CONVEX_3CRV_POOL = constants_1.DUMB_ADDRESS;
+var ADAPTER_CURVE_FRAX_POOL = constants_1.DUMB_ADDRESS2;
+var ADAPTER_CONVEX_FRAX3CRV_POOL = constants_1.DUMB_ADDRESS3;
+var CREDIT_ACCOUNT = constants_1.DUMB_ADDRESS4;
+describe("RewardConvex test", function () {
+    it("findAdapters find convex adapters correctly", function () {
+        var _a;
+        var cm = {
+            adapters: (_a = {},
+                _a[ADAPTER_CONVEX_3CRV_POOL] = contracts_1.contractsByNetwork.Mainnet.CONVEX_3CRV_POOL,
+                _a[ADAPTER_CURVE_FRAX_POOL] = contracts_1.contractsByNetwork.Mainnet.CURVE_FRAX_POOL,
+                _a[ADAPTER_CONVEX_FRAX3CRV_POOL] = contracts_1.contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
+                _a),
+        };
+        var expectedResult = [
+            {
+                adapter: ADAPTER_CONVEX_3CRV_POOL,
+                contract: "CONVEX_3CRV_POOL",
+            },
+            {
+                adapter: ADAPTER_CONVEX_FRAX3CRV_POOL,
+                contract: "CONVEX_FRAX3CRV_POOL",
+            },
+        ];
+        var result = rewardConvex_1.RewardConvex.findAdapters(cm);
+        (0, chai_1.expect)(result).to.be.eql(expectedResult);
+    });
+    it("prepareMultiCalls prepares multicall data correctly", function () {
+        var _a;
+        var cm = {
+            adapters: (_a = {},
+                _a[ADAPTER_CONVEX_3CRV_POOL] = contracts_1.contractsByNetwork.Mainnet.CONVEX_3CRV_POOL,
+                _a[ADAPTER_CURVE_FRAX_POOL] = contracts_1.contractsByNetwork.Mainnet.CURVE_FRAX_POOL,
+                _a[ADAPTER_CONVEX_FRAX3CRV_POOL] = contracts_1.contractsByNetwork.Goerli.CONVEX_FRAX3CRV_POOL,
+                _a),
+        };
+        var calls = [
+            {
+                address: ADAPTER_CONVEX_3CRV_POOL,
+                interface: rewardConvex_1.RewardConvex.poolInterface,
+                method: "earned(address)",
+                params: [CREDIT_ACCOUNT],
+            },
+            {
+                address: ADAPTER_CONVEX_FRAX3CRV_POOL,
+                interface: rewardConvex_1.RewardConvex.poolInterface,
+                method: "earned(address)",
+                params: [CREDIT_ACCOUNT],
+            },
+            {
+                address: contracts_1.contractParams.CONVEX_FRAX3CRV_POOL
+                    .extraRewards[0].poolAddress.Mainnet,
+                interface: rewardConvex_1.RewardConvex.poolInterface,
+                method: "earned(address)",
+                params: [CREDIT_ACCOUNT],
+            },
+        ];
+        var distribution = [
+            {
+                adapter: ADAPTER_CONVEX_3CRV_POOL,
+                contract: "CONVEX_3CRV_POOL",
+                token: "CRV",
+            },
+            {
+                adapter: ADAPTER_CONVEX_FRAX3CRV_POOL,
+                contract: "CONVEX_FRAX3CRV_POOL",
+                token: "CRV",
+            },
+            {
+                adapter: ADAPTER_CONVEX_FRAX3CRV_POOL,
+                contract: "CONVEX_FRAX3CRV_POOL",
+                token: "FXS",
+            },
+        ];
+        var result = rewardConvex_1.RewardConvex.prepareMultiCalls(CREDIT_ACCOUNT, cm, "Mainnet");
+        console.log(result);
+        (0, chai_1.expect)(result).to.be.eql({ calls: calls, distribution: distribution });
+    });
+    it("parseResults parse data correctly", function () {
+        var rewards = [
+            ethers_1.BigNumber.from(1000),
+            ethers_1.BigNumber.from(2000),
+            ethers_1.BigNumber.from(4000),
+        ];
+        var distribution = [
+            {
+                adapter: ADAPTER_CONVEX_3CRV_POOL,
+                contract: "CONVEX_3CRV_POOL",
+                token: "CRV",
+            },
+            {
+                adapter: ADAPTER_CONVEX_FRAX3CRV_POOL,
+                contract: "CONVEX_FRAX3CRV_POOL",
+                token: "CRV",
+            },
+            {
+                adapter: ADAPTER_CONVEX_FRAX3CRV_POOL,
+                contract: "CONVEX_FRAX3CRV_POOL",
+                token: "FXS",
+            },
+        ];
+        var parsed = rewardConvex_1.RewardConvex.parseResults(CREDIT_ACCOUNT, rewards, distribution);
+        var callData = rewardConvex_1.RewardConvex.poolInterface.encodeFunctionData("getReward(address,bool)", [CREDIT_ACCOUNT, true]);
+        var expected = [
+            {
+                contract: "CONVEX_3CRV_POOL",
+                rewards: {
+                    CRV: ethers_1.BigNumber.from(1000),
+                },
+                calls: [
+                    {
+                        target: ADAPTER_CONVEX_3CRV_POOL,
+                        callData: callData,
+                    },
+                ],
+            },
+            {
+                contract: "CONVEX_FRAX3CRV_POOL",
+                rewards: {
+                    CRV: ethers_1.BigNumber.from(2000),
+                    FXS: ethers_1.BigNumber.from(4000),
+                },
+                calls: [
+                    {
+                        target: ADAPTER_CONVEX_FRAX3CRV_POOL,
+                        callData: callData,
+                    },
+                ],
+            },
+        ];
+        (0, chai_1.expect)(parsed).to.be.eql(expected);
+    });
+});

package/lib/core/trade.js

@@ -37,7 +37,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Trade = void 0;
-var txParser_1 = require("../parsers/txParser");
 var decimals_1 = require("../tokens/decimals");
 var token_1 = require("../tokens/token");
 var formatter_1 = require("../utils/formatter");
@@ -86,12 +85,10 @@ var Trade = /** @class */ (function () {
             var receipt;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
-                        console.log(txParser_1.TxParser.parseMultiCall(this.tradePath.calls));
-                        return [4 /*yield*/, signer.sendTransaction({
-                                to: call.target,
-                                data: call.callData,
-                            })];
+                    case 0: return [4 /*yield*/, signer.sendTransaction({
+                            to: call.target,
+                            data: call.callData,
+                        })];
                     case 1:
                         receipt = _a.sent();
                         return [2 /*return*/, new transactions_1.TXSwap({

package/lib/oracles/oracles.d.ts

@@ -10,7 +10,8 @@ export declare enum OracleType {
     CURVE_LP_TOKEN_ORACLE = 2,
     YEARN_CURVE_LP_TOKEN_ORACLE = 3,
     ZERO_ORACLE = 4,
-    LIKE_CURVE_LP_TOKEN_ORACLE = 5
+    LIKE_CURVE_LP_TOKEN_ORACLE = 5,
+    WSTETH_ORACLE = 6
 }
 export declare type PriceFeedData = {
     type: OracleType.CHAINLINK_ORACLE;
@@ -29,6 +30,9 @@ export declare type PriceFeedData = {
 } | {
     type: OracleType.LIKE_CURVE_LP_TOKEN_ORACLE;
     curveSymbol: SupportedToken;
+} | {
+    type: OracleType.WSTETH_ORACLE;
+    token: SupportedToken;
 };
 export interface TokenPriceFeedData {
     priceFeedETH?: PriceFeedData;

package/lib/oracles/oracles.js

@@ -9,4 +9,5 @@ var OracleType;
     OracleType[OracleType["YEARN_CURVE_LP_TOKEN_ORACLE"] = 3] = "YEARN_CURVE_LP_TOKEN_ORACLE";
     OracleType[OracleType["ZERO_ORACLE"] = 4] = "ZERO_ORACLE";
     OracleType[OracleType["LIKE_CURVE_LP_TOKEN_ORACLE"] = 5] = "LIKE_CURVE_LP_TOKEN_ORACLE";
+    OracleType[OracleType["WSTETH_ORACLE"] = 6] = "WSTETH_ORACLE";
 })(OracleType = exports.OracleType || (exports.OracleType = {}));

package/lib/oracles/priceFeeds.js

@@ -263,6 +263,12 @@ exports.priceFeedsByNetwork = {
             },
         },
     },
+    wstETH: {
+        priceFeedUSD: {
+            type: oracles_1.OracleType.WSTETH_ORACLE,
+            token: "STETH",
+        },
+    },
     CVX: {
         priceFeedUSD: {
             type: oracles_1.OracleType.CHAINLINK_ORACLE,

package/lib/payload/creditAccount.d.ts

@@ -1,3 +1,4 @@
 import { CreditAccountDataStruct, CreditAccountDataStructOutput } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
+import { ExcludeArrayProps } from "../utils/types";
 export declare type TokenBalancePayload = CreditAccountDataStruct["balances"];
-export declare type CreditAccountDataPayload = CreditAccountDataStructOutput;
+export declare type CreditAccountDataPayload = ExcludeArrayProps<CreditAccountDataStructOutput>;

package/lib/payload/creditManager.d.ts

@@ -1,10 +1,11 @@
 import { BigNumberish } from "ethers";
 import { CreditManagerDataStructOutput } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
+import { ExcludeArrayProps } from "../utils/types";
 export interface AdapterPayload {
     allowedContract: string;
     adapter: string;
 }
-export declare type CreditManagerDataPayload = CreditManagerDataStructOutput;
+export declare type CreditManagerDataPayload = ExcludeArrayProps<CreditManagerDataStructOutput>;
 export interface CreditManagerStatPayload extends CreditManagerDataPayload {
     allowedContracts?: Array<string>;
     uniqueUsers: number;

package/lib/payload/pool.d.ts

@@ -1,2 +1,3 @@
 import { PoolDataStruct } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
-export declare type PoolDataPayload = PoolDataStruct;
+import { ExcludeArrayProps } from "../utils/types";
+export declare type PoolDataPayload = ExcludeArrayProps<PoolDataStruct>;

package/lib/tokens/decimals.js

@@ -18,6 +18,7 @@ exports.decimals = {
     WETH: 18,
     YFI: 18,
     STETH: 18,
+    wstETH: 18,
     CVX: 18,
     FRAX: 18,
     FXS: 18,

package/lib/tokens/normal.d.ts

@@ -1,7 +1,7 @@
 import { TradeAction } from "../pathfinder/tradeTypes";
 import type { TokenBase } from "./token";
 import { TokenType } from "./tokenType";
-export declare type NormalToken = "1INCH" | "AAVE" | "COMP" | "CRV" | "DPI" | "FEI" | "LINK" | "SNX" | "UNI" | "USDT" | "USDC" | "DAI" | "WETH" | "WBTC" | "YFI" | "STETH" | "CVX" | "FRAX" | "FXS" | "LDO" | "LUSD" | "sUSD" | "GUSD" | "LQTY";
+export declare type NormalToken = "1INCH" | "AAVE" | "COMP" | "CRV" | "DPI" | "FEI" | "LINK" | "SNX" | "UNI" | "USDT" | "USDC" | "DAI" | "WETH" | "WBTC" | "YFI" | "STETH" | "wstETH" | "CVX" | "FRAX" | "FXS" | "LDO" | "LUSD" | "sUSD" | "GUSD" | "LQTY";
 export declare type NormalTokenData = {
     symbol: NormalToken;
     type: TokenType.NORMAL_TOKEN;

package/lib/tokens/normal.js

@@ -433,6 +433,31 @@ exports.normalTokens = {
             },
         ],
     },
+    wstETH: {
+        name: "wstETH",
+        decimals: 18,
+        symbol: "wstETH",
+        type: tokenType_1.TokenType.NORMAL_TOKEN,
+        swapActions: [
+            {
+                type: tradeTypes_1.TradeType.UniswapV3Swap,
+                contract: "UNISWAP_V3_ROUTER",
+            },
+            {
+                type: tradeTypes_1.TradeType.UniswapV2Swap,
+                contract: "UNISWAP_V2_ROUTER",
+            },
+            {
+                type: tradeTypes_1.TradeType.UniswapV2Swap,
+                contract: "SUSHISWAP_ROUTER",
+            },
+            {
+                type: tradeTypes_1.TradeType.CurveExchange,
+                contract: "CURVE_STETH_GATEWAY",
+                tokenOut: ["WETH"],
+            },
+        ],
+    },
     CVX: {
         name: "CVX",
         decimals: 18,

package/lib/tokens/token.js

@@ -42,6 +42,7 @@ exports.tokenDataByNetwork = {
         YFI: "0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e",
         /// UPDATE
         STETH: "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
+        wstETH: "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0",
         CVX: "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B",
         FRAX: "0x853d955aCEf822Db058eb8505911ED77F175b99e",
         FXS: "0x3432B6A60D23Ca0dFCa7761B7ab56459D9C964D0",
@@ -108,6 +109,7 @@ exports.tokenDataByNetwork = {
         YFI: "0xCad5D7701e0A85fe50B3aCaBDcdF7e75672F326e",
         /// UPDATE
         STETH: "0xd628baa42b3080593a231016bF3F229161C9F745",
+        wstETH: "DEPLOY ME",
         CVX: "0x6D75eb70402CF06a0cB5B8fdc1836dAe29702B17",
         FRAX: "0x92d43093959C7DDa89896418bCE9DE0B87879646",
         FXS: "0x34C035818Dd308f3aC20e68bC03C3E4FC8924d9d",

package/lib/utils/types.d.ts

@@ -2,3 +2,9 @@ export declare type PartialRecord<K extends keyof any, T> = {
     [P in K]?: T;
 };
 export declare type AwaitedRes<T extends (...args: any) => any> = Awaited<ReturnType<T>>;
+declare type ArrayMethodKeys = keyof [] & {};
+declare type NonArrayKeys<T> = T extends `${number}` | number | ArrayMethodKeys ? never : T;
+export declare type ExcludeArrayProps<T> = {
+    [K in keyof T as NonArrayKeys<K>]: T[K];
+};
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "1.7.11",
+  "version": "1.8.0",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -15,7 +15,6 @@
     "dev": "tsc -w",
     "pub": "rm -rf ./src/types/hardhat.ts && cp ./src/types/*.d.ts ./lib/types && tsc && yarn publish",
     "copyTypes": "node ./scripts/copyTypes.js",
-    "prepush": "yarn lint --max-warnings=0",
     "prepare": "husky install",
     "prettier": "prettier --write .",
     "prettier:ci": "npx prettier --check .",