@hyperlane-xyz/core 5.1.2 → 5.2.0

package/contracts/interfaces/IInterchainSecurityModule.sol

@@ -12,8 +12,8 @@ interface IInterchainSecurityModule {
         NULL, // used with relayer carrying no metadata
         CCIP_READ,
         ARB_L2_TO_L1,
-        WEIGHT_MERKLE_ROOT_MULTISIG,
-        WEIGHT_MESSAGE_ID_MULTISIG,
+        WEIGHTED_MERKLE_ROOT_MULTISIG,
+        WEIGHTED_MESSAGE_ID_MULTISIG,
         OP_L2_TO_L1
     }
 

package/contracts/isms/hook/ArbL2ToL1Ism.sol

@@ -61,11 +61,11 @@ contract ArbL2ToL1Ism is
         bytes calldata metadata,
         bytes calldata message
     ) external override returns (bool) {
-        bool verified = isVerified(message);
-        if (verified) {
-            releaseValueToRecipient(message);
+        if (!isVerified(message)) {
+            _verifyWithOutboxCall(metadata, message);
         }
-        return verified || _verifyWithOutboxCall(metadata, message);
+        releaseValueToRecipient(message);
+        return true;
     }
 
     // ============ Internal function ============
@@ -78,7 +78,7 @@ contract ArbL2ToL1Ism is
     function _verifyWithOutboxCall(
         bytes calldata metadata,
         bytes calldata message
-    ) internal returns (bool) {
+    ) internal {
         (
             bytes32[] memory proof,
             uint256 index,
@@ -87,6 +87,7 @@ contract ArbL2ToL1Ism is
             uint256 l2Block,
             uint256 l1Block,
             uint256 l2Timestamp,
+            uint256 value,
             bytes memory data
         ) = abi.decode(
                 metadata,
@@ -98,6 +99,7 @@ contract ArbL2ToL1Ism is
                     uint256,
                     uint256,
                     uint256,
+                    uint256,
                     bytes
                 )
             );
@@ -120,8 +122,6 @@ contract ArbL2ToL1Ism is
             convertedBytes == messageId,
             "ArbL2ToL1Ism: invalid message id"
         );
-
-        // value send to 0
         arbOutbox.executeTransaction(
             proof,
             index,
@@ -130,11 +130,9 @@ contract ArbL2ToL1Ism is
             l2Block,
             l1Block,
             l2Timestamp,
-            0,
+            value,
             data
         );
-        // the above bridge call will revert if the verifyMessageId call fails
-        return true;
     }
 
     /// @inheritdoc AbstractMessageIdAuthorizedIsm

package/contracts/isms/multisig/WeightedMultisigIsm.sol

@@ -39,7 +39,7 @@ contract StaticMerkleRootWeightedMultisigIsm is
     AbstractMetaProxyWeightedMultisigIsm
 {
     uint8 public constant moduleType =
-        uint8(IInterchainSecurityModule.Types.WEIGHT_MERKLE_ROOT_MULTISIG);
+        uint8(IInterchainSecurityModule.Types.WEIGHTED_MERKLE_ROOT_MULTISIG);
 }
 
 contract StaticMessageIdWeightedMultisigIsm is
@@ -47,7 +47,7 @@ contract StaticMessageIdWeightedMultisigIsm is
     AbstractMetaProxyWeightedMultisigIsm
 {
     uint8 public constant moduleType =
-        uint8(IInterchainSecurityModule.Types.WEIGHT_MESSAGE_ID_MULTISIG);
+        uint8(IInterchainSecurityModule.Types.WEIGHTED_MESSAGE_ID_MULTISIG);
 }
 
 contract StaticMerkleRootWeightedMultisigIsmFactory is

package/contracts/token/HypNative.sol

@@ -48,30 +48,6 @@ contract HypNative is TokenRouter {
         return _transferRemote(_destination, _recipient, _amount, _hookPayment);
     }
 
-    /**
-     * @inheritdoc TokenRouter
-     * @dev uses (`msg.value` - `_amount`) as hook payment.
-     */
-    function transferRemote(
-        uint32 _destination,
-        bytes32 _recipient,
-        uint256 _amount,
-        bytes calldata _hookMetadata,
-        address _hook
-    ) external payable virtual override returns (bytes32 messageId) {
-        require(msg.value >= _amount, "Native: amount exceeds msg.value");
-        uint256 _hookPayment = msg.value - _amount;
-        return
-            _transferRemote(
-                _destination,
-                _recipient,
-                _amount,
-                _hookPayment,
-                _hookMetadata,
-                _hook
-            );
-    }
-
     function balanceOf(
         address _account
     ) external view override returns (uint256) {

package/contracts/token/extensions/HypNativeScaled.sol

@@ -38,31 +38,6 @@ contract HypNativeScaled is HypNative {
             );
     }
 
-    /**
-     * @inheritdoc TokenRouter
-     * @dev uses (`msg.value` - `_amount`) as hook payment.
-     */
-    function transferRemote(
-        uint32 _destination,
-        bytes32 _recipient,
-        uint256 _amount,
-        bytes calldata _hookMetadata,
-        address _hook
-    ) external payable override returns (bytes32 messageId) {
-        require(msg.value >= _amount, "Native: amount exceeds msg.value");
-        uint256 _hookPayment = msg.value - _amount;
-        uint256 _scaledAmount = _amount / scale;
-        return
-            _transferRemote(
-                _destination,
-                _recipient,
-                _scaledAmount,
-                _hookPayment,
-                _hookMetadata,
-                _hook
-            );
-    }
-
     /**
      * @dev Sends scaled `_amount` (multiplied by `scale`) to `_recipient`.
      * @inheritdoc TokenRouter