@uniswap/router-sdk 1.0.0-beta.6 → 1.0.1

package/dist/approveAndCall.d.ts

@@ -0,0 +1,22 @@
+import { Interface } from '@ethersproject/abi';
+import { Currency, Token } from '@uniswap/sdk-core';
+export declare enum ApprovalTypes {
+    NOT_REQUIRED = 0,
+    MAX = 1,
+    MAX_MINUS_ONE = 2,
+    ZERO_THEN_MAX = 3,
+    ZERO_THEN_MAX_MINUS_ONE = 4
+}
+export declare abstract class ApproveAndCall {
+    static INTERFACE: Interface;
+    /**
+     * Cannot be constructed.
+     */
+    private constructor();
+    static encodeApproveMax(token: Token): string;
+    static encodeApproveMaxMinusOne(token: Token): string;
+    static encodeApproveZeroThenMax(token: Token): string;
+    static encodeApproveZeroThenMaxMinusOne(token: Token): string;
+    static encodeCallPositionManager(calldatas: string[]): string;
+    static encodeApprove(token: Currency, approvalType: ApprovalTypes): string;
+}

package/dist/constants.d.ts

@@ -1,5 +1,5 @@
 import JSBI from 'jsbi';
-export declare const MSG_SENDER = "0x0000000000000000000000000000000000000000";
-export declare const ADDRESS_THIS = "0x0000000000000000000000000000000000000001";
+export declare const MSG_SENDER = "0x0000000000000000000000000000000000000001";
+export declare const ADDRESS_THIS = "0x0000000000000000000000000000000000000002";
 export declare const ZERO: JSBI;
 export declare const ONE: JSBI;

package/dist/entities/route.d.ts

@@ -7,6 +7,8 @@ export interface IRoute<TInput extends Currency, TOutput extends Currency, TPool
     pools: TPool[];
     path: Token[];
     midPrice: Price<TInput, TOutput>;
