@uniswap/router-sdk 1.9.3 → 1.11.0

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

@@ -14,8 +14,10 @@ var IMulticallExtended_json = require('@uniswap/swap-router-contracts/artifacts/
 var IPeripheryPaymentsWithFeeExtended_json = require('@uniswap/swap-router-contracts/artifacts/contracts/interfaces/IPeripheryPaymentsWithFeeExtended.sol/IPeripheryPaymentsWithFeeExtended.json');
 var ISwapRouter02_json = require('@uniswap/swap-router-contracts/artifacts/contracts/interfaces/ISwapRouter02.sol/ISwapRouter02.json');
 var v2Sdk = require('@uniswap/v2-sdk');
+var v4Sdk = require('@uniswap/v4-sdk');
 var solidity = require('@ethersproject/solidity');
 
+var ADDRESS_ZERO = '0x0000000000000000000000000000000000000000';
 var MSG_SENDER = '0x0000000000000000000000000000000000000001';
 var ADDRESS_THIS = '0x0000000000000000000000000000000000000002';
 var ZERO = /*#__PURE__*/JSBI.BigInt(0);
@@ -640,13 +642,22 @@ var MixedRouteSDK = /*#__PURE__*/function () {
       return pool.chainId === chainId;
     });
     !allOnSameChain ?  invariant(false, 'CHAIN_IDS')  : void 0;
-    var wrappedInput = input.wrapped;
-    !pools[0].involvesToken(wrappedInput) ?  invariant(false, 'INPUT')  : void 0;
-    !pools[pools.length - 1].involvesToken(output.wrapped) ?  invariant(false, 'OUTPUT')  : void 0;
+    if (pools[0] instanceof v4Sdk.Pool) {
+      this.adjustedInput = pools[0].involvesToken(input) ? input : input.wrapped;
+    } else {
+      this.adjustedInput = input.wrapped; // no native currencies in v2/v3
+    }
+    !pools[0].involvesToken(this.adjustedInput) ?  invariant(false, 'INPUT')  : void 0;
+    var lastPool = pools[pools.length - 1];
+    if (lastPool instanceof v4Sdk.Pool) {
+      !(lastPool.involvesToken(output) || lastPool.involvesToken(output.wrapped)) ?  invariant(false, 'OUTPUT')  : void 0;
+    } else {
+      !lastPool.involvesToken(output.wrapped) ?  invariant(false, 'OUTPUT')  : void 0;
+    }
     /**
      * Normalizes token0-token1 order and selects the next token/fee step to add to the path
      * */
-    var tokenPath = [wrappedInput];
+    var tokenPath = [this.adjustedInput];
     for (var _iterator = _createForOfIteratorHelperLoose(pools.entries()), _step; !(_step = _iterator()).done;) {
       var _step$value = _step.value,
         i = _step$value[0],
@@ -678,17 +689,17 @@ var MixedRouteSDK = /*#__PURE__*/function () {
           price = _ref.price;
         return nextInput.equals(pool.token0) ? {
           nextInput: pool.token1,
-          price: price.multiply(pool.token0Price)
+          price: price.multiply(pool.token0Price.asFraction)
         } : {
           nextInput: pool.token0,
-          price: price.multiply(pool.token1Price)
+          price: price.multiply(pool.token1Price.asFraction)
         };
-      }, this.pools[0].token0.equals(this.input.wrapped) ? {
+      }, this.pools[0].token0.equals(this.adjustedInput) ? {
         nextInput: this.pools[0].token1,
-        price: this.pools[0].token0Price
+        price: this.pools[0].token0Price.asFraction
       } : {
         nextInput: this.pools[0].token0,
-        price: this.pools[0].token1Price
+        price: this.pools[0].token1Price.asFraction
       }).price;
       return this._midPrice = new sdkCore.Price(this.input, this.output, price.denominator, price.numerator);
     }
@@ -696,6 +707,49 @@ var MixedRouteSDK = /*#__PURE__*/function () {
   return MixedRouteSDK;
 }();
 
+function getOutputAmount(_x, _x2) {
+  return _getOutputAmount.apply(this, arguments);
+}
+function _getOutputAmount() {
+  _getOutputAmount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(pool, amountIn) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(pool instanceof v4Sdk.Pool)) {
+            _context.next = 11;
+            break;
+          }
+          if (!pool.involvesCurrency(amountIn.currency)) {
+            _context.next = 7;
+            break;
+          }
+          _context.next = 4;
+          return pool.getOutputAmount(amountIn);
+        case 4:
+          return _context.abrupt("return", _context.sent);
+        case 7:
+          if (!pool.involvesCurrency(amountIn.currency.wrapped)) {
+            _context.next = 11;
+            break;
+          }
+          _context.next = 10;
+          return pool.getOutputAmount(amountIn.wrapped);
+        case 10:
+          return _context.abrupt("return", _context.sent);
+        case 11:
+          _context.next = 13;
+          return pool.getOutputAmount(amountIn.wrapped);
+        case 13:
+          return _context.abrupt("return", _context.sent);
+        case 14:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _getOutputAmount.apply(this, arguments);
+}
+
 /**
  * Trades comparator, an extension of the input output comparator that also considers other dimensions of the trade in ranking them
  * @template TInput The input token, either Ether or an ERC-20
@@ -773,15 +827,24 @@ var MixedRouteTrade = /*#__PURE__*/function () {
     }).reduce(function (total, cur) {
       return total + cur;
     }, 0);
