Skip to content

improve tests L2CrossDomainMessenger_Test #12934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smartcontracts merged 5 commits into from
Nov 19, 2024
Merged

improve tests L2CrossDomainMessenger_Test #12934

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
694c6b4
improve tests
AmadiMichael Nov 15, 2024
8d4c4b1
fixes
AmadiMichael Nov 15, 2024
4f52eb5
fixes...
AmadiMichael Nov 15, 2024
1bad60f
Apply suggestions from code review
AmadiMichael Nov 18, 2024
6311054
fixes
AmadiMichael Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 81 additions & 4 deletions packages/contracts-bedrock/test/L2/L2CrossDomainMessenger.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ pragma solidity 0.8.15;
import { CommonTest } from "test/setup/CommonTest.sol";
import { Reverter } from "test/mocks/Callers.sol";
import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
import { stdError } from "forge-std/StdError.sol";

// Libraries
import { Hashing } from "src/libraries/Hashing.sol";
Expand Down Expand Up @@ -148,17 +149,93 @@ contract L2CrossDomainMessenger_Test is CommonTest {
assertEq(l2CrossDomainMessenger.failedMessages(hash), false);
}

/// @dev Tests that `relayMessage` reverts if attempting to relay
/// a message sent to an L1 system contract.
/// @dev Tests that relayMessage reverts if the value sent does not match the amount
function test_relayMessage_valueDoesNotMatchAmount_reverts() external {
Comment thread
AmadiMichael marked this conversation as resolved.
Outdated
// set the target to be the alice
Comment thread
AmadiMichael marked this conversation as resolved.
Outdated
address target = alice;
address sender = address(l1CrossDomainMessenger);
address caller = AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger));
bytes memory message = hex"1111";

// cannot send a message where the amount inputted does not match the msg.value
vm.deal(caller, 10 ether);
Comment thread
smartcontracts marked this conversation as resolved.
vm.prank(caller);
vm.expectRevert(stdError.assertionError);
Comment thread
smartcontracts marked this conversation as resolved.
l2CrossDomainMessenger.relayMessage{ value: 10 ether }(
Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 9 ether, 0, message
);
}

/// @dev Tests that relayMessage reverts if a failed message is attempted to be replayed and the caller is the other
/// messenger
function test_relayMessage_failedMessageReplay_reverts() external {
Comment thread
AmadiMichael marked this conversation as resolved.
Outdated
// set the target to be the alice
Comment thread
smartcontracts marked this conversation as resolved.
Outdated
address target = alice;
address sender = address(l1CrossDomainMessenger);
address caller = AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger));
bytes memory message = hex"1111";

// make a failed message
vm.etch(target, hex"fe");
vm.prank(caller);
l2CrossDomainMessenger.relayMessage(
Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 0, 0, message
);

// cannot replay messages when the caller is the other messenger
vm.prank(caller);
vm.expectRevert(stdError.assertionError);
l2CrossDomainMessenger.relayMessage(
Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 0, 0, message
);
}

/// @dev Tests that relayMessage reverts if attempting to relay a message
/// sent to an L1 system contract.
function test_relayMessage_toSystemContract_reverts() external {
Comment thread
smartcontracts marked this conversation as resolved.
Outdated
address target = address(l2ToL1MessagePasser);
address sender = address(l1CrossDomainMessenger);
address caller = AddressAliasHelper.applyL1ToL2Alias(address(l1CrossDomainMessenger));
bytes memory message = hex"1111";

vm.store(address(optimismPortal), bytes32(0), bytes32(abi.encode(sender)));

vm.prank(caller);
vm.expectRevert("CrossDomainMessenger: cannot send message to blocked system address");
l2CrossDomainMessenger.relayMessage(
Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
sender,
address(l2CrossDomainMessenger),
0,
0,
message
);

vm.prank(caller);
vm.expectRevert("CrossDomainMessenger: cannot send message to blocked system address");
l2CrossDomainMessenger.relayMessage(
Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
sender,
address(l2ToL1MessagePasser),
0,
0,
message
);
}

/// @dev Tests that the relayMessage function reverts if the message called by non-optimismPortal but not a failed
/// message
function test_relayMessage_nonFailedMessageCalledByNonOtherMessenger_reverts() external {
Comment thread
AmadiMichael marked this conversation as resolved.
Outdated
address target = address(alice);
address sender = address(l1CrossDomainMessenger);
bytes memory message = hex"1111";

vm.store(address(optimismPortal), bytes32(0), bytes32(abi.encode(sender)));

vm.prank(bob);
vm.expectRevert("CrossDomainMessenger: message cannot be replayed");
l1CrossDomainMessenger.relayMessage(Encoding.encodeVersionedNonce(0, 1), sender, target, 0, 0, message);
l2CrossDomainMessenger.relayMessage(
Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }), sender, target, 0, 0, message
);
}

/// @dev Tests that `relayMessage` correctly resets the `xDomainMessageSender`
Expand Down