Merge pull request #33 from KyberNetwork/custom-fee-recipient

feat: add custom fee recipients

Author: qcuong98

foundry.toml

@@ -6,11 +6,11 @@ ffi = true
 fs_permissions = [{ access = 'read-write', path = './'}]
 
 additional_compiler_profiles = [
-  { name = "si_router", via_ir = true, optimizer_runs = 1000 }
+  { name = "si_router", via_ir = true, optimizer_runs = 500 }
 ]
 
 compilation_restrictions = [
-  { paths = "src/KSSmartIntentRouter.sol", optimizer_runs = 1000 },
+  { paths = "src/KSSmartIntentRouter.sol", optimizer_runs = 500 },
 ]
 
 [lint]

script/DeployRouter.s.sol

@@ -17,14 +17,13 @@ contract DeployRouter is BaseScript {
     address[] memory guardians = _readAddressArray('router-guardians');
     address[] memory rescuers = _readAddressArray('router-rescuers');
     address[] memory actionContracts = _readAddressArray('action-contracts');
-    address feeRecipient = _readAddress('fee-recipient');
     address forwarder = _readAddress('forwarder');
 
     vm.startBroadcast();
 
     bytes memory creationCode = abi.encodePacked(
       type(KSSmartIntentRouter).creationCode,
-      abi.encode(admin, guardians, rescuers, actionContracts, feeRecipient, forwarder)
+      abi.encode(admin, guardians, rescuers, actionContracts, forwarder)
     );
     address router = _create3Deploy(keccak256(abi.encodePacked(salt)), creationCode);
 

script/config/fee-recipient.json

@@ -30,14 +30,12 @@ contract KSSmartIntentRouter is
     address[] memory initialGuardians,
     address[] memory initialRescuers,
     address[] memory initialActionContracts,
-    address _feeRecipient,
     address _forwarder
   ) ManagementBase(0, initialAdmin) {
     _batchGrantRole(KSRoles.GUARDIAN_ROLE, initialGuardians);
     _batchGrantRole(KSRoles.RESCUER_ROLE, initialRescuers);
     _batchGrantRole(ACTION_CONTRACT_ROLE, initialActionContracts);
 
-    _updateFeeRecipient(_feeRecipient);
     _updateForwarder(_forwarder);
   }
 
@@ -64,17 +62,6 @@ contract KSSmartIntentRouter is
     emit UpdateForwarder(newForwarder);
   }
 
-  /// @inheritdoc IKSSmartIntentRouter
-  function updateFeeRecipient(address newFeeRecipient) public onlyRole(DEFAULT_ADMIN_ROLE) {
-    _updateFeeRecipient(newFeeRecipient);
-  }
-
-  function _updateFeeRecipient(address newFeeRecipient) internal {
-    feeRecipient = newFeeRecipient;
-
-    emit UpdateFeeRecipient(newFeeRecipient);
-  }
-
   /// @inheritdoc IKSSmartIntentRouter
   function delegate(IntentData calldata intentData) public {
     if (intentData.coreData.mainAddress != msg.sender) {
@@ -169,7 +156,7 @@ contract KSSmartIntentRouter is
     );
 
     (uint256[] memory fees, bytes memory beforeExecutionData) =
-      HookLibrary.beforeExecution(intentHash, intentData, feeRecipient, actionData);
+      HookLibrary.beforeExecution(intentHash, intentData, actionData);
 
     address actionContract = intentData.coreData.actionContracts[actionData.actionSelectorId];
     bytes4 actionSelector = intentData.coreData.actionSelectors[actionData.actionSelectorId];
@@ -198,7 +185,7 @@ contract KSSmartIntentRouter is
     }
 
     HookLibrary.afterExecution(
-      intentHash, intentData, feeRecipient, beforeExecutionData, actionResult
+      intentHash, intentData, actionData, beforeExecutionData, actionResult
     );
 
     emit ExecuteIntent(intentHash, actionData, actionResult);

src/KSSmartIntentRouter.sol

