Merge branch 'main' into kunal/verify-message-id

solidity/test/isms/ERC5164ISM.t.sol

@@ -134,7 +134,7 @@ contract ERC5164IsmTest is ExternalBridgeTest {
         vm.expectRevert(
             "AbstractMessageIdAuthorizedIsm: sender is not the hook"
         );
-        ism.verifyMessageId(messageId, 0);
+        ism.verifyMessageId(messageId);
         assertFalse(ism.isVerified(encodedMessage));
     }
 
@@ -157,7 +157,7 @@ contract ERC5164IsmTest is ExternalBridgeTest {
         uint256 _msgValue
     ) internal override {
         vm.prank(address(executor));
-        ism.verifyMessageId(messageId, _msgValue);
+        ism.verifyMessageId(messageId);
     }
 
     function _encodeExternalDestinationBridgeCall(
@@ -168,7 +168,7 @@ contract ERC5164IsmTest is ExternalBridgeTest {
     ) internal override returns (bytes memory) {
         if (_from == address(hook)) {
             vm.prank(address(executor));
-            ism.verifyMessageId{value: _msgValue}(messageId, _msgValue);
+            ism.verifyMessageId{value: _msgValue}(messageId);
         }
     }
 }

solidity/test/isms/ExternalBridgeTest.sol

@@ -50,7 +50,7 @@ abstract contract ExternalBridgeTest is Test {
     /* ============ Hook.postDispatch ============ */
 
     function test_postDispatch() public {
-        bytes memory encodedHookData = _encodeHookData(messageId, 0);
+        bytes memory encodedHookData = _encodeHookData(messageId);
         originMailbox.updateLatestDispatchedId(messageId);
         _expectOriginExternalBridgeCall(encodedHookData);
 
@@ -93,7 +93,10 @@ abstract contract ExternalBridgeTest is Test {
     /* ============ ISM.verifyMessageId ============ */
 
     function test_verifyMessageId_asyncCall() public {
-        bytes memory encodedHookData = _encodeHookData(messageId, 0);
+        bytes memory encodedHookData = abi.encodeCall(
+            AbstractMessageIdAuthorizedIsm.verifyMessageId,
+            (messageId)
+        );
         _externalBridgeDestinationCall(encodedHookData, 0);
 
         assertTrue(ism.isVerified(encodedMessage));
@@ -119,7 +122,7 @@ abstract contract ExternalBridgeTest is Test {
     }
 
     function test_verify_msgValue_asyncCall() public virtual {
-        bytes memory encodedHookData = _encodeHookData(messageId, MSG_VALUE);
+        bytes memory encodedHookData = _encodeHookData(messageId);
         _externalBridgeDestinationCall(encodedHookData, MSG_VALUE);
 
         assertTrue(ism.verify(new bytes(0), encodedMessage));
@@ -176,7 +179,7 @@ abstract contract ExternalBridgeTest is Test {
         bytes memory externalCalldata = _encodeExternalDestinationBridgeCall(
             address(hook),
             address(ism),
-            MSG_VALUE,
+            0,
             incorrectMessageId
         );
 
@@ -187,21 +190,17 @@ abstract contract ExternalBridgeTest is Test {
         // async call - native bridges might have try catch block to prevent revert
         try
             this.externalBridgeDestinationCallWrapper(
-                _encodeHookData(incorrectMessageId, MSG_VALUE),
+                _encodeHookData(incorrectMessageId),
                 0
             )
         {} catch {}
         assertFalse(ism.isVerified(testMessage));
-        assertEq(address(testRecipient).balance, 0);
     }
 
     /// forge-config: default.fuzz.runs = 10
     function test_verify_valueAlreadyClaimed(uint256 _msgValue) public virtual {
         _msgValue = bound(_msgValue, 0, MAX_MSG_VALUE);
-        _externalBridgeDestinationCall(
-            _encodeHookData(messageId, _msgValue),
-            _msgValue
-        );
+        _externalBridgeDestinationCall(_encodeHookData(messageId), _msgValue);
 
         bool verified = ism.verify(new bytes(0), encodedMessage);
         assertTrue(verified);
@@ -263,13 +262,12 @@ abstract contract ExternalBridgeTest is Test {
     }
 
     function _encodeHookData(
-        bytes32 _messageId,
-        uint256 _msgValue
+        bytes32 _messageId
     ) internal pure returns (bytes memory) {
         return
             abi.encodeCall(
                 AbstractMessageIdAuthorizedIsm.verifyMessageId,
-                (_messageId, _msgValue)
+                (_messageId)
             );
     }
 

solidity/test/isms/OPL2ToL1Ism.t.sol

@@ -126,7 +126,7 @@ contract OPL2ToL1IsmTest is ExternalBridgeTest {
         uint256 _value,
         bytes32 _messageId
     ) internal view returns (bytes memory) {
-        bytes memory encodedHookData = _encodeHookData(_messageId, _value);
+        bytes memory encodedHookData = _encodeHookData(_messageId);
 
         return
             abi.encodeCall(

solidity/test/isms/OPStackIsm.t.sol

@@ -99,12 +99,8 @@ contract OPStackIsmTest is ExternalBridgeTest {
     function test_verify_revertsWhen_incorrectMessageId() public override {
         bytes32 incorrectMessageId = keccak256("incorrect message id");
 
-        _externalBridgeDestinationCall(
-            _encodeHookData(incorrectMessageId, MSG_VALUE),
-            0
-        );
+        _externalBridgeDestinationCall(_encodeHookData(incorrectMessageId), 0);
         assertFalse(ism.isVerified(testMessage));
-        assertEq(address(testRecipient).balance, 0);
     }
 
     /* ============ helper functions ============ */
@@ -157,7 +153,7 @@ contract OPStackIsmTest is ExternalBridgeTest {
     function test_verify_revertsWhen_notAuthorizedHook() public override {
         // needs to be called by the canonical messenger on Optimism
         vm.expectRevert(NotCrossChainCall.selector);
-        ism.verifyMessageId(messageId, 0);
+        ism.verifyMessageId(messageId);
 
         vm.startPrank(L2_MESSENGER_ADDRESS);
         _setExternalOriginSender(address(this));
@@ -166,7 +162,7 @@ contract OPStackIsmTest is ExternalBridgeTest {
         vm.expectRevert(
             "AbstractMessageIdAuthorizedIsm: sender is not the hook"
         );
-        ism.verifyMessageId(messageId, 0);
+        ism.verifyMessageId(messageId);
     }
 
     function _setExternalOriginSender(
@@ -184,10 +180,7 @@ contract OPStackIsmTest is ExternalBridgeTest {
         vm.expectRevert(
             "AbstractMessageIdAuthorizedIsm: msg.value must be less than 2^255"
         );
-        _externalBridgeDestinationCall(
-            _encodeHookData(messageId, _msgValue),
-            _msgValue
-        );
+        _externalBridgeDestinationCall(_encodeHookData(messageId), _msgValue);
 
         assertFalse(ism.isVerified(encodedMessage));