@uniswap/router-sdk 2.0.4 → 2.1.0

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

@@ -278,306 +278,113 @@ function _extends() {
 function _inheritsLoose(t, o) {
   t.prototype = Object.create(o.prototype), t.prototype.constructor = t, _setPrototypeOf(t, o);
 }
-function _regeneratorRuntime() {
-  _regeneratorRuntime = function () {
-    return e;
-  };
-  var t,
-    e = {},
-    r = Object.prototype,
-    n = r.hasOwnProperty,
-    o = Object.defineProperty || function (t, e, r) {
-      t[e] = r.value;
-    },
-    i = "function" == typeof Symbol ? Symbol : {},
-    a = i.iterator || "@@iterator",
-    c = i.asyncIterator || "@@asyncIterator",
-    u = i.toStringTag || "@@toStringTag";
-  function define(t, e, r) {
-    return Object.defineProperty(t, e, {
-      value: r,
-      enumerable: !0,
-      configurable: !0,
-      writable: !0
-    }), t[e];
-  }
-  try {
-    define({}, "");
-  } catch (t) {
-    define = function (t, e, r) {
-      return t[e] = r;
-    };
-  }
-  function wrap(t, e, r, n) {
-    var i = e && e.prototype instanceof Generator ? e : Generator,
-      a = Object.create(i.prototype),
-      c = new Context(n || []);
-    return o(a, "_invoke", {
-      value: makeInvokeMethod(t, r, c)
-    }), a;
-  }
-  function tryCatch(t, e, r) {
-    try {
-      return {
-        type: "normal",
-        arg: t.call(e, r)
-      };
-    } catch (t) {
-      return {
-        type: "throw",
-        arg: t
-      };
-    }
-  }
-  e.wrap = wrap;
-  var h = "suspendedStart",
-    l = "suspendedYield",
-    f = "executing",
-    s = "completed",
-    y = {};
-  function Generator() {}
-  function GeneratorFunction() {}
-  function GeneratorFunctionPrototype() {}
-  var p = {};
-  define(p, a, function () {
-    return this;
-  });
-  var d = Object.getPrototypeOf,
-    v = d && d(d(values([])));
-  v && v !== r && n.call(v, a) && (p = v);
-  var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p);
-  function defineIteratorMethods(t) {
-    ["next", "throw", "return"].forEach(function (e) {
-      define(t, e, function (t) {
-        return this._invoke(e, t);
-      });
-    });
-  }
-  function AsyncIterator(t, e) {
-    function invoke(r, o, i, a) {
-      var c = tryCatch(t[r], t, o);
-      if ("throw" !== c.type) {
-        var u = c.arg,
-          h = u.value;
-        return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) {
-          invoke("next", t, i, a);
-        }, function (t) {
-          invoke("throw", t, i, a);
-        }) : e.resolve(h).then(function (t) {
-          u.value = t, i(u);
-        }, function (t) {
-          return invoke("throw", t, i, a);
-        });
-      }
-      a(c.arg);
-    }
-    var r;
-    o(this, "_invoke", {
-      value: function (t, n) {
-        function callInvokeWithMethodAndArg() {
-          return new e(function (e, r) {
-            invoke(t, n, e, r);
-          });
+function _regenerator() {
+  /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
+  var e,
+    t,
+    r = "function" == typeof Symbol ? Symbol : {},
+    n = r.iterator || "@@iterator",
+    o = r.toStringTag || "@@toStringTag";
+  function i(r, n, o, i) {
+    var c = n && n.prototype instanceof Generator ? n : Generator,
+      u = Object.create(c.prototype);
+    return _regeneratorDefine(u, "_invoke", function (r, n, o) {
+      var i,
+        c,
+        u,
+        f = 0,
+        p = o || [],
+        y = !1,
+        G = {
+          p: 0,
+          n: 0,
+          v: e,
+          a: d,
+          f: d.bind(e, 4),
+          d: function (t, r) {
+            return i = t, c = 0, u = e, G.n = r, a;
+          }
+        };
+      function d(r, n) {
+        for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) {
+          var o,
+            i = p[t],
+            d = G.p,
+            l = i[2];
+          r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0));
         }
-        return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+        if (o || r > 1) return a;
+        throw y = !0, n;
       }
-    });
-  }
-  function makeInvokeMethod(e, r, n) {
-    var o = h;
-    return function (i, a) {
-      if (o === f) throw Error("Generator is already running");
-      if (o === s) {
-        if ("throw" === i) throw a;
+      return function (o, p, l) {
+        if (f > 1) throw TypeError("Generator is already running");
+        for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) {
+          i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u);
+          try {
+            if (f = 2, i) {
+              if (c || (o = "next"), t = i[o]) {
+                if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object");
+                if (!t.done) return t;
+                u = t.value, c < 2 && (c = 0);
+              } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1);
+              i = e;
+            } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break;
+          } catch (t) {
+            i = e, c = 1, u = t;
+          } finally {
+            f = 1;
+          }
+        }
         return {
           value: t,
-          done: !0
+          done: y
         };
-      }
-      for (n.method = i, n.arg = a;;) {
-        var c = n.delegate;
-        if (c) {
-          var u = maybeInvokeDelegate(c, n);
-          if (u) {
-            if (u === y) continue;
-            return u;
-          }
-        }
-        if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) {
-          if (o === h) throw o = s, n.arg;
-          n.dispatchException(n.arg);
-        } else "return" === n.method && n.abrupt("return", n.arg);
-        o = f;
-        var p = tryCatch(e, r, n);
-        if ("normal" === p.type) {
-          if (o = n.done ? s : l, p.arg === y) continue;
-          return {
-            value: p.arg,
-            done: n.done
-          };
-        }
-        "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg);
-      }
-    };
-  }
-  function maybeInvokeDelegate(e, r) {
-    var n = r.method,
-      o = e.iterator[n];
-    if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y;
-    var i = tryCatch(o, e.iterator, r.arg);
-    if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y;
-    var a = i.arg;
-    return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y);
-  }
-  function pushTryEntry(t) {
-    var e = {
-      tryLoc: t[0]
-    };
-    1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e);
-  }
-  function resetTryEntry(t) {
-    var e = t.completion || {};
-    e.type = "normal", delete e.arg, t.completion = e;
-  }
-  function Context(t) {
-    this.tryEntries = [{
-      tryLoc: "root"
-    }], t.forEach(pushTryEntry, this), this.reset(!0);
+      };
+    }(r, o, i), !0), u;
   }