@@ -49,9 +49,6 @@ abstract contract KSSmartIntentRouterAccounting is KSSmartIntentStorage, Managem
     IKSGenericForwarder _forwarder,
     uint256[] memory fees
   ) internal checkLengths(actionData.erc20Ids.length, actionData.erc20Amounts.length) {
-    /// @dev gas optimization
-    address _feeRecipient = feeRecipient;
-
     uint256 approvalFlags = actionData.approvalFlags;
 
     for (uint256 i = 0; i < actionData.erc20Ids.length; i++) {
@@ -67,7 +64,8 @@ abstract contract KSSmartIntentRouterAccounting is KSSmartIntentStorage, Managem
         fees[i],
         _checkFlag(approvalFlags, i),
         _forwarder,
-        _feeRecipient
+        actionData.feeInfo,
+        actionData.partnerRecipient
       );
     }
     approvalFlags >>= tokenData.erc20Data.length;

src/KSSmartIntentRouterAccounting.sol

@@ -9,6 +9,4 @@ abstract contract KSSmartIntentStorage is IKSSmartIntentRouter {
   mapping(bytes32 => IntentStatus) internal intentStatuses;
 
   IKSGenericForwarder internal forwarder;
-
-  address internal feeRecipient;
 }

src/KSSmartIntentStorage.sol

@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
 
 import './BaseHook.sol';
 
+import '../../interfaces/hooks/IKSConditionalHook.sol';
 import 'openzeppelin-contracts/contracts/utils/math/Math.sol';
-import 'src/interfaces/hooks/IKSConditionalHook.sol';
 
 /**
  * @param startTimestamp the start timestamp of the condition

src/hooks/base/BaseConditionalHook.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
 
+import '../../hooks/base/BaseConditionalHook.sol';
 import 'ks-common-sc/src/libraries/token/TokenHelper.sol';
-import 'src/hooks/base/BaseConditionalHook.sol';
 
+import {IPositionManager} from '../../interfaces/uniswapv4/IPositionManager.sol';
 import 'openzeppelin-contracts/contracts/token/ERC721/IERC721.sol';
-import {IPositionManager} from 'src/interfaces/uniswapv4/IPositionManager.sol';
 
 abstract contract BaseTickBasedRemoveLiquidityHook is BaseConditionalHook {
   using TokenHelper for address;

src/hooks/base/BaseTickBasedRemoveLiquidityHook.sol

@@ -3,11 +3,11 @@ pragma solidity ^0.8.0;
 
 import 'ks-common-sc/src/libraries/token/TokenHelper.sol';
 
-import 'src/hooks/base/BaseTickBasedRemoveLiquidityHook.sol';
-import 'src/interfaces/pancakev4/ICLPositionManager.sol';
-import {PoolId, TickInfo} from 'src/interfaces/pancakev4/Types.sol';
-import 'src/libraries/uniswapv4/LiquidityAmounts.sol';
-import 'src/libraries/uniswapv4/TickMath.sol';
+import '../../interfaces/pancakev4/ICLPositionManager.sol';
+import {PoolId, TickInfo} from '../../interfaces/pancakev4/Types.sol';
+import '../../libraries/uniswapv4/LiquidityAmounts.sol';
+import '../../libraries/uniswapv4/TickMath.sol';
+import '../base/BaseTickBasedRemoveLiquidityHook.sol';
 
 contract KSRemoveLiquidityPancakeV4CLHook is BaseTickBasedRemoveLiquidityHook {
   using TokenHelper for address;

src/hooks/remove-liq/KSRemoveLiquidityPancakeV4CLHook.sol

@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.0;
 
-import 'ks-common-sc/src/libraries/token/TokenHelper.sol';
-import 'src/hooks/base/BaseTickBasedRemoveLiquidityHook.sol';
+import '../base/BaseTickBasedRemoveLiquidityHook.sol';
+
+import '../../interfaces/uniswapv3/IUniswapV3PM.sol';
+import '../../interfaces/uniswapv3/IUniswapV3Pool.sol';
+import '../../libraries/uniswapv4/LiquidityAmounts.sol';
+import '../../libraries/uniswapv4/TickMath.sol';
 
 import 'ks-common-sc/src/libraries/calldata/CalldataDecoder.sol';
-import 'src/interfaces/uniswapv3/IUniswapV3PM.sol';
-import 'src/interfaces/uniswapv3/IUniswapV3Pool.sol';
-import 'src/libraries/uniswapv4/LiquidityAmounts.sol';
-import 'src/libraries/uniswapv4/TickMath.sol';
+import 'ks-common-sc/src/libraries/token/TokenHelper.sol';
 
 contract KSRemoveLiquidityUniswapV3Hook is BaseTickBasedRemoveLiquidityHook {
   using TokenHelper for address;