@uniswap/router-sdk 1.14.0 → 1.14.1

package/dist/entities/mixedRoute/route.d.ts

@@ -10,7 +10,8 @@ export declare class MixedRouteSDK<TInput extends Currency, TOutput extends Curr
     readonly path: Currency[];
     readonly input: TInput;
     readonly output: TOutput;
-    readonly adjustedInput: Currency;
+    readonly pathInput: Currency;
+    readonly pathOutput: Currency;
     private _midPrice;
     /**
      * Creates an instance of route.

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

@@ -643,6 +643,30 @@ function isValidTokenPath(prevPool, currentPool, inputToken) {
   return false;
 }
 
+function amountWithPathCurrency(amount, pool) {
+  return sdkCore.CurrencyAmount.fromFractionalAmount(getPathCurrency(amount.currency, pool), amount.numerator, amount.denominator);
+}
+function getPathCurrency(currency, pool) {
+  // return currency if the currency matches a currency of the pool
+  if (pool.involvesToken(currency)) {
+    return currency;
+    // return if currency.wrapped if pool involves wrapped currency
+  } else if (pool.involvesToken(currency.wrapped)) {
+    return currency.wrapped;
+    // return native currency if pool involves native version of wrapped currency (only applies to V4)
+  } else if (pool instanceof v4Sdk.Pool) {
+    if (pool.currency0.wrapped.equals(currency)) {
+      return pool.token0;
+    } else if (pool.token1.wrapped.equals(currency)) {
+      return pool.token1;
+    }
+    // otherwise the token is invalid
+  } else {
+    throw new Error("Expected currency " + currency.symbol + " to be either " + pool.token0.symbol + " or " + pool.token1.symbol);
+  }
+  return currency; // this line needed for typescript to compile
+}
+
 /**
  * Represents a list of pools or pairs through which a swap can occur
  * @template TInput The input token
@@ -663,12 +687,9 @@ var MixedRouteSDK = /*#__PURE__*/function () {
       return pool.chainId === chainId;
     });
     !allOnSameChain ?  invariant(false, 'CHAIN_IDS')  : 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;
+    this.pathInput = getPathCurrency(input, pools[0]);
+    this.pathOutput = getPathCurrency(output, pools[pools.length - 1]);
+    !pools[0].involvesToken(this.pathInput) ?  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;
@@ -678,8 +699,8 @@ var MixedRouteSDK = /*#__PURE__*/function () {
     /**
      * Normalizes token0-token1 order and selects the next token/fee step to add to the path
      * */
-    var tokenPath = [this.adjustedInput];
-    pools[0].token0.equals(this.adjustedInput) ? tokenPath.push(pools[0].token1) : tokenPath.push(pools[0].token0);
+    var tokenPath = [this.pathInput];
+    pools[0].token0.equals(this.pathInput) ? 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];
@@ -715,7 +736,7 @@ var MixedRouteSDK = /*#__PURE__*/function () {
           nextInput: pool.token0,
           price: price.multiply(pool.token1Price.asFraction)
         };
-      }, this.pools[0].token0.equals(this.adjustedInput) ? {
+      }, this.pools[0].token0.equals(this.pathInput) ? {
         nextInput: this.pools[0].token1,
         price: this.pools[0].token0Price.asFraction
       } : {
@@ -728,58 +749,6 @@ 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 = 13;
-            break;
-          }
-          if (!pool.involvesCurrency(amountIn.currency)) {
-            _context.next = 5;
-            break;
-          }
-          _context.next = 4;
-          return pool.getOutputAmount(amountIn);
-        case 4:
-          return _context.abrupt("return", _context.sent);
-        case 5:
-          if (!pool.token0.wrapped.equals(amountIn.currency)) {
-            _context.next = 9;
-            break;
-          }
-          _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 13:
-          _context.next = 15;
-          return pool.getOutputAmount(amountIn.wrapped);
-        case 15:
-          return _context.abrupt("return", _context.sent);
-        case 16:
-        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
@@ -900,14 +869,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$getOutputAmoun, _outputAmount;
+      var amounts, inputAmount, outputAmount, i, pool, _yield$pool$getOutput, _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] = route.pools[0] instanceof v4Sdk.Pool ? amount : amount.wrapped;
+            amounts[0] = amountWithPathCurrency(amount, route.pools[0]);
             i = 0;
           case 5:
             if (!(i < route.path.length - 1)) {
@@ -916,10 +885,10 @@ var MixedRouteTrade = /*#__PURE__*/function () {
             }
             pool = route.pools[i];
             _context.next = 9;
-            return getOutputAmount(pool, amounts[i]);
+            return pool.getOutputAmount(amountWithPathCurrency(amounts[i], pool));
           case 9:
-            _yield$getOutputAmoun = _context.sent;
-            _outputAmount = _yield$getOutputAmoun[0];
+            _yield$pool$getOutput = _context.sent;
+            _outputAmount = _yield$pool$getOutput[0];
             amounts[i + 1] = _outputAmount;
           case 12:
             i++;
@@ -962,7 +931,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$getOutputAmoun2, _outputAmount2;
+      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) {
           case 0:
@@ -980,7 +949,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.adjustedInput, amount.numerator, amount.denominator);
+            amounts[0] = sdkCore.CurrencyAmount.fromFractionalAmount(route.pathInput, amount.numerator, amount.denominator);
             i = 0;
           case 12:
             if (!(i < route.path.length - 1)) {
@@ -989,10 +958,10 @@ var MixedRouteTrade = /*#__PURE__*/function () {
             }
             pool = route.pools[i];
             _context2.next = 16;
-            return getOutputAmount(pool, amounts[i]);
+            return pool.getOutputAmount(amountWithPathCurrency(amounts[i], pool));
           case 16:
-            _yield$getOutputAmoun2 = _context2.sent;
-            _outputAmount2 = _yield$getOutputAmoun2[0];
+            _yield$pool$getOutput2 = _context2.sent;
+            _outputAmount2 = _yield$pool$getOutput2[0];
             amounts[i + 1] = _outputAmount2;
           case 19:
             i++;
@@ -1829,9 +1798,9 @@ function encodeMixedRouteToPath(route) {
   var path;
   var types;
   if (containsV4Pool) {
-    path = [route.adjustedInput.isNative ? ADDRESS_ZERO : route.adjustedInput.address];
+    path = [route.pathInput.isNative ? ADDRESS_ZERO : route.pathInput.address];
     types = ['address'];
-    var currencyIn = route.adjustedInput;
+    var currencyIn = route.pathInput;
     for (var _iterator = _createForOfIteratorHelperLoose(route.pools), _step; !(_step = _iterator()).done;) {
       var pool = _step.value;
       var currencyOut = currencyIn.equals(pool.token0) ? pool.token1 : pool.token0;
@@ -1895,7 +1864,7 @@ var partitionMixedRouteByProtocol = function partitionMixedRouteByProtocol(route
   var left = 0;
   var right = 0;
   while (right < route.pools.length) {
-    if (route.pools[left] instanceof v3Sdk.Pool && route.pools[right] instanceof v2Sdk.Pair || route.pools[left] instanceof v2Sdk.Pair && route.pools[right] instanceof v3Sdk.Pool) {
+    if (route.pools[left] instanceof v4Sdk.Pool && !(route.pools[right] instanceof v4Sdk.Pool) || route.pools[left] instanceof v3Sdk.Pool && !(route.pools[right] instanceof v3Sdk.Pool) || route.pools[left] instanceof v2Sdk.Pair && !(route.pools[right] instanceof v2Sdk.Pair)) {
       acc.push(route.pools.slice(left, right));
       left = right;
     }