@uniswap/router-sdk 1.22.0 → 1.22.2

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

@@ -18,8 +18,9 @@ export declare class MixedRouteSDK<TInput extends Currency, TOutput extends Curr
      * @param pools An array of `TPool` objects (pools or pairs), ordered by the route the swap will take
      * @param input The input token
      * @param output The output token
+     * @param retainsFakePool Set to true to filter out a pool that has a fake eth-weth pool
      */
-    constructor(pools: TPool[], input: TInput, output: TOutput);
+    constructor(pools: TPool[], input: TInput, output: TOutput, retainFakePools?: boolean);
     get chainId(): number;
     /**
      * Returns the mid price of the route

package/dist/index.d.ts

@@ -12,4 +12,3 @@ export * from './utils/encodeMixedRouteToPath';
 export * from './utils/TPool';
 export * from './utils/pathCurrency';
 export * from './utils';
-export * from './utils/isValidTokenPath';

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

@@ -628,22 +628,6 @@ 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 (inputToken instanceof sdkCore.Token && currentPool.involvesToken(inputToken)) return true;
-  if (currentPool instanceof v4Sdk.Pool && 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;
-}
-
 function amountWithPathCurrency(amount, pool) {
   return sdkCore.CurrencyAmount.fromFractionalAmount(getPathCurrency(amount.currency, pool), amount.numerator, amount.denominator);
 }
@@ -679,10 +663,18 @@ var MixedRouteSDK = /*#__PURE__*/function () {
    * @param pools An array of `TPool` objects (pools or pairs), ordered by the route the swap will take
    * @param input The input token
    * @param output The output token
+   * @param retainsFakePool Set to true to filter out a pool that has a fake eth-weth pool
    */
-  function MixedRouteSDK(pools, input, output) {
+  function MixedRouteSDK(pools, input, output, retainFakePools) {
+    if (retainFakePools === void 0) {
+      retainFakePools = false;
+    }
     this._midPrice = null;
+    pools = retainFakePools ? pools : pools.filter(function (pool) {
+      return !(pool instanceof v4Sdk.Pool && pool.tickSpacing === 0);
+    });
     !(pools.length > 0) ?  invariant(false, 'POOLS')  : void 0;
+    // there is a pool mismatched to the path if we do not retain the fake eth-weth pools
     var chainId = pools[0].chainId;
     var allOnSameChain = pools.every(function (pool) {
       return pool.chainId === chainId;
@@ -690,7 +682,11 @@ var MixedRouteSDK = /*#__PURE__*/function () {
     !allOnSameChain ?  invariant(false, 'CHAIN_IDS')  : 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;
+    if (!(pools[0] instanceof v4Sdk.Pool)) {
+      !pools[0].involvesToken(this.pathInput) ?  invariant(false, 'INPUT')  : void 0;
+    } else {
+      !pools[0].v4InvolvesToken(this.pathInput) ?  invariant(false, 'INPUT')  : void 0;
+    }
     var lastPool = pools[pools.length - 1];
     if (lastPool instanceof v4Sdk.Pool) {
       !(lastPool.v4InvolvesToken(output) || lastPool.v4InvolvesToken(output.wrapped)) ?  invariant(false, 'OUTPUT')  : void 0;
@@ -703,11 +699,31 @@ var MixedRouteSDK = /*#__PURE__*/function () {
     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];
       var inputToken = tokenPath[i];
-      var outputToken = pool instanceof v4Sdk.Pool ? pool.token0.equals(inputToken) ? pool.token1 : pool.token0 : pool.token0.wrapped.equals(inputToken.wrapped) ? pool.token1 : pool.token0;
-      !isValidTokenPath(prevPool, pool, inputToken) ?  invariant(false, "PATH")  : void 0;
+      var outputToken = void 0;
+      if (
+      // we hit an edge case if it's a v4 pool and neither of the tokens are in the pool OR it is not a v4 pool but the input currency is eth
+      pool instanceof v4Sdk.Pool && !pool.involvesToken(inputToken) || !(pool instanceof v4Sdk.Pool) && inputToken.isNative) {
+        // We handle the case where the inputToken =/= pool.token0 or pool.token1. There are 2 specific cases.
+        if (inputToken.equals(pool.token0.wrapped)) {
+          // 1) the inputToken is WETH and the current pool has ETH
+          // for example, pools: USDC-WETH, ETH-PEPE, path: USDC, WETH, PEPE
+          // second pool is a v4 pool, the first could be any version
+          outputToken = pool.token1;
+        } else if (inputToken.wrapped.equals(pool.token0) || inputToken.wrapped.equals(pool.token1)) {
+          // 2) the inputToken is ETH and the current pool has WETH
+          // for example, pools: USDC-ETH, WETH-PEPE, path: USDC, ETH, PEPE
+          // first pool is a v4 pool, the second could be any version
+          outputToken = inputToken.wrapped.equals(pool.token0) ? pool.token1 : pool.token0;
+        } else {
+          throw new Error("POOL_MISMATCH pool: " + JSON.stringify(pool) + " inputToken: " + JSON.stringify(inputToken));
+        }
+      } else {
+        // then the input token must equal either token0 or token1
+        !(inputToken.equals(pool.token0) || inputToken.equals(pool.token1)) ?  invariant(false, "PATH pool " + JSON.stringify(pool) + " inputToken " + JSON.stringify(inputToken))  : void 0;
+        outputToken = inputToken.equals(pool.token0) ? pool.token1 : pool.token0;
+      }
       tokenPath.push(outputToken);
     }
     this.pools = pools;
@@ -2421,7 +2437,6 @@ exports.getOutputOfPools = getOutputOfPools;
 exports.getPathCurrency = getPathCurrency;
 exports.getPathToken = getPathToken;
 exports.isMint = isMint;
-exports.isValidTokenPath = isValidTokenPath;
 exports.partitionMixedRouteByProtocol = partitionMixedRouteByProtocol;
 exports.tradeComparator = tradeComparator;
 //# sourceMappingURL=router-sdk.cjs.development.js.map