fix: use entire message when calculating relay hash for evm chains (#867)

* fix: hash entire message when calculating relay hash for evm chains

Signed-off-by: bennett <bennett@umaproject.org>

* make getV3RelayHash public

Signed-off-by: bennett <bennett@umaproject.org>

* update fixture with relay hash change

Signed-off-by: bennett <bennett@umaproject.org>

---------

Signed-off-by: bennett <bennett@umaproject.org>

Author: bmzig

contracts/SpokePool.sol

@@ -976,7 +976,7 @@ abstract contract SpokePool is
 
         V3RelayExecutionParams memory relayExecution = V3RelayExecutionParams({
             relay: relayData,
-            relayHash: _getV3RelayHash(relayData),
+            relayHash: getV3RelayHash(relayData),
             updatedOutputAmount: relayData.outputAmount,
             updatedRecipient: relayData.recipient,
             updatedMessage: relayData.message,
@@ -1046,7 +1046,7 @@ abstract contract SpokePool is
 
         V3RelayExecutionParams memory relayExecution = V3RelayExecutionParams({
             relay: relayData,
-            relayHash: _getV3RelayHash(relayData),
+            relayHash: getV3RelayHash(relayData),
             updatedOutputAmount: updatedOutputAmount,
             updatedRecipient: updatedRecipient,
             updatedMessage: updatedMessage,
@@ -1093,7 +1093,7 @@ abstract contract SpokePool is
         }
         if (relayData.fillDeadline < currentTime) revert ExpiredFillDeadline();
 
-        bytes32 relayHash = _getV3RelayHash(relayData);
+        bytes32 relayHash = getV3RelayHash(relayData);
         if (fillStatuses[relayHash] != uint256(FillStatus.Unfilled)) revert InvalidSlowFillRequest();
         fillStatuses[relayHash] = uint256(FillStatus.RequestedSlowFill);
 
@@ -1182,7 +1182,7 @@ abstract contract SpokePool is
         // deposit params like outputAmount, message and recipient.
         V3RelayExecutionParams memory relayExecution = V3RelayExecutionParams({
             relay: relayData,
-            relayHash: _getV3RelayHash(relayData),
+            relayHash: getV3RelayHash(relayData),
             updatedOutputAmount: slowFillLeaf.updatedOutputAmount,
             updatedRecipient: relayData.recipient,
             updatedMessage: relayData.message,
@@ -1302,6 +1302,10 @@ abstract contract SpokePool is
         return relayerRefund[l2TokenAddress][refundAddress];
     }
 
+    function getV3RelayHash(V3RelayData memory relayData) public view returns (bytes32) {
+        return keccak256(abi.encode(relayData, chainId()));
+    }
+
     /**************************************
      *         INTERNAL FUNCTIONS         *
      **************************************/
@@ -1627,27 +1631,6 @@ abstract contract SpokePool is
         return (amount * uint256(int256(1e18) - feesPct)) / 1e18;
     }
 
-    function _getV3RelayHash(V3RelayData memory relayData) private view returns (bytes32) {
-        return
-            keccak256(
-                abi.encode(
-                    relayData.depositor,
-                    relayData.recipient,
-                    relayData.exclusiveRelayer,
-                    relayData.inputToken,
-                    relayData.outputToken,
-                    relayData.inputAmount,
-                    relayData.outputAmount,
-                    relayData.originChainId,
-                    relayData.depositId,
-                    relayData.fillDeadline,
-                    relayData.exclusivityDeadline,
-                    _hashNonEmptyMessage(relayData.message),
-                    chainId()
-                )
-            );
-    }
-
     // Unwraps ETH and does a transfer to a recipient address. If the recipient is a smart contract then sends wrappedNativeToken.
     function _unwrapwrappedNativeTokenTo(address payable to, uint256 amount) internal {
         if (address(to).isContract()) {

test/evm/hardhat/fixtures/SpokePool.Fixture.ts

@@ -180,39 +180,13 @@ export function getRelayHash(
 }
 
 export function getV3RelayHash(relayData: V3RelayData, destinationChainId: number): string {
-  const messageHash = relayData.message == "0x" ? ethers.constants.HashZero : ethers.utils.keccak256(relayData.message);
   return ethers.utils.keccak256(
     defaultAbiCoder.encode(
       [
-        "bytes32", // depositor
-        "bytes32", // recipient
-        "bytes32", // exclusiveRelayer
-        "bytes32", // inputToken
-        "bytes32", // outputToken
-        "uint256", // inputAmount
-        "uint256", // outputAmount
-        "uint256", // originChainId
-        "uint256", // depositId
-        "uint32", // fillDeadline
-        "uint32", // exclusivityDeadline
-        "bytes32", // messageHash
-        "uint256", // destinationChainId
+        "tuple(bytes32 depositor, bytes32 recipient, bytes32 exclusiveRelayer, bytes32 inputToken, bytes32 outputToken, uint256 inputAmount, uint256 outputAmount, uint256 originChainId, uint256 depositId, uint32 fillDeadline, uint32 exclusivityDeadline, bytes message)",
+        "uint256 destinationChainId",
       ],
-      [
-        relayData.depositor,
-        relayData.recipient,
-        relayData.exclusiveRelayer,
-        relayData.inputToken,
-        relayData.outputToken,
-        relayData.inputAmount,
-        relayData.outputAmount,
-        relayData.originChainId,
-        relayData.depositId,
-        relayData.fillDeadline,
-        relayData.exclusivityDeadline,
-        messageHash,
-        destinationChainId,
-      ]
+      [relayData, destinationChainId]
     )
   );
 }