-    var poolAddressSet = new Set();
+    var poolIdentifierSet = new Set();
     for (var _iterator = _createForOfIteratorHelperLoose(routes), _step; !(_step = _iterator()).done;) {
       var route = _step.value.route;
       for (var _iterator2 = _createForOfIteratorHelperLoose(route.pools), _step2; !(_step2 = _iterator2()).done;) {
         var pool = _step2.value;
-        pool instanceof v3Sdk.Pool ? poolAddressSet.add(v3Sdk.Pool.getAddress(pool.token0, pool.token1, pool.fee)) : poolAddressSet.add(v2Sdk.Pair.getAddress(pool.token0, pool.token1));
+        if (pool instanceof v4Sdk.Pool) {
+          poolIdentifierSet.add(pool.poolId);
+        } else if (pool instanceof v3Sdk.Pool) {
+          poolIdentifierSet.add(v3Sdk.Pool.getAddress(pool.token0, pool.token1, pool.fee));
+        } else if (pool instanceof v2Sdk.Pair) {
+          var pair = pool;
+          poolIdentifierSet.add(v2Sdk.Pair.getAddress(pair.token0, pair.token1));
+        } else {
+          throw new Error('Unexpected pool type in route when constructing trade object');
+        }
       }
     }
-    !(numPools === poolAddressSet.size) ?  invariant(false, 'POOLS_DUPLICATED')  : void 0;
+    !(numPools === poolIdentifierSet.size) ?  invariant(false, 'POOLS_DUPLICATED')  : void 0;
     !(tradeType === sdkCore.TradeType.EXACT_INPUT) ?  invariant(false, 'TRADE_TYPE')  : void 0;
     this.swaps = routes;
     this.tradeType = tradeType;
