@uniswap/router-sdk 1.0.3 → 1.0.6

package/dist/approveAndCall.d.ts

@@ -21,6 +21,13 @@ export declare abstract class ApproveAndCall {
     static encodeApproveZeroThenMax(token: Token): string;
     static encodeApproveZeroThenMaxMinusOne(token: Token): string;
     static encodeCallPositionManager(calldatas: string[]): string;
-    static encodeAddLiquidity(position: Position, addLiquidityOptions: CondensedAddLiquidityOptions, slippageTolerance: Percent): string;
+    /**
+     * Encode adding liquidity to a position in the nft manager contract
+     * @param position Forcasted position with expected amount out from swap
+     * @param minimalPosition Forcasted position with custom minimal token amounts
+     * @param addLiquidityOptions Options for adding liquidity
+     * @param slippageTolerance Defines maximum slippage
+     */
+    static encodeAddLiquidity(position: Position, minimalPosition: Position, addLiquidityOptions: CondensedAddLiquidityOptions, slippageTolerance: Percent): string;
     static encodeApprove(token: Currency, approvalType: ApprovalTypes): string;
 }

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

@@ -65,12 +65,31 @@ var ApproveAndCall = /*#__PURE__*/function () {
       var encodedMulticall = v3Sdk.NonfungiblePositionManager.INTERFACE.encodeFunctionData('multicall', [calldatas]);
       return ApproveAndCall.INTERFACE.encodeFunctionData('callPositionManager', [encodedMulticall]);
     }
-  };
+  }
+  /**
+   * Encode adding liquidity to a position in the nft manager contract
+   * @param position Forcasted position with expected amount out from swap
+   * @param minimalPosition Forcasted position with custom minimal token amounts
+   * @param addLiquidityOptions Options for adding liquidity
+   * @param slippageTolerance Defines maximum slippage
+   */
+  ;
 
-  ApproveAndCall.encodeAddLiquidity = function encodeAddLiquidity(position, addLiquidityOptions, slippageTolerance) {
+  ApproveAndCall.encodeAddLiquidity = function encodeAddLiquidity(position, minimalPosition, addLiquidityOptions, slippageTolerance) {
     var _position$mintAmounts = position.mintAmountsWithSlippage(slippageTolerance),
         amount0Min = _position$mintAmounts.amount0,
-        amount1Min = _position$mintAmounts.amount1;
+        amount1Min = _position$mintAmounts.amount1; // position.mintAmountsWithSlippage() can create amounts not dependenable in scenarios
+    // such as range orders. Allow the option to provide a position with custom minimum amounts
+    // for these scenarios
+
+
+    if (JSBI.lessThan(minimalPosition.amount0.quotient, amount0Min)) {
+      amount0Min = minimalPosition.amount0.quotient;
+    }
+
+    if (JSBI.lessThan(minimalPosition.amount1.quotient, amount1Min)) {
+      amount1Min = minimalPosition.amount1.quotient;
+    }
 
     if (isMint(addLiquidityOptions)) {
       return ApproveAndCall.INTERFACE.encodeFunctionData('mint', [{
@@ -1689,7 +1708,8 @@ var SwapRouter = /*#__PURE__*/function () {
         outputIsNative = _SwapRouter$encodeSwa2.outputIsNative,
         sampleTrade = _SwapRouter$encodeSwa2.sampleTrade,
         totalAmountSwapped = _SwapRouter$encodeSwa2.totalAmountIn,
-        quoteAmountOut = _SwapRouter$encodeSwa2.quoteAmountOut; // encode output token permit if necessary
+        quoteAmountOut = _SwapRouter$encodeSwa2.quoteAmountOut,
+        minimumAmountOut = _SwapRouter$encodeSwa2.minimumAmountOut; // encode output token permit if necessary
 
 
     if (options.outputTokenPermit) {
@@ -1698,7 +1718,7 @@ var SwapRouter = /*#__PURE__*/function () {
     }
 
     var chainId = sampleTrade.route.chainId;
-    var zeroForOne = position.pool.token0 === totalAmountSwapped.currency.wrapped;
+    var zeroForOne = position.pool.token0.wrapped.address === totalAmountSwapped.currency.wrapped.address;
 
     var _SwapRouter$getPositi = SwapRouter.getPositionAmounts(position, zeroForOne),
         positionAmountIn = _SwapRouter$getPositi.positionAmountIn,
@@ -1720,9 +1740,19 @@ var SwapRouter = /*#__PURE__*/function () {
     inputIsNative ? calldatas.push(PaymentsExtended.encodeWrapETH(positionAmountIn.quotient)) : calldatas.push(PaymentsExtended.encodePull(tokenIn, positionAmountIn.quotient)); // approve token balances to NFTManager
 
     if (tokenInApprovalType !== exports.ApprovalTypes.NOT_REQUIRED) calldatas.push(ApproveAndCall.encodeApprove(tokenIn, tokenInApprovalType));
-    if (tokenOutApprovalType !== exports.ApprovalTypes.NOT_REQUIRED) calldatas.push(ApproveAndCall.encodeApprove(tokenOut, tokenOutApprovalType)); // encode NFTManager add liquidity
-
-    calldatas.push(ApproveAndCall.encodeAddLiquidity(position, addLiquidityOptions, options.slippageTolerance)); // sweep remaining tokens
+    if (tokenOutApprovalType !== exports.ApprovalTypes.NOT_REQUIRED) calldatas.push(ApproveAndCall.encodeApprove(tokenOut, tokenOutApprovalType)); // represents a position with token amounts resulting from a swap with maximum slippage
+    // hence the minimal amount out possible.
+
+    var minimalPosition = v3Sdk.Position.fromAmounts({
+      pool: position.pool,
+      tickLower: position.tickLower,
+      tickUpper: position.tickUpper,
+      amount0: zeroForOne ? position.amount0.quotient.toString() : minimumAmountOut.quotient.toString(),
+      amount1: zeroForOne ? minimumAmountOut.quotient.toString() : position.amount1.quotient.toString(),
+      useFullPrecision: false
+    }); // encode NFTManager add liquidity
+
+    calldatas.push(ApproveAndCall.encodeAddLiquidity(position, minimalPosition, addLiquidityOptions, options.slippageTolerance)); // 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));