Merge pull request #38 from KyberNetwork/fix-action-data-hash

fix: ActionData type hash

Author: qcuong98

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
           submodules: recursive
 
       - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+        uses: KyberNetwork/foundry-toolchain@master
         with:
           version: v1.3.0
 

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
           submodules: recursive
 
       - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+        uses: KyberNetwork/foundry-toolchain@master
         with:
           version: v1.3.0
 

src/types/ActionData.sol

@@ -42,7 +42,7 @@ using ActionDataLibrary for ActionData global;
 library ActionDataLibrary {
   bytes32 constant ACTION_DATA_TYPE_HASH = keccak256(
     abi.encodePacked(
-      'ActionData(uint256[] erc20Ids,uint256[] erc20Amounts,uint256[] erc721Ids,uint256 approvalFlags,uint256 actionSelectorId,bytes actionCalldata,bytes hookActionData,bytes extraData,uint256 deadline,uint256 nonce)'
+      'ActionData(uint256[] erc20Ids,uint256[] erc20Amounts,uint256[] erc721Ids,uint256 feeInfo,address partnerRecipient,uint256 approvalFlags,uint256 actionSelectorId,bytes actionCalldata,bytes hookActionData,bytes extraData,uint256 deadline,uint256 nonce)'
     )
   );
 
@@ -53,6 +53,8 @@ library ActionDataLibrary {
         keccak256(abi.encodePacked(self.erc20Ids)),
         keccak256(abi.encodePacked(self.erc20Amounts)),
         keccak256(abi.encodePacked(self.erc721Ids)),
+        self.feeInfo,
+        self.partnerRecipient,
         self.approvalFlags,
         self.actionSelectorId,
         keccak256(self.actionCalldata),