revert

solidity/contracts/hooks/ArbL2ToL1Hook.sol

@@ -43,7 +43,7 @@
     // precompile contract on L2 for sending messages to L1
     ArbSys public immutable arbSys;
     // child hook to call first
     AbstractPostDispatchHook public immutable childHook;
 
     // ============ Constructor ============
 
@@ -52,7 +52,7 @@
         uint32 _destinationDomain,
         bytes32 _ism,
         address _arbSys,
         address _childHook
     ) AbstractMessageIdAuthHook(_mailbox, _destinationDomain, _ism) {
         arbSys = ArbSys(_arbSys);
         childHook = AbstractPostDispatchHook(_childHook);
@@ -81,11 +81,11 @@
     ) internal override {
         bytes memory payload = abi.encodeCall(
             AbstractMessageIdAuthorizedIsm.verifyMessageId,
-            (message.id(), metadata.msgValue(0))
+            message.id()
         );
 
         childHook.postDispatch{
             value: childHook.quoteDispatch(metadata, message)
         }(metadata, message);
         arbSys.sendTxToL1{value: metadata.msgValue(0)}(
             TypeCasts.bytes32ToAddress(ism),

solidity/contracts/hooks/OPL2ToL1Hook.sol

@@ -40,9 +40,9 @@
     // precompile contract on L2 for sending messages to L1
     ICrossDomainMessenger public immutable l2Messenger;
     // child hook to call first
     AbstractPostDispatchHook public immutable childHook;
     // Minimum gas limit that the message can be executed with - OP specific
     uint32 public constant MIN_GAS_LIMIT = 300_000;
 
     // ============ Constructor ============
 
@@ -51,7 +51,7 @@
         uint32 _destinationDomain,
         bytes32 _ism,
         address _l2Messenger,
         address _childHook
     ) AbstractMessageIdAuthHook(_mailbox, _destinationDomain, _ism) {
         l2Messenger = ICrossDomainMessenger(_l2Messenger);
         childHook = AbstractPostDispatchHook(_childHook);
@@ -80,11 +80,11 @@
     ) internal override {
         bytes memory payload = abi.encodeCall(
             AbstractMessageIdAuthorizedIsm.verifyMessageId,
-            (message.id(), metadata.msgValue(0))
+            message.id()
         );
 
         childHook.postDispatch{
             value: childHook.quoteDispatch(metadata, message)
         }(metadata, message);
         l2Messenger.sendMessage{value: metadata.msgValue(0)}(
             TypeCasts.bytes32ToAddress(ism),

solidity/contracts/hooks/OPStackHook.sol

@@ -75,7 +75,7 @@ contract OPStackHook is AbstractMessageIdAuthHook {
     ) internal override {
         bytes memory payload = abi.encodeCall(
             AbstractMessageIdAuthorizedIsm.verifyMessageId,
-            (message.id(), metadata.msgValue(0))
+            message.id()
         );
 
         l1Messenger.sendMessage{value: metadata.msgValue(0)}(

solidity/contracts/hooks/PolygonPosHook.sol

@@ -58,7 +58,7 @@ contract PolygonPosHook is AbstractMessageIdAuthHook, FxBaseRootTunnel {
 
     // ============ Internal functions ============
     function _quoteDispatch(
-        bytes calldata,
+        bytes calldata metadata,
         bytes calldata
     ) internal pure override returns (uint256) {
         return metadata.msgValue(0);
@@ -77,7 +77,7 @@ contract PolygonPosHook is AbstractMessageIdAuthHook, FxBaseRootTunnel {
 
         bytes memory payload = abi.encodeCall(
             AbstractMessageIdAuthorizedIsm.verifyMessageId,
-            (message.id(), metadata.msgValue(0))
+            message.id()
         );
         _sendMessageToChild(payload);
     }

solidity/contracts/hooks/aggregation/ERC5164Hook.sol

@@ -65,7 +65,7 @@ contract ERC5164Hook is AbstractMessageIdAuthHook {
 
         bytes memory payload = abi.encodeCall(
             AbstractMessageIdAuthorizedIsm.verifyMessageId,
-            (message.id(), 0)
+            message.id()
         );
         dispatcher.dispatchMessage(
             destinationDomain,

solidity/contracts/hooks/layer-zero/LayerZeroV2Hook.sol

@@ -60,7 +60,7 @@ contract LayerZeroV2Hook is AbstractMessageIdAuthHook {
     ) internal override {
         bytes memory payload = abi.encodeCall(
             AbstractMessageIdAuthorizedIsm.verifyMessageId,
-            (message.id(), metadata.msgValue(0))
+            message.id()
         );
 
         bytes calldata lZMetadata = metadata.getCustomMetadata();

solidity/contracts/isms/hook/AbstractMessageIdAuthorizedIsm.sol

@@ -52,7 +52,7 @@ abstract contract AbstractMessageIdAuthorizedIsm is
     // ============ Events ============
 
     /// @notice Emitted when a message is received from the external bridge
-    event ReceivedMessage(bytes32 indexed messageId, uint256 msgValue);
+    event ReceivedMessage(bytes32 indexed messageId);
 
     // ============ Initializer ============
 
@@ -114,21 +114,18 @@ abstract contract AbstractMessageIdAuthorizedIsm is
      * @dev Only callable by the authorized hook.
      * @param messageId Hyperlane Id of the message.
      */
-    function verifyMessageId(
-        bytes32 messageId,
-        uint256 msgValue
-    ) public payable virtual {
+    function verifyMessageId(bytes32 messageId) public payable virtual {
         require(
             _isAuthorized(),
             "AbstractMessageIdAuthorizedIsm: sender is not the hook"
         );
         require(
-            msg.value < 2 ** VERIFIED_MASK_INDEX && msg.value == msgValue,
+            msg.value < 2 ** VERIFIED_MASK_INDEX,
             "AbstractMessageIdAuthorizedIsm: msg.value must be less than 2^255"
         );
 
         verifiedMessages[messageId] = msg.value.setBit(VERIFIED_MASK_INDEX);
-        emit ReceivedMessage(messageId, msgValue);
+        emit ReceivedMessage(messageId);
     }
 
     // ============ Internal Functions ============

solidity/test/isms/ERC5164ISM.t.sol

@@ -150,8 +150,6 @@ contract ERC5164IsmTest is ExternalBridgeTest {
 
     function test_verify_valueAlreadyClaimed(uint256) public override {}
 
-    function test_verify_override_msgValue() public override {}
-
     function testFuzz_postDispatch_refundsExtraValue(uint256) public override {}
 
     /* ============ helper functions ============ */

solidity/test/isms/ExternalBridgeTest.sol

@@ -250,16 +250,6 @@ abstract contract ExternalBridgeTest is Test {
         assertEq(address(testRecipient).balance, _msgValue);
     }
 
-    function test_verify_override_msgValue() public virtual {
-        bytes memory encodedHookData = _encodeHookData(messageId);
-
-        _externalBridgeDestinationCall(encodedHookData, MSG_VALUE);
-        _externalBridgeDestinationCall(encodedHookData, 0);
-
-        assertTrue(ism.verify(new bytes(0), encodedMessage));
-        assertEq(address(testRecipient).balance, MSG_VALUE);
-    }
-
     /* ============ helper functions ============ */
 
     function _encodeTestMessage() internal view returns (bytes memory) {