@uniswap/router-sdk 1.11.0 → 1.11.2

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

@@ -1,8 +1,5 @@
 import { Currency, Price } from '@uniswap/sdk-core';
-import { Pair } from '@uniswap/v2-sdk';
-import { Pool as V3Pool } from '@uniswap/v3-sdk';
-import { Pool as V4Pool } from '@uniswap/v4-sdk';
-declare type TPool = Pair | V3Pool | V4Pool;
+import { TPool } from '../../utils/TPool';
 /**
  * Represents a list of pools or pairs through which a swap can occur
  * @template TInput The input token
@@ -28,4 +25,3 @@ export declare class MixedRouteSDK<TInput extends Currency, TOutput extends Curr
      */
     get midPrice(): Price<TInput, TOutput>;
 }
-export {};

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

@@ -1,9 +1,7 @@
 import { Currency, Percent, Price, CurrencyAmount, TradeType } from '@uniswap/sdk-core';
-import { Pair } from '@uniswap/v2-sdk';
-import { BestTradeOptions, Pool as V3Pool } from '@uniswap/v3-sdk';
-import { Pool as V4Pool } from '@uniswap/v4-sdk';
+import { BestTradeOptions } from '@uniswap/v3-sdk';
 import { MixedRouteSDK } from './route';
-declare type TPool = Pair | V3Pool | V4Pool;
+import { TPool } from '../../utils/TPool';
 /**
  * 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
@@ -183,4 +181,3 @@ export declare class MixedRouteTrade<TInput extends Currency, TOutput extends Cu
      */
     static bestTradeExactIn<TInput extends Currency, TOutput extends Currency>(pools: TPool[], currencyAmountIn: CurrencyAmount<TInput>, currencyOut: TOutput, { maxNumResults, maxHops }?: BestTradeOptions, currentPools?: TPool[], nextAmountIn?: CurrencyAmount<Currency>, bestTrades?: MixedRouteTrade<TInput, TOutput, TradeType.EXACT_INPUT>[]): Promise<MixedRouteTrade<TInput, TOutput, TradeType.EXACT_INPUT>[]>;
 }
-export {};

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();
       }