feat: added payloadId tests, fixed old tests

Author: tHeMaskedMan981

test/SetupTest.t.sol

@@ -132,12 +132,14 @@ contract DeploySetup is SetupStore {
         arbConfig.messageSwitchboard.setSiblingConfig(
             optChainSlug,
             toBytes32Format(address(optConfig.socket)),
-            toBytes32Format(address(optConfig.messageSwitchboard))
+            toBytes32Format(address(optConfig.messageSwitchboard)),
+            uint32(optConfig.messageSwitchboard.switchboardId())
         );
         optConfig.messageSwitchboard.setSiblingConfig(
             arbChainSlug,
             toBytes32Format(address(arbConfig.socket)),
-            toBytes32Format(address(arbConfig.messageSwitchboard))
+            toBytes32Format(address(arbConfig.messageSwitchboard)),
+            uint32(arbConfig.messageSwitchboard.switchboardId())
         );
         vm.stopPrank();
         _connectCorePlugs();
@@ -667,7 +669,7 @@ contract WatcherSetup is FeesSetup {
             value: digestParams.value,
             payload: digestParams.payload,
             target: fromBytes32Format(digestParams.target),
-            payloadPointer: uint160(payloadParams.payloadPointer),
+            payloadId: payloadParams.payloadId,
             prevBatchDigestHash: digestParams.prevBatchDigestHash,
             source: digestParams.source,
             extraData: digestParams.extraData
@@ -830,19 +832,17 @@ contract MessageSwitchboardSetup is DeploySetup {
         SocketContracts memory srcSocketConfig_,
         SocketContracts memory dstSocketConfig_,
         bytes memory payload_
-    ) internal view returns (uint160 payloadPointer, DigestParams memory digestParams) {
-        bytes32 triggerId = srcPlug_.getNextTriggerId(srcSocketConfig_.chainSlug);
+    ) internal view returns (bytes32 payloadId, DigestParams memory digestParams) {
         uint40 payloadCounter = srcSocketConfig_.messageSwitchboard.payloadCounter();
-
-        payloadPointer =
-            (uint160(srcSocketConfig_.chainSlug) << 120) |
-            (uint160(uint64(uint256(triggerId))) << 80) |
-            payloadCounter;
-
-        bytes32 payloadId = createPayloadId(
-            payloadPointer,
-            dstSocketConfig_.messageSwitchboard.switchboardId(),
-            dstSocketConfig_.chainSlug
+        
+        // Calculate payload ID using new structure
+        // Message payload: origin = (srcChainSlug, srcSwitchboardId), verification = (dstChainSlug, dstSwitchboardId)
+        payloadId = createPayloadId(
+            srcSocketConfig_.chainSlug,              // origin chain slug
+            uint32(srcSocketConfig_.messageSwitchboard.switchboardId()),  // origin switchboard id
+            dstSocketConfig_.chainSlug,              // verification chain slug
+            uint32(dstSocketConfig_.messageSwitchboard.switchboardId()),  // verification switchboard id
+            uint64(payloadCounter)                   // pointer (counter)
         );
 
         digestParams = _createDigestParams(
@@ -851,17 +851,16 @@ contract MessageSwitchboardSetup is DeploySetup {
             address(dstPlug_),
             address(dstSocketConfig_.socket),
             payloadId,
-            triggerId,
             payload_
         );
     }
 
     function _executeOnDestination(
         DigestParams memory digestParams_,
-        uint160 payloadPointer_
+        bytes32 payloadId_
     ) internal {
         _attestPayload(digestParams_);
-        _execute(digestParams_, payloadPointer_);
+        _execute(digestParams_, payloadId_);
     }
 
     // Helper function to attest a payload
@@ -884,10 +883,8 @@ contract MessageSwitchboardSetup is DeploySetup {
         address dstPlug_,
         address dstSocket_,
         bytes32 payloadId_,
-        bytes32 triggerId_,
         bytes memory payload_
     ) internal view returns (DigestParams memory digestParams) {
-        bytes memory extraData = abi.encode(srcChainSlug_, toBytes32Format(srcPlug_));
         digestParams = DigestParams({
             socket: toBytes32Format(dstSocket_),
             transmitter: bytes32(0),
@@ -899,8 +896,8 @@ contract MessageSwitchboardSetup is DeploySetup {
             payload: payload_,
             target: toBytes32Format(dstPlug_),
             source: abi.encode(srcChainSlug_, toBytes32Format(srcPlug_)),
-            prevBatchDigestHash: triggerId_,
-            extraData: extraData
+            prevBatchDigestHash: bytes32(0), // No longer using triggerId
+            extraData: "0x" // Contract now sets extraData to empty
         });
     }
 
@@ -925,7 +922,7 @@ contract MessageSwitchboardSetup is DeploySetup {
     }
 
     // Helper function to execute on destination chain
-    function _execute(DigestParams memory digestParams_, uint160 payloadPointer_) internal {
+    function _execute(DigestParams memory digestParams_, bytes32 payloadId_) internal {
         // this is a signature for the socket batcher (only used for EVM)
         ExecuteParams memory executeParams = ExecuteParams({
             callType: digestParams_.callType,
@@ -934,7 +931,7 @@ contract MessageSwitchboardSetup is DeploySetup {
             value: digestParams_.value,
             payload: digestParams_.payload,
             target: fromBytes32Format(digestParams_.target),
-            payloadPointer: payloadPointer_,
+            payloadId: payloadId_,
             prevBatchDigestHash: digestParams_.prevBatchDigestHash,
             source: digestParams_.source,
             extraData: digestParams_.extraData