Skip to content

appgatewayid in event #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arthcp merged 2 commits into from
Dec 5, 2025
Merged

appgatewayid in event #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8510544
feat: appgatewayid in event
arthcp Dec 5, 2025
2a392e6
feat: remove switchboardId
arthcp Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions contracts/protocol/switchboard/EVMxSwitchboard.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ contract EVMxSwitchboard is SwitchboardBase {
event PayloadRequested(
bytes32 indexed payloadId,
address indexed plug,
uint32 indexed switchboardId,
bytes32 indexed appGatewayId,
bytes overrides,
bytes payload
);
Expand Down Expand Up @@ -154,6 +154,7 @@ contract EVMxSwitchboard is SwitchboardBase {
watcherSetId,
payloadCounter++
);
bytes32 appGatewayId = plugAppGatewayIds[plug_];
DigestParams memory digestParams = DigestParams({
socket: toBytes32Format(address(this)),
transmitter: toBytes32Format(transmitter),
Expand All @@ -163,7 +164,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("")
Expand All @@ -172,7 +173,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, overrides_, payload_);
}

/**
Expand Down
3 changes: 1 addition & 2 deletions contracts/protocol/switchboard/MessageSwitchboard.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ contract MessageSwitchboard is SwitchboardBase, ReentrancyGuard {
event PayloadRequested(
bytes32 indexed payloadId,
address indexed plug,
uint32 indexed switchboardId,
bytes overrides,
bytes payload
);
Expand Down Expand Up @@ -243,7 +242,7 @@ contract MessageSwitchboard is SwitchboardBase, ReentrancyGuard {
);
}

emit PayloadRequested(payloadId, plug_, switchboardId, overrides_, payload_);
emit PayloadRequested(payloadId, plug_, overrides_, payload_);
}

/**
Expand Down
16 changes: 14 additions & 2 deletions test/protocol/switchboard/EVMxSwitchboard.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -463,7 +469,7 @@ contract SocketPayloadIdVerificationTest is EVMxSwitchboardTestBase {
emit EVMxSwitchboard.PayloadRequested(
expectedPayloadId,
address(triggerPlug),
switchboardId,
toBytes32Format(address(0x1234)),
expectedOverrides,
payload
);
Expand Down Expand Up @@ -933,6 +939,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
Expand Down Expand Up @@ -964,7 +976,7 @@ contract SocketPayloadIdVerificationTest is EVMxSwitchboardTestBase {
emit EVMxSwitchboard.PayloadRequested(
expectedPayloadId,
address(triggerPlug),
switchboardId,
toBytes32Format(address(0x1234)),
expectedOverrides,
payload
);
Expand Down
2 changes: 0 additions & 2 deletions test/protocol/switchboard/MessageSwitchboard.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,6 @@ contract MessageSwitchboardTest is Test, Utils {
emit MessageSwitchboard.PayloadRequested(
expectedPayloadId,
address(srcPlug),
switchboardId,
overrides,
payload
);
Expand Down Expand Up @@ -650,7 +649,6 @@ contract MessageSwitchboardTest is Test, Utils {
emit MessageSwitchboard.PayloadRequested(
expectedPayloadId,
address(srcPlug),
switchboardId,
plugOverrides,
payload
);
Expand Down