Merge pull request #49 from KyberNetwork/update-selector

feat: update interaction selector

Author: qcuong98

src/KSSmartIntentRouter.sol

@@ -6,10 +6,10 @@ import {KSSmartIntentRouterAccounting} from './KSSmartIntentRouterAccounting.sol
 import {KSSmartIntentRouterNonces} from './KSSmartIntentRouterNonces.sol';
 
 import {IKSSmartIntentRouter} from './interfaces/IKSSmartIntentRouter.sol';
+import {IKSAllowanceHub} from './interfaces/actions/IKSAllowanceHub.sol';
 import {IKSSwapRouterV2} from './interfaces/actions/IKSSwapRouterV2.sol';
 import {IKSSwapRouterV3} from './interfaces/actions/IKSSwapRouterV3.sol';
 import {IKSZapRouter} from './interfaces/actions/IKSZapRouter.sol';
-
 import {HookLibrary} from './libraries/HookLibrary.sol';
 
 import {ActionData} from './types/ActionData.sol';
@@ -212,6 +212,7 @@ contract KSSmartIntentRouter is
       selector == IKSSwapRouterV2.swap.selector
         || selector == IKSSwapRouterV2.swapSimpleMode.selector
         || selector == IKSSwapRouterV3.swap.selector || selector == IKSZapRouter.zap.selector
+        || selector == IKSAllowanceHub.permitTransferAndExecute.selector
     ) {
       return IKSGenericForwarder(address(0));
     }

src/interfaces/actions/IKSAllowanceHub.sol

@@ -0,0 +1,59 @@
+/// @title IKSAllowanceHub
+pragma solidity ^0.8.0;
+
+/// @notice Interface for the KSAllowanceHub
+interface IKSAllowanceHub {
+  /**
+   * @notice Parameters for collecting ERC20 tokens from `msg.sender`
+   * @param token The address of the tokens to collect
+   * @param targets The addresses to transfer the tokens to
+   * @param amounts The amounts to transfer to each target
+   * @param permitData The permit data for the tokens
+   */
+  struct ERC20Params {
+    address token;
+    address[] targets;
+    uint256[] amounts;
+    bytes permitData;
+  }
+
+  /**
+   * @notice Parameters for collecting an ERC721 token from `msg.sender`
+   * @param token The address of the token to collect
+   * @param tokenId The token ID to collect
+   * @param target The address to transfer the token to
+   * @param permitData The permit data for the token
+   */
+  struct ERC721Params {
+    address token;
+    uint256 tokenId;
+    address target;
+    bytes permitData;
+  }
+
+  /**
+   * @notice Parameters for calling a generic router
+   * @param router The address of the router
+   * @param value The value to send along with the call
+   * @param data The data to call the generic router with
+   */
+  struct GenericCall {
+    address router;
+    uint256 value;
+    bytes data;
+  }
+
+  /**
+   * @notice Permits, transfers ERC20 and ERC721 tokens, executes generic calls
+   * @param erc20Params The ERC20 tokens to transfer
+   * @param erc721Params The ERC721 tokens to transfer
+   * @param genericCalls The generic calls to execute
+   * @return results The results of the generic calls
+   * @return gasUsed The amount of gas used
+   */
+  function permitTransferAndExecute(
+    ERC20Params[] calldata erc20Params,
+    ERC721Params[] calldata erc721Params,
+    GenericCall[] calldata genericCalls
+  ) external payable returns (bytes[] memory results, uint256 gasUsed);
+}

src/interfaces/actions/IKSSwapRouterV3.sol

@@ -9,10 +9,12 @@ interface IKSSwapRouterV3 {
   /// @param targets The targets to transfer the input token to
   /// @param amounts The amounts to transfer to the targets
   struct InputTokenData {
-    // length = 5 * 32: IERC20Permit, use ERC20 `transferFrom`
-    // length = 6 * 32: IDaiLikePermit, use ERC20 `transferFrom`
-    // length = 0: use ERC20 `transferFrom`
-    // otherwise: use Permit2 `transferFrom`
+    // Permit method selection:
+    // length = 5 * 32: use ERC20 `permit`
+    // length = 6 * 32: use DAI `permit`
+    // Transfer method selection:
+    // length == 0: use Permit2 `transferFrom`
+    // length != 0: use ERC20 `transferFrom`
     bytes permitData;
     address[] feeRecipients;
     uint256[] fees;
@@ -31,32 +33,37 @@ interface IKSSwapRouterV3 {
   }
 
   /// @notice Contains the parameters for a swap
-  /// @param permit2Data The data to call permit2 with
   /// @param inputTokens The input tokens
-  /// @param inputAmounts The input amounts
+  /// @param inputAmounts The input amounts (only used for fee calculation)
   /// @param inputData The additional data for the input tokens
   /// @param outputTokens The output tokens
   /// @param outputData The additional data for the output tokens
+  /// @param permit2Data The data to call permit2 with
   /// @param executor The executor to call
   /// @param executorData The data to pass to the executor
   /// @param recipient The recipient of the output tokens
+  /// @param deadline The deadline for the swap
   /// @param clientData The client data
   struct SwapParams {
-    bytes permit2Data;
     address[] inputTokens;
     uint256[] inputAmounts;
     InputTokenData[] inputData;
     address[] outputTokens;
     OutputTokenData[] outputData;
+    bytes permit2Data;
     address executor;
     bytes executorData;
     address recipient;
+    uint256 deadline;
     bytes clientData;
   }
 
   /// @notice Entry point for swapping
   /// @param params The parameters for the swap
-  function swap(SwapParams calldata params) external payable;
+  function swap(SwapParams calldata params)
+    external
+    payable
+    returns (uint256[] memory outputAmounts, uint256 gasUsed);
 
   /// @notice Returns the address of who called the swap function
   function msgSender() external view returns (address);