+    input: TInput;
+    output: TOutput;
 }
 export declare class RouteV2<TInput extends Currency, TOutput extends Currency> extends V2RouteSDK<TInput, TOutput> implements IRoute<TInput, TOutput, Pair> {
     readonly protocol: Protocol;

package/dist/entities/trade.d.ts

@@ -1,7 +1,7 @@
 import { Currency, CurrencyAmount, Percent, Price, TradeType } from '@uniswap/sdk-core';
+import { Pair, Route as V2RouteSDK } from '@uniswap/v2-sdk';
+import { Pool, Route as V3RouteSDK } from '@uniswap/v3-sdk';
 import { IRoute } from './route';
-import { Route as V2RouteSDK, Pair } from '@uniswap/v2-sdk';
-import { Route as V3RouteSDK, Pool } from '@uniswap/v3-sdk';
 export declare class Trade<TInput extends Currency, TOutput extends Currency, TTradeType extends TradeType> {
     readonly routes: IRoute<TInput, TOutput, Pair | Pool>[];
     readonly tradeType: TTradeType;

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

@@ -6,16 +6,17 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 
 var JSBI = _interopDefault(require('jsbi'));
 var abi = require('@ethersproject/abi');
-var v3Sdk = require('@uniswap/v3-sdk');
 var IMulticallExtended_json = require('@uniswap/swap-router-contracts/artifacts/contracts/interfaces/IMulticallExtended.sol/IMulticallExtended.json');
+var v3Sdk = require('@uniswap/v3-sdk');
 var sdkCore = require('@uniswap/sdk-core');
 var IPeripheryPaymentsWithFeeExtended_json = require('@uniswap/swap-router-contracts/artifacts/contracts/interfaces/IPeripheryPaymentsWithFeeExtended.sol/IPeripheryPaymentsWithFeeExtended.json');
 var ISwapRouter02_json = require('@uniswap/swap-router-contracts/artifacts/contracts/interfaces/ISwapRouter02.sol/ISwapRouter02.json');
 var v2Sdk = require('@uniswap/v2-sdk');
 var invariant = _interopDefault(require('tiny-invariant'));
+var IApproveAndCall_json = require('@uniswap/swap-router-contracts/artifacts/contracts/interfaces/IApproveAndCall.sol/IApproveAndCall.json');
 
-var MSG_SENDER = '0x0000000000000000000000000000000000000000';
-var ADDRESS_THIS = '0x0000000000000000000000000000000000000001';
+var MSG_SENDER = '0x0000000000000000000000000000000000000001';
+var ADDRESS_THIS = '0x0000000000000000000000000000000000000002';
 var ZERO = /*#__PURE__*/JSBI.BigInt(0);
 var ONE = /*#__PURE__*/JSBI.BigInt(1);
 
@@ -216,10 +217,71 @@ 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 (Protocol) {
-  Protocol["V2"] = "V2";
-  Protocol["V3"] = "V3";
-})(exports.Protocol || (exports.Protocol = {}));
+var ApprovalTypes;
+
+(function (ApprovalTypes) {
+  ApprovalTypes[ApprovalTypes["NOT_REQUIRED"] = 0] = "NOT_REQUIRED";
+  ApprovalTypes[ApprovalTypes["MAX"] = 1] = "MAX";
+  ApprovalTypes[ApprovalTypes["MAX_MINUS_ONE"] = 2] = "MAX_MINUS_ONE";
+  ApprovalTypes[ApprovalTypes["ZERO_THEN_MAX"] = 3] = "ZERO_THEN_MAX";
+  ApprovalTypes[ApprovalTypes["ZERO_THEN_MAX_MINUS_ONE"] = 4] = "ZERO_THEN_MAX_MINUS_ONE";
+})(ApprovalTypes || (ApprovalTypes = {}));
+
+var ApproveAndCall = /*#__PURE__*/function () {
+  /**
+   * Cannot be constructed.
+   */
+  function ApproveAndCall() {}
+
+  ApproveAndCall.encodeApproveMax = function encodeApproveMax(token) {
+    return ApproveAndCall.INTERFACE.encodeFunctionData('approveMax', [token.address]);
+  };
+
+  ApproveAndCall.encodeApproveMaxMinusOne = function encodeApproveMaxMinusOne(token) {
+    return ApproveAndCall.INTERFACE.encodeFunctionData('approveMaxMinusOne', [token.address]);
+  };
+
+  ApproveAndCall.encodeApproveZeroThenMax = function encodeApproveZeroThenMax(token) {
+    return ApproveAndCall.INTERFACE.encodeFunctionData('approveZeroThenMax', [token.address]);
+  };
+
+  ApproveAndCall.encodeApproveZeroThenMaxMinusOne = function encodeApproveZeroThenMaxMinusOne(token) {
+    return ApproveAndCall.INTERFACE.encodeFunctionData('approveZeroThenMaxMinusOne', [token.address]);
+  };
+
+  ApproveAndCall.encodeCallPositionManager = function encodeCallPositionManager(calldatas) {
+    !(calldatas.length > 0) ?  invariant(false, 'NULL_CALLDATA')  : void 0;
+
+    if (calldatas.length == 1) {
+      return ApproveAndCall.INTERFACE.encodeFunctionData('callPositionManager', calldatas);
+    } else {
+      var encodedMulticall = v3Sdk.NonfungiblePositionManager.INTERFACE.encodeFunctionData('multicall', [calldatas]);
+      return ApproveAndCall.INTERFACE.encodeFunctionData('callPositionManager', [encodedMulticall]);
+    }
+  };
+
+  ApproveAndCall.encodeApprove = function encodeApprove(token, approvalType) {
+    switch (approvalType) {
+      case ApprovalTypes.MAX:
+        return ApproveAndCall.encodeApproveMax(token.wrapped);
+
+      case ApprovalTypes.MAX_MINUS_ONE:
+        return ApproveAndCall.encodeApproveMaxMinusOne(token.wrapped);
+
+      case ApprovalTypes.ZERO_THEN_MAX:
+        return ApproveAndCall.encodeApproveZeroThenMax(token.wrapped);
+
+      case ApprovalTypes.ZERO_THEN_MAX_MINUS_ONE:
+        return ApproveAndCall.encodeApproveZeroThenMaxMinusOne(token.wrapped);
+
+      default:
+        throw 'Error: invalid ApprovalType';
+    }
+  };
+
+  return ApproveAndCall;
+}();
+ApproveAndCall.INTERFACE = /*#__PURE__*/new abi.Interface(IApproveAndCall_json.abi);
 
 function createCommonjsModule(fn, module) {
 	return module = { exports: {} }, fn(module, module.exports), module.exports;
@@ -981,6 +1043,11 @@ try {
 }
 });
 
