feat: add ZkEvmReceiver

src/ZkEvmReceiver.sol

@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+pragma solidity ^0.8.0;
+
+interface IZkEvmBridgeMessageReceiver {
+    function onMessageReceived(address originAddress, uint32 originNetwork, bytes calldata data) external payable;
+}
+
+/**
+ * @title ZkEvmReceiver
+ * @notice Receive messages to a zkevm chain
+ */
+abstract contract ZkEvmReceiver is IZkEvmBridgeMessageReceiver {
+    address public immutable l1Authority;
+    address constant bridge = 0x2a3DD3EB832aF982ec71669E178424b10Dca2EDe;
+
+    constructor(address _l1Authority) {
+        l1Authority = _l1Authority;
+    }
+
+    modifier onlySelf() {
+        require(msg.sender == address(this), "Receiver/invalid-sender");
+        _;
+    }
+
+    function onMessageReceived(address originAddress, uint32, /*originNetwork*/ bytes calldata data) external payable {
+        require(msg.sender == bridge, "Receiver/invalid-caller");
+        require(originAddress == l1Authority, "Receiver/invalid-l1Authority");
+        (bool success, bytes memory ret) = address(this).call(data);
+        if (!success) {
+            assembly {
+                revert(add(ret, 0x20), mload(ret))
+            }
+        }
+    }
+}

test/ZkEVMIntegration.t.sol

@@ -3,22 +3,20 @@ pragma solidity >=0.8.0;
 
 import "./IntegrationBase.t.sol";
 
-import { ZkEVMDomain, IBridgeMessageReceiver } from "../src/testing/ZkEVMDomain.sol";
-
-contract ZkevmMessageOrdering is MessageOrdering, IBridgeMessageReceiver {
-    function onMessageReceived(address /*originAddress*/, uint32 /*originNetwork*/, bytes memory data) external payable {
-        // call the specific method
-        (bool success, bytes memory ret) = address(this).call(data);
-        if (!success) {
-            assembly {
-                revert(add(ret, 0x20), mload(ret))
-            }
-        }
+import { ZkEVMDomain } from "../src/testing/ZkEVMDomain.sol";
+import { ZkEvmReceiver } from "../src/ZkEvmReceiver.sol";
+
+contract ZkevmMessageOrdering is MessageOrdering, ZkEvmReceiver {
+    constructor(address l1Authority) ZkEvmReceiver(l1Authority) {}
+
+    function push(uint256 messageId) public override onlySelf {
+        super.push(messageId);
     }
 
 }
 
 contract ZkEVMIntegrationTest is IntegrationBaseTest {
+    address l2Authority = makeAddr("l2Authority");
 
     function test_zkevm() public {
         setChain("zkevm", ChainData("ZkEVM", 1101, "https://zkevm-rpc.com"));
@@ -31,23 +29,27 @@ contract ZkEVMIntegrationTest is IntegrationBaseTest {
 
         host.selectFork();
 
-        ZkevmMessageOrdering moHost = new ZkevmMessageOrdering();
+        ZkevmMessageOrdering moHost = new ZkevmMessageOrdering(l2Authority);
 
         zkevm.selectFork();
 
-        ZkevmMessageOrdering moZkevm = new ZkevmMessageOrdering();
+        ZkevmMessageOrdering moZkevm = new ZkevmMessageOrdering(l1Authority);
 
+        vm.startPrank(l2Authority);
         // Queue up two more L2 -> L1 messages
         zkevm.L1_MESSENGER().bridgeMessage(0, address(moHost), true, abi.encodeCall(MessageOrdering.push, (3)));
         zkevm.L1_MESSENGER().bridgeMessage(0, address(moHost), true, abi.encodeCall(MessageOrdering.push, (4)));
+        vm.stopPrank();
 
         assertEq(moZkevm.length(), 0);
 
         host.selectFork();
 
+        vm.startPrank(l1Authority);
         // Queue up two more L1 -> L2 messages
         XChainForwarders.sendMessageZkEVM(address(moZkevm), abi.encodeCall(MessageOrdering.push, (1)));
         XChainForwarders.sendMessageZkEVM(address(moZkevm), abi.encodeCall(MessageOrdering.push, (2)));
+        vm.stopPrank();
 
         assertEq(moHost.length(), 0);
 
@@ -62,6 +64,19 @@ contract ZkEVMIntegrationTest is IntegrationBaseTest {
         assertEq(moHost.length(), 2);
         assertEq(moHost.messages(0), 3);
         assertEq(moHost.messages(1), 4);
+
+        // Validate the message receiver failure modes
+        vm.startPrank(notL1Authority);
+        XChainForwarders.sendMessageZkEVM(address(moZkevm), abi.encodeCall(MessageOrdering.push, (999)));
+        vm.stopPrank();
+
+        vm.expectRevert("Receiver/invalid-l1Authority");
+        zkevm.relayFromHost(true);
+        assertEq(moZkevm.length(), 2); // No change
+
+        zkevm.selectFork();
+        vm.expectRevert("Receiver/invalid-sender");
+        moZkevm.push(999);
     }
 
 }