@dhedge/v2-sdk 1.9.1 → 1.9.2

package/README.md

@@ -28,11 +28,11 @@ yarn add @dhedge/v2-sdk
 
 ### Initial setup
 
-If you want to use 1Inch to trade pool assets you need to apply for an enterprise endpoint at [1Inch](https://docs.1inch.io/docs/aggregation-protocol/introduction).
+If you want to use 1Inch to trade pool assets you need to apply for an API key at [1Inch Dev Portal](https://docs.1inch.io/docs/aggregation-protocol/introduction).
 Then you need to copy .env.example file to .env and set your url there.
 
 ```
-ONEINCH_API_URL=https://my-personal-url.1inch.io/v5.0
+ONEINCH_API_KEY=YOUR_API_KEY_FROM_1INCH
 ```
 
 Initialize the sdk with an [ethers wallet](https://docs.ethers.io/v5/api/signer/#Wallet) and the network.

package/dist/services/oneInch/index.d.ts

@@ -0,0 +1,3 @@
+import { ethers } from "../..";
+import { Pool } from "../../entities";
+export declare function getOneInchSwapTxData(pool: Pool, assetFrom: string, assetTo: string, amountIn: ethers.BigNumber | string, slippage: number): Promise<string>;

package/dist/test/utils/testingHelper.d.ts

@@ -0,0 +1,13 @@
+import { ethers } from "ethers";
+import { Network } from "../../types";
+export declare type TestingRunParams = {
+    network: Network;
+    wallet: ethers.Wallet;
+};
+declare type TestHelperParams = {
+    testingRun: (testingRunParams: TestingRunParams) => void;
+} & {
+    network: Network;
+};
+export declare const testingHelper: ({ network, testingRun }: TestHelperParams) => void;
+export {};

package/dist/test/wallet.d.ts

@@ -1,2 +1,9 @@
 import { ethers } from "ethers";
+import { Network } from "../types";
 export declare const wallet: ethers.Wallet;
+export declare const networkPortMap: {
+    polygon: number;
+    optimism: number;
+    arbitrum: number;
+};
+export declare const getWallet: (network: Network) => ethers.Wallet;

package/dist/v2-sdk.cjs.development.js

@@ -7,12 +7,12 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var ethers = require('ethers');
 var Lyra = require('@lyrafinance/lyra-js');
 var Lyra__default = _interopDefault(Lyra);
-var axios = _interopDefault(require('axios'));
 var sdkCore = require('@uniswap/sdk-core');
 var v3Sdk = require('@uniswap/v3-sdk');
 var JSBI = _interopDefault(require('jsbi'));
 require('lodash/set');
 require('@ethersproject/abi');
+var axios = _interopDefault(require('axios'));
 var sdk = require('@sushiswap/sdk');
 var sor = require('@balancer-labs/sor');
 
@@ -9750,46 +9750,6 @@ function _getEasySwapperTxData() {
   return _getEasySwapperTxData.apply(this, arguments);
 }
 
-function getOneInchProtocols(_x) {
-  return _getOneInchProtocols.apply(this, arguments);
-}
-
-function _getOneInchProtocols() {
-  _getOneInchProtocols = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(chainId) {
-    var response, protocols, filteredProtocols;
-    return runtime_1.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return axios.get("https://api.1inch.io/v5.0/" + chainId + "/liquidity-sources");
-
-          case 3:
-            response = _context.sent;
-            protocols = response.data.protocols.map(function (e) {
-              return e.id;
-            });
-            filteredProtocols = protocols.filter(function (e) {
-              return !e.includes("PMM");
-            });
-            return _context.abrupt("return", "&protocols=" + filteredProtocols.join(","));
-
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](0);
-            return _context.abrupt("return", "");
-
-          case 12:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[0, 9]]);
-  }));
-  return _getOneInchProtocols.apply(this, arguments);
-}
-
 var abi$i = [
 	{
 		inputs: [
@@ -19608,6 +19568,55 @@ var getZeroExTradeTxData = /*#__PURE__*/function () {
   };
 }();
 
+var oneInchBaseUrl = "https://api.1inch.dev/swap/v5.2/";
+function getOneInchSwapTxData(_x, _x2, _x3, _x4, _x5) {
+  return _getOneInchSwapTxData.apply(this, arguments);
+}
+
+function _getOneInchSwapTxData() {
+  _getOneInchSwapTxData = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(pool, assetFrom, assetTo, amountIn, slippage) {
+    var chainId, apiUrl, response;
+    return runtime_1.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (process.env.ONEINCH_API_KEY) {
+              _context.next = 2;
+              break;
+            }
+
+            throw new Error("ONEINCH_API_KEY not configured in .env file");
+
+          case 2:
+            chainId = networkChainIdMap[pool.network];
+            apiUrl = "" + oneInchBaseUrl + chainId + "/swap?src=" + assetFrom + "&dst=" + assetTo + "&amount=" + amountIn.toString() + "&from=" + pool.address + "&slippage=" + slippage.toString() + "&disableEstimate=true";
+            _context.prev = 4;
+            _context.next = 7;
+            return axios.get(apiUrl, {
+              headers: {
+                Authorization: "Bearer " + process.env.ONEINCH_API_KEY
+              }
+            });
+
+          case 7:
+            response = _context.sent;
+            return _context.abrupt("return", response.data.tx.data);
+
+          case 11:
+            _context.prev = 11;
+            _context.t0 = _context["catch"](4);
+            throw new ApiError("Swap api request of 1inch failed");
+
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[4, 11]]);
+  }));
+  return _getOneInchSwapTxData.apply(this, arguments);
+}
+
 var Pool = /*#__PURE__*/function () {
   function Pool(network, signer, poolLogic, mangerLogic, utils, factory) {
     this.network = network;
@@ -19997,7 +20006,7 @@ var Pool = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _trade = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee9(dapp, assetFrom, assetTo, amountIn, slippage, options) {
-      var swapTxData, chainId, protocols, apiUrl, response, iSynthetix, assets, daoAddress, iUniswapV2Router, minAmountOut, tx;
+      var swapTxData, iSynthetix, assets, daoAddress, iUniswapV2Router, minAmountOut, tx;
       return runtime_1.wrap(function _callee9$(_context9) {
         while (1) {
           switch (_context9.prev = _context9.next) {
@@ -20011,7 +20020,7 @@ var Pool = /*#__PURE__*/function () {
               }
 
               _context9.t0 = dapp;
-              _context9.next = _context9.t0 === exports.Dapp.ZEROEX ? 5 : _context9.t0 === exports.Dapp.ONEINCH ? 9 : _context9.t0 === exports.Dapp.BALANCER ? 27 : _context9.t0 === exports.Dapp.SYNTHETIX ? 31 : _context9.t0 === exports.Dapp.TOROS ? 38 : 42;
+              _context9.next = _context9.t0 === exports.Dapp.ZEROEX ? 5 : _context9.t0 === exports.Dapp.ONEINCH ? 9 : _context9.t0 === exports.Dapp.BALANCER ? 13 : _context9.t0 === exports.Dapp.SYNTHETIX ? 17 : _context9.t0 === exports.Dapp.TOROS ? 24 : 28;
               break;
 
             case 5:
@@ -20020,107 +20029,80 @@ var Pool = /*#__PURE__*/function () {
 
             case 7:
               swapTxData = _context9.sent;
-              return _context9.abrupt("break", 57);
+              return _context9.abrupt("break", 43);
 
             case 9:
-              chainId = networkChainIdMap[this.network];
-              _context9.next = 12;
-              return getOneInchProtocols(chainId);
-
-            case 12:
-              protocols = _context9.sent;
-
-              if (process.env.ONEINCH_API_URL) {
-                _context9.next = 15;
-                break;
-              }
-
-              throw new Error("ONEINCH_API_URL not configured in .env file");
-
-            case 15:
-              apiUrl = process.env.ONEINCH_API_URL + "/" + chainId + "/swap?fromTokenAddress=" + assetFrom + "&toTokenAddress=" + assetTo + "&amount=" + amountIn.toString() + "&fromAddress=" + this.address + "&destReceiver=" + this.address + "&slippage=" + slippage.toString() + "&disableEstimate=true" + protocols;
-              _context9.prev = 16;
-              _context9.next = 19;
-              return axios.get(apiUrl);
-
-            case 19:
-              response = _context9.sent;
-              swapTxData = response.data.tx.data;
-              _context9.next = 26;
-              break;
+              _context9.next = 11;
+              return getOneInchSwapTxData(this, assetFrom, assetTo, amountIn, slippage);
 
-            case 23:
-              _context9.prev = 23;
-              _context9.t1 = _context9["catch"](16);
-              throw new ApiError("Swap api request of 1inch failed");
-
-            case 26:
-              return _context9.abrupt("break", 57);
+            case 11:
+              swapTxData = _context9.sent;
+              return _context9.abrupt("break", 43);
 
-            case 27:
-              _context9.next = 29;
+            case 13:
+              _context9.next = 15;
               return this.utils.getBalancerSwapTx(this, assetFrom, assetTo, amountIn, slippage);
 
-            case 29:
+            case 15:
               swapTxData = _context9.sent;
-              return _context9.abrupt("break", 57);
+              return _context9.abrupt("break", 43);
 
-            case 31:
+            case 17:
               iSynthetix = new ethers.ethers.utils.Interface(ISynthetix.abi);
               assets = [assetFrom, assetTo].map(function (asset) {
                 return ethers.ethers.utils.formatBytes32String(asset);
               });
-              _context9.next = 35;
+              _context9.next = 21;
               return this.factory.owner();
 
-            case 35:
+            case 21:
               daoAddress = _context9.sent;
               swapTxData = iSynthetix.encodeFunctionData(exports.Transaction.SWAP_SYNTHS, [assets[0], amountIn, assets[1], daoAddress, SYNTHETIX_TRACKING_CODE]);
-              return _context9.abrupt("break", 57);
+              return _context9.abrupt("break", 43);
 
-            case 38:
-              _context9.next = 40;
+            case 24:
+              _context9.next = 26;
               return getEasySwapperTxData(this, assetFrom, assetTo, ethers.ethers.BigNumber.from(amountIn), slippage);
 
-            case 40:
+            case 26:
               swapTxData = _context9.sent;
-              return _context9.abrupt("break", 57);
+              return _context9.abrupt("break", 43);
 
-            case 42:
+            case 28:
               iUniswapV2Router = new ethers.ethers.utils.Interface(IUniswapV2Router.abi);
-              _context9.next = 45;
+              _context9.next = 31;
               return this.utils.getMinAmountOut(dapp, assetFrom, assetTo, amountIn, slippage);
 
-            case 45:
+            case 31:
               minAmountOut = _context9.sent;
-              _context9.t2 = iUniswapV2Router;
-              _context9.t3 = exports.Transaction.SWAP;
-              _context9.t4 = amountIn;
-              _context9.t5 = minAmountOut;
-              _context9.t6 = [assetFrom, assetTo];
-              _context9.t7 = this.address;
-              _context9.next = 54;
+              _context9.t1 = iUniswapV2Router;
+              _context9.t2 = exports.Transaction.SWAP;
+              _context9.t3 = amountIn;
+              _context9.t4 = minAmountOut;
+              _context9.t5 = [assetFrom, assetTo];
+              _context9.t6 = this.address;
+              _context9.next = 40;
               return getDeadline(this);
 
-            case 54:
-              _context9.t8 = _context9.sent;
-              _context9.t9 = [_context9.t4, _context9.t5, _context9.t6, _context9.t7, _context9.t8];
-              swapTxData = _context9.t2.encodeFunctionData.call(_context9.t2, _context9.t3, _context9.t9);
+            case 40:
+              _context9.t7 = _context9.sent;
+              _context9.t8 = [_context9.t3, _context9.t4, _context9.t5, _context9.t6, _context9.t7];
+              swapTxData = _context9.t1.encodeFunctionData.call(_context9.t1, _context9.t2, _context9.t8);
 
-            case 57:
-              _context9.next = 59;
+            case 43:
+              _context9.next = 45;
               return this.poolLogic.execTransaction(routerAddress[this.network][dapp], swapTxData, options);
 
-            case 59:
+            case 45:
               tx = _context9.sent;
               return _context9.abrupt("return", tx);
 
-            case 61:
+            case 47:
             case "end":
               return _context9.stop();
           }
         }
-      }, _callee9, this, [[16, 23]]);
+      }, _callee9, this);
     }));
 
     function trade(_x24, _x25, _x26, _x27, _x28, _x29) {