@dhedge/v2-sdk 1.10.10 → 1.10.12

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

@@ -53,6 +53,24 @@ function _asyncToGenerator(fn) {
   };
 }
 
+function _extends() {
+  _extends = Object.assign || function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
+        }
+      }
+    }
+
+    return target;
+  };
+
+  return _extends.apply(this, arguments);
+}
+
 function _inheritsLoose(subClass, superClass) {
   subClass.prototype = Object.create(superClass.prototype);
   subClass.prototype.constructor = subClass;
@@ -4253,7 +4271,6 @@ var ManagerLogic = {
   Dapp["VELODROMEV2"] = "velodromeV2";
   Dapp["VELODROMECL"] = "velodromeCL";
   Dapp["LYRA"] = "lyra";
-  Dapp["ZEROEX"] = "0x";
   Dapp["RAMSES"] = "ramses";
   Dapp["AERODROME"] = "aerodrome";
   Dapp["AERODROMECL"] = "aerodromeCL";
@@ -4290,7 +4307,7 @@ var _factoryAddress, _Network$POLYGON, _Network$OPTIMISM, _Network$ARBITRUM, _Ne
 require("dotenv").config();
 
 var factoryAddress = (_factoryAddress = {}, _factoryAddress[exports.Network.POLYGON] = process.env.STAGING_CONTRACTS ? "0xDd87eCdB10cFF7004276AAbAbd30e7a08F69bb53" : "0xfdc7b8bFe0DD3513Cc669bB8d601Cb83e2F69cB0", _factoryAddress[exports.Network.OPTIMISM] = "0x5e61a079A178f0E5784107a4963baAe0c5a680c6", _factoryAddress[exports.Network.ARBITRUM] = "0xfffb5fb14606eb3a548c113026355020ddf27535", _factoryAddress[exports.Network.BASE] = "0x49Afe3abCf66CF09Fab86cb1139D8811C8afe56F", _factoryAddress);
-var routerAddress = (_routerAddress = {}, _routerAddress[exports.Network.POLYGON] = (_Network$POLYGON = {}, _Network$POLYGON[exports.Dapp.SUSHISWAP] = "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506", _Network$POLYGON[exports.Dapp.AAVE] = "0x8dFf5E27EA6b7AC08EbFdf9eB090F32ee9a30fcf", _Network$POLYGON[exports.Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$POLYGON[exports.Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$POLYGON[exports.Dapp.QUICKSWAP] = "0xa5E0829CaCEd8fFDD4De3c43696c57F7D7A678ff", _Network$POLYGON[exports.Dapp.BALANCER] = "0xBA12222222228d8Ba445958a75a0704d566BF2C8", _Network$POLYGON[exports.Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$POLYGON[exports.Dapp.ARRAKIS] = "0xc73fb100a995b33f9fa181d420f4c8d74506df66", _Network$POLYGON[exports.Dapp.TOROS] = "0x45b90480D6F643dE2f128db091A357C3c90399f2", _Network$POLYGON[exports.Dapp.ZEROEX] = "0xdef1c0ded9bec7f1a1670819833240f027b25eff", _Network$POLYGON[exports.Dapp.ODOS] = "0x4e3288c9ca110bcc82bf38f09a7b425c095d92bf", _Network$POLYGON), _routerAddress[exports.Network.OPTIMISM] = (_Network$OPTIMISM = {}, _Network$OPTIMISM[exports.Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$OPTIMISM[exports.Dapp.SYNTHETIX] = "0x8700dAec35aF8Ff88c16BdF0418774CB3D7599B4", _Network$OPTIMISM[exports.Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$OPTIMISM[exports.Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$OPTIMISM[exports.Dapp.TOROS] = "0x2Ed1bd7f66e47113672f3870308b5E867C5bb743", _Network$OPTIMISM[exports.Dapp.VELODROME] = "0x9c12939390052919aF3155f41Bf4160Fd3666A6f", _Network$OPTIMISM[exports.Dapp.VELODROMEV2] = "0xa062ae8a9c5e11aaa026fc2670b0d65ccc8b2858", _Network$OPTIMISM[exports.Dapp.LYRA] = "0xCCE7819d65f348c64B7Beb205BA367b3fE33763B", _Network$OPTIMISM[exports.Dapp.ARRAKIS] = "0x9ce88a56d120300061593eF7AD074A1B710094d5", _Network$OPTIMISM[exports.Dapp.ZEROEX] = "0xdef1abe32c034e558cdd535791643c58a13acc10", _Network$OPTIMISM[exports.Dapp.ODOS] = "0xca423977156bb05b13a2ba3b76bc5419e2fe9680", _Network$OPTIMISM), _routerAddress[exports.Network.ARBITRUM] = (_Network$ARBITRUM = {}, _Network$ARBITRUM[exports.Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$ARBITRUM[exports.Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$ARBITRUM[exports.Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$ARBITRUM[exports.Dapp.BALANCER] = "0xBA12222222228d8Ba445958a75a0704d566BF2C8", _Network$ARBITRUM[exports.Dapp.RAMSES] = "0xaaa87963efeb6f7e0a2711f397663105acb1805e", _Network$ARBITRUM[exports.Dapp.ZEROEX] = "0xdef1c0ded9bec7f1a1670819833240f027b25eff", _Network$ARBITRUM[exports.Dapp.TOROS] = "0xA5679C4272A056Bb83f039961fae7D99C48529F5", _Network$ARBITRUM[exports.Dapp.ODOS] = "0xa669e7A0d4b3e4Fa48af2dE86BD4CD7126Be4e13", _Network$ARBITRUM), _routerAddress[exports.Network.BASE] = (_Network$BASE = {}, _Network$BASE[exports.Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$BASE[exports.Dapp.ZEROEX] = "0xdef1c0ded9bec7f1a1670819833240f027b25eff", _Network$BASE[exports.Dapp.AERODROME] = "0xcF77a3Ba9A5CA399B7c97c74d54e5b1Beb874E43", _Network$BASE[exports.Dapp.AAVEV3] = "0xA238Dd80C259a72e81d7e4664a9801593F98d1c5", _Network$BASE[exports.Dapp.TOROS] = "0xf067575Eb60c7587C11e867907AA7284833704d1", _Network$BASE[exports.Dapp.ODOS] = "0x19cEeAd7105607Cd444F5ad10dd51356436095a1", _Network$BASE), _routerAddress);
+var routerAddress = (_routerAddress = {}, _routerAddress[exports.Network.POLYGON] = (_Network$POLYGON = {}, _Network$POLYGON[exports.Dapp.SUSHISWAP] = "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506", _Network$POLYGON[exports.Dapp.AAVE] = "0x8dFf5E27EA6b7AC08EbFdf9eB090F32ee9a30fcf", _Network$POLYGON[exports.Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$POLYGON[exports.Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$POLYGON[exports.Dapp.QUICKSWAP] = "0xa5E0829CaCEd8fFDD4De3c43696c57F7D7A678ff", _Network$POLYGON[exports.Dapp.BALANCER] = "0xBA12222222228d8Ba445958a75a0704d566BF2C8", _Network$POLYGON[exports.Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$POLYGON[exports.Dapp.ARRAKIS] = "0xc73fb100a995b33f9fa181d420f4c8d74506df66", _Network$POLYGON[exports.Dapp.TOROS] = "0x45b90480D6F643dE2f128db091A357C3c90399f2", _Network$POLYGON[exports.Dapp.ODOS] = "0x4e3288c9ca110bcc82bf38f09a7b425c095d92bf", _Network$POLYGON), _routerAddress[exports.Network.OPTIMISM] = (_Network$OPTIMISM = {}, _Network$OPTIMISM[exports.Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$OPTIMISM[exports.Dapp.SYNTHETIX] = "0x8700dAec35aF8Ff88c16BdF0418774CB3D7599B4", _Network$OPTIMISM[exports.Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$OPTIMISM[exports.Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$OPTIMISM[exports.Dapp.TOROS] = "0x2Ed1bd7f66e47113672f3870308b5E867C5bb743", _Network$OPTIMISM[exports.Dapp.VELODROME] = "0x9c12939390052919aF3155f41Bf4160Fd3666A6f", _Network$OPTIMISM[exports.Dapp.VELODROMEV2] = "0xa062ae8a9c5e11aaa026fc2670b0d65ccc8b2858", _Network$OPTIMISM[exports.Dapp.LYRA] = "0xCCE7819d65f348c64B7Beb205BA367b3fE33763B", _Network$OPTIMISM[exports.Dapp.ARRAKIS] = "0x9ce88a56d120300061593eF7AD074A1B710094d5", _Network$OPTIMISM[exports.Dapp.ODOS] = "0xca423977156bb05b13a2ba3b76bc5419e2fe9680", _Network$OPTIMISM), _routerAddress[exports.Network.ARBITRUM] = (_Network$ARBITRUM = {}, _Network$ARBITRUM[exports.Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$ARBITRUM[exports.Dapp.UNISWAPV3] = "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45", _Network$ARBITRUM[exports.Dapp.AAVEV3] = "0x794a61358D6845594F94dc1DB02A252b5b4814aD", _Network$ARBITRUM[exports.Dapp.BALANCER] = "0xBA12222222228d8Ba445958a75a0704d566BF2C8", _Network$ARBITRUM[exports.Dapp.RAMSES] = "0xaaa87963efeb6f7e0a2711f397663105acb1805e", _Network$ARBITRUM[exports.Dapp.TOROS] = "0xA5679C4272A056Bb83f039961fae7D99C48529F5", _Network$ARBITRUM[exports.Dapp.ODOS] = "0xa669e7A0d4b3e4Fa48af2dE86BD4CD7126Be4e13", _Network$ARBITRUM), _routerAddress[exports.Network.BASE] = (_Network$BASE = {}, _Network$BASE[exports.Dapp.ONEINCH] = "0x111111125421ca6dc452d289314280a0f8842a65", _Network$BASE[exports.Dapp.AERODROME] = "0xcF77a3Ba9A5CA399B7c97c74d54e5b1Beb874E43", _Network$BASE[exports.Dapp.AAVEV3] = "0xA238Dd80C259a72e81d7e4664a9801593F98d1c5", _Network$BASE[exports.Dapp.TOROS] = "0xf067575Eb60c7587C11e867907AA7284833704d1", _Network$BASE[exports.Dapp.ODOS] = "0x19cEeAd7105607Cd444F5ad10dd51356436095a1", _Network$BASE), _routerAddress);
 var dappFactoryAddress = (_dappFactoryAddress = {}, _dappFactoryAddress[exports.Network.POLYGON] = (_Network$POLYGON2 = {}, _Network$POLYGON2[exports.Dapp.SUSHISWAP] = "0xc35DADB65012eC5796536bD9864eD8773aBc74C4", _Network$POLYGON2[exports.Dapp.QUICKSWAP] = "0x5757371414417b8C6CAad45bAeF941aBc7d3Ab32", _Network$POLYGON2), _dappFactoryAddress[exports.Network.OPTIMISM] = {}, _dappFactoryAddress[exports.Network.ARBITRUM] = {}, _dappFactoryAddress[exports.Network.BASE] = {}, _dappFactoryAddress);
 var stakingAddress = (_stakingAddress = {}, _stakingAddress[exports.Network.POLYGON] = (_Network$POLYGON3 = {}, _Network$POLYGON3[exports.Dapp.SUSHISWAP] = "0x0769fd68dFb93167989C6f7254cd0D766Fb2841F", _Network$POLYGON3[exports.Dapp.BALANCER] = "0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e", _Network$POLYGON3[exports.Dapp.AAVE] = "0x357D51124f59836DeD84c8a1730D72B749d8BC23", _Network$POLYGON3[exports.Dapp.AAVEV3] = "0x929EC64c34a17401F460460D4B9390518E5B473e", _Network$POLYGON3), _stakingAddress[exports.Network.OPTIMISM] = (_Network$OPTIMISM2 = {}, _Network$OPTIMISM2[exports.Dapp.AAVEV3] = "0x929EC64c34a17401F460460D4B9390518E5B473e", _Network$OPTIMISM2[exports.Dapp.COMPOUNDV3] = "0x443ea0340cb75a160f31a440722dec7b5bc3c2e9", _Network$OPTIMISM2), _stakingAddress[exports.Network.ARBITRUM] = (_Network$ARBITRUM2 = {}, _Network$ARBITRUM2[exports.Dapp.COMPOUNDV3] = "0x88730d254a2f7e6ac8388c3198afd694ba9f7fae", _Network$ARBITRUM2[exports.Dapp.PANCAKECL] = "0x5e09ACf80C0296740eC5d6F643005a4ef8DaA694", _Network$ARBITRUM2), _stakingAddress[exports.Network.BASE] = (_Network$BASE2 = {}, _Network$BASE2[exports.Dapp.PANCAKECL] = "0xC6A2Db661D5a5690172d8eB0a7DEA2d3008665A3", _Network$BASE2), _stakingAddress);
 var aaveAddressProvider = (_aaveAddressProvider = {}, _aaveAddressProvider[exports.Network.POLYGON] = (_Network$POLYGON4 = {}, _Network$POLYGON4[exports.Dapp.AAVE] = "0xd05e3E715d945B59290df0ae8eF85c1BdB684744", _Network$POLYGON4[exports.Dapp.AAVEV3] = "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb", _Network$POLYGON4), _aaveAddressProvider[exports.Network.OPTIMISM] = (_Network$OPTIMISM3 = {}, _Network$OPTIMISM3[exports.Dapp.AAVEV3] = "0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb", _Network$OPTIMISM3), _aaveAddressProvider[exports.Network.ARBITRUM] = (_Network$ARBITRUM3 = {}, _Network$ARBITRUM3[exports.Dapp.AAVEV3] = "0xa97684ead0e402dc232d5a977953df7ecbab3cdb", _Network$ARBITRUM3), _aaveAddressProvider[exports.Network.BASE] = (_Network$BASE3 = {}, _Network$BASE3[exports.Dapp.AAVEV3] = "0xe20fCBdBfFC4Dd138cE8b2E6FBb6CB49777ad64D", _Network$BASE3), _aaveAddressProvider);
@@ -4306,7 +4323,14 @@ var flatMoneyContractAddresses = (_flatMoneyContractAdd = {}, _flatMoneyContract
   DelayedOrder: "0x6D857e9D24a7566bB72a3FB0847A3E0e4E1c2879",
   FlatcoinVault: "0x95Fa1ddc9a78273f795e67AbE8f1Cd2Cd39831fF",
   StableModule: "0xb95fB324b8A2fAF8ec4f76e3dF46C718402736e2",
-  RETH: "0xb6fe221fe9eef5aba221c348ba20a1bf5e73624c"
+  COLLATERAL: "0xb6fe221fe9eef5aba221c348ba20a1bf5e73624c" // RETH
+
+}, _flatMoneyContractAdd[exports.Network.OPTIMISM] = {
+  OrderExecution: "0x7805CB7fb2C2e70FDdF92949065D9Ee1Fc2F72a8",
+  DelayedOrder: "0xd917A0C9B21Bb71DF1209d2c211Ad83004F01554",
+  FlatcoinVault: "0x86C7b9640302082B0dF78023F930d8612bFcaD3f",
+  COLLATERAL: "0x68f180fcCe6836688e9084f035309E29Bf0A2095",
+  StableModule: "0x357CB23571EF7a3d6189b7FAcFC361eA71f7CAB5"
 }, _flatMoneyContractAdd);
 
 var abi$3 = [
@@ -10482,7 +10506,8 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   VELODROME_CL_USDC_WETH_GAUGE: "",
   VELO: "",
   COMPOUNDV3_WETH: "",
-  TOROS: ""
+  TOROS: "",
+  UNIT: ""
 }, _CONTRACT_ADDRESS[exports.Network.OPTIMISM] = {
   USDC: "0x0b2c639c533813f4aa9d7837caf62653d097ff85",
   USDT: "",
@@ -10494,6 +10519,7 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   uniswapV3: {
     nonfungiblePositionManager: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
   },
+  UNIT: "0x357CB23571EF7a3d6189b7FAcFC361eA71f7CAB5",
   WMATIC: "",
   //
   ARRAKIS_USDC_WETH_GAUGE: "",
@@ -10516,6 +10542,7 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   uniswapV3: {
     nonfungiblePositionManager: "0xC36442b4a4522E871399CD717aBDD847Ab11FE88"
   },
+  UNIT: "",
   //
   ARRAKIS_USDC_WETH_GAUGE: "",
   ARRAKIS_USDC_WETH_LP: "",
@@ -10531,6 +10558,7 @@ var CONTRACT_ADDRESS = (_CONTRACT_ADDRESS = {}, _CONTRACT_ADDRESS[exports.Networ
   WETH: "0x4200000000000000000000000000000000000006",
   WBTC: "",
   SWETH: "",
+  UNIT: "0xb95fB324b8A2fAF8ec4f76e3dF46C718402736e2",
   uniswapV3: {
     nonfungiblePositionManager: ""
   },
@@ -16073,25 +16101,59 @@ var getPoolTxOrGasEstimate = /*#__PURE__*/function () {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
+            if (!pool.isDhedge) {
+              _context2.next = 12;
+              break;
+            }
+
             if (!estimateGas) {
-              _context2.next = 6;
+              _context2.next = 7;
               break;
             }
 
-            _context2.next = 3;
+            _context2.next = 4;
             return pool.poolLogic.estimateGas.execTransaction(args[0], args[1], args[2]);
 
-          case 3:
+          case 4:
             return _context2.abrupt("return", _context2.sent);
 
-          case 6:
-            _context2.next = 8;
+          case 7:
+            _context2.next = 9;
             return pool.poolLogic.execTransaction(args[0], args[1], args[2]);
 
-          case 8:
+          case 9:
             return _context2.abrupt("return", _context2.sent);
 
-          case 9:
+          case 10:
+            _context2.next = 21;
+            break;
+
+          case 12:
+            if (!estimateGas) {
+              _context2.next = 18;
+              break;
+            }
+
+            _context2.next = 15;
+            return pool.signer.estimateGas({
+              to: args[0],
+              data: args[1]
+            });
+
+          case 15:
+            return _context2.abrupt("return", _context2.sent);
+
+          case 18:
+            _context2.next = 20;
+            return pool.signer.sendTransaction(_extends({
+              to: args[0],
+              data: args[1]
+            }, args[2]));
+
+          case 20:
+            return _context2.abrupt("return", _context2.sent);
+
+          case 21:
           case "end":
             return _context2.stop();
         }
@@ -20765,94 +20827,6 @@ function _getFuturesCancelOrderTxData() {
   return _getFuturesCancelOrderTxData.apply(this, arguments);
 }
 
-// see https://stackoverflow.com/a/41102306
-var CAN_SET_PROTOTYPE = ("setPrototypeOf" in Object);
-var ApiError = /*#__PURE__*/function (_Error) {
-  _inheritsLoose(ApiError, _Error);
-
-  function ApiError(message) {
-    var _this;
-
-    _this = _Error.call(this, message != null ? message : "Api request failed") || this;
-    _this.name = _this.constructor.name;
-    if (CAN_SET_PROTOTYPE) Object.setPrototypeOf(_assertThisInitialized(_this), (this instanceof ApiError ? this.constructor : void 0).prototype);
-    return _this;
-  }
-
-  return ApiError;
-}( /*#__PURE__*/_wrapNativeSuper(Error));
-
-// in 0x, e.g. 0.03 for 3% slippage allowed
-// 1inch slippage 0.5% represented by 0.5
-// 0x slippage 0.5% represented by 0.005
-
-var getZeroExSlippage = function getZeroExSlippage(slippage) {
-  return Number(slippage) / 100;
-};
-
-var getZeroExTradeTxData = /*#__PURE__*/function () {
-  var _ref = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(network, assetFrom, assetTo, amountIn, slippage, takerAddress) {
-    var slippagePercentage, params, response;
-    return runtime_1.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            if (slippage === void 0) {
-              slippage = 0.5;
-            }
-
-            if (process.env.ZEROEX_API_KEY) {
-              _context.next = 3;
-              break;
-            }
-
-            throw new Error("ZEROEX_API_KEY not configured in .env file");
-
-          case 3:
-            _context.prev = 3;
-            slippagePercentage = getZeroExSlippage(slippage);
-            params = {
-              buyToken: assetTo,
-              sellToken: assetFrom,
-              sellAmount: amountIn.toString(),
-              // necessary to skip quote validation is that in which the takerAddress refers to a smart contract
-              skipValidation: true,
-              // Used to enable RFQ-T liquidity
-              intentOnFilling: true,
-              takerAddress: takerAddress,
-              slippagePercentage: slippagePercentage // excludedSourcesParam
-
-            };
-            _context.next = 8;
-            return axios.get("https://" + network + ".api.0x.org/swap/v1/quote", {
-              params: params,
-              headers: {
-                "0x-api-key": process.env.ZEROEX_API_KEY
-              }
-            });
-
-          case 8:
-            response = _context.sent;
-            return _context.abrupt("return", response.data.data);
-
-          case 12:
-            _context.prev = 12;
-            _context.t0 = _context["catch"](3);
-            throw new ApiError("Swap api request of 0x failed");
-
-          case 15:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee, null, [[3, 12]]);
-  }));
-
-  return function getZeroExTradeTxData(_x, _x2, _x3, _x4, _x5, _x6) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
 var abi$q = [
 	{
 		inputs: [
@@ -21535,6 +21509,108 @@ var DelayedOrderAbi = [
 	}
 ];
 
+var IOrderExecutionModuleAbi = [
+	{
+		type: "function",
+		name: "cancelExistingOrder",
+		inputs: [
+			{
+				name: "account",
+				type: "address",
+				internalType: "address"
+			}
+		],
+		outputs: [
+		],
+		stateMutability: "nonpayable"
+	},
+	{
+		type: "function",
+		name: "cancelOrderByModule",
+		inputs: [
+			{
+				name: "account",
+				type: "address",
+				internalType: "address"
+			}
+		],
+		outputs: [
+		],
+		stateMutability: "nonpayable"
+	},
+	{
+		type: "function",
+		name: "executeLimitOrder",
+		inputs: [
+			{
+				name: "tokenId",
+				type: "uint256",
+				internalType: "uint256"
+			},
+			{
+				name: "priceUpdateData",
+				type: "bytes[]",
+				internalType: "bytes[]"
+			}
+		],
+		outputs: [
+		],
+		stateMutability: "payable"
+	},
+	{
+		type: "function",
+		name: "executeOrder",
+		inputs: [
+			{
+				name: "account",
+				type: "address",
+				internalType: "address"
+			},
+			{
+				name: "priceUpdateData",
+				type: "bytes[]",
+				internalType: "bytes[]"
+			}
+		],
+		outputs: [
+		],
+		stateMutability: "payable"
+	},
+	{
+		type: "function",
+		name: "hasOrderExpired",
+		inputs: [
+			{
+				name: "account",
+				type: "address",
+				internalType: "address"
+			}
+		],
+		outputs: [
+			{
+				name: "expired",
+				type: "bool",
+				internalType: "bool"
+			}
+		],
+		stateMutability: "view"
+	},
+	{
+		type: "function",
+		name: "maxExecutabilityAge",
+		inputs: [
+		],
+		outputs: [
+			{
+				name: "maxExecutabilityAge",
+				type: "uint64",
+				internalType: "uint64"
+			}
+		],
+		stateMutability: "view"
+	}
+];
+
 var StableModuleAbi = [
 	{
 		inputs: [
@@ -23409,7 +23485,7 @@ var getKeeperFeeContract = /*#__PURE__*/function () {
 }();
 var getKeeperFee = /*#__PURE__*/function () {
   var _ref2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(pool, maxKeeperFeeInUsd) {
-    var keeperFeeContract, gasPrice, keeperfee, keeperFeeInUsd;
+    var keeperFeeContract, feeHistory, gasPrice, keeperfee, keeperFeeInUsd;
     return runtime_1.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -23420,49 +23496,50 @@ var getKeeperFee = /*#__PURE__*/function () {
           case 2:
             keeperFeeContract = _context2.sent;
             _context2.next = 5;
-            return pool.signer.provider.getGasPrice();
+            return pool.signer.provider.send("eth_feeHistory", [1, "latest"]);
 
           case 5:
-            gasPrice = _context2.sent;
+            feeHistory = _context2.sent;
+            gasPrice = Number(feeHistory.baseFeePerGas[0]);
 
             if (!gasPrice) {
-              _context2.next = 12;
+              _context2.next = 13;
               break;
             }
 
-            _context2.next = 9;
-            return keeperFeeContract["getKeeperFee(uint256)"](new BigNumber(gasPrice.toString()).times(1.2).toFixed(0));
+            _context2.next = 10;
+            return keeperFeeContract["getKeeperFee(uint256)"](new BigNumber(gasPrice.toString()).times(1.5).toFixed(0));
 
-          case 9:
+          case 10:
             keeperfee = _context2.sent;
-            _context2.next = 15;
+            _context2.next = 16;
             break;
 
-          case 12:
-            _context2.next = 14;
+          case 13:
+            _context2.next = 15;
             return keeperFeeContract["getKeeperFee()"]();
 
-          case 14:
+          case 15:
             keeperfee = _context2.sent;
 
-          case 15:
-            _context2.next = 17;
+          case 16:
+            _context2.next = 18;
             return getKeeperFeeInUsd(pool, keeperfee);
 
-          case 17:
+          case 18:
             keeperFeeInUsd = _context2.sent;
 
             if (!(Number.isFinite(maxKeeperFeeInUsd) && keeperFeeInUsd.gt(ethers.ethers.BigNumber.from(maxKeeperFeeInUsd).toString()))) {
-              _context2.next = 20;
+              _context2.next = 21;
               break;
             }
 
             throw new Error("mintUnitViaFlatMoney: keeperFee too large");
 
-          case 20:
+          case 21:
             return _context2.abrupt("return", keeperfee);
 
-          case 21:
+          case 22:
           case "end":
             return _context2.stop();
         }
@@ -23476,7 +23553,7 @@ var getKeeperFee = /*#__PURE__*/function () {
 }();
 var getKeeperFeeInUsd = /*#__PURE__*/function () {
   var _ref3 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(pool, keeperFee) {
-    var flatMoneyContracts, fundComposition, filteredFc, rateD1;
+    var flatMoneyContracts, fundComposition, filteredFc, rateD1, assetDecimal;
     return runtime_1.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -23497,7 +23574,7 @@ var getKeeperFeeInUsd = /*#__PURE__*/function () {
           case 5:
             fundComposition = _context3.sent;
             filteredFc = fundComposition.filter(function (fc) {
-              return fc.asset.toLocaleLowerCase() === flatMoneyContracts.RETH.toLocaleLowerCase();
+              return fc.asset.toLocaleLowerCase() === flatMoneyContracts.COLLATERAL.toLocaleLowerCase();
             });
 
             if (filteredFc[0]) {
@@ -23509,9 +23586,14 @@ var getKeeperFeeInUsd = /*#__PURE__*/function () {
 
           case 9:
             rateD1 = new BigNumber(filteredFc[0].rate.toString()).div(1e18);
-            return _context3.abrupt("return", rateD1.times(keeperFee.toString()).div(1e18));
+            _context3.next = 12;
+            return pool.utils.getDecimals(flatMoneyContracts.COLLATERAL);
 
-          case 11:
+          case 12:
+            assetDecimal = _context3.sent;
+            return _context3.abrupt("return", rateD1.times(keeperFee.toString()).div(Math.pow(10, assetDecimal)));
+
+          case 14:
           case "end":
             return _context3.stop();
         }
@@ -23533,6 +23615,9 @@ function getAnnounceStableWithdrawTxData(withdrawAmount, minAmountOut, keeperFee
 function getCancelExistingOrderTxData(account) {
   return new ethers.ethers.utils.Interface(DelayedOrderAbi).encodeFunctionData("cancelExistingOrder", [account]);
 }
+function getCancelExistingOrderTxDataForV2(account) {
+  return new ethers.ethers.utils.Interface(IOrderExecutionModuleAbi).encodeFunctionData("cancelExistingOrder", [account]);
+}
 function mintUnitViaFlatMoney(_x, _x2, _x3, _x4, _x5, _x6) {
   return _mintUnitViaFlatMoney.apply(this, arguments);
 }
@@ -23568,7 +23653,7 @@ function _mintUnitViaFlatMoney() {
 
           case 7:
             keeperfee = _context.sent;
-            // in RETH
+            // in COLLATERAL
             adjustedDepositAmount = new BigNumber(depositAmount.toString()).minus(keeperfee.toString() // keeper fee deducted from amountIn
             );
             _context.next = 11;
@@ -23669,7 +23754,7 @@ function cancelOrderViaFlatMoney(_x13, _x14, _x15) {
 
 function _cancelOrderViaFlatMoney() {
   _cancelOrderViaFlatMoney = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(pool, options, estimateGas) {
-    var flatMoneyContracts, cancelOrderTxData, tx;
+    var flatMoneyContracts, toAddress, cancelOrderTxData, tx;
     return runtime_1.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -23692,19 +23777,46 @@ function _cancelOrderViaFlatMoney() {
             throw new Error("cancelOrderViaFlatMoney: network not supported");
 
           case 5:
-            _context3.next = 7;
-            return getCancelExistingOrderTxData(pool.address);
+            // flat money v2
+            // use OrderExecution module to cancel order
+            toAddress = flatMoneyContracts.DelayedOrder;
+            cancelOrderTxData = getCancelExistingOrderTxData(pool.address);
 
-          case 7:
+            if (!flatMoneyContracts.OrderExecution) {
+              _context3.next = 12;
+              break;
+            }
+
+            toAddress = flatMoneyContracts.OrderExecution;
+            _context3.next = 11;
+            return getCancelExistingOrderTxDataForV2(pool.address);
+
+          case 11:
             cancelOrderTxData = _context3.sent;
-            _context3.next = 10;
-            return getPoolTxOrGasEstimate(pool, [flatMoneyContracts.DelayedOrder, cancelOrderTxData, options], estimateGas);
 
-          case 10:
+          case 12:
+            if (!estimateGas) {
+              _context3.next = 16;
+              break;
+            }
+
+            return _context3.abrupt("return", pool.signer.estimateGas({
+              to: toAddress,
+              data: cancelOrderTxData
+            }));
+
+          case 16:
+            _context3.next = 18;
+            return pool.signer.sendTransaction(_extends({
+              to: toAddress,
+              data: cancelOrderTxData
+            }, options));
+
+          case 18:
             tx = _context3.sent;
             return _context3.abrupt("return", tx);
 
-          case 12:
+          case 20:
           case "end":
             return _context3.stop();
         }
@@ -24284,7 +24396,11 @@ function _getOdosSwapTxData() {
 }
 
 var Pool = /*#__PURE__*/function () {
-  function Pool(network, signer, poolLogic, mangerLogic, utils, factory) {
+  function Pool(network, signer, poolLogic, mangerLogic, utils, factory, isDhedge) {
+    if (isDhedge === void 0) {
+      isDhedge = true;
+    }
+
     this.network = network;
     this.poolLogic = poolLogic;
     this.address = poolLogic.address;
@@ -24292,6 +24408,7 @@ var Pool = /*#__PURE__*/function () {
     this.signer = signer;
     this.utils = utils;
     this.factory = factory;
+    this.isDhedge = isDhedge;
   }
   /**
    * Return the assets with balances and deposit info of a pool
@@ -24815,69 +24932,61 @@ var Pool = /*#__PURE__*/function () {
               }
 
               _context10.t0 = dapp;
-              _context10.next = _context10.t0 === exports.Dapp.ZEROEX ? 6 : _context10.t0 === exports.Dapp.ONEINCH ? 10 : _context10.t0 === exports.Dapp.BALANCER ? 15 : _context10.t0 === exports.Dapp.SYNTHETIX ? 19 : _context10.t0 === exports.Dapp.TOROS ? 26 : _context10.t0 === exports.Dapp.ODOS ? 30 : 34;
+              _context10.next = _context10.t0 === exports.Dapp.ONEINCH ? 6 : _context10.t0 === exports.Dapp.BALANCER ? 11 : _context10.t0 === exports.Dapp.SYNTHETIX ? 15 : _context10.t0 === exports.Dapp.TOROS ? 22 : _context10.t0 === exports.Dapp.ODOS ? 26 : 30;
               break;
 
             case 6:
               _context10.next = 8;
-              return getZeroExTradeTxData(this.network, assetFrom, assetTo, amountIn, slippage, this.address);
-
-            case 8:
-              swapTxData = _context10.sent;
-              return _context10.abrupt("break", 49);
-
-            case 10:
-              _context10.next = 12;
               return getOneInchSwapTxData(this, assetFrom, assetTo, amountIn, slippage);
 
-            case 12:
+            case 8:
               _yield$getOneInchSwap = _context10.sent;
               swapTxData = _yield$getOneInchSwap.swapTxData;
-              return _context10.abrupt("break", 49);
+              return _context10.abrupt("break", 45);
 
-            case 15:
-              _context10.next = 17;
+            case 11:
+              _context10.next = 13;
               return this.utils.getBalancerSwapTx(this, assetFrom, assetTo, amountIn, slippage);
 
-            case 17:
+            case 13:
               swapTxData = _context10.sent;
-              return _context10.abrupt("break", 49);
+              return _context10.abrupt("break", 45);
 
-            case 19:
+            case 15:
               iSynthetix = new ethers.ethers.utils.Interface(ISynthetix.abi);
               assets = [assetFrom, assetTo].map(function (asset) {
                 return ethers.ethers.utils.formatBytes32String(asset);
               });
-              _context10.next = 23;
+              _context10.next = 19;
               return this.factory.owner();
 
-            case 23:
+            case 19:
               daoAddress = _context10.sent;
               swapTxData = iSynthetix.encodeFunctionData(exports.Transaction.SWAP_SYNTHS, [assets[0], amountIn, assets[1], daoAddress, SYNTHETIX_TRACKING_CODE]);
-              return _context10.abrupt("break", 49);
+              return _context10.abrupt("break", 45);
 
-            case 26:
-              _context10.next = 28;
+            case 22:
+              _context10.next = 24;
               return getEasySwapperTxData(this, assetFrom, assetTo, ethers.ethers.BigNumber.from(amountIn), slippage);
 
-            case 28:
+            case 24:
               swapTxData = _context10.sent;
-              return _context10.abrupt("break", 49);
+              return _context10.abrupt("break", 45);
 
-            case 30:
-              _context10.next = 32;
+            case 26:
+              _context10.next = 28;
               return getOdosSwapTxData(this, assetFrom, assetTo, amountIn, slippage);
 
-            case 32:
+            case 28:
               swapTxData = _context10.sent;
-              return _context10.abrupt("break", 49);
+              return _context10.abrupt("break", 45);
 
-            case 34:
+            case 30:
               iUniswapV2Router = new ethers.ethers.utils.Interface(IUniswapV2Router.abi);
-              _context10.next = 37;
+              _context10.next = 33;
               return this.utils.getMinAmountOut(dapp, assetFrom, assetTo, amountIn, slippage);
 
-            case 37:
+            case 33:
               minAmountOut = _context10.sent;
               _context10.t1 = iUniswapV2Router;
               _context10.t2 = exports.Transaction.SWAP;
@@ -24885,23 +24994,23 @@ var Pool = /*#__PURE__*/function () {
               _context10.t4 = minAmountOut;
               _context10.t5 = [assetFrom, assetTo];
               _context10.t6 = this.address;
-              _context10.next = 46;
+              _context10.next = 42;
               return getDeadline(this);
 
-            case 46:
+            case 42:
               _context10.t7 = _context10.sent;
               _context10.t8 = [_context10.t3, _context10.t4, _context10.t5, _context10.t6, _context10.t7];
               swapTxData = _context10.t1.encodeFunctionData.call(_context10.t1, _context10.t2, _context10.t8);
 
-            case 49:
-              _context10.next = 51;
+            case 45:
+              _context10.next = 47;
               return getPoolTxOrGasEstimate(this, [routerAddress[this.network][dapp], swapTxData, options], estimateGas);
 
-            case 51:
+            case 47:
               tx = _context10.sent;
               return _context10.abrupt("return", tx);
 
-            case 53:
+            case 49:
             case "end":
               return _context10.stop();
           }
@@ -31105,22 +31214,35 @@ var Dhedge = /*#__PURE__*/function () {
   _proto.loadPool =
   /*#__PURE__*/
   function () {
-    var _loadPool = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(address) {
+    var _loadPool = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(address, isDhedge) {
       var poolLogic, managerLogicAddress, managerLogic;
       return runtime_1.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              if (isDhedge === void 0) {
+                isDhedge = true;
+              }
+
               poolLogic = new ethers.Contract(address, PoolLogic.abi, this.signer);
-              _context2.next = 3;
+              managerLogicAddress = address;
+
+              if (!isDhedge) {
+                _context2.next = 7;
+                break;
+              }
+
+              _context2.next = 6;
               return poolLogic.poolManagerLogic();
 
-            case 3:
+            case 6:
               managerLogicAddress = _context2.sent;
+
+            case 7:
               managerLogic = new ethers.Contract(managerLogicAddress, ManagerLogic.abi, this.signer);
-              return _context2.abrupt("return", new Pool(this.network, this.signer, poolLogic, managerLogic, this.utils, this.factory));
+              return _context2.abrupt("return", new Pool(this.network, this.signer, poolLogic, managerLogic, this.utils, this.factory, isDhedge));
 
-            case 6:
+            case 9:
             case "end":
               return _context2.stop();
           }
@@ -31128,7 +31250,7 @@ var Dhedge = /*#__PURE__*/function () {
       }, _callee2, this);
     }));
 
-    function loadPool(_x7) {
+    function loadPool(_x7, _x8) {
       return _loadPool.apply(this, arguments);
     }
 
@@ -31148,6 +31270,23 @@ var Dhedge = /*#__PURE__*/function () {
   return Dhedge;
 }();
 
+// see https://stackoverflow.com/a/41102306
+var CAN_SET_PROTOTYPE = ("setPrototypeOf" in Object);
+var ApiError = /*#__PURE__*/function (_Error) {
+  _inheritsLoose(ApiError, _Error);
+
+  function ApiError(message) {
+    var _this;
+
+    _this = _Error.call(this, message != null ? message : "Api request failed") || this;
+    _this.name = _this.constructor.name;
+    if (CAN_SET_PROTOTYPE) Object.setPrototypeOf(_assertThisInitialized(_this), (this instanceof ApiError ? this.constructor : void 0).prototype);
+    return _this;
+  }
+
+  return ApiError;
+}( /*#__PURE__*/_wrapNativeSuper(Error));
+
 Object.defineProperty(exports, 'ethers', {
   enumerable: true,
   get: function () {