Resolve conflicts; Semver bump; Changeset

.changeset/silly-mangos-shop.md

+---
+'@eth-optimism/contracts-bedrock': minor
+---
+
+Change the `relayMessage` reentrancy guard in the XDMs to be per-message.

packages/contracts-bedrock/.gas-snapshot

@@ -70,22 +70,23 @@ L1BlockNumberTest:test_getL1BlockNumber_succeeds() (gas: 10603)
 L1BlockNumberTest:test_receive_succeeds() (gas: 25340)
 L1CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 24781)
 L1CrossDomainMessenger_Test:test_pause_callerIsNotOwner_reverts() (gas: 24517)
-L1CrossDomainMessenger_Test:test_pause_succeeds() (gas: 52942)
-L1CrossDomainMessenger_Test:test_relayMessage_legacyOldReplay_reverts() (gas: 56574)
-L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailureThenSuccess_reverts() (gas: 212474)
-L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailure_succeeds() (gas: 203204)
-L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterSuccess_reverts() (gas: 126420)
-L1CrossDomainMessenger_Test:test_relayMessage_legacy_succeeds() (gas: 76600)
-L1CrossDomainMessenger_Test:test_relayMessage_paused_reverts() (gas: 60476)
-L1CrossDomainMessenger_Test:test_relayMessage_reentrancy_reverts() (gas: 190799)
-L1CrossDomainMessenger_Test:test_relayMessage_retryAfterFailure_succeeds() (gas: 197144)
-L1CrossDomainMessenger_Test:test_relayMessage_succeeds() (gas: 73558)
-L1CrossDomainMessenger_Test:test_relayMessage_toSystemContract_reverts() (gas: 65827)
-L1CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 19500)
-L1CrossDomainMessenger_Test:test_replayMessage_withValue_reverts() (gas: 38220)
+L1CrossDomainMessenger_Test:test_pause_succeeds() (gas: 52964)
+L1CrossDomainMessenger_Test:test_relayMessage_legacyOldReplay_reverts() (gas: 74749)
+L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailureThenSuccess_reverts() (gas: 232829)
+L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailure_succeeds() (gas: 205373)
+L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterSuccess_reverts() (gas: 145674)
+L1CrossDomainMessenger_Test:test_relayMessage_legacy_succeeds() (gas: 77679)
+L1CrossDomainMessenger_Test:test_relayMessage_paused_reverts() (gas: 78550)
+L1CrossDomainMessenger_Test:test_relayMessage_reentrancyDiffMessage_succeeds() (gas: 725841)
+L1CrossDomainMessenger_Test:test_relayMessage_reentrancySameMessage_reverts() (gas: 661391)
+L1CrossDomainMessenger_Test:test_relayMessage_retryAfterFailure_succeeds() (gas: 199464)
+L1CrossDomainMessenger_Test:test_relayMessage_succeeds() (gas: 74718)
+L1CrossDomainMessenger_Test:test_relayMessage_toSystemContract_reverts() (gas: 102318)
+L1CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 12562)
+L1CrossDomainMessenger_Test:test_replayMessage_withValue_reverts() (gas: 56477)
 L1CrossDomainMessenger_Test:test_sendMessage_succeeds() (gas: 299710)
 L1CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 1490566)
-L1CrossDomainMessenger_Test:test_unpause_callerIsNotOwner_reverts() (gas: 24516)
+L1CrossDomainMessenger_Test:test_unpause_callerIsNotOwner_reverts() (gas: 24538)
 L1CrossDomainMessenger_Test:test_unpause_succeeds() (gas: 45185)
 L1CrossDomainMessenger_Test:test_xDomainMessageSender_reset_succeeds() (gas: 85083)
 L1CrossDomainMessenger_Test:test_xDomainSender_notSet_reverts() (gas: 24274)
