@hyperlane-xyz/core 5.4.0-beta.0 → 5.4.1

package/contracts/PackageVersioned.sol

@@ -7,5 +7,5 @@ pragma solidity >=0.6.11;
  **/
 abstract contract PackageVersioned {
     // GENERATED CODE - DO NOT EDIT
-    string public constant PACKAGE_VERSION = "5.4.0-beta.0";
+    string public constant PACKAGE_VERSION = "5.4.1";
 }

package/contracts/isms/warp-route/RateLimitedIsm.sol

@@ -16,6 +16,8 @@ contract RateLimitedIsm is
     using Message for bytes;
     using TokenMessage for bytes;
 
+    address public immutable recipient;
+
     mapping(bytes32 messageId => bool validated) public messageValidated;
 
     modifier validateMessageOnce(bytes calldata _message) {
@@ -25,14 +27,22 @@ contract RateLimitedIsm is
         _;
     }
 
+    modifier onlyRecipient(bytes calldata _message) {
+        require(_message.recipientAddress() == recipient, "InvalidRecipient");
+        _;
+    }
+
     constructor(
         address _mailbox,
-        uint256 _maxCapacity
-    ) MailboxClient(_mailbox) RateLimited(_maxCapacity) {}
+        uint256 _maxCapacity,
+        address _recipient
+    ) MailboxClient(_mailbox) RateLimited(_maxCapacity) {
+        recipient = _recipient;
+    }
 
     /// @inheritdoc IInterchainSecurityModule
     function moduleType() external pure returns (uint8) {
-        return uint8(IInterchainSecurityModule.Types.UNUSED);
+        return uint8(IInterchainSecurityModule.Types.NULL);
     }
 
     /**
@@ -42,7 +52,12 @@ contract RateLimitedIsm is
     function verify(
         bytes calldata,
         bytes calldata _message
-    ) external validateMessageOnce(_message) returns (bool) {
+    )
+        external
+        onlyRecipient(_message)
+        validateMessageOnce(_message)
+        returns (bool)
+    {
         require(_isDelivered(_message.id()), "InvalidDeliveredMessage");
 
         uint256 newAmount = _message.body().amount();

package/contracts/middleware/InterchainAccountRouter.sol

@@ -307,7 +307,7 @@ contract InterchainAccountRouter is Router {
             _sender,
             _ism.bytes32ToAddress()
         );
-        _interchainAccount.multicall(_calls);
+        _interchainAccount.multicall{value: msg.value}(_calls);
     }
 
     /**

package/contracts/middleware/libs/OwnableMulticall.sol

@@ -20,7 +20,9 @@ contract OwnableMulticall {
         _;
     }
 
-    function multicall(CallLib.Call[] calldata calls) external onlyOwner {
+    function multicall(
+        CallLib.Call[] calldata calls
+    ) external payable onlyOwner {
         return CallLib.multicall(calls);
     }
 

package/contracts/mock/MockHyperlaneEnvironment.sol

@@ -38,8 +38,10 @@ contract MockHyperlaneEnvironment {
         mailboxes[_destinationDomain] = destinationMailbox;
     }
 
-    function processNextPendingMessage() public {
-        mailboxes[destinationDomain].processNextInboundMessage();
+    function processNextPendingMessage() public payable {
+        mailboxes[destinationDomain].processNextInboundMessage{
+            value: msg.value
+        }();
     }
 
     function processNextPendingMessageFromDestination() public {

package/contracts/mock/MockMailbox.sol

@@ -72,9 +72,9 @@ contract MockMailbox is Mailbox {
         inboundUnprocessedNonce++;
     }
 
-    function processNextInboundMessage() public {
+    function processNextInboundMessage() public payable {
         bytes memory _message = inboundMessages[inboundProcessedNonce];
-        Mailbox(address(this)).process("", _message);
+        Mailbox(address(this)).process{value: msg.value}("", _message);
         inboundProcessedNonce++;
     }
 }