@uniswap/router-sdk 1.0.2 → 1.0.3

package/dist/approveAndCall.d.ts

@@ -1,5 +1,7 @@
 import { Interface } from '@ethersproject/abi';
-import { Currency, Token } from '@uniswap/sdk-core';
+import { Currency, Percent, Token } from '@uniswap/sdk-core';
+import { MintSpecificOptions, IncreaseSpecificOptions, Position } from '@uniswap/v3-sdk';
+export declare type CondensedAddLiquidityOptions = Omit<MintSpecificOptions, 'createPool'> | IncreaseSpecificOptions;
 export declare enum ApprovalTypes {
     NOT_REQUIRED = 0,
     MAX = 1,
@@ -7,6 +9,7 @@ export declare enum ApprovalTypes {
     ZERO_THEN_MAX = 3,
     ZERO_THEN_MAX_MINUS_ONE = 4
 }
+export declare function isMint(options: CondensedAddLiquidityOptions): options is Omit<MintSpecificOptions, 'createPool'>;
 export declare abstract class ApproveAndCall {
     static INTERFACE: Interface;
     /**
@@ -18,5 +21,6 @@ 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;
     static encodeApprove(token: Currency, approvalType: ApprovalTypes): string;
 }

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

@@ -26,8 +26,14 @@ var ONE = /*#__PURE__*/JSBI.BigInt(1);
   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";
-})(exports.ApprovalTypes || (exports.ApprovalTypes = {}));
+})(exports.ApprovalTypes || (exports.ApprovalTypes = {})); // type guard
 
+
+function isMint(options) {
+  return Object.keys(options).some(function (k) {
+    return k === 'recipient';
+  });
+}
 var ApproveAndCall = /*#__PURE__*/function () {
   /**
    * Cannot be constructed.
@@ -61,6 +67,33 @@ var ApproveAndCall = /*#__PURE__*/function () {
     }
   };
 
+  ApproveAndCall.encodeAddLiquidity = function encodeAddLiquidity(position, addLiquidityOptions, slippageTolerance) {
+    var _position$mintAmounts = position.mintAmountsWithSlippage(slippageTolerance),
+        amount0Min = _position$mintAmounts.amount0,
+        amount1Min = _position$mintAmounts.amount1;
+
+    if (isMint(addLiquidityOptions)) {
+      return ApproveAndCall.INTERFACE.encodeFunctionData('mint', [{
+        token0: position.pool.token0.address,
+        token1: position.pool.token1.address,
+        fee: position.pool.fee,
+        tickLower: position.tickLower,
+        tickUpper: position.tickUpper,
+        amount0Min: v3Sdk.toHex(amount0Min),
+        amount1Min: v3Sdk.toHex(amount1Min),
+        recipient: addLiquidityOptions.recipient
+      }]);
+    } else {
+      return ApproveAndCall.INTERFACE.encodeFunctionData('increaseLiquidity', [{
+        token0: position.pool.token0.address,
+        token1: position.pool.token1.address,
+        amount0Min: v3Sdk.toHex(amount0Min),
+        amount1Min: v3Sdk.toHex(amount1Min),
+        tokenId: v3Sdk.toHex(addLiquidityOptions.tokenId)
+      }]);
+    }
+  };
+
   ApproveAndCall.encodeApprove = function encodeApprove(token, approvalType) {
     switch (approvalType) {
       case exports.ApprovalTypes.MAX:
@@ -1586,9 +1619,12 @@ var SwapRouter = /*#__PURE__*/function () {
 
     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) {
+    var minimumAmountOut = trades.reduce(function (sum, trade) {
       return sum.add(trade.minimumAmountOut(options.slippageTolerance));
     }, ZERO_OUT);
+    var quoteAmountOut = trades.reduce(function (sum, trade) {
+      return sum.add(trade.outputAmount);
+    }, ZERO_OUT);
     var totalAmountIn = trades.reduce(function (sum, trade) {
       return sum.add(trade.maximumAmountIn(options.slippageTolerance));
     }, ZERO_IN);
@@ -1599,7 +1635,8 @@ var SwapRouter = /*#__PURE__*/function () {
       inputIsNative: inputIsNative,
       outputIsNative: outputIsNative,
       totalAmountIn: totalAmountIn,
-      totalAmountOut: totalAmountOut
+      minimumAmountOut: minimumAmountOut,
+      quoteAmountOut: quoteAmountOut
     };
   }
   /**
@@ -1617,14 +1654,14 @@ var SwapRouter = /*#__PURE__*/function () {
         inputIsNative = _SwapRouter$encodeSwa.inputIsNative,
         outputIsNative = _SwapRouter$encodeSwa.outputIsNative,
         totalAmountIn = _SwapRouter$encodeSwa.totalAmountIn,
-        totalAmountOut = _SwapRouter$encodeSwa.totalAmountOut; // unwrap or sweep
+        minimumAmountOut = _SwapRouter$encodeSwa.minimumAmountOut; // unwrap or sweep
 
 
     if (routerMustCustody) {
       if (outputIsNative) {
-        calldatas.push(PaymentsExtended.encodeUnwrapWETH9(totalAmountOut.quotient, options.recipient, options.fee));
+        calldatas.push(PaymentsExtended.encodeUnwrapWETH9(minimumAmountOut.quotient, options.recipient, options.fee));
       } else {
-        calldatas.push(PaymentsExtended.encodeSweepToken(sampleTrade.outputAmount.currency.wrapped, totalAmountOut.quotient, options.recipient, options.fee));
+        calldatas.push(PaymentsExtended.encodeSweepToken(sampleTrade.outputAmount.currency.wrapped, minimumAmountOut.quotient, options.recipient, options.fee));
       }
     } // must refund when paying in ETH, but with an uncertain input amount
 
@@ -1652,7 +1689,13 @@ var SwapRouter = /*#__PURE__*/function () {
         outputIsNative = _SwapRouter$encodeSwa2.outputIsNative,
         sampleTrade = _SwapRouter$encodeSwa2.sampleTrade,
         totalAmountSwapped = _SwapRouter$encodeSwa2.totalAmountIn,
-        totalAmountOut = _SwapRouter$encodeSwa2.totalAmountOut;
+        quoteAmountOut = _SwapRouter$encodeSwa2.quoteAmountOut; // encode output token permit if necessary
+
+
+    if (options.outputTokenPermit) {
+      !quoteAmountOut.currency.isToken ?  invariant(false, 'NON_TOKEN_PERMIT_OUTPUT')  : void 0;
+      calldatas.push(v3Sdk.SelfPermit.encodePermit(quoteAmountOut.currency, options.outputTokenPermit));
+    }
 
     var chainId = sampleTrade.route.chainId;
     var zeroForOne = position.pool.token0 === totalAmountSwapped.currency.wrapped;
@@ -1665,7 +1708,7 @@ var SwapRouter = /*#__PURE__*/function () {
     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);
+    var amountOutRemaining = positionAmountOut.subtract(quoteAmountOut.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
@@ -1679,7 +1722,7 @@ var SwapRouter = /*#__PURE__*/function () {
     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.encodeCallPositionManager([v3Sdk.NonfungiblePositionManager.addCallParameters(position, addLiquidityOptions).calldata])); // sweep remaining tokens
+    calldatas.push(ApproveAndCall.encodeAddLiquidity(position, 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));
@@ -1731,4 +1774,5 @@ exports.RouteV3 = RouteV3;
 exports.SwapRouter = SwapRouter;
 exports.Trade = Trade;
 exports.ZERO = ZERO;
+exports.isMint = isMint;
 //# sourceMappingURL=router-sdk.cjs.development.js.map