[cantina finding #7] enhanced logs

contracts/ccip/GovernanceCCIPReceiver.sol

@@ -32,6 +32,8 @@ contract GovernanceCCIPReceiver is IGovernanceCCIPReceiver, CCIPReceiver {
     internal
     override
   {
+    bytes32 messageId = message.messageId;
+
     // Validate chain selector
     require(
       message.sourceChainSelector == mainnetChainSelector,
@@ -54,6 +56,6 @@ contract GovernanceCCIPReceiver is IGovernanceCCIPReceiver, CCIPReceiver {
     (bool success, ) = target.call(payload);
     require(success, MessageCallFailed());
 
-    emit MessageExecuted(target, payload);
+    emit MessageExecuted(messageId, target, payload);
   }
 }

contracts/ccip/GovernanceCCIPRelay.sol

@@ -143,6 +143,6 @@ contract GovernanceCCIPRelay is IGovernanceCCIPRelay {
       require(success, FailedToRefundEth());
     }
 
-    emit MessageRelayed(target, payload);
+    emit MessageRelayed(messageId, target, payload);
   }
 }

contracts/ccip/interfaces/IGovernanceCCIPReceiver.sol

@@ -9,12 +9,17 @@ import {Client} from "@chainlink/contracts-ccip/src/v0.8/ccip/libraries/Client.s
  */
 interface IGovernanceCCIPReceiver {
   /// @notice Emitted when a message is successfully executed.
+  /// @param messageId The ccip message id.
   /// @param target The target address on the destination chain.
   /// @param payload The payload of the message.
-  event MessageExecuted(address indexed target, bytes payload);
-
-	/// @dev Error thrown when a provided address is the zero address.
-	error AddressCannotBeZero();
+  event MessageExecuted(
+    bytes32 indexed messageId,
+    address indexed target,
+    bytes payload
+  );
+
+  /// @dev Error thrown when a provided address is the zero address.
+  error AddressCannotBeZero();
 
   /// @dev Error thrown when an unauthorized caller tries to execute a restricted function.
   /// @param caller The address of the unauthorized caller.

contracts/ccip/interfaces/IGovernanceCCIPRelay.sol

@@ -9,20 +9,25 @@ import {IRouterClient} from "@chainlink/contracts-ccip/src/v0.8/ccip/interfaces/
  */
 interface IGovernanceCCIPRelay {
   /// @notice Emitted when a governance message is relayed.
+  /// @param messageId The ccip message id.
   /// @param target The target address of the execution.
   /// @param payload The calldata payload executed.
-  event MessageRelayed(address indexed target, bytes payload);
+  event MessageRelayed(
+    bytes32 indexed messageId,
+    address indexed target,
+    bytes payload
+  );
 
   /// @notice Emitted when a new destination chain is added.
   /// @param chainSelector The CCIP chain selector of the destination chain.
   /// @param receiver The address of the receiver contract on the destination chain.
   event DestinationChainAdded(uint64 indexed chainSelector, address receiver);
 
-	/// @dev Error thrown when a provided address is the zero address.
-	error AddressCannotBeZero();
+  /// @dev Error thrown when a provided address is the zero address.
+  error AddressCannotBeZero();
 
-	/// @dev Error thrown when payload is empty.
-	error PayloadCannotBeEmpty();
+  /// @dev Error thrown when payload is empty.
+  error PayloadCannotBeEmpty();
 
   /// @dev Error thrown when an unauthorized caller tries to execute a restricted function.
   error Unauthorized(address caller);

test/ccip/GovernanceCCIPIntegrationTest.t.sol

@@ -227,18 +227,16 @@ contract GovernanceCCIPIntegrationTest is Test {
 
     // Send the message via GovernanceRelay
     vm.deal(address(timelock), fee); // Fund the contract with enough Ether
-    vm.expectEmit(true, true, true, true);
-    emit IGovernanceCCIPRelay.MessageRelayed(target, payload);
     vm.prank(address(timelock));
-    governanceRelay.relayMessage{value: fee}(
+    bytes32 messageId = governanceRelay.relayMessage{value: fee}(
       polygonMainnetChainSelector,
       target,
       payload
     );
 
     // Route the message to Polygon
     vm.expectEmit(true, true, true, true);
-    emit IGovernanceCCIPReceiver.MessageExecuted(target, payload);
+    emit IGovernanceCCIPReceiver.MessageExecuted(messageId, target, payload);
     ccipLocalSimulatorFork.switchChainAndRouteMessage(polygonMainnetForkId);
 
     // Verify the message was received and executed on Polygon
@@ -275,17 +273,15 @@ contract GovernanceCCIPIntegrationTest is Test {
       abi.encode(fee)
     );
     vm.deal(address(timelock), fee);
-    vm.expectEmit(true, true, true, true);
-    emit IGovernanceCCIPRelay.MessageRelayed(target, payload);
     vm.prank(address(timelock));
-    governanceRelay.relayMessage{value: fee}(
+    bytes32 messageId = governanceRelay.relayMessage{value: fee}(
       polygonMainnetChainSelector,
       target,
       payload
     );
 
     vm.expectEmit(true, true, true, true);
-    emit IGovernanceCCIPReceiver.MessageExecuted(target, payload);
+    emit IGovernanceCCIPReceiver.MessageExecuted(messageId, target, payload);
     ccipLocalSimulatorFork.switchChainAndRouteMessage(polygonMainnetForkId);
 
     vm.selectFork(polygonMainnetForkId);

test/ccip/GovernanceCCIPReceiverTest.t.sol

@@ -161,6 +161,7 @@ contract GovernanceCCIPReceiverTest is Test {
     vm.prank(ccipRouter);
     vm.expectEmit(true, true, true, true);
     emit IGovernanceCCIPReceiver.MessageExecuted(
+      bytes32(""),
       address(numberUpdater),
       payload
     );

test/ccip/GovernanceCCIPRelayTest.t.sol

@@ -172,7 +172,7 @@ contract GovernanceCCIPRelayTest is Test {
 
     vm.prank(timelock);
     vm.expectEmit(true, true, true, true);
-    emit IGovernanceCCIPRelay.MessageRelayed(target, payload);
+    emit IGovernanceCCIPRelay.MessageRelayed(bytes32(""), target, payload);
     relay.relayMessage{value: fee}(destinationChainSelector, target, payload);
   }