Move variable length types to end when ABI encoding packed

MultiMessageAggregation · Sep 21, 2023 · 3c2f4e3 · 3c2f4e3
1 parent 6dcff66
commit 3c2f4e3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/controllers/GovernanceTimelock.sol b/src/controllers/GovernanceTimelock.sol
@@ -81,7 +81,7 @@ contract GovernanceTimelock is IGovernanceTimelock {
         ++txCounter;
         uint256 eta = block.timestamp + delay;
 
-        scheduledTransaction[txCounter] = keccak256(abi.encodePacked(_target, _value, _data, eta));
+        scheduledTransaction[txCounter] = keccak256(abi.encodePacked(_target, _value, eta, _data));
         emit TransactionScheduled(txCounter, _target, _value, _data, eta);
     }
 
@@ -102,7 +102,7 @@ contract GovernanceTimelock is IGovernanceTimelock {
         }
 
         /// @dev check the input params against hash
-        if (scheduledTransaction[_txId] != keccak256(abi.encodePacked(_target, _value, _data, _eta))) {
+        if (scheduledTransaction[_txId] != keccak256(abi.encodePacked(_target, _value, _eta, _data))) {
             revert Error.INVALID_TX_INPUT();
         }
 

diff --git a/src/libraries/Message.sol b/src/libraries/Message.sol
@@ -31,9 +31,9 @@ library MessageLibrary {
                 _message.dstChainId,
                 _message.nonce,
                 _message.target,
-                _message.callData,
                 _message.nativeValue,
-                _message.expiration
+                _message.expiration,
+                _message.callData
             )
         );
     }

diff --git a/test/unit-tests/GovernanceTimelock.t.sol b/test/unit-tests/GovernanceTimelock.t.sol
@@ -56,7 +56,7 @@ contract GovernanceTimelockTest is Setup {
 
         assertEq(timelock.txCounter(), 1);
         assertEq(
-            timelock.scheduledTransaction(1), keccak256(abi.encodePacked(address(42), uint256(1), bytes("42"), eta))
+            timelock.scheduledTransaction(1), keccak256(abi.encodePacked(address(42), uint256(1), eta, bytes("42")))
         );
     }