@gearbox-protocol/sdk 1.5.4 → 1.5.7

package/lib/contracts/contracts.d.ts

@@ -29,6 +29,7 @@ export declare type CurveParams = {
     type: AdapterInterface.CURVE_V1_2ASSETS | AdapterInterface.CURVE_V1_3ASSETS | AdapterInterface.CURVE_V1_4ASSETS | AdapterInterface.CURVE_V1_WRAPPER;
     lpToken: CurveLPToken;
     tokens: Array<NormalToken | CurveLPToken>;
+    underlyings?: Array<NormalToken>;
     wrapper?: CurvePoolContract;
 } & BaseContractParams;
 export declare type CurveSteCRVPoolParams = {

package/lib/contracts/contracts.js

@@ -126,6 +126,7 @@ exports.contractParams = {
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
         lpToken: "FRAX3CRV",
         tokens: ["FRAX", "3Crv"],
+        underlyings: ["FRAX", "DAI", "USDC", "USDT"],
     },
     CURVE_LUSD_POOL: {
         name: "Curve LUSD",
@@ -133,6 +134,7 @@ exports.contractParams = {
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
         lpToken: "LUSD3CRV",
         tokens: ["LUSD", "3Crv"],
+        underlyings: ["LUSD", "DAI", "USDC", "USDT"],
     },
     CURVE_SUSD_POOL: {
         name: "Curve SUSD",
@@ -155,6 +157,7 @@ exports.contractParams = {
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
         lpToken: "gusd3CRV",
         tokens: ["GUSD", "3Crv"],
+        underlyings: ["GUSD", "DAI", "USDC", "USDT"],
     },
     YEARN_DAI_VAULT: {
         name: "Yearn DAI",

package/lib/oracles/oracles.d.ts

@@ -18,7 +18,6 @@ export declare type PriceFeedData = {
 } | {
     type: OracleType.YEARN_TOKEN_ORACLE;
     token: SupportedToken;
-    address: Record<NetworkType, string>;
 } | {
     type: OracleType.CURVE_LP_TOKEN_ORACLE;
     assets: Array<SupportedToken>;

package/lib/oracles/priceFeeds.js

@@ -378,56 +378,32 @@ exports.priceFeedsByNetwork = {
         priceFeedETH: {
             type: oracles_1.OracleType.YEARN_TOKEN_ORACLE,
             token: "DAI",
-            address: {
-                Mainnet: "",
-                Goerli: "TODO: DEPLOY ME",
-            },
         },
         priceFeedUSD: {
             type: oracles_1.OracleType.YEARN_TOKEN_ORACLE,
             token: "DAI",
-            address: {
-                Mainnet: "",
-                Goerli: "TODO: DEPLOY ME",
-            },
         },
     },
     yvUSDC: {
         priceFeedETH: {
             type: oracles_1.OracleType.YEARN_TOKEN_ORACLE,
             token: "USDC",
-            address: {
-                Mainnet: "",
-                Goerli: "TODO: DEPLOY ME",
-            },
         },
         priceFeedUSD: {
             type: oracles_1.OracleType.YEARN_TOKEN_ORACLE,
             token: "USDC",
-            address: {
-                Mainnet: "",
-                Goerli: "TODO: DEPLOY ME",
-            },
         },
     },
     yvWETH: {
         priceFeedUSD: {
             type: oracles_1.OracleType.YEARN_TOKEN_ORACLE,
             token: "WETH",
-            address: {
-                Mainnet: "",
-                Goerli: "TODO: DEPLOY ME",
-            },
         },
     },
     yvWBTC: {
         priceFeedUSD: {
             type: oracles_1.OracleType.YEARN_TOKEN_ORACLE,
             token: "WBTC",
-            address: {
-                Mainnet: "",
-                Goerli: "TODO: DEPLOY ME",
-            },
         },
     },
     // CURVE LP TOKENS

package/lib/parsers/curveAdapterParser.d.ts

@@ -8,5 +8,6 @@ export declare class CurveAdapterParser extends AbstractParser implements IParse
     constructor(contract: SupportedContract, isContract: boolean);
     parse(calldata: string): string;
     getTokenByIndex(index: number): SupportedToken;
+    getUnderlyingTokenByIndex(index: number): SupportedToken;
     convertAmounts(amounts: Array<BigNumberish>): string;
 }

package/lib/parsers/curveAdapterParser.js

@@ -53,14 +53,24 @@ var CurveAdapterParser = /** @class */ (function (_super) {
             case "exchange":
             case "exchange_underlying": {
                 var _b = this.decodeFunctionData(functionFragment, calldata), i = _b[0], j = _b[1], dx = _b[2], min_dy = _b[3];
-                var iSym = this.getTokenByIndex(i);
-                var jSym = this.getTokenByIndex(j);
+                var iSym = functionFragment.name === "exchange_underlying"
+                    ? this.getUnderlyingTokenByIndex(i)
+                    : this.getTokenByIndex(i);
+                var jSym = functionFragment.name === "exchange_underlying"
+                    ? this.getUnderlyingTokenByIndex(j)
+                    : this.getTokenByIndex(j);
                 return "".concat(functionName, "(i ,j: ").concat(iSym, " => ").concat(jSym, ", dx: ").concat(this.formatBN(dx, iSym), ", min_dy: ").concat(this.formatBN(min_dy, jSym), ")");
             }
             case "exchange_all":
             case "exchange_all_underlying": {
                 var _c = this.decodeFunctionData(functionFragment, calldata), i = _c[0], j = _c[1], rateMinRAY = _c[2];
-                return "".concat(functionName, "(i: ").concat(this.getTokenByIndex(i), ", j: ").concat(this.getTokenByIndex(j), ", rateMinRAY: ").concat((0, formatter_1.formatBN)(rateMinRAY, 27));
+                var iSym = functionFragment.name === "exchange_all_underlying"
+                    ? this.getUnderlyingTokenByIndex(i)
+                    : this.getTokenByIndex(i);
+                var jSym = functionFragment.name === "exchange_all_underlying"
+                    ? this.getUnderlyingTokenByIndex(j)
+                    : this.getTokenByIndex(j);
+                return "".concat(functionName, "(i: ").concat(iSym, ", j: ").concat(jSym, ", rateMinRAY: ").concat((0, formatter_1.formatBN)(rateMinRAY, 27));
             }
             case "add_liquidity_one_coin": {
                 var _d = this.decodeFunctionData(functionFragment, calldata), amount = _d[0], i = _d[1], minAmount = _d[2];
@@ -92,6 +102,10 @@ var CurveAdapterParser = /** @class */ (function (_super) {
         return contracts_1.contractParams[this.contract]
             .tokens[index];
     };
+    CurveAdapterParser.prototype.getUnderlyingTokenByIndex = function (index) {
+        return contracts_1.contractParams[this.contract]
+            .underlyings[index];
+    };
     CurveAdapterParser.prototype.convertAmounts = function (amounts) {
         var _this = this;
         return amounts

package/lib/parsers/curveAdapterParser.spec.js

@@ -16,7 +16,7 @@ describe("CurveAdapterParser test", function () {
             constants_1.WAD.mul(3),
             constants_1.WAD.mul(32),
         ]));
-        (0, chai_1.expect)(parsed).to.be.eq("Curve2AssetsAdapter[CURVE_FRAX_POOL].exchange_underlying(i ,j: FRAX => 3Crv, dx: 3.00 [3000000000000000000], min_dy: 32.00 [32000000000000000000])", "Curve2AssetsAdapter: Incorrect parse exchange_underlying");
+        (0, chai_1.expect)(parsed).to.be.eq("Curve2AssetsAdapter[CURVE_FRAX_POOL].exchange_underlying(i ,j: FRAX => DAI, dx: 3.00 [3000000000000000000], min_dy: 32.00 [32000000000000000000])", "Curve2AssetsAdapter: Incorrect parse exchange_underlying");
         parsed = parser.parse(ifc.encodeFunctionData("add_liquidity_one_coin", [
             constants_1.WAD.mul(3),
             0,

package/lib/parsers/uniV3AdapterParser.js

@@ -17,6 +17,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UniswapV3AdapterParser = void 0;
 var types_1 = require("../types");
+var formatter_1 = require("../utils/formatter");
 var abstractParser_1 = require("./abstractParser");
 var UniswapV3AdapterParser = /** @class */ (function (_super) {
     __extends(UniswapV3AdapterParser, _super);
@@ -38,22 +39,33 @@ var UniswapV3AdapterParser = /** @class */ (function (_super) {
                 var amountOutMinimumStr = this.formatBN(amountOutMinimum, tokenOut);
                 return "".concat(functionName, "(amountIn: ").concat(amountInStr, ", amountOutMinimum: ").concat(amountOutMinimumStr, ",  path: ").concat(tokenInSym, " ==(fee: ").concat(fee, ")==> ").concat(tokenOutSym, ")");
             }
+            case "exactAllInputSingle": {
+                var _c = this.decodeFunctionData(functionFragment, calldata).params, tokenIn = _c.tokenIn, tokenOut = _c.tokenOut, fee = _c.fee, rateMinRAY = _c.rateMinRAY;
+                var tokenInSym = this.tokenSymbol(tokenIn);
+                var tokenOutSym = this.tokenSymbol(tokenOut);
+                return "".concat(functionName, "(rate: ").concat((0, formatter_1.formatBN)(rateMinRAY, 27), ",  path: ").concat(tokenInSym, " ==(fee: ").concat(fee, ")==> ").concat(tokenOutSym, ")");
+            }
             case "exactInput": {
-                var _c = this.decodeFunctionData(functionFragment, calldata).params, amountIn = _c.amountIn, amountOutMinimum = _c.amountOutMinimum, path = _c.path;
+                var _d = this.decodeFunctionData(functionFragment, calldata).params, amountIn = _d.amountIn, amountOutMinimum = _d.amountOutMinimum, path = _d.path;
                 var pathStr = this.trackInputPath(path);
                 var amountInStr = this.formatBN(amountIn, this.tokenSymbol("0x".concat(path.replace("0x", "").slice(0, 40))));
                 var amountOutMinimumStr = this.formatBN(amountOutMinimum, this.tokenSymbol("0x".concat(path.slice(-40, path.length))));
                 return "".concat(functionName, "(amountIn: ").concat(amountInStr, ", amountOutMinimum: ").concat(amountOutMinimumStr, ",  path: ").concat(pathStr);
             }
+            case "exactAllInput": {
+                var _e = this.decodeFunctionData(functionFragment, calldata).params, rateMinRAY = _e.rateMinRAY, path = _e.path;
+                var pathStr = this.trackInputPath(path);
+                return "".concat(functionName, "(rate: ").concat((0, formatter_1.formatBN)(rateMinRAY, 27), ",  path: ").concat(pathStr);
+            }
             case "exactOutput": {
-                var _d = this.decodeFunctionData(functionFragment, calldata).params, amountInMaximum = _d.amountInMaximum, amountOut = _d.amountOut, path = _d.path;
+                var _f = this.decodeFunctionData(functionFragment, calldata).params, amountInMaximum = _f.amountInMaximum, amountOut = _f.amountOut, path = _f.path;
                 var pathStr = this.trackOutputPath(path);
                 var amountInMaximumStr = this.formatBN(amountInMaximum, this.tokenSymbol("0x".concat(path.slice(-40, path.length))));
                 var amountOutStr = this.formatBN(amountOut, this.tokenSymbol("0x".concat(path.replace("0x", "").slice(0, 40))));
                 return "".concat(functionName, "(amountInMaximum: ").concat(amountInMaximumStr, ", amountOut: ").concat(amountOutStr, ",  path: ").concat(pathStr);
             }
             case "exactOutputSingle": {
-                var _e = this.decodeFunctionData(functionFragment, calldata)[0], tokenIn = _e[0], tokenOut = _e[1], fee = _e[2], amountOut = _e[5], amountInMaximum = _e[6];
+                var _g = this.decodeFunctionData(functionFragment, calldata)[0], tokenIn = _g[0], tokenOut = _g[1], fee = _g[2], amountOut = _g[5], amountInMaximum = _g[6];
                 var tokenInSym = this.tokenSymbol(tokenIn);
                 var tokenOutSym = this.tokenSymbol(tokenOut);
                 var amountInMaximumStr = this.formatBN(amountInMaximum, tokenInSym);

package/lib/parsers/uniV3AdapterParser.spec.js

@@ -37,6 +37,17 @@ describe("UniswapV3AdapterParser test", function () {
             },
         ]));
         (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactInputSingle(amountIn: 1.29M [1299000000000000000000000], amountOutMinimum: 10.20K [10200000000000000000000],  path: 1INCH ==(fee: 3000)==> 3Crv)", "Incorrect parse swapExactTokensForTokens");
+        parsed = parser.parse(ifc.encodeFunctionData("exactAllInputSingle", [
+            {
+                tokenIn: token_1.tokenDataByNetwork.Goerli["1INCH"],
+                tokenOut: token_1.tokenDataByNetwork.Goerli["3Crv"],
+                fee: 3000,
+                deadline: 12300,
+                rateMinRAY: constants_1.RAY.mul(1200),
+                sqrtPriceLimitX96: 0,
+            },
+        ]));
+        (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactAllInputSingle(rate: 1.20K,  path: 1INCH ==(fee: 3000)==> 3Crv)", "Incorrect parse swapExactTokensForTokens");
         parsed = parser.parse(ifc.encodeFunctionData("exactInput", [
             {
                 path: pathToUniV3Path([
@@ -51,6 +62,18 @@ describe("UniswapV3AdapterParser test", function () {
             },
         ]));
         (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactInput(amountIn: 12.39K [12399000000000000000000], amountOutMinimum: 122.00 [122000000],  path: AAVE ==(fee: 3000)==> LINK ==(fee: 3000)==> USDC", "Incorrect parse swapExactTokensForTokens");
+        parsed = parser.parse(ifc.encodeFunctionData("exactAllInput", [
+            {
+                path: pathToUniV3Path([
+                    token_1.tokenDataByNetwork.Mainnet.AAVE,
+                    token_1.tokenDataByNetwork.Mainnet.LINK,
+                    token_1.tokenDataByNetwork.Mainnet.USDC,
+                ]),
+                rateMinRAY: constants_1.RAY.mul(1200),
+                deadline: 1232131,
+            },
+        ]));
+        (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactAllInput(rate: 1.20K,  path: AAVE ==(fee: 3000)==> LINK ==(fee: 3000)==> USDC", "Incorrect parse swapExactTokensForTokens");
         parsed = parser.parse(ifc.encodeFunctionData("exactOutputSingle", [
             {
                 tokenIn: token_1.tokenDataByNetwork.Goerli["1INCH"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "1.5.4",
+  "version": "1.5.7",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",