+(function (Protocol) {
+  Protocol["V2"] = "V2";
+  Protocol["V3"] = "V3";
+})(exports.Protocol || (exports.Protocol = {}));
+
 var RouteV2 = /*#__PURE__*/function (_V2RouteSDK) {
   _inheritsLoose(RouteV2, _V2RouteSDK);
 
@@ -1051,7 +1118,43 @@ var Trade = /*#__PURE__*/function () {
       });
     }
 
-    this.tradeType = tradeType;
+    this.tradeType = tradeType; // each route must have the same input and output currency
+
+    var inputCurrency = this.swaps[0].inputAmount.currency;
+    var outputCurrency = this.swaps[0].outputAmount.currency;
+    !this.swaps.every(function (_ref2) {
+      var route = _ref2.route;
+      return inputCurrency.wrapped.equals(route.input.wrapped);
+    }) ?  invariant(false, 'INPUT_CURRENCY_MATCH')  : void 0;
+    !this.swaps.every(function (_ref3) {
+      var route = _ref3.route;
+      return outputCurrency.wrapped.equals(route.output.wrapped);
+    }) ?  invariant(false, 'OUTPUT_CURRENCY_MATCH')  : void 0; // pools must be unique inter protocols
+
+    var numPools = this.swaps.map(function (_ref4) {
+      var route = _ref4.route;
+      return route.pools.length;
+    }).reduce(function (total, cur) {
+      return total + cur;
+    }, 0);
+    var poolAddressSet = new Set();
+
+    for (var _iterator3 = _createForOfIteratorHelperLoose(this.swaps), _step3; !(_step3 = _iterator3()).done;) {
+      var _route2 = _step3.value.route;
+
+      for (var _iterator4 = _createForOfIteratorHelperLoose(_route2.pools), _step4; !(_step4 = _iterator4()).done;) {
+        var pool = _step4.value;
+
+        if (_route2.protocol == exports.Protocol.V3) {
+          poolAddressSet.add(v3Sdk.Pool.getAddress(pool.token0, pool.token1, pool.fee));
+        } else {
+          var pair = pool;
+          poolAddressSet.add(v2Sdk.Pair.getAddress(pair.token0, pair.token1));
+        }
+      }
+    }
+
+    !(numPools == poolAddressSet.size) ?  invariant(false, 'POOLS_DUPLICATED')  : void 0;
   }
 
   var _proto = Trade.prototype;
