fix: move payload id to digest map

Author: ameeshaagrawal

contracts/protocol/Socket.sol

@@ -17,9 +17,6 @@ contract Socket is SocketUtils {
     /// @notice Mapping of payload id to execution status (Executed/Reverted)
     mapping(bytes32 => ExecutionStatus) public executionStatus;
 
-    /// @notice Mapping of payload id to its digest for verification
-    mapping(bytes32 => bytes32) public payloadIdToDigest;
-
     // --- Constructor ---
 
     /**
@@ -95,8 +92,6 @@ contract Socket is SocketUtils {
         );
 
         bytes32 digest = _createDigest(transmitter, executionParams_);
-        payloadIdToDigest[executionParams_.payloadId] = digest;
-
         if (
             !ISwitchboard(switchboardAddress).allowPayload(
                 digest,

contracts/protocol/interfaces/ISocket.sol

@@ -125,13 +125,6 @@ interface ISocket {
      */
     function chainSlug() external view returns (uint32);
 
-    /**
-     * @notice Returns the digest of a payload
-     * @param payloadId_ The payload ID
-     * @return digest The digest hash for verification
-     */
-    function payloadIdToDigest(bytes32 payloadId_) external view returns (bytes32);
-
     /**
      * @notice Returns the switchboard address for a given switchboard ID
      * @param switchboardId_ The switchboard ID

contracts/protocol/switchboard/EVMxSwitchboard.sol

@@ -167,7 +167,6 @@ contract EVMxSwitchboard is SwitchboardBase {
             evmxWatcherId,
             payloadCounter++
         );
-
         payloadIdToPlug[payloadId] = plug_;
         emit PayloadRequested(payloadId, plug_, switchboardId, overrides, payload_);
     }

contracts/protocol/switchboard/MessageSwitchboard.sol

@@ -64,6 +64,9 @@ contract MessageSwitchboard is SwitchboardBase, ReentrancyGuard {
     /// @notice Mapping of fee updater address to nonce to usage status (prevents replay attacks)
     mapping(address => mapping(uint256 => bool)) public usedNonces;
 
+    /// @notice Mapping of payload id to its digest for verification
+    mapping(bytes32 => bytes32) public payloadIdToDigest;
+
     // --- Events ---
 
     /// @notice Event emitted when watcher attests a payload
@@ -214,6 +217,7 @@ contract MessageSwitchboard is SwitchboardBase, ReentrancyGuard {
             bytes32 payloadId_
         ) = _createDigestAndPayloadId(plug_, overrides, payload_);
         payloadId = payloadId_;
+        payloadIdToDigest[payloadId] = digest;
 
         if (overrides.isSponsored) {
             // Sponsored flow - validate sponsor has approved this plug

test/protocol/Socket.t.sol

@@ -657,16 +657,6 @@ contract SocketExecuteTestPart2 is SocketTestBase {
         assertEq(returnData.length, 2048, "Return data should be truncated to maxCopyBytes (2048)");
     }
 
-    function test_Execute_StoresDigest() public {
-        bytes32 payloadId = executionParams.payloadId;
-
-        hoax(transmitter);
-        socket.execute{value: 1 ether}(executionParams, transmissionParams);
-
-        bytes32 storedDigest = socket.payloadIdToDigest(payloadId);
-        assertTrue(storedDigest != bytes32(0), "Digest should be stored");
-    }
-
     function test_Execute_TryCallRevert_ValueStaysInSocketAndGetsRefunded() public {
         // Create a plug that will revert when called
         SimpleMockPlug revertingPlug = new SimpleMockPlug();