Merge branch 'develop' into ctb/fix-legacy-withdraw

packages/contracts-bedrock/.gas-snapshot

@@ -393,7 +393,7 @@ SequencerFeeVault_Test:test_constructor_succeeds() (gas: 5504)
 SequencerFeeVault_Test:test_minWithdrawalAmount_succeeds() (gas: 5420)
 SequencerFeeVault_Test:test_receive_succeeds() (gas: 17336)
 SequencerFeeVault_Test:test_withdraw_notEnough_reverts() (gas: 9309)
-SequencerFeeVault_Test:test_withdraw_succeeds() (gas: 163169)
+SequencerFeeVault_Test:test_withdraw_succeeds() (gas: 163184)
 SystemConfig_Initialize_TestFail:test_initialize_lowGasLimit_reverts() (gas: 61966)
 SystemConfig_Setters_TestFail:test_setBatcherHash_notOwner_reverts() (gas: 10545)
 SystemConfig_Setters_TestFail:test_setGasConfig_notOwner_reverts() (gas: 10532)

packages/contracts-bedrock/contracts/test/FeeVault.t.sol

@@ -19,6 +19,9 @@ contract FeeVault_Test is Bridge_Initializer {
         super.setUp();
         vm.etch(Predeploys.BASE_FEE_VAULT, address(new BaseFeeVault(recipient)).code);
         vm.etch(Predeploys.L1_FEE_VAULT, address(new L1FeeVault(recipient)).code);
+
+        vm.label(Predeploys.BASE_FEE_VAULT, "BaseFeeVault");
+        vm.label(Predeploys.L1_FEE_VAULT, "L1FeeVault");
     }
 
     function test_constructor_succeeds() external {

packages/contracts-bedrock/contracts/test/SequencerFeeVault.t.sol

@@ -16,6 +16,7 @@ contract SequencerFeeVault_Test is Bridge_Initializer {
     function setUp() public override {
         super.setUp();
         vm.etch(Predeploys.SEQUENCER_FEE_WALLET, address(new SequencerFeeVault(recipient)).code);
+        vm.label(Predeploys.SEQUENCER_FEE_WALLET, "SequencerFeeVault");
     }
 
     function test_minWithdrawalAmount_succeeds() external {
@@ -52,7 +53,7 @@ contract SequencerFeeVault_Test is Bridge_Initializer {
         // No ether has been withdrawn yet
         assertEq(vault.totalProcessed(), 0);
 
-        vm.expectEmit(true, true, true, true);
+        vm.expectEmit(true, true, true, true, address(Predeploys.SEQUENCER_FEE_WALLET));
         emit Withdrawal(address(vault).balance, vault.RECIPIENT(), address(this));
 
         // The entire vault's balance is withdrawn