@@ -123,8 +124,8 @@ L1StandardBridge_FinalizeETHWithdrawal_Test:test_finalizeETHWithdrawal_succeeds(
 L1StandardBridge_Getter_Test:test_getters_succeeds() (gas: 32151)
 L1StandardBridge_Initialize_Test:test_initialize_succeeds() (gas: 22005)
 L1StandardBridge_Receive_Test:test_receive_succeeds() (gas: 520198)
-L2CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 8389)
-L2CrossDomainMessenger_Test:test_pause_notOwner_reverts() (gas: 10837)
+L2CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 8412)
+L2CrossDomainMessenger_Test:test_pause_notOwner_reverts() (gas: 10860)
 L2CrossDomainMessenger_Test:test_pause_succeeds() (gas: 31846)
 L2CrossDomainMessenger_Test:test_relayMessage_paused_reverts() (gas: 59603)
 L2CrossDomainMessenger_Test:test_relayMessage_reentrancyDiffMessage_succeeds() (gas: 686507)

packages/contracts-bedrock/contracts/L1/L1CrossDomainMessenger.sol

@@ -20,12 +20,12 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, Semver {
     OptimismPortal public immutable PORTAL;
 
     /**
-     * @custom:semver 1.0.0
+     * @custom:semver 1.1.0
      *
      * @param _portal Address of the OptimismPortal contract on this network.
      */
     constructor(OptimismPortal _portal)
-        Semver(1, 0, 0)
+        Semver(1, 1, 0)
         CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER)
     {
         PORTAL = _portal;

packages/contracts-bedrock/contracts/L2/L2CrossDomainMessenger.sol

@@ -17,12 +17,12 @@ import { L2ToL1MessagePasser } from "./L2ToL1MessagePasser.sol";
  */
 contract L2CrossDomainMessenger is CrossDomainMessenger, Semver {
     /**
-     * @custom:semver 1.0.0
+     * @custom:semver 1.1.0
      *
      * @param _l1CrossDomainMessenger Address of the L1CrossDomainMessenger contract.
      */
     constructor(address _l1CrossDomainMessenger)
-        Semver(1, 0, 0)
+        Semver(1, 1, 0)
         CrossDomainMessenger(_l1CrossDomainMessenger)
     {
         initialize();

packages/contracts-bedrock/contracts/test/L1CrossDomainMessenger.t.sol

@@ -362,7 +362,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
         vm.prank(address(op));
         vm.expectCall(target, callMessage);
         L1Messenger.relayMessage(
-            Encoding.encodeVersionedNonce(0, 1),
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
             sender,
             target,
             0,
@@ -380,7 +380,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
         caller.setPayload(
             abi.encodeWithSelector(
                 L1Messenger.relayMessage.selector,
-                Encoding.encodeVersionedNonce(0, 1),
+                Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
                 sender,
                 target,
                 0,
@@ -421,7 +421,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
         bytes memory messageB = hex"";
 
         bytes32 hashA = Hashing.hashCrossDomainMessage(
-            Encoding.encodeVersionedNonce(0, 1),
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
             sender,
             target,
             0,
@@ -429,7 +429,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
             messageA
         );
         bytes32 hashB = Hashing.hashCrossDomainMessage(
-            Encoding.encodeVersionedNonce(0, 1),
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
             sender,
             target,
             0,
@@ -445,7 +445,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
 
         vm.expectCall(target, messageA);
         L1Messenger.relayMessage(
-            Encoding.encodeVersionedNonce(0, 1),
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
             sender,
             target,
             0,
@@ -454,7 +454,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
         );
         vm.expectCall(target, messageB);
         L1Messenger.relayMessage(
-            Encoding.encodeVersionedNonce(0, 1),
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
             sender,
             target,
             0,
@@ -477,7 +477,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
         caller.setPayload(
             abi.encodeWithSelector(
                 L1Messenger.relayMessage.selector,
-                Encoding.encodeVersionedNonce(0, 1),
+                Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
                 sender,
                 target,
                 0,
@@ -492,7 +492,7 @@ contract L1CrossDomainMessenger_Test is Messenger_Initializer {
         vm.expectEmit(true, true, true, true, target);
         emit WhatHappened(true, hex"");
         L1Messenger.relayMessage(
-            Encoding.encodeVersionedNonce(0, 1),
+            Encoding.encodeVersionedNonce({ _nonce: 0, _version: 1 }),
             sender,
             target,
             0,