ctp: more strict assertions on expect emit

packages/contracts-periphery/.gas-snapshot

@@ -4,12 +4,12 @@ AssetReceiverTest:testFail_withdrawERC721() (gas: 55908)
 AssetReceiverTest:testFail_withdrawETH() (gas: 10457)
 AssetReceiverTest:testFail_withdrawETHwithAmount() (gas: 10594)
 AssetReceiverTest:test_constructor() (gas: 9794)
-AssetReceiverTest:test_receive() (gas: 20787)
-AssetReceiverTest:test_withdrawERC20() (gas: 185351)
-AssetReceiverTest:test_withdrawERC20withAmount() (gas: 184431)
-AssetReceiverTest:test_withdrawERC721() (gas: 51387)
-AssetReceiverTest:test_withdrawETH() (gas: 28551)
-AssetReceiverTest:test_withdrawETHwithAmount() (gas: 28480)
+AssetReceiverTest:test_receive() (gas: 21010)
+AssetReceiverTest:test_withdrawERC20() (gas: 185529)
+AssetReceiverTest:test_withdrawERC20withAmount() (gas: 184609)
+AssetReceiverTest:test_withdrawERC721() (gas: 51565)
+AssetReceiverTest:test_withdrawETH() (gas: 28774)
+AssetReceiverTest:test_withdrawETHwithAmount() (gas: 28703)
 AssetReceiverTest:test_attest_bulk() (gas: 611417)
 AssetReceiverTest:test_attest_individual() (gas: 538536)
 AssetReceiverTest:test_attest_single() (gas: 558939)

packages/contracts-periphery/contracts/foundry-tests/AssetReceiver.t.sol

@@ -63,7 +63,7 @@ contract AssetReceiverTest is AssetReceiver_Initializer {
         // Check that contract balance is 0 initially
         assertEq(address(assetReceiver).balance, 0);
 
-        vm.expectEmit(true, true, true, true);
+        vm.expectEmit(true, true, true, true, address(assetReceiver));
         emit ReceivedETH(alice, 100);
         // Send funds
         vm.prank(alice);
@@ -84,7 +84,7 @@ contract AssetReceiverTest is AssetReceiver_Initializer {
 
         assertEq(address(alice).balance, 1 ether);
 
-        vm.expectEmit(true, true, true, true);
+        vm.expectEmit(true, true, true, true, address(assetReceiver));
         emit WithdrewETH(alice, alice, 1 ether);
 
         // call withdrawETH
@@ -112,7 +112,7 @@ contract AssetReceiverTest is AssetReceiver_Initializer {
 
         assertEq(address(alice).balance, 1 ether);
 
-        vm.expectEmit(true, true, true, true);
+        vm.expectEmit(true, true, true, true, address(assetReceiver));
         emit WithdrewETH(alice, alice, 0.5 ether);
 
         // call withdrawETH
@@ -140,7 +140,7 @@ contract AssetReceiverTest is AssetReceiver_Initializer {
         assertEq(testERC20.balanceOf(address(assetReceiver)), 100_000);
         assertEq(testERC20.balanceOf(alice), 0);
 
-        vm.expectEmit(true, true, true, true);
+        vm.expectEmit(true, true, true, true, address(assetReceiver));
         emit WithdrewERC20(alice, alice, address(testERC20), 100_000);
 
         // call withdrawERC20
@@ -168,7 +168,7 @@ contract AssetReceiverTest is AssetReceiver_Initializer {
         assertEq(testERC20.balanceOf(address(assetReceiver)), 100_000);
         assertEq(testERC20.balanceOf(alice), 0);
 
-        vm.expectEmit(true, true, true, true);
+        vm.expectEmit(true, true, true, true, address(assetReceiver));
         emit WithdrewERC20(alice, alice, address(testERC20), 50_000);
 
         // call withdrawERC20
@@ -197,7 +197,7 @@ contract AssetReceiverTest is AssetReceiver_Initializer {
         testERC721.transferFrom(alice, address(assetReceiver), DEFAULT_TOKEN_ID);
         assertEq(testERC721.ownerOf(DEFAULT_TOKEN_ID), address(assetReceiver));
 
-        vm.expectEmit(true, true, true, true);
+        vm.expectEmit(true, true, true, true, address(assetReceiver));
         emit WithdrewERC721(alice, alice, address(testERC721), DEFAULT_TOKEN_ID);
 
         // Call withdrawERC721