@@ -184,7 +184,7 @@ contract TestEndToEndBase is Test, IRateLimiterEvents {
184184
185185 vm.stopPrank ();
186186
187- // Get the TransferSent(bytes32) event to ensure it matches up with the TransferRedeemed(bytes32) event later
187+ // Get the TransferSent(bytes32) event digest to ensure it matches up with the TransferRedeemed(uint16, bytes32) event digest later
188188 Vm.Log[] memory recordedLogs = vm.getRecordedLogs ();
189189 bytes32 sentEventDigest;
190190 for (uint256 i = 0 ; i < recordedLogs.length ; i++ ) {
@@ -220,18 +220,24 @@ contract TestEndToEndBase is Test, IRateLimiterEvents {
220220 );
221221 }
222222
223- // Get the TransferRedeemed(bytes32) event to ensure it matches up with the TransferSent(bytes32) event earlier
223+ // Get the TransferRedeemed(uint16, bytes32) event digest to ensure it matches up with the TransferSent(bytes32) event digest earlier
224224 recordedLogs = vm.getRecordedLogs ();
225225 bytes32 recvEventDigest;
226+ bytes32 recvSourceChain;
226227 for (uint256 i = 0 ; i < recordedLogs.length ; i++ ) {
227- if (recordedLogs[i].topics[0 ] == keccak256 ("TransferRedeemed(bytes32) " )) {
228- recvEventDigest = recordedLogs[i].topics[1 ];
228+ if (recordedLogs[i].topics[0 ] == keccak256 ("TransferRedeemed(uint16,bytes32) " )) {
229+ recvSourceChain = recordedLogs[i].topics[1 ];
230+ recvEventDigest = recordedLogs[i].topics[2 ];
229231 break ;
230232 }
231233 }
234+ require (
235+ recvSourceChain == bytes32 (uint256 (chainId1)),
236+ "Incorrect TransferRedeemed(uint16,bytes32) event sourceChain "
237+ );
232238 require (
233239 sentEventDigest == recvEventDigest,
234- "TransferRedeemed(bytes32) event should match TransferSent(bytes32) "
240+ "TransferRedeemed(uint16, bytes32) event digest should match TransferSent(bytes32) event digest "
235241 );
236242
237243 // Can't resubmit the same message twice
0 commit comments