@uniswap/router-sdk 1.11.1 → 1.12.0

package/dist/constants.d.ts

@@ -5,6 +5,9 @@ export declare const MSG_SENDER = "0x0000000000000000000000000000000000000001";
 export declare const ADDRESS_THIS = "0x0000000000000000000000000000000000000002";
 export declare const ZERO: JSBI;
 export declare const ONE: JSBI;
-export declare const V2_FEE_PATH_PLACEHOLDER = 8388608;
+export declare const MIXED_QUOTER_V1_V2_FEE_PATH_PLACEHOLDER: number;
+export declare const MIXED_QUOTER_V2_V2_FEE_PATH_PLACEHOLDER: number;
+export declare const MIXED_QUOTER_V2_V3_FEE_PATH_PLACEHOLDER: number;
+export declare const MIXED_QUOTER_V2_V4_FEE_PATH_PLACEHOLDER: number;
 export declare const ZERO_PERCENT: Percent;
 export declare const ONE_HUNDRED_PERCENT: Percent;

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

@@ -22,8 +22,14 @@ var MSG_SENDER = '0x0000000000000000000000000000000000000001';
 var ADDRESS_THIS = '0x0000000000000000000000000000000000000002';
 var ZERO = /*#__PURE__*/JSBI.BigInt(0);
 var ONE = /*#__PURE__*/JSBI.BigInt(1);
-// = 1 << 23 or 100000000000000000000000
-var V2_FEE_PATH_PLACEHOLDER = 8388608;
+// = 1 << 23 or 0b0100000000000000000000000
+var MIXED_QUOTER_V1_V2_FEE_PATH_PLACEHOLDER = 1 << 23;
+// = 10 << 4 or 0b00100000
+var MIXED_QUOTER_V2_V2_FEE_PATH_PLACEHOLDER = 2 << 4;
+// = 11 << 20 or 0b001100000000000000000000
+var MIXED_QUOTER_V2_V3_FEE_PATH_PLACEHOLDER = 3 << 20;
+// = 100 << 20 or 0b010000000000000000000000
+var MIXED_QUOTER_V2_V4_FEE_PATH_PLACEHOLDER = 4 << 20;
 var ZERO_PERCENT = /*#__PURE__*/new sdkCore.Percent(ZERO);
 var ONE_HUNDRED_PERCENT = /*#__PURE__*/new sdkCore.Percent(100, 100);
 
@@ -1817,33 +1823,65 @@ var Trade = /*#__PURE__*/function () {
  * @returns the exactIn encoded path
  */
 function encodeMixedRouteToPath(route) {
-  var firstInputToken = route.input.wrapped;
-  var _route$pools$reduce = route.pools.reduce(function (_ref, pool, index) {
+  var containsV4Pool = route.pools.some(function (pool) {
+    return pool instanceof v4Sdk.Pool;
+  });
+  var path;
+  var types;
+  if (containsV4Pool) {
+    path = [route.adjustedInput.isNative ? ADDRESS_ZERO : route.adjustedInput.address];
+    types = ['address'];
+    var currencyIn = route.adjustedInput;
+    for (var _iterator = _createForOfIteratorHelperLoose(route.pools), _step; !(_step = _iterator()).done;) {
+      var pool = _step.value;
+      var currencyOut = currencyIn.equals(pool.token0) ? pool.token1 : pool.token0;
+      if (pool instanceof v4Sdk.Pool) {
+        var v4Fee = pool.fee + MIXED_QUOTER_V2_V4_FEE_PATH_PLACEHOLDER;
+        path.push(v4Fee, pool.tickSpacing, pool.hooks, currencyOut.isNative ? ADDRESS_ZERO : currencyOut.wrapped.address);
+        types.push('uint24', 'uint24', 'address', 'address');
+      } else if (pool instanceof v3Sdk.Pool) {
+        var v3Fee = pool.fee + MIXED_QUOTER_V2_V3_FEE_PATH_PLACEHOLDER;
+        path.push(v3Fee, currencyOut.wrapped.address);
+        types.push('uint24', 'address');
+      } else if (pool instanceof v2Sdk.Pair) {
+        var v2Fee = MIXED_QUOTER_V2_V2_FEE_PATH_PLACEHOLDER;
+        path.push(v2Fee, currencyOut.wrapped.address);
+        types.push('uint8', 'address');
+      } else {
+        throw new Error("Unsupported pool type " + JSON.stringify(pool));
+      }
+      currencyIn = currencyOut;
+    }
+  } else {
+    // TODO: ROUTE-276 - delete this else block
+    // We introduced this else block as a safety measure to prevent non-v4 mixed routes from potentially regressing
+    // We'd like to gain more confidence in the new implementation before removing this block
+    var result = route.pools.reduce(function (_ref, pool, index) {
       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.wrapped.address, pool instanceof v3Sdk.Pool ? pool.fee : V2_FEE_PATH_PLACEHOLDER, outputToken.wrapped.address]
+          path: [inputToken.wrapped.address, pool instanceof v3Sdk.Pool ? pool.fee : MIXED_QUOTER_V1_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.wrapped.address])
+          path: [].concat(path, [pool instanceof v3Sdk.Pool ? pool.fee : MIXED_QUOTER_V1_V2_FEE_PATH_PLACEHOLDER, outputToken.wrapped.address])
         };
       }
     }, {
-      inputToken: firstInputToken,
+      inputToken: route.input,
       path: [],
       types: []
-    }),
-    path = _route$pools$reduce.path,
-    types = _route$pools$reduce.types;
+    });
+    path = result.path;
+    types = result.types;
+  }
   return solidity.pack(types, path);
 }
 
@@ -2329,6 +2367,10 @@ SwapRouter.INTERFACE = /*#__PURE__*/new abi.Interface(ISwapRouter02_json.abi);
 exports.ADDRESS_THIS = ADDRESS_THIS;
 exports.ADDRESS_ZERO = ADDRESS_ZERO;
 exports.ApproveAndCall = ApproveAndCall;
+exports.MIXED_QUOTER_V1_V2_FEE_PATH_PLACEHOLDER = MIXED_QUOTER_V1_V2_FEE_PATH_PLACEHOLDER;
+exports.MIXED_QUOTER_V2_V2_FEE_PATH_PLACEHOLDER = MIXED_QUOTER_V2_V2_FEE_PATH_PLACEHOLDER;
+exports.MIXED_QUOTER_V2_V3_FEE_PATH_PLACEHOLDER = MIXED_QUOTER_V2_V3_FEE_PATH_PLACEHOLDER;
+exports.MIXED_QUOTER_V2_V4_FEE_PATH_PLACEHOLDER = MIXED_QUOTER_V2_V4_FEE_PATH_PLACEHOLDER;
 exports.MSG_SENDER = MSG_SENDER;
 exports.MixedRoute = MixedRoute;
 exports.MixedRouteSDK = MixedRouteSDK;
@@ -2342,7 +2384,6 @@ exports.RouteV3 = RouteV3;
 exports.RouteV4 = RouteV4;
 exports.SwapRouter = SwapRouter;
 exports.Trade = Trade;
-exports.V2_FEE_PATH_PLACEHOLDER = V2_FEE_PATH_PLACEHOLDER;
 exports.ZERO = ZERO;
 exports.ZERO_PERCENT = ZERO_PERCENT;
 exports.encodeMixedRouteToPath = encodeMixedRouteToPath;