@uniswap/universal-router-sdk 4.4.0 → 4.4.1

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

@@ -364,6 +364,27 @@ function createCommand(type, parameters) {
   }
 }
 
+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.token0.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
+}
+
 (function (RouterActionType) {
   RouterActionType["UniswapTrade"] = "UniswapTrade";
   RouterActionType["UnwrapWETH"] = "UnwrapWETH";
@@ -617,7 +638,7 @@ var UniswapTrade = /*#__PURE__*/function () {
           addV3Swap(planner, swap, this.trade.tradeType, this.options, this.payerIsUser, routerMustCustody);
           break;
         case routerSdk.Protocol.V4:
-          addV4Swap(planner, swap, this.trade.tradeType, this.options, this.payerIsUser, routerMustCustody, performAggregatedSlippageCheck);
+          addV4Swap(planner, swap, this.trade.tradeType, this.options, this.payerIsUser, routerMustCustody);
           break;
         case routerSdk.Protocol.MIXED:
           addMixedSwap(planner, swap, this.trade.tradeType, this.options, this.payerIsUser, routerMustCustody);
@@ -739,7 +760,7 @@ function addV3Swap(planner, _ref2, tradeType, options, payerIsUser, routerMustCu
     planner.addCommand(exports.CommandType.V3_SWAP_EXACT_OUT, [routerMustCustody ? ROUTER_AS_RECIPIENT : options.recipient, trade.minimumAmountOut(options.slippageTolerance).quotient.toString(), trade.maximumAmountIn(options.slippageTolerance).quotient.toString(), path, payerIsUser]);
   }
 }
-function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCustody, performAggregatedSlippageCheck) {
+function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCustody) {
   var _options$recipient;
   var route = _ref3.route,
     inputAmount = _ref3.inputAmount,
@@ -750,7 +771,7 @@ function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCu
     outputAmount: outputAmount,
     tradeType: tradeType
   });
-  var slippageToleranceOnSwap = performAggregatedSlippageCheck ? undefined : options.slippageTolerance;
+  var slippageToleranceOnSwap = routerMustCustody && tradeType == sdkCore.TradeType.EXACT_INPUT ? undefined : options.slippageTolerance;
   var inputWethFromRouter = inputAmount.currency.isNative && !route.input.isNative;
   if (inputWethFromRouter && !payerIsUser) throw new Error('Inconsistent payer');
   var v4Planner = new v4Sdk.V4Planner();