-  function values(e) {
-    if (e || "" === e) {
-      var r = e[a];
-      if (r) return r.call(e);
-      if ("function" == typeof e.next) return e;
-      if (!isNaN(e.length)) {
-        var o = -1,
-          i = function next() {
-            for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next;
-            return next.value = t, next.done = !0, next;
-          };
-        return i.next = i;
-      }
-    }
-    throw new TypeError(typeof e + " is not iterable");
+  var a = {};
+  function Generator() {}
+  function GeneratorFunction() {}
+  function GeneratorFunctionPrototype() {}
+  t = Object.getPrototypeOf;
+  var c = [][n] ? t(t([][n]())) : (_regeneratorDefine(t = {}, n, function () {
+      return this;
+    }), t),
+    u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c);
+  function f(e) {
+    return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e;
   }
-  return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", {
-    value: GeneratorFunctionPrototype,
-    configurable: !0
-  }), o(GeneratorFunctionPrototype, "constructor", {
-    value: GeneratorFunction,
-    configurable: !0
-  }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) {
-    var e = "function" == typeof t && t.constructor;
-    return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name));
-  }, e.mark = function (t) {
-    return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t;
-  }, e.awrap = function (t) {
-    return {
-      __await: t
-    };
-  }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () {
+  return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine(u), _regeneratorDefine(u, o, "Generator"), _regeneratorDefine(u, n, function () {
     return this;
-  }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) {
-    void 0 === i && (i = Promise);
-    var a = new AsyncIterator(wrap(t, r, n, o), i);
-    return e.isGeneratorFunction(r) ? a : a.next().then(function (t) {
-      return t.done ? t.value : a.next();
-    });
-  }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () {
-    return this;
-  }), define(g, "toString", function () {
+  }), _regeneratorDefine(u, "toString", function () {
     return "[object Generator]";
-  }), e.keys = function (t) {
-    var e = Object(t),
-      r = [];
-    for (var n in e) r.push(n);
-    return r.reverse(), function next() {
-      for (; r.length;) {
-        var t = r.pop();
-        if (t in e) return next.value = t, next.done = !1, next;
-      }
-      return next.done = !0, next;
+  }), (_regenerator = function () {
+    return {
+      w: i,
+      m: f
     };
-  }, e.values = values, Context.prototype = {
-    constructor: Context,
-    reset: function (e) {
-      if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t);
-    },
-    stop: function () {
-      this.done = !0;
-      var t = this.tryEntries[0].completion;
-      if ("throw" === t.type) throw t.arg;
-      return this.rval;
-    },
-    dispatchException: function (e) {
-      if (this.done) throw e;
-      var r = this;
-      function handle(n, o) {
-        return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o;
-      }
-      for (var o = this.tryEntries.length - 1; o >= 0; --o) {
-        var i = this.tryEntries[o],
-          a = i.completion;
-        if ("root" === i.tryLoc) return handle("end");
-        if (i.tryLoc <= this.prev) {
-          var c = n.call(i, "catchLoc"),
-            u = n.call(i, "finallyLoc");
-          if (c && u) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
-            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
-          } else if (c) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
-          } else {
-            if (!u) throw Error("try statement without catch or finally");
-            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
-          }
-        }
-      }
-    },
-    abrupt: function (t, e) {
-      for (var r = this.tryEntries.length - 1; r >= 0; --r) {
-        var o = this.tryEntries[r];
-        if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) {
-          var i = o;
-          break;
-        }
-      }
-      i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null);
-      var a = i ? i.completion : {};
-      return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a);
-    },
-    complete: function (t, e) {
-      if ("throw" === t.type) throw t.arg;
-      return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y;
-    },
-    finish: function (t) {
-      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
-        var r = this.tryEntries[e];
-        if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y;
-      }
-    },
-    catch: function (t) {
-      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
-        var r = this.tryEntries[e];
-        if (r.tryLoc === t) {
-          var n = r.completion;
-          if ("throw" === n.type) {
-            var o = n.arg;
-            resetTryEntry(r);
-          }
-          return o;
-        }
-      }
-      throw Error("illegal catch attempt");
-    },
-    delegateYield: function (e, r, n) {
-      return this.delegate = {
-        iterator: values(e),
-        resultName: r,
-        nextLoc: n
-      }, "next" === this.method && (this.arg = t), y;
-    }
-  }, e;
+  })();
+}
+function _regeneratorDefine(e, r, n, t) {
+  var i = Object.defineProperty;
+  try {
+    i({}, "", {});
+  } catch (e) {
+    i = 0;
+  }
+  _regeneratorDefine = function (e, r, n, t) {
+    function o(r, n) {
+      _regeneratorDefine(e, r, function (e) {
+        return this._invoke(r, n, e);
+      });
+    }
+    r ? i ? i(e, r, {
+      value: n,
+      enumerable: !t,
+      configurable: !t,
+      writable: !t
+    }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2));
+  }, _regeneratorDefine(e, r, n, t);
 }
 function _setPrototypeOf(t, e) {
   return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
@@ -862,36 +669,36 @@ var MixedRouteTrade = /*#__PURE__*/function () {
   MixedRouteTrade.fromRoute =
   /*#__PURE__*/
   function () {
-    var _fromRoute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(route, amount, tradeType) {
+    var _fromRoute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(route, amount, tradeType) {
       var amounts, inputAmount, outputAmount, i, pool, _yield$pool$getOutput, _outputAmount;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             amounts = new Array(route.path.length);
             !(tradeType === sdkCore.TradeType.EXACT_INPUT) ?  invariant(false, 'TRADE_TYPE')  : void 0;
             !amount.currency.equals(route.input) ?  invariant(false, 'INPUT')  : void 0;
             amounts[0] = amountWithPathCurrency(amount, route.pools[0]);
             i = 0;
-          case 5:
+          case 1:
             if (!(i < route.path.length - 1)) {
-              _context.next = 15;
+              _context.n = 4;
               break;
             }
             pool = route.pools[i];
-            _context.next = 9;
+            _context.n = 2;
             return pool.getOutputAmount(amountWithPathCurrency(amounts[i], pool));
-          case 9:
-            _yield$pool$getOutput = _context.sent;
+          case 2:
+            _yield$pool$getOutput = _context.v;
             _outputAmount = _yield$pool$getOutput[0];
             amounts[i + 1] = _outputAmount;
-          case 12:
+          case 3:
             i++;
-            _context.next = 5;
+            _context.n = 1;
             break;
-          case 15:
+          case 4:
             inputAmount = sdkCore.CurrencyAmount.fromFractionalAmount(route.input, amount.numerator, amount.denominator);
             outputAmount = sdkCore.CurrencyAmount.fromFractionalAmount(route.output, amounts[amounts.length - 1].numerator, amounts[amounts.length - 1].denominator);
-            return _context.abrupt("return", new MixedRouteTrade({
+            return _context.a(2, new MixedRouteTrade({
               routes: [{
                 inputAmount: inputAmount,
                 outputAmount: outputAmount,
@@ -899,9 +706,6 @@ var MixedRouteTrade = /*#__PURE__*/function () {
               }],
               tradeType: tradeType
             }));
-          case 18:
-          case "end":
-            return _context.stop();
         }
       }, _callee);
     }));
@@ -924,17 +728,17 @@ var MixedRouteTrade = /*#__PURE__*/function () {
   MixedRouteTrade.fromRoutes =
   /*#__PURE__*/
   function () {
-    var _fromRoutes = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(routes, tradeType) {
+    var _fromRoutes = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(routes, tradeType) {
       var populatedRoutes, _iterator3, _step3, _step3$value, route, amount, amounts, inputAmount, outputAmount, i, pool, _yield$pool$getOutput2, _outputAmount2;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
           case 0:
             populatedRoutes = [];
             !(tradeType === sdkCore.TradeType.EXACT_INPUT) ?  invariant(false, 'TRADE_TYPE')  : void 0;
             _iterator3 = _createForOfIteratorHelperLoose(routes);
-          case 3:
+          case 1:
             if ((_step3 = _iterator3()).done) {
-              _context2.next = 26;
+              _context2.n = 7;
               break;
             }
             _step3$value = _step3.value, route = _step3$value.route, amount = _step3$value.amount;
@@ -945,40 +749,37 @@ var MixedRouteTrade = /*#__PURE__*/function () {
             inputAmount = sdkCore.CurrencyAmount.fromFractionalAmount(route.input, amount.numerator, amount.denominator);
             amounts[0] = sdkCore.CurrencyAmount.fromFractionalAmount(route.pathInput, amount.numerator, amount.denominator);
             i = 0;
-          case 12:
+          case 2:
             if (!(i < route.path.length - 1)) {
-              _context2.next = 22;
+              _context2.n = 5;
               break;
             }
             pool = route.pools[i];
-            _context2.next = 16;
+            _context2.n = 3;
             return pool.getOutputAmount(amountWithPathCurrency(amounts[i], pool));
-          case 16:
-            _yield$pool$getOutput2 = _context2.sent;
+          case 3:
+            _yield$pool$getOutput2 = _context2.v;
             _outputAmount2 = _yield$pool$getOutput2[0];
             amounts[i + 1] = _outputAmount2;
-          case 19:
+          case 4:
             i++;
-            _context2.next = 12;
+            _context2.n = 2;
             break;
-          case 22:
+          case 5:
             outputAmount = sdkCore.CurrencyAmount.fromFractionalAmount(route.output, amounts[amounts.length - 1].numerator, amounts[amounts.length - 1].denominator);
             populatedRoutes.push({
               route: route,
               inputAmount: inputAmount,
               outputAmount: outputAmount
             });
-          case 24:
-            _context2.next = 3;
+          case 6:
+            _context2.n = 1;
             break;
-          case 26:
-            return _context2.abrupt("return", new MixedRouteTrade({
+          case 7:
+            return _context2.a(2, new MixedRouteTrade({
               routes: populatedRoutes,
               tradeType: tradeType
             }));
-          case 27:
-          case "end":
-            return _context2.stop();
         }
       }, _callee2);
     }));
@@ -1072,12 +873,12 @@ var MixedRouteTrade = /*#__PURE__*/function () {
   MixedRouteTrade.bestTradeExactIn =
   /*#__PURE__*/
   function () {
-    var _bestTradeExactIn = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(pools, currencyAmountIn, currencyOut, _temp,
+    var _bestTradeExactIn = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(pools, currencyAmountIn, currencyOut, _temp,
     // used in recursion.
     currentPools, nextAmountIn, bestTrades) {
-      var _ref5, _ref5$maxNumResults, maxNumResults, _ref5$maxHops, maxHops, amountIn, i, pool, amountInAdjusted, amountOut, _ref6, poolsExcludingThisPool;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      var _ref5, _ref5$maxNumResults, maxNumResults, _ref5$maxHops, maxHops, amountIn, i, pool, amountInAdjusted, amountOut, _ref6, poolsExcludingThisPool, _t, _t2, _t3, _t4;
+      return _regenerator().w(function (_context3) {
+        while (1) switch (_context3.p = _context3.n) {
           case 0:
             _ref5 = _temp === void 0 ? {} : _temp, _ref5$maxNumResults = _ref5.maxNumResults, maxNumResults = _ref5$maxNumResults === void 0 ? 3 : _ref5$maxNumResults, _ref5$maxHops = _ref5.maxHops, maxHops = _ref5$maxHops === void 0 ? 3 : _ref5$maxHops;
             if (currentPools === void 0) {
@@ -1094,101 +895,95 @@ var MixedRouteTrade = /*#__PURE__*/function () {
             !(currencyAmountIn === nextAmountIn || currentPools.length > 0) ?  invariant(false, 'INVALID_RECURSION')  : void 0;
             amountIn = nextAmountIn;
             i = 0;
-          case 9:
+          case 1:
             if (!(i < pools.length)) {
-              _context3.next = 56;
+              _context3.n = 15;
               break;
             }
             pool = pools[i];
             amountInAdjusted = pool instanceof v4Sdk.Pool ? amountIn : amountIn.wrapped; // pool irrelevant
             if (!(!pool.token0.equals(amountInAdjusted.currency) && !pool.token1.equals(amountInAdjusted.currency))) {
-              _context3.next = 14;
+              _context3.n = 2;
               break;
             }
-            return _context3.abrupt("continue", 53);
-          case 14:
+            return _context3.a(3, 14);
+          case 2:
             if (!(pool instanceof v2Sdk.Pair)) {
-              _context3.next = 17;
+              _context3.n = 3;
               break;
             }
             if (!(pool.reserve0.equalTo(ZERO) || pool.reserve1.equalTo(ZERO))) {
-              _context3.next = 17;
+              _context3.n = 3;
               break;
             }
-            return _context3.abrupt("continue", 53);
-          case 17:
+            return _context3.a(3, 14);
+          case 3:
             amountOut = void 0;
-            _context3.prev = 18;
+            _context3.p = 4;
             if (!(pool instanceof v4Sdk.Pool)) {
-              _context3.next = 26;
+              _context3.n = 6;
               break;
             }
-            _context3.next = 23;
+            _context3.n = 5;
             return pool.getOutputAmount(amountInAdjusted);
-          case 23:
-            _context3.t0 = _context3.sent;
-            _context3.next = 29;
+          case 5:
+            _t = _context3.v;
+            _context3.n = 8;
             break;
-          case 26:
-            _context3.next = 28;
+          case 6:
+            _context3.n = 7;
             return pool.getOutputAmount(amountInAdjusted.wrapped);
-          case 28:
-            _context3.t0 = _context3.sent;
-          case 29:
-            _ref6 = _context3.t0;
+          case 7:
+            _t = _context3.v;
+          case 8:
+            _ref6 = _t;
             amountOut = _ref6[0];
-            _context3.next = 38;
+            _context3.n = 11;
             break;
-          case 33:
-            _context3.prev = 33;
-            _context3.t1 = _context3["catch"](18);
-            if (!_context3.t1.isInsufficientInputAmountError) {
-              _context3.next = 37;
+          case 9:
+            _context3.p = 9;
+            _t2 = _context3.v;
+            if (!_t2.isInsufficientInputAmountError) {
+              _context3.n = 10;
               break;
             }
-            return _context3.abrupt("continue", 53);
-          case 37:
-            throw _context3.t1;
-          case 38:
+            return _context3.a(3, 14);
+          case 10:
+            throw _t2;
+          case 11:
             if (!amountOut.currency.wrapped.equals(currencyOut.wrapped)) {
-              _context3.next = 49;
+              _context3.n = 13;
               break;
             }
-            _context3.t2 = sdkCore.sortedInsert;
-            _context3.t3 = bestTrades;
-            _context3.next = 43;
+            _t3 = sdkCore.sortedInsert;
+            _t4 = bestTrades;
+            _context3.n = 12;
             return MixedRouteTrade.fromRoute(new MixedRouteSDK([].concat(currentPools, [pool]), currencyAmountIn.currency, currencyOut), currencyAmountIn, sdkCore.TradeType.EXACT_INPUT);
-          case 43:
-            _context3.t4 = _context3.sent;
-            _context3.t5 = maxNumResults;
-            _context3.t6 = tradeComparator;
-            (0, _context3.t2)(_context3.t3, _context3.t4, _context3.t5, _context3.t6);
-            _context3.next = 53;
+          case 12:
+            _t3(_t4, _context3.v, maxNumResults, tradeComparator);
+            _context3.n = 14;
             break;
-          case 49:
+          case 13:
             if (!(maxHops > 1 && pools.length > 1)) {
-              _context3.next = 53;
+              _context3.n = 14;
               break;
             }
             poolsExcludingThisPool = pools.slice(0, i).concat(pools.slice(i + 1, pools.length)); // otherwise, consider all the other paths that lead from this token as long as we have not exceeded maxHops
-            _context3.next = 53;
+            _context3.n = 14;
             return MixedRouteTrade.bestTradeExactIn(poolsExcludingThisPool, currencyAmountIn, currencyOut, {
               maxNumResults: maxNumResults,
               maxHops: maxHops - 1
             }, [].concat(currentPools, [pool]), amountOut, bestTrades);
-          case 53:
+          case 14:
             i++;
-            _context3.next = 9;
+            _context3.n = 1;
             break;
-          case 56:
-            return _context3.abrupt("return", bestTrades);
-          case 57:
-          case "end":
-            return _context3.stop();
+          case 15:
+            return _context3.a(2, bestTrades);
         }
-      }, _callee3, null, [[18, 33]]);
+      }, _callee3, null, [[4, 9]]);
     }));
-    function bestTradeExactIn(_x6, _x7, _x8, _x9, _x10, _x11, _x12) {
+    function bestTradeExactIn(_x6, _x7, _x8, _x9, _x0, _x1, _x10) {
       return _bestTradeExactIn.apply(this, arguments);
     }
     return bestTradeExactIn;
@@ -1503,10 +1298,10 @@ var Trade = /*#__PURE__*/function () {
     return new sdkCore.Price(this.inputAmount.currency, this.outputAmount.currency, this.maximumAmountIn(slippageTolerance).quotient, this.minimumAmountOut(slippageTolerance).quotient);
   };
   Trade.fromRoutes = /*#__PURE__*/function () {
-    var _fromRoutes = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(v2Routes, v3Routes, tradeType, mixedRoutes, v4Routes) {
-      var populatedV2Routes, populatedV3Routes, populatedV4Routes, populatedMixedRoutes, _iterator7, _step7, _step7$value, routev2, _amount2, v2Trade, _inputAmount5, _outputAmount5, _iterator8, _step8, _step8$value, routev3, _amount3, v3Trade, _inputAmount6, _outputAmount6, _iterator9, _step9, _step9$value, routev4, amount, v4Trade, inputAmount, outputAmount, _iterator10, _step10, _step10$value, mixedRoute, _amount, mixedRouteTrade, _inputAmount4, _outputAmount4;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _fromRoutes = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(v2Routes, v3Routes, tradeType, mixedRoutes, v4Routes) {
+      var populatedV2Routes, populatedV3Routes, populatedV4Routes, populatedMixedRoutes, _iterator7, _step7, _step7$value, routev2, _amount2, v2Trade, _inputAmount5, _outputAmount5, _iterator8, _step8, _step8$value, routev3, _amount3, v3Trade, _inputAmount6, _outputAmount6, _iterator9, _step9, _step9$value, routev4, amount, v4Trade, inputAmount, outputAmount, _iterator0, _step0, _step0$value, mixedRoute, _amount, mixedRouteTrade, _inputAmount4, _outputAmount4;
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             populatedV2Routes = [];
             populatedV3Routes = [];
@@ -1523,86 +1318,83 @@ var Trade = /*#__PURE__*/function () {
               });
             }
             _iterator8 = _createForOfIteratorHelperLoose(v3Routes);
-          case 6:
+          case 1:
             if ((_step8 = _iterator8()).done) {
-              _context.next = 15;
+              _context.n = 4;
               break;
             }
             _step8$value = _step8.value, routev3 = _step8$value.routev3, _amount3 = _step8$value.amount;
-            _context.next = 10;
+            _context.n = 2;
             return v3Sdk.Trade.fromRoute(routev3, _amount3, tradeType);
-          case 10:
-            v3Trade = _context.sent;
+          case 2:
+            v3Trade = _context.v;
             _inputAmount6 = v3Trade.inputAmount, _outputAmount6 = v3Trade.outputAmount;
             populatedV3Routes.push({
               routev3: routev3,
               inputAmount: _inputAmount6,
               outputAmount: _outputAmount6
             });
-          case 13:
-            _context.next = 6;
+          case 3:
+            _context.n = 1;
             break;
-          case 15:
+          case 4:
             if (!v4Routes) {
-              _context.next = 26;
+              _context.n = 8;
               break;
             }
             _iterator9 = _createForOfIteratorHelperLoose(v4Routes);
-          case 17:
+          case 5:
             if ((_step9 = _iterator9()).done) {
-              _context.next = 26;
+              _context.n = 8;
               break;
             }
             _step9$value = _step9.value, routev4 = _step9$value.routev4, amount = _step9$value.amount;
-            _context.next = 21;
+            _context.n = 6;
             return v4Sdk.Trade.fromRoute(routev4, amount, tradeType);
-          case 21:
-            v4Trade = _context.sent;
+          case 6:
+            v4Trade = _context.v;
             inputAmount = v4Trade.inputAmount, outputAmount = v4Trade.outputAmount;
             populatedV4Routes.push({
               routev4: routev4,
               inputAmount: inputAmount,
               outputAmount: outputAmount
             });
-          case 24:
-            _context.next = 17;
+          case 7:
+            _context.n = 5;
             break;
-          case 26:
+          case 8:
             if (!mixedRoutes) {
-              _context.next = 37;
+              _context.n = 12;
               break;
             }
-            _iterator10 = _createForOfIteratorHelperLoose(mixedRoutes);
-          case 28:
-            if ((_step10 = _iterator10()).done) {
-              _context.next = 37;
+            _iterator0 = _createForOfIteratorHelperLoose(mixedRoutes);
+          case 9:
+            if ((_step0 = _iterator0()).done) {
+              _context.n = 12;
               break;
             }
-            _step10$value = _step10.value, mixedRoute = _step10$value.mixedRoute, _amount = _step10$value.amount;
-            _context.next = 32;
+            _step0$value = _step0.value, mixedRoute = _step0$value.mixedRoute, _amount = _step0$value.amount;
+            _context.n = 10;
             return MixedRouteTrade.fromRoute(mixedRoute, _amount, tradeType);
-          case 32:
-            mixedRouteTrade = _context.sent;
+          case 10:
+            mixedRouteTrade = _context.v;
             _inputAmount4 = mixedRouteTrade.inputAmount, _outputAmount4 = mixedRouteTrade.outputAmount;
             populatedMixedRoutes.push({
               mixedRoute: mixedRoute,
               inputAmount: _inputAmount4,
               outputAmount: _outputAmount4
             });
-          case 35:
-            _context.next = 28;
+          case 11:
+            _context.n = 9;
             break;
-          case 37:
-            return _context.abrupt("return", new Trade({
+          case 12:
+            return _context.a(2, new Trade({
               v2Routes: populatedV2Routes,
               v3Routes: populatedV3Routes,
               v4Routes: populatedV4Routes,
               mixedRoutes: populatedMixedRoutes,
               tradeType: tradeType
             }));
-          case 38:
-          case "end":
-            return _context.stop();
         }
       }, _callee);
     }));
@@ -1612,17 +1404,17 @@ var Trade = /*#__PURE__*/function () {
     return fromRoutes;
   }();
   Trade.fromRoute = /*#__PURE__*/function () {
-    var _fromRoute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(route, amount, tradeType) {
+    var _fromRoute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(route, amount, tradeType) {
       var v2Routes, v3Routes, v4Routes, mixedRoutes, v2Trade, inputAmount, outputAmount, v3Trade, _inputAmount7, _outputAmount7, v4Trade, _inputAmount8, _outputAmount8, mixedRouteTrade, _inputAmount9, _outputAmount9;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
           case 0:
             v2Routes = [];
             v3Routes = [];
             v4Routes = [];
             mixedRoutes = [];
             if (!(route instanceof v2Sdk.Route)) {
-              _context2.next = 10;
+              _context2.n = 1;
               break;
             }
             v2Trade = new v2Sdk.Trade(route, amount, tradeType);
@@ -1632,72 +1424,69 @@ var Trade = /*#__PURE__*/function () {
               inputAmount: inputAmount,
               outputAmount: outputAmount
             }];
-            _context2.next = 35;
+            _context2.n = 8;
             break;
-          case 10:
+          case 1:
             if (!(route instanceof v3Sdk.Route)) {
-              _context2.next = 18;
+              _context2.n = 3;
               break;
             }
-            _context2.next = 13;
+            _context2.n = 2;
             return v3Sdk.Trade.fromRoute(route, amount, tradeType);
-          case 13:
-            v3Trade = _context2.sent;
+          case 2:
+            v3Trade = _context2.v;
             _inputAmount7 = v3Trade.inputAmount, _outputAmount7 = v3Trade.outputAmount;
             v3Routes = [{
               routev3: route,
               inputAmount: _inputAmount7,
               outputAmount: _outputAmount7
             }];
-            _context2.next = 35;
+            _context2.n = 8;
             break;
-          case 18:
+          case 3:
             if (!(route instanceof v4Sdk.Route)) {
-              _context2.next = 26;
+              _context2.n = 5;
               break;
             }
-            _context2.next = 21;
+            _context2.n = 4;
             return v4Sdk.Trade.fromRoute(route, amount, tradeType);
-          case 21:
-            v4Trade = _context2.sent;
+          case 4:
+            v4Trade = _context2.v;
             _inputAmount8 = v4Trade.inputAmount, _outputAmount8 = v4Trade.outputAmount;
             v4Routes = [{
               routev4: route,
               inputAmount: _inputAmount8,
               outputAmount: _outputAmount8
             }];
-            _context2.next = 35;
+            _context2.n = 8;
             break;
-          case 26:
+          case 5:
             if (!(route instanceof MixedRouteSDK)) {
-              _context2.next = 34;
+              _context2.n = 7;
               break;
             }
-            _context2.next = 29;
+            _context2.n = 6;
             return MixedRouteTrade.fromRoute(route, amount, tradeType);
-          case 29:
-            mixedRouteTrade = _context2.sent;
+          case 6:
+            mixedRouteTrade = _context2.v;
             _inputAmount9 = mixedRouteTrade.inputAmount, _outputAmount9 = mixedRouteTrade.outputAmount;
             mixedRoutes = [{
               mixedRoute: route,
               inputAmount: _inputAmount9,
               outputAmount: _outputAmount9
             }];
-            _context2.next = 35;
+            _context2.n = 8;
             break;
-          case 34:
+          case 7:
             throw new Error('Invalid route type');
-          case 35:
-            return _context2.abrupt("return", new Trade({
+          case 8:
+            return _context2.a(2, new Trade({
               v2Routes: v2Routes,
               v3Routes: v3Routes,
               v4Routes: v4Routes,
               mixedRoutes: mixedRoutes,
               tradeType: tradeType
             }));
-          case 36:
-          case "end":
-            return _context2.stop();
         }
       }, _callee2);
     }));
@@ -1852,10 +1641,10 @@ var Trade = /*#__PURE__*/function () {
       // because we're unable to derive the pre-buy-tax amount, use 0% as a placeholder.
       if (this.outputTax.equalTo(ONE_HUNDRED_PERCENT)) return ZERO_PERCENT;
       var spotOutputAmount = sdkCore.CurrencyAmount.fromRawAmount(this.outputAmount.currency, 0);
-      for (var _iterator11 = _createForOfIteratorHelperLoose(this.swaps), _step11; !(_step11 = _iterator11()).done;) {
-        var _step11$value = _step11.value,
-          route = _step11$value.route,
-          inputAmount = _step11$value.inputAmount;
+      for (var _iterator1 = _createForOfIteratorHelperLoose(this.swaps), _step1; !(_step1 = _iterator1()).done;) {
+        var _step1$value = _step1.value,
+          route = _step1$value.route,
+          inputAmount = _step1$value.inputAmount;
         var midPrice = route.midPrice;
         var postTaxInputAmount = inputAmount.multiply(new sdkCore.Fraction(ONE).subtract(this.inputTax));
         spotOutputAmount = spotOutputAmount.add(midPrice.quote(postTaxInputAmount));