@@ -807,14 +870,14 @@ var MixedRouteTrade = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _fromRoute = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(route, amount, tradeType) {
-      var amounts, inputAmount, outputAmount, i, pool, _yield$pool$getOutput, _outputAmount;
+      var amounts, inputAmount, outputAmount, i, pool, _yield$getOutputAmoun, _outputAmount;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           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] = amount.wrapped;
+            amounts[0] = route.pools[0] instanceof v4Sdk.Pool ? amount : amount.wrapped;
             i = 0;
           case 5:
             if (!(i < route.path.length - 1)) {
@@ -823,10 +886,10 @@ var MixedRouteTrade = /*#__PURE__*/function () {
             }
             pool = route.pools[i];
             _context.next = 9;
-            return pool.getOutputAmount(amounts[i]);
+            return getOutputAmount(pool, amounts[i]);
           case 9:
-            _yield$pool$getOutput = _context.sent;
-            _outputAmount = _yield$pool$getOutput[0];
+            _yield$getOutputAmoun = _context.sent;
+            _outputAmount = _yield$getOutputAmoun[0];
             amounts[i + 1] = _outputAmount;
           case 12:
             i++;
@@ -869,7 +932,7 @@ var MixedRouteTrade = /*#__PURE__*/function () {
   /*#__PURE__*/
   function () {
     var _fromRoutes = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(routes, tradeType) {
-      var populatedRoutes, _iterator3, _step3, _step3$value, route, amount, amounts, inputAmount, outputAmount, i, pool, _yield$pool$getOutput2, _outputAmount2;
+      var populatedRoutes, _iterator3, _step3, _step3$value, route, amount, amounts, inputAmount, outputAmount, i, pool, _yield$getOutputAmoun2, _outputAmount2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -887,7 +950,7 @@ var MixedRouteTrade = /*#__PURE__*/function () {
             outputAmount = void 0;
             !amount.currency.equals(route.input) ?  invariant(false, 'INPUT')  : void 0;
             inputAmount = sdkCore.CurrencyAmount.fromFractionalAmount(route.input, amount.numerator, amount.denominator);
-            amounts[0] = sdkCore.CurrencyAmount.fromFractionalAmount(route.input.wrapped, amount.numerator, amount.denominator);
+            amounts[0] = sdkCore.CurrencyAmount.fromFractionalAmount(route.adjustedInput, amount.numerator, amount.denominator);
             i = 0;
           case 12:
             if (!(i < route.path.length - 1)) {
@@ -896,10 +959,10 @@ var MixedRouteTrade = /*#__PURE__*/function () {
             }
             pool = route.pools[i];
             _context2.next = 16;
-            return pool.getOutputAmount(amounts[i]);
+            return getOutputAmount(pool, amounts[i]);
           case 16:
-            _yield$pool$getOutput2 = _context2.sent;
-            _outputAmount2 = _yield$pool$getOutput2[0];
+            _yield$getOutputAmoun2 = _context2.sent;
+            _outputAmount2 = _yield$getOutputAmoun2[0];
             amounts[i + 1] = _outputAmount2;
           case 19:
             i++;
@@ -1019,7 +1082,7 @@ var MixedRouteTrade = /*#__PURE__*/function () {
     var _bestTradeExactIn = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(pools, currencyAmountIn, currencyOut, _temp,
     // used in recursion.
     currentPools, nextAmountIn, bestTrades) {
-      var _ref5, _ref5$maxNumResults, maxNumResults, _ref5$maxHops, maxHops, amountIn, tokenOut, i, pool, amountOut, _yield$pool$getOutput3, poolsExcludingThisPool;
+      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) {
           case 0:
@@ -1036,20 +1099,20 @@ var MixedRouteTrade = /*#__PURE__*/function () {
             !(pools.length > 0) ?  invariant(false, 'POOLS')  : void 0;
             !(maxHops > 0) ?  invariant(false, 'MAX_HOPS')  : void 0;
             !(currencyAmountIn === nextAmountIn || currentPools.length > 0) ?  invariant(false, 'INVALID_RECURSION')  : void 0;
-            amountIn = nextAmountIn.wrapped;
-            tokenOut = currencyOut.wrapped;
+            amountIn = nextAmountIn;
             i = 0;
-          case 10:
+          case 9:
             if (!(i < pools.length)) {
-              _context3.next = 49;
+              _context3.next = 56;
               break;
             }
-            pool = pools[i]; // pool irrelevant
-            if (!(!pool.token0.equals(amountIn.currency) && !pool.token1.equals(amountIn.currency))) {
+            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;
               break;
             }
-            return _context3.abrupt("continue", 46);
+            return _context3.abrupt("continue", 53);
           case 14:
             if (!(pool instanceof v2Sdk.Pair)) {
               _context3.next = 17;
@@ -1059,65 +1122,78 @@ var MixedRouteTrade = /*#__PURE__*/function () {
               _context3.next = 17;
               break;
             }
-            return _context3.abrupt("continue", 46);
+            return _context3.abrupt("continue", 53);
           case 17:
             amountOut = void 0;
             _context3.prev = 18;
-            _context3.next = 22;
-            return pool.getOutputAmount(amountIn);
-          case 22:
-            _yield$pool$getOutput3 = _context3.sent;
-            amountOut = _yield$pool$getOutput3[0];
-            _context3.next = 31;
+            if (!(pool instanceof v4Sdk.Pool)) {
+              _context3.next = 26;
+              break;
+            }
+            _context3.next = 23;
+            return pool.getOutputAmount(amountInAdjusted);
+          case 23:
+            _context3.t0 = _context3.sent;
+            _context3.next = 29;
             break;
           case 26:
-            _context3.prev = 26;
-            _context3.t0 = _context3["catch"](18);
-            if (!_context3.t0.isInsufficientInputAmountError) {
-              _context3.next = 30;
+            _context3.next = 28;
+            return pool.getOutputAmount(amountInAdjusted.wrapped);
+          case 28:
+            _context3.t0 = _context3.sent;
+          case 29:
+            _ref6 = _context3.t0;
+            amountOut = _ref6[0];
+            _context3.next = 38;
+            break;
+          case 33:
+            _context3.prev = 33;
+            _context3.t1 = _context3["catch"](18);
+            if (!_context3.t1.isInsufficientInputAmountError) {
+              _context3.next = 37;
               break;
             }
-            return _context3.abrupt("continue", 46);
-          case 30:
-            throw _context3.t0;
-          case 31:
-            if (!(amountOut.currency.isToken && amountOut.currency.equals(tokenOut))) {
-              _context3.next = 42;
+            return _context3.abrupt("continue", 53);
+          case 37:
+            throw _context3.t1;
+          case 38:
+            if (!amountOut.currency.wrapped.equals(currencyOut.wrapped)) {
+              _context3.next = 49;
               break;
             }
-            _context3.t1 = sdkCore.sortedInsert;
-            _context3.t2 = bestTrades;
-            _context3.next = 36;
+            _context3.t2 = sdkCore.sortedInsert;
+            _context3.t3 = bestTrades;
+            _context3.next = 43;
             return MixedRouteTrade.fromRoute(new MixedRouteSDK([].concat(currentPools, [pool]), currencyAmountIn.currency, currencyOut), currencyAmountIn, sdkCore.TradeType.EXACT_INPUT);
-          case 36:
-            _context3.t3 = _context3.sent;
-            _context3.t4 = maxNumResults;
-            _context3.t5 = tradeComparator;
-            (0, _context3.t1)(_context3.t2, _context3.t3, _context3.t4, _context3.t5);
-            _context3.next = 46;
+          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;
             break;
-          case 42:
+          case 49:
             if (!(maxHops > 1 && pools.length > 1)) {
-              _context3.next = 46;
+              _context3.next = 53;
               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 = 46;
+            _context3.next = 53;
             return MixedRouteTrade.bestTradeExactIn(poolsExcludingThisPool, currencyAmountIn, currencyOut, {
               maxNumResults: maxNumResults,
               maxHops: maxHops - 1
             }, [].concat(currentPools, [pool]), amountOut, bestTrades);
-          case 46:
+          case 53:
             i++;
-            _context3.next = 10;
+            _context3.next = 9;
             break;
-          case 49:
+          case 56:
             return _context3.abrupt("return", bestTrades);
-          case 50:
+          case 57:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[18, 26]]);
+      }, _callee3, null, [[18, 33]]);
     }));
     function bestTradeExactIn(_x6, _x7, _x8, _x9, _x10, _x11, _x12) {
       return _bestTradeExactIn.apply(this, arguments);
@@ -1140,8 +1216,8 @@ var MixedRouteTrade = /*#__PURE__*/function () {
         return this._inputAmount;
       }
       var inputCurrency = this.swaps[0].inputAmount.currency;
-      var totalInputFromRoutes = this.swaps.map(function (_ref6) {
-        var inputAmount = _ref6.inputAmount;
+      var totalInputFromRoutes = this.swaps.map(function (_ref7) {
+        var inputAmount = _ref7.inputAmount;
         return inputAmount;
       }).reduce(function (total, cur) {
         return total.add(cur);
@@ -1159,8 +1235,8 @@ var MixedRouteTrade = /*#__PURE__*/function () {
         return this._outputAmount;
       }
       var outputCurrency = this.swaps[0].outputAmount.currency;
-      var totalOutputFromRoutes = this.swaps.map(function (_ref7) {
-        var outputAmount = _ref7.outputAmount;
+      var totalOutputFromRoutes = this.swaps.map(function (_ref8) {
+        var outputAmount = _ref8.outputAmount;
         return outputAmount;
       }).reduce(function (total, cur) {
         return total.add(cur);
@@ -1205,6 +1281,7 @@ var MixedRouteTrade = /*#__PURE__*/function () {
 (function (Protocol) {
   Protocol["V2"] = "V2";
   Protocol["V3"] = "V3";
+  Protocol["V4"] = "V4";
   Protocol["MIXED"] = "MIXED";
 })(exports.Protocol || (exports.Protocol = {}));
 
@@ -1232,14 +1309,26 @@ var RouteV3 = /*#__PURE__*/function (_V3RouteSDK) {
   }
   return RouteV3;
 }(v3Sdk.Route);
+// V4 route wrapper
+var RouteV4 = /*#__PURE__*/function (_V4RouteSDK) {
+  _inheritsLoose(RouteV4, _V4RouteSDK);
+  function RouteV4(v4Route) {
+    var _this3;
+    _this3 = _V4RouteSDK.call(this, v4Route.pools, v4Route.input, v4Route.output) || this;
+    _this3.protocol = exports.Protocol.V4;
+    _this3.path = v4Route.currencyPath;
+    return _this3;
+  }
+  return RouteV4;
+}(v4Sdk.Route);
 // Mixed route wrapper
 var MixedRoute = /*#__PURE__*/function (_MixedRouteSDK) {
   _inheritsLoose(MixedRoute, _MixedRouteSDK);
   function MixedRoute(mixedRoute) {
-    var _this3;
-    _this3 = _MixedRouteSDK.call(this, mixedRoute.pools, mixedRoute.input, mixedRoute.output) || this;
-    _this3.protocol = exports.Protocol.MIXED;
-    return _this3;
+    var _this4;
+    _this4 = _MixedRouteSDK.call(this, mixedRoute.pools, mixedRoute.input, mixedRoute.output) || this;
+    _this4.protocol = exports.Protocol.MIXED;
+    return _this4;
   }
   return MixedRoute;
 }(MixedRouteSDK);
@@ -1247,33 +1336,52 @@ var MixedRoute = /*#__PURE__*/function (_MixedRouteSDK) {
 var Trade = /*#__PURE__*/function () {
   //  construct a trade across v2 and v3 routes from pre-computed amounts
   function Trade(_ref) {
-    var v2Routes = _ref.v2Routes,
-      v3Routes = _ref.v3Routes,
-      tradeType = _ref.tradeType,
-      mixedRoutes = _ref.mixedRoutes;
+    var _ref$v2Routes = _ref.v2Routes,
+      v2Routes = _ref$v2Routes === void 0 ? [] : _ref$v2Routes,
+      _ref$v3Routes = _ref.v3Routes,
+      v3Routes = _ref$v3Routes === void 0 ? [] : _ref$v3Routes,
+      _ref$v4Routes = _ref.v4Routes,
+      v4Routes = _ref$v4Routes === void 0 ? [] : _ref$v4Routes,
+      _ref$mixedRoutes = _ref.mixedRoutes,
+      mixedRoutes = _ref$mixedRoutes === void 0 ? [] : _ref$mixedRoutes,
+      tradeType = _ref.tradeType;
     this.swaps = [];
     this.routes = [];
     // wrap v2 routes
     for (var _iterator = _createForOfIteratorHelperLoose(v2Routes), _step; !(_step = _iterator()).done;) {
       var _step$value = _step.value,
         routev2 = _step$value.routev2,
-        _inputAmount = _step$value.inputAmount,
-        _outputAmount = _step$value.outputAmount;
-      var _route = new RouteV2(routev2);
-      this.routes.push(_route);
+        inputAmount = _step$value.inputAmount,
+        outputAmount = _step$value.outputAmount;
+      var route = new RouteV2(routev2);
+      this.routes.push(route);
       this.swaps.push({
-        route: _route,
-        inputAmount: _inputAmount,
-        outputAmount: _outputAmount
+        route: route,
+        inputAmount: inputAmount,
+        outputAmount: outputAmount
       });
     }
     // wrap v3 routes
     for (var _iterator2 = _createForOfIteratorHelperLoose(v3Routes), _step2; !(_step2 = _iterator2()).done;) {
       var _step2$value = _step2.value,
         routev3 = _step2$value.routev3,
-        _inputAmount2 = _step2$value.inputAmount,
-        _outputAmount2 = _step2$value.outputAmount;
-      var _route2 = new RouteV3(routev3);
+        _inputAmount = _step2$value.inputAmount,
+        _outputAmount = _step2$value.outputAmount;
+      var _route = new RouteV3(routev3);
+      this.routes.push(_route);
+      this.swaps.push({
+        route: _route,
+        inputAmount: _inputAmount,
+        outputAmount: _outputAmount
+      });
+    }
+    // wrap v4 routes
+    for (var _iterator3 = _createForOfIteratorHelperLoose(v4Routes), _step3; !(_step3 = _iterator3()).done;) {
+      var _step3$value = _step3.value,
+        routev4 = _step3$value.routev4,
+        _inputAmount2 = _step3$value.inputAmount,
+        _outputAmount2 = _step3$value.outputAmount;
+      var _route2 = new RouteV4(routev4);
       this.routes.push(_route2);
       this.swaps.push({
         route: _route2,
@@ -1281,21 +1389,18 @@ var Trade = /*#__PURE__*/function () {
         outputAmount: _outputAmount2
       });
     }
-    // wrap mixedRoutes
-    if (mixedRoutes) {
-      for (var _iterator3 = _createForOfIteratorHelperLoose(mixedRoutes), _step3; !(_step3 = _iterator3()).done;) {
-        var _step3$value = _step3.value,
-          mixedRoute = _step3$value.mixedRoute,
-          inputAmount = _step3$value.inputAmount,
-          outputAmount = _step3$value.outputAmount;
-        var route = new MixedRoute(mixedRoute);
-        this.routes.push(route);
-        this.swaps.push({
-          route: route,
-          inputAmount: inputAmount,
-          outputAmount: outputAmount
-        });
-      }
+    for (var _iterator4 = _createForOfIteratorHelperLoose(mixedRoutes), _step4; !(_step4 = _iterator4()).done;) {
+      var _step4$value = _step4.value,
+        mixedRoute = _step4$value.mixedRoute,
+        _inputAmount3 = _step4$value.inputAmount,
+        _outputAmount3 = _step4$value.outputAmount;
+      var _route3 = new MixedRoute(mixedRoute);
+      this.routes.push(_route3);
+      this.swaps.push({
+        route: _route3,
+        inputAmount: _inputAmount3,
+        outputAmount: _outputAmount3
+      });
     }
     if (this.swaps.length === 0) {
       throw new Error('No routes provided when calling Trade constructor');
@@ -1319,22 +1424,24 @@ var Trade = /*#__PURE__*/function () {
     }).reduce(function (total, cur) {
       return total + cur;
     }, 0);
-    var poolAddressSet = new Set();
-    for (var _iterator4 = _createForOfIteratorHelperLoose(this.swaps), _step4; !(_step4 = _iterator4()).done;) {
-      var _route3 = _step4.value.route;
-      for (var _iterator5 = _createForOfIteratorHelperLoose(_route3.pools), _step5; !(_step5 = _iterator5()).done;) {
-        var pool = _step5.value;
-        if (pool instanceof v3Sdk.Pool) {
-          poolAddressSet.add(v3Sdk.Pool.getAddress(pool.token0, pool.token1, pool.fee));
+    var poolIdentifierSet = new Set();
+    for (var _iterator5 = _createForOfIteratorHelperLoose(this.swaps), _step5; !(_step5 = _iterator5()).done;) {
+      var _route4 = _step5.value.route;
+      for (var _iterator6 = _createForOfIteratorHelperLoose(_route4.pools), _step6; !(_step6 = _iterator6()).done;) {
+        var pool = _step6.value;
+        if (pool instanceof v4Sdk.Pool) {
+          poolIdentifierSet.add(pool.poolId);
+        } else if (pool instanceof v3Sdk.Pool) {
+          poolIdentifierSet.add(v3Sdk.Pool.getAddress(pool.token0, pool.token1, pool.fee));
         } else if (pool instanceof v2Sdk.Pair) {
           var pair = pool;
-          poolAddressSet.add(v2Sdk.Pair.getAddress(pair.token0, pair.token1));
+          poolIdentifierSet.add(v2Sdk.Pair.getAddress(pair.token0, pair.token1));
         } else {
           throw new Error('Unexpected pool type in route when constructing trade object');
         }
       }
     }
-    !(numPools === poolAddressSet.size) ?  invariant(false, 'POOLS_DUPLICATED')  : void 0;
+    !(numPools === poolIdentifierSet.size) ?  invariant(false, 'POOLS_DUPLICATED')  : void 0;
   }
   var _proto = Trade.prototype;
   /**
@@ -1380,98 +1487,126 @@ 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) {
-      var populatedV2Routes, populatedV3Routes, populatedMixedRoutes, _iterator6, _step6, _step6$value, routev2, _amount, v2Trade, _inputAmount3, _outputAmount3, _iterator7, _step7, _step7$value, routev3, _amount2, v3Trade, _inputAmount4, _outputAmount4, _iterator8, _step8, _step8$value, mixedRoute, amount, mixedRouteTrade, inputAmount, outputAmount;
+    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) {
           case 0:
             populatedV2Routes = [];
             populatedV3Routes = [];
+            populatedV4Routes = [];
             populatedMixedRoutes = [];
-            for (_iterator6 = _createForOfIteratorHelperLoose(v2Routes); !(_step6 = _iterator6()).done;) {
-              _step6$value = _step6.value, routev2 = _step6$value.routev2, _amount = _step6$value.amount;
-              v2Trade = new v2Sdk.Trade(routev2, _amount, tradeType);
-              _inputAmount3 = v2Trade.inputAmount, _outputAmount3 = v2Trade.outputAmount;
+            for (_iterator7 = _createForOfIteratorHelperLoose(v2Routes); !(_step7 = _iterator7()).done;) {
+              _step7$value = _step7.value, routev2 = _step7$value.routev2, _amount2 = _step7$value.amount;
+              v2Trade = new v2Sdk.Trade(routev2, _amount2, tradeType);
+              _inputAmount5 = v2Trade.inputAmount, _outputAmount5 = v2Trade.outputAmount;
               populatedV2Routes.push({
                 routev2: routev2,
-                inputAmount: _inputAmount3,
-                outputAmount: _outputAmount3
+                inputAmount: _inputAmount5,
+                outputAmount: _outputAmount5
               });
             }
-            _iterator7 = _createForOfIteratorHelperLoose(v3Routes);
-          case 5:
-            if ((_step7 = _iterator7()).done) {
-              _context.next = 14;
+            _iterator8 = _createForOfIteratorHelperLoose(v3Routes);
+          case 6:
+            if ((_step8 = _iterator8()).done) {
+              _context.next = 15;
               break;
             }
-            _step7$value = _step7.value, routev3 = _step7$value.routev3, _amount2 = _step7$value.amount;
-            _context.next = 9;
-            return v3Sdk.Trade.fromRoute(routev3, _amount2, tradeType);
-          case 9:
+            _step8$value = _step8.value, routev3 = _step8$value.routev3, _amount3 = _step8$value.amount;
+            _context.next = 10;
+            return v3Sdk.Trade.fromRoute(routev3, _amount3, tradeType);
+          case 10:
             v3Trade = _context.sent;
-            _inputAmount4 = v3Trade.inputAmount, _outputAmount4 = v3Trade.outputAmount;
+            _inputAmount6 = v3Trade.inputAmount, _outputAmount6 = v3Trade.outputAmount;
             populatedV3Routes.push({
               routev3: routev3,
-              inputAmount: _inputAmount4,
-              outputAmount: _outputAmount4
+              inputAmount: _inputAmount6,
+              outputAmount: _outputAmount6
             });
-          case 12:
-            _context.next = 5;
+          case 13:
+            _context.next = 6;
             break;
-          case 14:
+          case 15:
+            if (!v4Routes) {
+              _context.next = 26;
+              break;
+            }
+            _iterator9 = _createForOfIteratorHelperLoose(v4Routes);
+          case 17:
+            if ((_step9 = _iterator9()).done) {
+              _context.next = 26;
+              break;
+            }
+            _step9$value = _step9.value, routev4 = _step9$value.routev4, amount = _step9$value.amount;
+            _context.next = 21;
+            return v4Sdk.Trade.fromRoute(routev4, amount, tradeType);
+          case 21:
+            v4Trade = _context.sent;
+            inputAmount = v4Trade.inputAmount, outputAmount = v4Trade.outputAmount;
+            populatedV4Routes.push({
+              routev4: routev4,
+              inputAmount: inputAmount,
+              outputAmount: outputAmount
+            });
+          case 24:
+            _context.next = 17;
+            break;
+          case 26:
             if (!mixedRoutes) {
-              _context.next = 25;
+              _context.next = 37;
               break;
             }
-            _iterator8 = _createForOfIteratorHelperLoose(mixedRoutes);
-          case 16:
-            if ((_step8 = _iterator8()).done) {
-              _context.next = 25;
+            _iterator10 = _createForOfIteratorHelperLoose(mixedRoutes);
+          case 28:
+            if ((_step10 = _iterator10()).done) {
+              _context.next = 37;
               break;
             }
-            _step8$value = _step8.value, mixedRoute = _step8$value.mixedRoute, amount = _step8$value.amount;
-            _context.next = 20;
-            return MixedRouteTrade.fromRoute(mixedRoute, amount, tradeType);
-          case 20:
+            _step10$value = _step10.value, mixedRoute = _step10$value.mixedRoute, _amount = _step10$value.amount;
+            _context.next = 32;
+            return MixedRouteTrade.fromRoute(mixedRoute, _amount, tradeType);
+          case 32:
             mixedRouteTrade = _context.sent;
-            inputAmount = mixedRouteTrade.inputAmount, outputAmount = mixedRouteTrade.outputAmount;
+            _inputAmount4 = mixedRouteTrade.inputAmount, _outputAmount4 = mixedRouteTrade.outputAmount;
             populatedMixedRoutes.push({
               mixedRoute: mixedRoute,
-              inputAmount: inputAmount,
-              outputAmount: outputAmount
+              inputAmount: _inputAmount4,
+              outputAmount: _outputAmount4
             });
-          case 23:
-            _context.next = 16;
+          case 35:
+            _context.next = 28;
             break;
-          case 25:
+          case 37:
             return _context.abrupt("return", new Trade({
               v2Routes: populatedV2Routes,
               v3Routes: populatedV3Routes,
+              v4Routes: populatedV4Routes,
               mixedRoutes: populatedMixedRoutes,
               tradeType: tradeType
             }));
-          case 26:
+          case 38:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    function fromRoutes(_x, _x2, _x3, _x4) {
+    function fromRoutes(_x, _x2, _x3, _x4, _x5) {
       return _fromRoutes.apply(this, arguments);
     }
     return fromRoutes;
   }();
   Trade.fromRoute = /*#__PURE__*/function () {
     var _fromRoute = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(route, amount, tradeType) {
-      var v2Routes, v3Routes, mixedRoutes, v2Trade, inputAmount, outputAmount, v3Trade, _inputAmount5, _outputAmount5, mixedRouteTrade, _inputAmount6, _outputAmount6;
+      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) {
           case 0:
             v2Routes = [];
             v3Routes = [];
+            v4Routes = [];
             mixedRoutes = [];
             if (!(route instanceof v2Sdk.Route)) {
-              _context2.next = 9;
+              _context2.next = 10;
               break;
             }
             v2Trade = new v2Sdk.Trade(route, amount, tradeType);
@@ -1481,58 +1616,76 @@ var Trade = /*#__PURE__*/function () {
               inputAmount: inputAmount,
               outputAmount: outputAmount
             }];
-            _context2.next = 26;
+            _context2.next = 35;
             break;
-          case 9:
+          case 10:
             if (!(route instanceof v3Sdk.Route)) {
-              _context2.next = 17;
+              _context2.next = 18;
               break;
             }
-            _context2.next = 12;
+            _context2.next = 13;
             return v3Sdk.Trade.fromRoute(route, amount, tradeType);
-          case 12:
+          case 13:
             v3Trade = _context2.sent;
-            _inputAmount5 = v3Trade.inputAmount, _outputAmount5 = v3Trade.outputAmount;
+            _inputAmount7 = v3Trade.inputAmount, _outputAmount7 = v3Trade.outputAmount;
             v3Routes = [{
               routev3: route,
-              inputAmount: _inputAmount5,
-              outputAmount: _outputAmount5
+              inputAmount: _inputAmount7,
+              outputAmount: _outputAmount7
             }];
-            _context2.next = 26;
+            _context2.next = 35;
             break;
-          case 17:
+          case 18:
+            if (!(route instanceof v4Sdk.Route)) {
+              _context2.next = 26;
+              break;
+            }
+            _context2.next = 21;
+            return v4Sdk.Trade.fromRoute(route, amount, tradeType);
+          case 21:
+            v4Trade = _context2.sent;
+            _inputAmount8 = v4Trade.inputAmount, _outputAmount8 = v4Trade.outputAmount;
+            v4Routes = [{
+              routev4: route,
+              inputAmount: _inputAmount8,
+              outputAmount: _outputAmount8
+            }];
+            _context2.next = 35;
+            break;
+          case 26:
             if (!(route instanceof MixedRouteSDK)) {
-              _context2.next = 25;
+              _context2.next = 34;
               break;
             }
-            _context2.next = 20;
+            _context2.next = 29;
             return MixedRouteTrade.fromRoute(route, amount, tradeType);
-          case 20:
+          case 29:
             mixedRouteTrade = _context2.sent;
-            _inputAmount6 = mixedRouteTrade.inputAmount, _outputAmount6 = mixedRouteTrade.outputAmount;
+            _inputAmount9 = mixedRouteTrade.inputAmount, _outputAmount9 = mixedRouteTrade.outputAmount;
             mixedRoutes = [{
               mixedRoute: route,
-              inputAmount: _inputAmount6,
-              outputAmount: _outputAmount6
+              inputAmount: _inputAmount9,
+              outputAmount: _outputAmount9
             }];
-            _context2.next = 26;
+            _context2.next = 35;
             break;
-          case 25:
+          case 34:
             throw new Error('Invalid route type');
-          case 26:
+          case 35:
             return _context2.abrupt("return", new Trade({
               v2Routes: v2Routes,
               v3Routes: v3Routes,
+              v4Routes: v4Routes,
               mixedRoutes: mixedRoutes,
               tradeType: tradeType
             }));
-          case 27:
+          case 36:
           case "end":
             return _context2.stop();
         }
       }, _callee2);
     }));
-    function fromRoute(_x5, _x6, _x7) {
+    function fromRoute(_x6, _x7, _x8) {
       return _fromRoute.apply(this, arguments);
     }
     return fromRoute;
@@ -1613,10 +1766,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 _iterator9 = _createForOfIteratorHelperLoose(this.swaps), _step9; !(_step9 = _iterator9()).done;) {
-        var _step9$value = _step9.value,
-          route = _step9$value.route,
-          inputAmount = _step9$value.inputAmount;
+      for (var _iterator11 = _createForOfIteratorHelperLoose(this.swaps), _step11; !(_step11 = _iterator11()).done;) {
+        var _step11$value = _step11.value,
+          route = _step11$value.route,
+          inputAmount = _step11$value.inputAmount;
         var midPrice = route.midPrice;
         var postTaxInputAmount = inputAmount.multiply(new sdkCore.Fraction(ONE).subtract(this.inputTax));
         spotOutputAmount = spotOutputAmount.add(midPrice.quote(postTaxInputAmount));
@@ -1645,18 +1798,19 @@ function encodeMixedRouteToPath(route) {
       var inputToken = _ref.inputToken,
         path = _ref.path,
         types = _ref.types;
+      if (pool instanceof v4Sdk.Pool) throw 'Encoding mixed routes with V4 not supported';
       var outputToken = pool.token0.equals(inputToken) ? pool.token1 : pool.token0;
       if (index === 0) {
         return {
           inputToken: outputToken,
           types: ['address', 'uint24', 'address'],
-          path: [inputToken.address, pool instanceof v3Sdk.Pool ? pool.fee : V2_FEE_PATH_PLACEHOLDER, outputToken.address]
+          path: [inputToken.wrapped.address, pool instanceof v3Sdk.Pool ? pool.fee : V2_FEE_PATH_PLACEHOLDER, outputToken.wrapped.address]
         };
       } else {
         return {
           inputToken: outputToken,
           types: [].concat(types, ['uint24', 'address']),
-          path: [].concat(path, [pool instanceof v3Sdk.Pool ? pool.fee : V2_FEE_PATH_PLACEHOLDER, outputToken.address])
+          path: [].concat(path, [pool instanceof v3Sdk.Pool ? pool.fee : V2_FEE_PATH_PLACEHOLDER, outputToken.wrapped.address])
         };
       }
     }, {
@@ -1830,6 +1984,9 @@ var SwapRouter = /*#__PURE__*/function () {
         route = _step2$value.route,
         inputAmount = _step2$value.inputAmount,
         outputAmount = _step2$value.outputAmount;
+      if (route.pools.some(function (pool) {
+        return pool instanceof v4Sdk.Pool;
+      })) throw 'Encoding mixed routes with V4 not supported';
       var amountIn = v3Sdk.toHex(trade.maximumAmountIn(options.slippageTolerance, inputAmount).quotient);
       var amountOut = v3Sdk.toHex(trade.minimumAmountOut(options.slippageTolerance, outputAmount).quotient);
       // flag for whether the trade is single hop or not
@@ -1845,8 +2002,8 @@ var SwapRouter = /*#__PURE__*/function () {
         /// We don't use encodeV3Swap() or encodeV2Swap() because casting the trade to a V3Trade or V2Trade is overcomplex
         if (mixedRouteIsAllV3(route)) {
           var exactInputSingleParams = {
-            tokenIn: route.path[0].address,
-            tokenOut: route.path[1].address,
+            tokenIn: route.path[0].wrapped.address,
+            tokenOut: route.path[1].wrapped.address,
             fee: route.pools[0].fee,
             recipient: recipient,
             amountIn: amountIn,
@@ -1856,7 +2013,7 @@ var SwapRouter = /*#__PURE__*/function () {
           calldatas.push(SwapRouter.INTERFACE.encodeFunctionData('exactInputSingle', [exactInputSingleParams]));
         } else {
           var path = route.path.map(function (token) {
-            return token.address;
+            return token.wrapped.address;
           });
           var exactInputParams = [amountIn, performAggregatedSlippageCheck ? 0 : amountOut, path, recipient];
           calldatas.push(SwapRouter.INTERFACE.encodeFunctionData('swapExactTokensForTokens', exactInputParams));
@@ -1875,7 +2032,7 @@ var SwapRouter = /*#__PURE__*/function () {
           var newRouteOriginal = new MixedRouteSDK([].concat(section), section[0].token0.equals(inputToken) ? section[0].token0 : section[0].token1, outputToken);
           var newRoute = new MixedRoute(newRouteOriginal);
           /// Previous output is now input
-          inputToken = outputToken;
+          inputToken = outputToken.wrapped;
           if (mixedRouteIsAllV3(newRoute)) {
             var _path = encodeMixedRouteToPath(newRoute);
             var _exactInputParams = {
@@ -1890,7 +2047,7 @@ var SwapRouter = /*#__PURE__*/function () {
             calldatas.push(SwapRouter.INTERFACE.encodeFunctionData('exactInput', [_exactInputParams]));
           } else {
             var _exactInputParams2 = [i === 0 ? amountIn : 0, !isLastSectionInRoute(i) ? 0 : amountOut, newRoute.path.map(function (token) {
-              return token.address;
+              return token.wrapped.address;
             }), isLastSectionInRoute(i) ? recipient : ADDRESS_THIS];
             calldatas.push(SwapRouter.INTERFACE.encodeFunctionData('swapExactTokensForTokens', _exactInputParams2));
           }
@@ -1907,7 +2064,7 @@ var SwapRouter = /*#__PURE__*/function () {
     if (trades instanceof Trade) {
       !trades.swaps.every(function (swap) {
         return swap.route.protocol === exports.Protocol.V3 || swap.route.protocol === exports.Protocol.V2 || swap.route.protocol === exports.Protocol.MIXED;
-      }) ?  invariant(false, 'UNSUPPORTED_PROTOCOL')  : void 0;
+      }) ?  invariant(false, 'UNSUPPORTED_PROTOCOL (encoding routes with v4 not supported)')  : void 0;
       var individualTrades = [];
       for (var _iterator3 = _createForOfIteratorHelperLoose(trades.swaps), _step3; !(_step3 = _iterator3()).done;) {
         var _step3$value = _step3.value,
@@ -2146,6 +2303,7 @@ var SwapRouter = /*#__PURE__*/function () {
 SwapRouter.INTERFACE = /*#__PURE__*/new abi.Interface(ISwapRouter02_json.abi);
 
 exports.ADDRESS_THIS = ADDRESS_THIS;
+exports.ADDRESS_ZERO = ADDRESS_ZERO;
 exports.ApproveAndCall = ApproveAndCall;
 exports.MSG_SENDER = MSG_SENDER;
 exports.MixedRoute = MixedRoute;
@@ -2157,6 +2315,7 @@ exports.ONE_HUNDRED_PERCENT = ONE_HUNDRED_PERCENT;
 exports.PaymentsExtended = PaymentsExtended;
 exports.RouteV2 = RouteV2;
 exports.RouteV3 = RouteV3;
+exports.RouteV4 = RouteV4;
 exports.SwapRouter = SwapRouter;
 exports.Trade = Trade;
 exports.V2_FEE_PATH_PLACEHOLDER = V2_FEE_PATH_PLACEHOLDER;