@uniswap/router-sdk 1.10.0 → 1.11.1

package/dist/entities/trade.d.ts

@@ -18,28 +18,28 @@ export declare class Trade<TInput extends Currency, TOutput extends Currency, TT
         inputAmount: CurrencyAmount<TInput>;
         outputAmount: CurrencyAmount<TOutput>;
     }[];
-    constructor({ v2Routes, v3Routes, v4Routes, tradeType, mixedRoutes, }: {
-        v2Routes: {
+    constructor({ v2Routes, v3Routes, v4Routes, mixedRoutes, tradeType, }: {
+        v2Routes?: {
             routev2: V2RouteSDK<TInput, TOutput>;
             inputAmount: CurrencyAmount<TInput>;
             outputAmount: CurrencyAmount<TOutput>;
         }[];
-        v3Routes: {
+        v3Routes?: {
             routev3: V3RouteSDK<TInput, TOutput>;
             inputAmount: CurrencyAmount<TInput>;
             outputAmount: CurrencyAmount<TOutput>;
         }[];
-        v4Routes: {
+        v4Routes?: {
             routev4: V4RouteSDK<TInput, TOutput>;
             inputAmount: CurrencyAmount<TInput>;
             outputAmount: CurrencyAmount<TOutput>;
         }[];
-        tradeType: TTradeType;
         mixedRoutes?: {
             mixedRoute: MixedRouteSDK<TInput, TOutput>;
             inputAmount: CurrencyAmount<TInput>;
             outputAmount: CurrencyAmount<TOutput>;
         }[];
+        tradeType: TTradeType;
     });
     get inputAmount(): CurrencyAmount<TInput>;
     get outputAmount(): CurrencyAmount<TOutput>;
@@ -91,12 +91,12 @@ export declare class Trade<TInput extends Currency, TOutput extends Currency, TT
     }[], v3Routes: {
         routev3: V3RouteSDK<TInput, TOutput>;
         amount: TTradeType extends TradeType.EXACT_INPUT ? CurrencyAmount<TInput> : CurrencyAmount<TOutput>;
-    }[], v4Routes: {
-        routev4: V4RouteSDK<TInput, TOutput>;
-        amount: TTradeType extends TradeType.EXACT_INPUT ? CurrencyAmount<TInput> : CurrencyAmount<TOutput>;
     }[], tradeType: TTradeType, mixedRoutes?: {
         mixedRoute: MixedRouteSDK<TInput, TOutput>;
         amount: TTradeType extends TradeType.EXACT_INPUT ? CurrencyAmount<TInput> : CurrencyAmount<TOutput>;
+    }[], v4Routes?: {
+        routev4: V4RouteSDK<TInput, TOutput>;
+        amount: TTradeType extends TradeType.EXACT_INPUT ? CurrencyAmount<TInput> : CurrencyAmount<TOutput>;
     }[]): Promise<Trade<TInput, TOutput, TTradeType>>;
-    static fromRoute<TInput extends Currency, TOutput extends Currency, TTradeType extends TradeType>(route: V2RouteSDK<TInput, TOutput> | V3RouteSDK<TInput, TOutput> | MixedRouteSDK<TInput, TOutput>, amount: TTradeType extends TradeType.EXACT_INPUT ? CurrencyAmount<TInput> : CurrencyAmount<TOutput>, tradeType: TTradeType): Promise<Trade<TInput, TOutput, TTradeType>>;
+    static fromRoute<TInput extends Currency, TOutput extends Currency, TTradeType extends TradeType>(route: V2RouteSDK<TInput, TOutput> | V3RouteSDK<TInput, TOutput> | V4RouteSDK<TInput, TOutput> | MixedRouteSDK<TInput, TOutput>, amount: TTradeType extends TradeType.EXACT_INPUT ? CurrencyAmount<TInput> : CurrencyAmount<TOutput>, tradeType: TTradeType): Promise<Trade<TInput, TOutput, TTradeType>>;
 }

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

@@ -622,6 +622,21 @@ function _createForOfIteratorHelperLoose(o, allowArrayLike) {
   throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
 
+function isValidTokenPath(prevPool, currentPool, inputToken) {
+  if (currentPool.involvesToken(inputToken)) return true;
+  // throw if both v4 pools, native/wrapped tokens not interchangeable in v4
+  if (prevPool instanceof v4Sdk.Pool && currentPool instanceof v4Sdk.Pool) return false;
+  // v2/v3 --> v4 valid if v2/v3 output is the wrapped version of the v4 pool native currency
+  if (currentPool instanceof v4Sdk.Pool) {
+    if (currentPool.token0.wrapped.equals(inputToken) || currentPool.token1.wrapped.equals(inputToken)) return true;
+  }
+  // v4 --> v2/v3 valid if v4 output is the native version of the v2/v3 wrapped token
+  if (prevPool instanceof v4Sdk.Pool) {
+    if (currentPool.involvesToken(inputToken.wrapped)) return true;
+  }
+  return false;
+}
+
 /**
  * Represents a list of pools or pairs through which a swap can occur
  * @template TInput The input token
@@ -658,14 +673,14 @@ var MixedRouteSDK = /*#__PURE__*/function () {
      * Normalizes token0-token1 order and selects the next token/fee step to add to the path
      * */
     var tokenPath = [this.adjustedInput];
-    for (var _iterator = _createForOfIteratorHelperLoose(pools.entries()), _step; !(_step = _iterator()).done;) {
-      var _step$value = _step.value,
-        i = _step$value[0],
-        pool = _step$value[1];
-      var currentInputToken = tokenPath[i];
-      !(currentInputToken.equals(pool.token0) || currentInputToken.equals(pool.token1)) ?  invariant(false, 'PATH')  : void 0;
-      var nextToken = currentInputToken.equals(pool.token0) ? pool.token1 : pool.token0;
-      tokenPath.push(nextToken);
+    pools[0].token0.equals(this.adjustedInput) ? tokenPath.push(pools[0].token1) : tokenPath.push(pools[0].token0);
+    for (var i = 1; i < pools.length; i++) {
+      var prevPool = pools[i - 1];
+      var pool = pools[i];
+      var inputToken = tokenPath[i];
+      var outputToken = pool.token0.wrapped.equals(inputToken.wrapped) ? pool.token1 : pool.token0;
+      !isValidTokenPath(prevPool, pool, inputToken) ?  invariant(false, 'PATH')  : void 0;
+      tokenPath.push(outputToken);
     }
     this.pools = pools;
     this.path = tokenPath;
@@ -716,32 +731,41 @@ function _getOutputAmount() {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           if (!(pool instanceof v4Sdk.Pool)) {
-            _context.next = 11;
+            _context.next = 13;
             break;
           }
           if (!pool.involvesCurrency(amountIn.currency)) {
-            _context.next = 7;
+            _context.next = 5;
             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;
+        case 5:
+          if (!pool.token0.wrapped.equals(amountIn.currency)) {
+            _context.next = 9;
             break;
           }
-          _context.next = 10;
-          return pool.getOutputAmount(amountIn.wrapped);
-        case 10:
+          _context.next = 8;
+          return pool.getOutputAmount(sdkCore.CurrencyAmount.fromRawAmount(pool.token0, amountIn.quotient));
+        case 8:
+          return _context.abrupt("return", _context.sent);
+        case 9:
+          if (!pool.token1.wrapped.equals(amountIn.currency)) {
+            _context.next = 13;
+            break;
+          }
+          _context.next = 12;
+          return pool.getOutputAmount(sdkCore.CurrencyAmount.fromRawAmount(pool.token1, amountIn.quotient));
+        case 12:
           return _context.abrupt("return", _context.sent);
-        case 11:
-          _context.next = 13;
-          return pool.getOutputAmount(amountIn.wrapped);
         case 13:
+          _context.next = 15;
+          return pool.getOutputAmount(amountIn.wrapped);
+        case 15:
           return _context.abrupt("return", _context.sent);
-        case 14:
+        case 16:
         case "end":
           return _context.stop();
       }
@@ -1336,48 +1360,65 @@ 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,
-      v4Routes = _ref.v4Routes,
-      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);
-      this.routes.push(_route2);
+        _inputAmount = _step2$value.inputAmount,
+        _outputAmount = _step2$value.outputAmount;
+      var _route = new RouteV3(routev3);
+      this.routes.push(_route);
       this.swaps.push({
-        route: _route2,
-        inputAmount: _inputAmount2,
-        outputAmount: _outputAmount2
+        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,
-        _inputAmount3 = _step3$value.inputAmount,
-        _outputAmount3 = _step3$value.outputAmount;
-      var _route3 = new RouteV4(routev4);
+        _inputAmount2 = _step3$value.inputAmount,
+        _outputAmount2 = _step3$value.outputAmount;
+      var _route2 = new RouteV4(routev4);
+      this.routes.push(_route2);
+      this.swaps.push({
+        route: _route2,
+        inputAmount: _inputAmount2,
+        outputAmount: _outputAmount2
+      });
+    }
+    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,
@@ -1385,22 +1426,6 @@ var Trade = /*#__PURE__*/function () {
         outputAmount: _outputAmount3
       });
     }
-    // wrap mixedRoutes
-    if (mixedRoutes) {
-      for (var _iterator4 = _createForOfIteratorHelperLoose(mixedRoutes), _step4; !(_step4 = _iterator4()).done;) {
-        var _step4$value = _step4.value,
-          mixedRoute = _step4$value.mixedRoute,
-          inputAmount = _step4$value.inputAmount,
-          outputAmount = _step4$value.outputAmount;
-        var route = new MixedRoute(mixedRoute);
-        this.routes.push(route);
-        this.swaps.push({
-          route: route,
-          inputAmount: inputAmount,
-          outputAmount: outputAmount
-        });
-      }
-    }
     if (this.swaps.length === 0) {
       throw new Error('No routes provided when calling Trade constructor');
     }
@@ -1486,8 +1511,8 @@ 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, v4Routes, tradeType, mixedRoutes) {
-      var populatedV2Routes, populatedV3Routes, populatedV4Routes, populatedMixedRoutes, _iterator7, _step7, _step7$value, routev2, _amount, v2Trade, _inputAmount4, _outputAmount4, _iterator8, _step8, _step8$value, routev3, _amount2, v3Trade, _inputAmount5, _outputAmount5, _iterator9, _step9, _step9$value, routev4, _amount3, v4Trade, _inputAmount6, _outputAmount6, _iterator10, _step10, _step10$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:
@@ -1496,13 +1521,13 @@ var Trade = /*#__PURE__*/function () {
             populatedV4Routes = [];
             populatedMixedRoutes = [];
             for (_iterator7 = _createForOfIteratorHelperLoose(v2Routes); !(_step7 = _iterator7()).done;) {
-              _step7$value = _step7.value, routev2 = _step7$value.routev2, _amount = _step7$value.amount;
-              v2Trade = new v2Sdk.Trade(routev2, _amount, tradeType);
-              _inputAmount4 = v2Trade.inputAmount, _outputAmount4 = v2Trade.outputAmount;
+              _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: _inputAmount4,
-                outputAmount: _outputAmount4
+                inputAmount: _inputAmount5,
+                outputAmount: _outputAmount5
               });
             }
             _iterator8 = _createForOfIteratorHelperLoose(v3Routes);
@@ -1511,67 +1536,71 @@ var Trade = /*#__PURE__*/function () {
               _context.next = 15;
               break;
             }
-            _step8$value = _step8.value, routev3 = _step8$value.routev3, _amount2 = _step8$value.amount;
+            _step8$value = _step8.value, routev3 = _step8$value.routev3, _amount3 = _step8$value.amount;
             _context.next = 10;
-            return v3Sdk.Trade.fromRoute(routev3, _amount2, tradeType);
+            return v3Sdk.Trade.fromRoute(routev3, _amount3, tradeType);
           case 10:
             v3Trade = _context.sent;
-            _inputAmount5 = v3Trade.inputAmount, _outputAmount5 = v3Trade.outputAmount;
+            _inputAmount6 = v3Trade.inputAmount, _outputAmount6 = v3Trade.outputAmount;
             populatedV3Routes.push({
               routev3: routev3,
-              inputAmount: _inputAmount5,
-              outputAmount: _outputAmount5
+              inputAmount: _inputAmount6,
+              outputAmount: _outputAmount6
             });
           case 13:
             _context.next = 6;
             break;
           case 15:
+            if (!v4Routes) {
+              _context.next = 26;
+              break;
+            }
             _iterator9 = _createForOfIteratorHelperLoose(v4Routes);
-          case 16:
+          case 17:
             if ((_step9 = _iterator9()).done) {
-              _context.next = 25;
+              _context.next = 26;
               break;
             }
-            _step9$value = _step9.value, routev4 = _step9$value.routev4, _amount3 = _step9$value.amount;
-            _context.next = 20;
-            return v4Sdk.Trade.fromRoute(routev4, _amount3, tradeType);
-          case 20:
+            _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;
-            _inputAmount6 = v4Trade.inputAmount, _outputAmount6 = v4Trade.outputAmount;
+            inputAmount = v4Trade.inputAmount, outputAmount = v4Trade.outputAmount;
             populatedV4Routes.push({
               routev4: routev4,
-              inputAmount: _inputAmount6,
-              outputAmount: _outputAmount6
+              inputAmount: inputAmount,
+              outputAmount: outputAmount
             });
-          case 23:
-            _context.next = 16;
+          case 24:
+            _context.next = 17;
             break;
-          case 25:
+          case 26:
             if (!mixedRoutes) {
-              _context.next = 36;
+              _context.next = 37;
               break;
             }
             _iterator10 = _createForOfIteratorHelperLoose(mixedRoutes);
-          case 27:
+          case 28:
             if ((_step10 = _iterator10()).done) {
-              _context.next = 36;
+              _context.next = 37;
               break;
             }
-            _step10$value = _step10.value, mixedRoute = _step10$value.mixedRoute, amount = _step10$value.amount;
-            _context.next = 31;
-            return MixedRouteTrade.fromRoute(mixedRoute, amount, tradeType);
-          case 31:
+            _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 34:
-            _context.next = 27;
+          case 35:
+            _context.next = 28;
             break;
-          case 36:
+          case 37:
             return _context.abrupt("return", new Trade({
               v2Routes: populatedV2Routes,
               v3Routes: populatedV3Routes,
@@ -1579,7 +1608,7 @@ var Trade = /*#__PURE__*/function () {
               mixedRoutes: populatedMixedRoutes,
               tradeType: tradeType
             }));
-          case 37:
+          case 38:
           case "end":
             return _context.stop();
         }