@@ -762,13 +783,16 @@ function addV4Swap(planner, _ref3, tradeType, options, payerIsUser, routerMustCu
 }
 // encode a mixed route swap, i.e. including both v2 and v3 pools
 function addMixedSwap(planner, swap, tradeType, options, payerIsUser, routerMustCustody) {
-  var route = swap.route,
-    inputAmount = swap.inputAmount,
-    outputAmount = swap.outputAmount;
-  var tradeRecipient = routerMustCustody ? ROUTER_AS_RECIPIENT : options.recipient;
-  // single hop, so it can be reduced to plain v2 or v3 swap logic
+  var _options$recipient2;
+  var route = swap.route;
+  var inputAmount = swap.inputAmount;
+  var outputAmount = swap.outputAmount;
+  var tradeRecipient = routerMustCustody ? ROUTER_AS_RECIPIENT : (_options$recipient2 = options.recipient) != null ? _options$recipient2 : SENDER_AS_RECIPIENT;
+  // single hop, so it can be reduced to plain swap logic for one protocol version
   if (route.pools.length === 1) {
-    if (route.pools[0] instanceof v3Sdk.Pool) {
+    if (route.pools[0] instanceof v4Sdk.Pool) {
+      return addV4Swap(planner, swap, tradeType, options, payerIsUser, routerMustCustody);
+    } else if (route.pools[0] instanceof v3Sdk.Pool) {
       return addV3Swap(planner, swap, tradeType, options, payerIsUser, routerMustCustody);
     } else if (route.pools[0] instanceof v2Sdk.Pair) {
       return addV2Swap(planner, swap, tradeType, options, payerIsUser, routerMustCustody);
@@ -790,32 +814,53 @@ function addMixedSwap(planner, swap, tradeType, options, payerIsUser, routerMust
   var isLastSectionInRoute = function isLastSectionInRoute(i) {
     return i === sections.length - 1;
   };
-  var outputToken;
-  var inputToken = route.input.wrapped;
+  var inputToken = route.pathInput;
   for (var i = 0; i < sections.length; i++) {
     var section = sections[i];
-    /// Now, we get output of this section
-    outputToken = routerSdk.getOutputOfPools(section, inputToken);
-    var newRouteOriginal = new routerSdk.MixedRouteSDK([].concat(section), section[0].token0.equals(inputToken) ? section[0].token0 : section[0].token1, outputToken);
-    var newRoute = new routerSdk.MixedRoute(newRouteOriginal);
-    /// Previous output is now input
-    inputToken = outputToken.wrapped;
-    var mixedRouteIsAllV3 = function mixedRouteIsAllV3(route) {
-      return route.pools.every(function (pool) {
-        return pool instanceof v3Sdk.Pool;
-      });
-    };
-    if (mixedRouteIsAllV3(newRoute)) {
-      var path = routerSdk.encodeMixedRouteToPath(newRoute);
-      planner.addCommand(exports.CommandType.V3_SWAP_EXACT_IN, [
-      // if not last section: send tokens directly to the first v2 pair of the next section
-      // note: because of the partitioning function we can be sure that the next section is v2
-      isLastSectionInRoute(i) ? tradeRecipient : sections[i + 1][0].liquidityToken.address, i == 0 ? amountIn : CONTRACT_BALANCE, !isLastSectionInRoute(i) ? 0 : amountOut, path, payerIsUser && i === 0]);
+    var routePool = section[0];
+    var outputToken = routerSdk.getOutputOfPools(section, inputToken);
+    var subRoute = new routerSdk.MixedRoute(new routerSdk.MixedRouteSDK([].concat(section), inputToken, outputToken));
+    var nextInputToken = void 0;
+    var swapRecipient = void 0;
+    if (isLastSectionInRoute(i)) {
+      nextInputToken = outputToken;
+      swapRecipient = tradeRecipient;
     } else {
-      planner.addCommand(exports.CommandType.V2_SWAP_EXACT_IN, [isLastSectionInRoute(i) ? tradeRecipient : ROUTER_AS_RECIPIENT, i === 0 ? amountIn : CONTRACT_BALANCE, !isLastSectionInRoute(i) ? 0 : amountOut, newRoute.path.map(function (token) {
+      var nextPool = sections[i + 1][0];
+      nextInputToken = getPathCurrency(outputToken, nextPool);
+      var v2PoolIsSwapRecipient = nextPool instanceof v2Sdk.Pair && outputToken.equals(nextInputToken);
+      swapRecipient = v2PoolIsSwapRecipient ? nextPool.liquidityToken.address : ROUTER_AS_RECIPIENT;
+    }
+    if (routePool instanceof v4Sdk.Pool) {
+      var v4Planner = new v4Sdk.V4Planner();
+      var v4SubRoute = new v4Sdk.Route(section, subRoute.input, subRoute.output);
+      v4Planner.addSettle(inputToken, payerIsUser && i === 0, i == 0 ? amountIn : CONTRACT_BALANCE);
+      v4Planner.addAction(v4Sdk.Actions.SWAP_EXACT_IN, [{
+        currencyIn: inputToken.isNative ? ETH_ADDRESS : inputToken.address,
+        path: v4Sdk.encodeRouteToPath(v4SubRoute),
+        amountIn: 0,
+        amountOutMinimum: !isLastSectionInRoute(i) ? 0 : amountOut
+      }]);
+      v4Planner.addTake(outputToken, swapRecipient);
+      planner.addCommand(exports.CommandType.V4_SWAP, [v4Planner.finalize()]);
+    } else if (routePool instanceof v3Sdk.Pool) {
+      planner.addCommand(exports.CommandType.V3_SWAP_EXACT_IN, [swapRecipient, i == 0 ? amountIn : CONTRACT_BALANCE, !isLastSectionInRoute(i) ? 0 : amountOut, routerSdk.encodeMixedRouteToPath(subRoute), payerIsUser && i === 0]);
+    } else if (routePool instanceof v2Sdk.Pair) {
+      planner.addCommand(exports.CommandType.V2_SWAP_EXACT_IN, [swapRecipient, i === 0 ? amountIn : CONTRACT_BALANCE, !isLastSectionInRoute(i) ? 0 : amountOut, subRoute.path.map(function (token) {
         return token.wrapped.address;
       }), payerIsUser && i === 0]);
+    } else {
+      throw new Error('Unexpected Pool Type');
+    }
+    // perform a token transition (wrap/unwrap if necessary)
+    if (!isLastSectionInRoute(i)) {
+      if (outputToken.isNative && !nextInputToken.isNative) {
+        planner.addCommand(exports.CommandType.WRAP_ETH, [ROUTER_AS_RECIPIENT, CONTRACT_BALANCE]);
+      } else if (!outputToken.isNative && nextInputToken.isNative) {
+        planner.addCommand(exports.CommandType.UNWRAP_WETH, [ROUTER_AS_RECIPIENT, 0]);
+      }
     }
+    inputToken = nextInputToken;
   }
 }
 // if price impact is very high, there's a chance of hitting max/min prices resulting in a partial fill of the swap
@@ -972,6 +1017,7 @@ var UnwrapWETH = /*#__PURE__*/function () {
 (function (PoolType) {
   PoolType["V2Pool"] = "v2-pool";
   PoolType["V3Pool"] = "v3-pool";
+  PoolType["V4Pool"] = "v4-pool";
 })(exports.PoolType || (exports.PoolType = {}));
 var isNativeCurrency = function isNativeCurrency(address) {
   return address.toLowerCase() === ETH_ADDRESS.toLowerCase() || address.toLowerCase() === E_ETH_ADDRESS.toLowerCase();