From 851054410cfb113de0cf4c2df919dc443a512fc9 Mon Sep 17 00:00:00 2001 From: arthcp Date: Fri, 5 Dec 2025 20:37:26 +0530 Subject: [PATCH 1/2] feat: appgatewayid in event --- contracts/protocol/switchboard/EVMxSwitchboard.sol | 8 +++++--- test/protocol/switchboard/EVMxSwitchboard.t.sol | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/contracts/protocol/switchboard/EVMxSwitchboard.sol b/contracts/protocol/switchboard/EVMxSwitchboard.sol index f9e4cfc6..781228c7 100644 --- a/contracts/protocol/switchboard/EVMxSwitchboard.sol +++ b/contracts/protocol/switchboard/EVMxSwitchboard.sol @@ -60,7 +60,8 @@ contract EVMxSwitchboard is SwitchboardBase { event PayloadRequested( bytes32 indexed payloadId, address indexed plug, - uint32 indexed switchboardId, + bytes32 indexed appGatewayId, + uint32 switchboardId, bytes overrides, bytes payload ); @@ -154,6 +155,7 @@ contract EVMxSwitchboard is SwitchboardBase { watcherSetId, payloadCounter++ ); + bytes32 appGatewayId = plugAppGatewayIds[plug_]; DigestParams memory digestParams = DigestParams({ socket: toBytes32Format(address(this)), transmitter: toBytes32Format(transmitter), @@ -163,7 +165,7 @@ contract EVMxSwitchboard is SwitchboardBase { gasLimit: overridesParams.gasLimit, value: msg.value, payload: payload_, - target: plugAppGatewayIds[plug_], + target: appGatewayId, source: abi.encodePacked(chainSlug, toBytes32Format(plug_)), prevBatchDigestHash: bytes32(0), extraData: bytes("") @@ -172,7 +174,7 @@ contract EVMxSwitchboard is SwitchboardBase { bytes32 digest = createDigest(digestParams); payloadIdToDigest[payloadId] = digest; payloadIdToPlug[payloadId] = plug_; - emit PayloadRequested(payloadId, plug_, switchboardId, overrides_, payload_); + emit PayloadRequested(payloadId, plug_, appGatewayId, switchboardId, overrides_, payload_); } /** diff --git a/test/protocol/switchboard/EVMxSwitchboard.t.sol b/test/protocol/switchboard/EVMxSwitchboard.t.sol index eaecdf67..cee11c6a 100644 --- a/test/protocol/switchboard/EVMxSwitchboard.t.sol +++ b/test/protocol/switchboard/EVMxSwitchboard.t.sol @@ -428,6 +428,12 @@ contract SocketPayloadIdVerificationTest is EVMxSwitchboardTestBase { function test_EVMxSwitchboard_ProcessPayload_EmitsPayloadRequested() public { MockPlug triggerPlug = _createTriggerPlug(); + + bytes32 appGatewayId = toBytes32Format(address(0x1234)); + bytes memory plugConfig = abi.encode(appGatewayId); + vm.prank(address(socket)); + evmxSwitchboard.updatePlugConfig(address(triggerPlug), plugConfig); + (bytes memory payload, bytes memory overrides) = _createPayloadAndOverrides(); payload = abi.encode("test trigger"); // Override for this specific test @@ -463,6 +469,7 @@ contract SocketPayloadIdVerificationTest is EVMxSwitchboardTestBase { emit EVMxSwitchboard.PayloadRequested( expectedPayloadId, address(triggerPlug), + toBytes32Format(address(0x1234)), switchboardId, expectedOverrides, payload @@ -933,6 +940,12 @@ contract SocketPayloadIdVerificationTest is EVMxSwitchboardTestBase { function test_ProcessPayload_WithZeroDeadline_UsesDefault() public { MockPlug triggerPlug = _createTriggerPlug(); + + bytes32 appGatewayId = toBytes32Format(address(0x1234)); + bytes memory plugConfig = abi.encode(appGatewayId); + vm.prank(address(socket)); + evmxSwitchboard.updatePlugConfig(address(triggerPlug), plugConfig); + bytes memory payload = abi.encode("test"); // Pass 0 as deadline - should use default @@ -964,6 +977,7 @@ contract SocketPayloadIdVerificationTest is EVMxSwitchboardTestBase { emit EVMxSwitchboard.PayloadRequested( expectedPayloadId, address(triggerPlug), + toBytes32Format(address(0x1234)), switchboardId, expectedOverrides, payload From 2a392e64e8c9ef7ca8169a3486f41bb946a38579 Mon Sep 17 00:00:00 2001 From: arthcp Date: Fri, 5 Dec 2025 22:27:49 +0530 Subject: [PATCH 2/2] feat: remove switchboardId --- contracts/protocol/switchboard/EVMxSwitchboard.sol | 3 +-- contracts/protocol/switchboard/MessageSwitchboard.sol | 3 +-- test/protocol/switchboard/EVMxSwitchboard.t.sol | 2 -- test/protocol/switchboard/MessageSwitchboard.t.sol | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/contracts/protocol/switchboard/EVMxSwitchboard.sol b/contracts/protocol/switchboard/EVMxSwitchboard.sol index 781228c7..3b7c1b26 100644 --- a/contracts/protocol/switchboard/EVMxSwitchboard.sol +++ b/contracts/protocol/switchboard/EVMxSwitchboard.sol @@ -61,7 +61,6 @@ contract EVMxSwitchboard is SwitchboardBase { bytes32 indexed payloadId, address indexed plug, bytes32 indexed appGatewayId, - uint32 switchboardId, bytes overrides, bytes payload ); @@ -174,7 +173,7 @@ contract EVMxSwitchboard is SwitchboardBase { bytes32 digest = createDigest(digestParams); payloadIdToDigest[payloadId] = digest; payloadIdToPlug[payloadId] = plug_; - emit PayloadRequested(payloadId, plug_, appGatewayId, switchboardId, overrides_, payload_); + emit PayloadRequested(payloadId, plug_, appGatewayId, overrides_, payload_); } /** diff --git a/contracts/protocol/switchboard/MessageSwitchboard.sol b/contracts/protocol/switchboard/MessageSwitchboard.sol index cb7a018e..86e9ef6f 100644 --- a/contracts/protocol/switchboard/MessageSwitchboard.sol +++ b/contracts/protocol/switchboard/MessageSwitchboard.sol @@ -106,7 +106,6 @@ contract MessageSwitchboard is SwitchboardBase, ReentrancyGuard { event PayloadRequested( bytes32 indexed payloadId, address indexed plug, - uint32 indexed switchboardId, bytes overrides, bytes payload ); @@ -243,7 +242,7 @@ contract MessageSwitchboard is SwitchboardBase, ReentrancyGuard { ); } - emit PayloadRequested(payloadId, plug_, switchboardId, overrides_, payload_); + emit PayloadRequested(payloadId, plug_, overrides_, payload_); } /** diff --git a/test/protocol/switchboard/EVMxSwitchboard.t.sol b/test/protocol/switchboard/EVMxSwitchboard.t.sol index cee11c6a..858abb1d 100644 --- a/test/protocol/switchboard/EVMxSwitchboard.t.sol +++ b/test/protocol/switchboard/EVMxSwitchboard.t.sol @@ -470,7 +470,6 @@ contract SocketPayloadIdVerificationTest is EVMxSwitchboardTestBase { expectedPayloadId, address(triggerPlug), toBytes32Format(address(0x1234)), - switchboardId, expectedOverrides, payload ); @@ -978,7 +977,6 @@ contract SocketPayloadIdVerificationTest is EVMxSwitchboardTestBase { expectedPayloadId, address(triggerPlug), toBytes32Format(address(0x1234)), - switchboardId, expectedOverrides, payload ); diff --git a/test/protocol/switchboard/MessageSwitchboard.t.sol b/test/protocol/switchboard/MessageSwitchboard.t.sol index 240ab2ba..67442b71 100644 --- a/test/protocol/switchboard/MessageSwitchboard.t.sol +++ b/test/protocol/switchboard/MessageSwitchboard.t.sol @@ -547,7 +547,6 @@ contract MessageSwitchboardTest is Test, Utils { emit MessageSwitchboard.PayloadRequested( expectedPayloadId, address(srcPlug), - switchboardId, overrides, payload ); @@ -650,7 +649,6 @@ contract MessageSwitchboardTest is Test, Utils { emit MessageSwitchboard.PayloadRequested( expectedPayloadId, address(srcPlug), - switchboardId, plugOverrides, payload );