@@ -1109,7 +1212,7 @@ var Trade = /*#__PURE__*/function () {
 
   Trade.fromRoutes = /*#__PURE__*/function () {
     var _fromRoutes = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(v2Routes, v3Routes, tradeType) {
-      var populatedV2Routes, populatedV3Routes, _iterator3, _step3, _step3$value, routev2, amount, v2Trade, inputAmount, outputAmount, _iterator4, _step4, _step4$value, routev3, _amount, v3Trade, _inputAmount2, _outputAmount2;
+      var populatedV2Routes, populatedV3Routes, _iterator5, _step5, _step5$value, routev2, amount, v2Trade, inputAmount, outputAmount, _iterator6, _step6, _step6$value, routev3, _amount, v3Trade, _inputAmount2, _outputAmount2;
 
       return runtime_1.wrap(function _callee$(_context) {
         while (1) {
@@ -1118,8 +1221,8 @@ var Trade = /*#__PURE__*/function () {
               populatedV2Routes = [];
               populatedV3Routes = [];
 
-              for (_iterator3 = _createForOfIteratorHelperLoose(v2Routes); !(_step3 = _iterator3()).done;) {
-                _step3$value = _step3.value, routev2 = _step3$value.routev2, amount = _step3$value.amount;
+              for (_iterator5 = _createForOfIteratorHelperLoose(v2Routes); !(_step5 = _iterator5()).done;) {
+                _step5$value = _step5.value, routev2 = _step5$value.routev2, amount = _step5$value.amount;
                 v2Trade = new v2Sdk.Trade(routev2, amount, tradeType);
                 inputAmount = v2Trade.inputAmount, outputAmount = v2Trade.outputAmount;
                 populatedV2Routes.push({
@@ -1129,15 +1232,15 @@ var Trade = /*#__PURE__*/function () {
                 });
               }
 
-              _iterator4 = _createForOfIteratorHelperLoose(v3Routes);
+              _iterator6 = _createForOfIteratorHelperLoose(v3Routes);
 
             case 4:
-              if ((_step4 = _iterator4()).done) {
+              if ((_step6 = _iterator6()).done) {
                 _context.next = 13;
                 break;
               }
 
-              _step4$value = _step4.value, routev3 = _step4$value.routev3, _amount = _step4$value.amount;
+              _step6$value = _step6.value, routev3 = _step6$value.routev3, _amount = _step6$value.amount;
               _context.next = 8;
               return v3Sdk.Trade.fromRoute(routev3, _amount, tradeType);
 
@@ -1244,8 +1347,8 @@ var Trade = /*#__PURE__*/function () {
       }
 
       var inputCurrency = this.swaps[0].inputAmount.currency;
-      var totalInputFromRoutes = this.swaps.map(function (_ref2) {
-        var inputAmount = _ref2.inputAmount;
+      var totalInputFromRoutes = this.swaps.map(function (_ref5) {
+        var inputAmount = _ref5.inputAmount;
         return inputAmount;
       }).reduce(function (total, cur) {
         return total.add(cur);
@@ -1261,8 +1364,8 @@ var Trade = /*#__PURE__*/function () {
       }
 
       var outputCurrency = this.swaps[0].outputAmount.currency;
-      var totalOutputFromRoutes = this.swaps.map(function (_ref3) {
-        var outputAmount = _ref3.outputAmount;
+      var totalOutputFromRoutes = this.swaps.map(function (_ref6) {
+        var outputAmount = _ref6.outputAmount;
         return outputAmount;
       }).reduce(function (total, cur) {
         return total.add(cur);
@@ -1294,10 +1397,10 @@ var Trade = /*#__PURE__*/function () {
 
       var spotOutputAmount = sdkCore.CurrencyAmount.fromRawAmount(this.outputAmount.currency, 0);
 
-      for (var _iterator5 = _createForOfIteratorHelperLoose(this.swaps), _step5; !(_step5 = _iterator5()).done;) {
-        var _step5$value = _step5.value,
-            route = _step5$value.route,
-            inputAmount = _step5$value.inputAmount;
+      for (var _iterator7 = _createForOfIteratorHelperLoose(this.swaps), _step7; !(_step7 = _iterator7()).done;) {
+        var _step7$value = _step7.value,
+            route = _step7$value.route,
+            inputAmount = _step7$value.inputAmount;
         var midPrice = route.midPrice;
         spotOutputAmount = spotOutputAmount.add(midPrice.quote(inputAmount));
       }
@@ -1322,7 +1425,7 @@ var SwapRouter = /*#__PURE__*/function () {
    */
   function SwapRouter() {}
 
-  SwapRouter.encodeV2Swap = function encodeV2Swap(trade, options, routerMustCustody) {
+  SwapRouter.encodeV2Swap = function encodeV2Swap(trade, options, routerMustCustody, performAggregatedSlippageCheck) {
     var amountIn = v3Sdk.toHex(trade.maximumAmountIn(options.slippageTolerance).quotient);
     var amountOut = v3Sdk.toHex(trade.minimumAmountOut(options.slippageTolerance).quotient);
     var path = trade.route.path.map(function (token) {
@@ -1331,9 +1434,7 @@ var SwapRouter = /*#__PURE__*/function () {
     var recipient = routerMustCustody ? ADDRESS_THIS : typeof options.recipient === 'undefined' ? MSG_SENDER : sdkCore.validateAndParseAddress(options.recipient);
 
     if (trade.tradeType === sdkCore.TradeType.EXACT_INPUT) {
-      var exactInputParams = [amountIn, // save gas by only passing slippage check if we can't check it later
-      // not a pure win, as sometimes this will cost us more when it would have caused an earlier failure
-      routerMustCustody ? 0 : amountOut, path, recipient, false];
+      var exactInputParams = [amountIn, performAggregatedSlippageCheck ? 0 : amountOut, path, recipient];
       return SwapRouter.INTERFACE.encodeFunctionData('swapExactTokensForTokens', exactInputParams);
     } else {
       var exactOutputParams = [amountOut, amountIn, path, recipient];
@@ -1341,7 +1442,7 @@ var SwapRouter = /*#__PURE__*/function () {
     }
   };
 
-  SwapRouter.encodeV3Swap = function encodeV3Swap(trade, options, routerMustCustody) {
+  SwapRouter.encodeV3Swap = function encodeV3Swap(trade, options, routerMustCustody, performAggregatedSlippageCheck) {
     var calldatas = [];
 
     for (var _iterator = _createForOfIteratorHelperLoose(trade.swaps), _step; !(_step = _iterator()).done;) {
@@ -1363,9 +1464,8 @@ var SwapRouter = /*#__PURE__*/function () {
             fee: route.pools[0].fee,
             recipient: recipient,
             amountIn: amountIn,
-            amountOutMinimum: amountOut,
-            sqrtPriceLimitX96: 0,
-            hasAlreadyPaid: false
+            amountOutMinimum: performAggregatedSlippageCheck ? 0 : amountOut,
+            sqrtPriceLimitX96: 0
           };
           calldatas.push(SwapRouter.INTERFACE.encodeFunctionData('exactInputSingle', [exactInputSingleParams]));
         } else {
@@ -1388,8 +1488,7 @@ var SwapRouter = /*#__PURE__*/function () {
             path: path,
             recipient: recipient,
             amountIn: amountIn,
-            amountOutMinimum: amountOut,
-            hasAlreadyPaid: false
+            amountOutMinimum: performAggregatedSlippageCheck ? 0 : amountOut
           };
           calldatas.push(SwapRouter.INTERFACE.encodeFunctionData('exactInput', [exactInputParams]));
         } else {
@@ -1405,15 +1504,9 @@ var SwapRouter = /*#__PURE__*/function () {
     }
 
     return calldatas;
-  }
-  /**
-   * Produces the on-chain method name to call and the hex encoded parameters to pass as arguments for a given trade.
-   * @param trade to produce call parameters for
-   * @param options options for the call parameters
-   */
-  ;
+  };
 
-  SwapRouter.swapCallParameters = function swapCallParameters(trades, options) {
+  SwapRouter.encodeSwaps = function encodeSwaps(trades, options, isSwapAndAdd) {
     // If dealing with an instance of the aggregated Trade object, unbundle it to individual V2Trade and V3Trade objects.
     if (trades instanceof Trade) {
       !trades.swaps.every(function (swap) {
@@ -1446,6 +1539,9 @@ var SwapRouter = /*#__PURE__*/function () {
       trades = [trades];
     }
 
+    var numberOfTrades = trades.reduce(function (numberOfTrades, trade) {
+      return numberOfTrades + (trade instanceof v3Sdk.Trade ? trade.swaps.length : 1);
+    }, 0);
     var sampleTrade = trades[0]; // All trades should have the same starting/ending currency and trade type
 
     !trades.every(function (trade) {
@@ -1458,25 +1554,19 @@ var SwapRouter = /*#__PURE__*/function () {
       return trade.tradeType === sampleTrade.tradeType;
     }) ?  invariant(false, 'TRADE_TYPE_DIFF')  : void 0;
     var calldatas = [];
-    var ZERO_IN = sdkCore.CurrencyAmount.fromRawAmount(sampleTrade.inputAmount.currency, 0);
-    var ZERO_OUT = sdkCore.CurrencyAmount.fromRawAmount(sampleTrade.outputAmount.currency, 0);
-    var totalAmountOut = trades.reduce(function (sum, trade) {
-      return sum.add(trade.minimumAmountOut(options.slippageTolerance));
-    }, ZERO_OUT);
     var inputIsNative = sampleTrade.inputAmount.currency.isNative;
-    var outputIsNative = sampleTrade.outputAmount.currency.isNative; // flag for whether a refund needs to happen
-    //   1. when paying in ETH, but with an uncertain input amount
+    var outputIsNative = sampleTrade.outputAmount.currency.isNative; // flag for whether we want to perform an aggregated slippage check
+    //   1. when there are >2 exact input trades. this is only a heuristic,
+    //      as it's still more gas-expensive even in this case, but has benefits
+    //      in that the reversion probability is lower
 
-    var mustRefund = inputIsNative && sampleTrade.tradeType === sdkCore.TradeType.EXACT_OUTPUT; // flag for whether funds should be send first to the router
+    var performAggregatedSlippageCheck = sampleTrade.tradeType === sdkCore.TradeType.EXACT_INPUT && numberOfTrades > 2; // flag for whether funds should be send first to the router
     //   1. when receiving ETH (which much be unwrapped from WETH)
     //   2. when a fee on the output is being taken
-    //   3. when there are >1 exact input trades. this one isn't strictly necessary,
-    //      but typically we want to perform an aggregated slippage check
+    //   3. when performing swap and add
+    //   4. when performing an aggregated slippage check
 
-    var routerMustCustody = outputIsNative || !!options.fee || trades.length > 1 && sampleTrade.tradeType === sdkCore.TradeType.EXACT_INPUT;
-    var totalValue = inputIsNative ? trades.reduce(function (sum, trade) {
-      return sum.add(trade.maximumAmountIn(options.slippageTolerance));
-    }, ZERO_IN) : ZERO_IN; // encode permit if necessary
+    var routerMustCustody = outputIsNative || !!options.fee || !!isSwapAndAdd || performAggregatedSlippageCheck; // encode permit if necessary
 
     if (options.inputTokenPermit) {
       !sampleTrade.inputAmount.currency.isToken ?  invariant(false, 'NON_TOKEN_PERMIT')  : void 0;
@@ -1487,36 +1577,144 @@ var SwapRouter = /*#__PURE__*/function () {
       var trade = _step3.value;
 
       if (trade instanceof v2Sdk.Trade) {
-        calldatas.push(SwapRouter.encodeV2Swap(trade, options, routerMustCustody));
+        calldatas.push(SwapRouter.encodeV2Swap(trade, options, routerMustCustody, performAggregatedSlippageCheck));
       } else {
-        for (var _iterator4 = _createForOfIteratorHelperLoose(SwapRouter.encodeV3Swap(trade, options, routerMustCustody)), _step4; !(_step4 = _iterator4()).done;) {
+        for (var _iterator4 = _createForOfIteratorHelperLoose(SwapRouter.encodeV3Swap(trade, options, routerMustCustody, performAggregatedSlippageCheck)), _step4; !(_step4 = _iterator4()).done;) {
           var calldata = _step4.value;
           calldatas.push(calldata);
         }
       }
-    } // unwrap
+    }
+
+    var ZERO_IN = sdkCore.CurrencyAmount.fromRawAmount(sampleTrade.inputAmount.currency, 0);
+    var ZERO_OUT = sdkCore.CurrencyAmount.fromRawAmount(sampleTrade.outputAmount.currency, 0);
+    var totalAmountOut = trades.reduce(function (sum, trade) {
+      return sum.add(trade.minimumAmountOut(options.slippageTolerance));
+    }, ZERO_OUT);
+    var totalAmountIn = trades.reduce(function (sum, trade) {
+      return sum.add(trade.maximumAmountIn(options.slippageTolerance));
+    }, ZERO_IN);
+    return {
+      calldatas: calldatas,
+      sampleTrade: sampleTrade,
+      routerMustCustody: routerMustCustody,
+      inputIsNative: inputIsNative,
+      outputIsNative: outputIsNative,
+      totalAmountIn: totalAmountIn,
+      totalAmountOut: totalAmountOut
+    };
+  }
+  /**
+   * Produces the on-chain method name to call and the hex encoded parameters to pass as arguments for a given trade.
+   * @param trade to produce call parameters for
+   * @param options options for the call parameters
+   */
+  ;
+
+  SwapRouter.swapCallParameters = function swapCallParameters(trades, options) {
+    var _SwapRouter$encodeSwa = SwapRouter.encodeSwaps(trades, options),
+        calldatas = _SwapRouter$encodeSwa.calldatas,
+        sampleTrade = _SwapRouter$encodeSwa.sampleTrade,
+        routerMustCustody = _SwapRouter$encodeSwa.routerMustCustody,
+        inputIsNative = _SwapRouter$encodeSwa.inputIsNative,
+        outputIsNative = _SwapRouter$encodeSwa.outputIsNative,
+        totalAmountIn = _SwapRouter$encodeSwa.totalAmountIn,
+        totalAmountOut = _SwapRouter$encodeSwa.totalAmountOut; // unwrap or sweep
 
 
     if (routerMustCustody) {
-      // if all trades are exact output, we can save gas by not passing a slippage check
-      var canOmitSlippageCheck = sampleTrade.tradeType === sdkCore.TradeType.EXACT_OUTPUT;
-      var amountNecessary = canOmitSlippageCheck ? ZERO$1 : totalAmountOut.quotient;
-
       if (outputIsNative) {
-        calldatas.push(PaymentsExtended.encodeUnwrapWETH9(amountNecessary, options.recipient, options.fee));
+        calldatas.push(PaymentsExtended.encodeUnwrapWETH9(totalAmountOut.quotient, options.recipient, options.fee));
       } else {
-        calldatas.push(PaymentsExtended.encodeSweepToken(sampleTrade.outputAmount.currency.wrapped, amountNecessary, options.recipient, options.fee));
+        calldatas.push(PaymentsExtended.encodeSweepToken(sampleTrade.outputAmount.currency.wrapped, totalAmountOut.quotient, options.recipient, options.fee));
       }
-    } // refund
+    } // must refund when paying in ETH, but with an uncertain input amount
 
 
-    if (mustRefund) {
+    if (inputIsNative && sampleTrade.tradeType === sdkCore.TradeType.EXACT_OUTPUT) {
       calldatas.push(v3Sdk.Payments.encodeRefundETH());
     }
 
     return {
       calldata: MulticallExtended.encodeMulticall(calldatas, options.deadlineOrPreviousBlockhash),
-      value: v3Sdk.toHex(totalValue.quotient)
+      value: v3Sdk.toHex(inputIsNative ? totalAmountIn.quotient : ZERO$1)
+    };
+  }
+  /**
+   * Produces the on-chain method name to call and the hex encoded parameters to pass as arguments for a given trade.
+   * @param trade to produce call parameters for
+   * @param options options for the call parameters
+   */
+  ;
+
+  SwapRouter.swapAndAddCallParameters = function swapAndAddCallParameters(trades, options, position, addLiquidityOptions, tokenInApprovalType, tokenOutApprovalType) {
+    var _SwapRouter$encodeSwa2 = SwapRouter.encodeSwaps(trades, options, true),
+        calldatas = _SwapRouter$encodeSwa2.calldatas,
+        inputIsNative = _SwapRouter$encodeSwa2.inputIsNative,
+        outputIsNative = _SwapRouter$encodeSwa2.outputIsNative,
+        sampleTrade = _SwapRouter$encodeSwa2.sampleTrade,
+        totalAmountSwapped = _SwapRouter$encodeSwa2.totalAmountIn,
+        totalAmountOut = _SwapRouter$encodeSwa2.totalAmountOut;
+
+    var chainId = sampleTrade.route.chainId;
+    var zeroForOne = position.pool.token0 === totalAmountSwapped.currency.wrapped;
+
+    var _SwapRouter$getPositi = SwapRouter.getPositionAmounts(position, zeroForOne),
+        positionAmountIn = _SwapRouter$getPositi.positionAmountIn,
+        positionAmountOut = _SwapRouter$getPositi.positionAmountOut; // if tokens are native they will be converted to WETH9
+
+
+    var tokenIn = inputIsNative ? sdkCore.WETH9[chainId] : positionAmountIn.currency.wrapped;
+    var tokenOut = outputIsNative ? sdkCore.WETH9[chainId] : positionAmountOut.currency.wrapped; // if swap output does not make up whole outputTokenBalanceDesired, pull in remaining tokens for adding liquidity
+
+    var amountOutRemaining = positionAmountOut.subtract(totalAmountOut.wrapped);
+
+    if (amountOutRemaining.greaterThan(sdkCore.CurrencyAmount.fromRawAmount(positionAmountOut.currency, 0))) {
+      // if output is native, this means the remaining portion is included as native value in the transaction
+      // and must be wrapped. Otherwise, pull in remaining ERC20 token.
+      outputIsNative ? calldatas.push(PaymentsExtended.encodeWrapETH(amountOutRemaining.quotient)) : calldatas.push(PaymentsExtended.encodePull(tokenOut, amountOutRemaining.quotient));
+    } // if input is native, convert to WETH9, else pull ERC20 token
+
+
+    inputIsNative ? calldatas.push(PaymentsExtended.encodeWrapETH(positionAmountIn.quotient)) : calldatas.push(PaymentsExtended.encodePull(tokenIn, positionAmountIn.quotient)); // approve token balances to NFTManager
+
+    if (tokenInApprovalType !== ApprovalTypes.NOT_REQUIRED) calldatas.push(ApproveAndCall.encodeApprove(tokenIn, tokenInApprovalType));
+    if (tokenOutApprovalType !== ApprovalTypes.NOT_REQUIRED) calldatas.push(ApproveAndCall.encodeApprove(tokenOut, tokenOutApprovalType)); // encode NFTManager add liquidity
+
+    calldatas.push(ApproveAndCall.encodeCallPositionManager([v3Sdk.NonfungiblePositionManager.addCallParameters(position, addLiquidityOptions).calldata])); // sweep remaining tokens
+
+    inputIsNative ? calldatas.push(PaymentsExtended.encodeUnwrapWETH9(ZERO$1)) : calldatas.push(PaymentsExtended.encodeSweepToken(tokenIn, ZERO$1));
+    outputIsNative ? calldatas.push(PaymentsExtended.encodeUnwrapWETH9(ZERO$1)) : calldatas.push(PaymentsExtended.encodeSweepToken(tokenOut, ZERO$1));
+    var value;
+
+    if (inputIsNative) {
+      value = totalAmountSwapped.wrapped.add(positionAmountIn.wrapped).quotient;
+    } else if (outputIsNative) {
+      value = amountOutRemaining.quotient;
+    } else {
+      value = ZERO$1;
+    }
+
+    return {
+      calldata: MulticallExtended.encodeMulticall(calldatas, options.deadlineOrPreviousBlockhash),
+      value: value.toString()
+    };
+  };
+
+  SwapRouter.getPositionAmounts = function getPositionAmounts(position, zeroForOne) {
+    var _position$mintAmounts = position.mintAmounts,
+        amount0 = _position$mintAmounts.amount0,
+        amount1 = _position$mintAmounts.amount1;
+    var currencyAmount0 = sdkCore.CurrencyAmount.fromRawAmount(position.pool.token0, amount0);
+    var currencyAmount1 = sdkCore.CurrencyAmount.fromRawAmount(position.pool.token1, amount1);
+
+    var _ref = zeroForOne ? [currencyAmount0, currencyAmount1] : [currencyAmount1, currencyAmount0],
+        positionAmountIn = _ref[0],
+        positionAmountOut = _ref[1];
+
+    return {
+      positionAmountIn: positionAmountIn,
+      positionAmountOut: positionAmountOut
     };
   };