Merge pull request #4938 from ethereum-optimism/fix/test-setup

contracts-bedrock: fix setup chain in tests

packages/contracts-bedrock/.gas-snapshot

 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 261376)
-GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 75927)
+GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 75905)
 GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 348328)
 GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 112783)
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 348350)
@@ -8,7 +8,7 @@ GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (g
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 88535)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 75044)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 36157)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 167115)
+GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 167103)
 Bytes_slice_Test:test_slice_acrossMultipleWords_works() (gas: 9423)
 Bytes_slice_Test:test_slice_acrossWords_works() (gas: 1418)
 Bytes_slice_Test:test_slice_fromNonZeroIdx_works() (gas: 17154)
@@ -20,36 +20,36 @@ CrossDomainMessenger_BaseGas_Test:test_baseGas_succeeds() (gas: 20120)
 CrossDomainOwnableThroughPortal_Test:test_depositTransaction_crossDomainOwner_succeeds() (gas: 72463)
 CrossDomainOwnable_Test:test_onlyOwner_notOwner_reverts() (gas: 10597)
 CrossDomainOwnable_Test:test_onlyOwner_succeeds() (gas: 34883)
-CrossDomainOwnable2_Test:test_onlyOwner_notMessenger_reverts() (gas: 8461)
+CrossDomainOwnable2_Test:test_onlyOwner_notMessenger_reverts() (gas: 8416)
 CrossDomainOwnable2_Test:test_onlyOwner_notOwner2_reverts() (gas: 63695)
-CrossDomainOwnable2_Test:test_onlyOwner_notOwner_reverts() (gas: 16566)
+CrossDomainOwnable2_Test:test_onlyOwner_notOwner_reverts() (gas: 16544)
 CrossDomainOwnable2_Test:test_onlyOwner_succeeds() (gas: 78212)
-CrossDomainOwnable3_Test:test_constructor_succeeds() (gas: 10576)
-CrossDomainOwnable3_Test:test_crossDomainOnlyOwner_notMessenger_reverts() (gas: 28289)
-CrossDomainOwnable3_Test:test_crossDomainOnlyOwner_notOwner2_reverts() (gas: 78617)
+CrossDomainOwnable3_Test:test_constructor_succeeds() (gas: 10554)
+CrossDomainOwnable3_Test:test_crossDomainOnlyOwner_notMessenger_reverts() (gas: 28334)
+CrossDomainOwnable3_Test:test_crossDomainOnlyOwner_notOwner2_reverts() (gas: 78660)
 CrossDomainOwnable3_Test:test_crossDomainOnlyOwner_notOwner_reverts() (gas: 31956)
 CrossDomainOwnable3_Test:test_crossDomainTransferOwnership_succeeds() (gas: 96217)
-CrossDomainOwnable3_Test:test_localOnlyOwner_notOwner_reverts() (gas: 13215)
-CrossDomainOwnable3_Test:test_localOnlyOwner_succeeds() (gas: 35242)
-CrossDomainOwnable3_Test:test_localTransferOwnership_succeeds() (gas: 52084)
+CrossDomainOwnable3_Test:test_localOnlyOwner_notOwner_reverts() (gas: 13193)
+CrossDomainOwnable3_Test:test_localOnlyOwner_succeeds() (gas: 35220)
+CrossDomainOwnable3_Test:test_localTransferOwnership_succeeds() (gas: 52128)
 CrossDomainOwnable3_Test:test_transferOwnershipNoLocal_succeeds() (gas: 48610)
-CrossDomainOwnable3_Test:test_transferOwnership_noLocalZeroAddress_reverts() (gas: 12037)
+CrossDomainOwnable3_Test:test_transferOwnership_noLocalZeroAddress_reverts() (gas: 12015)
 CrossDomainOwnable3_Test:test_transferOwnership_notOwner_reverts() (gas: 13437)
 CrossDomainOwnable3_Test:test_transferOwnership_zeroAddress_reverts() (gas: 12081)
 DeployerWhitelist_Test:test_owner_succeeds() (gas: 7582)
-DeployerWhitelist_Test:test_storageSlots_succeeds() (gas: 33417)
-FeeVault_Test:test_constructor_succeeds() (gas: 10670)
+DeployerWhitelist_Test:test_storageSlots_succeeds() (gas: 33395)
+FeeVault_Test:test_constructor_succeeds() (gas: 10736)
 FeeVault_Test:test_minWithdrawalAmount_succeeds() (gas: 10713)
 GasPriceOracle_Test:test_baseFee_succeeds() (gas: 8325)
 GasPriceOracle_Test:test_decimals_succeeds() (gas: 6167)
-GasPriceOracle_Test:test_gasPrice_succeeds() (gas: 8317)
+GasPriceOracle_Test:test_gasPrice_succeeds() (gas: 8294)
 GasPriceOracle_Test:test_l1BaseFee_succeeds() (gas: 10656)
-GasPriceOracle_Test:test_overhead_succeeds() (gas: 10614)
+GasPriceOracle_Test:test_overhead_succeeds() (gas: 10636)
 GasPriceOracle_Test:test_scalar_succeeds() (gas: 10677)
-GasPriceOracle_Test:test_setGasPrice_doesNotExist_reverts() (gas: 5933)
+GasPriceOracle_Test:test_setGasPrice_doesNotExist_reverts() (gas: 5910)
 GasPriceOracle_Test:test_setL1BaseFee_doesNotExist_reverts() (gas: 5911)
 GovernanceToken_Test:test_approve_succeeds() (gas: 133293)
-GovernanceToken_Test:test_burnFrom_succeeds() (gas: 122778)
+GovernanceToken_Test:test_burnFrom_succeeds() (gas: 122733)
 GovernanceToken_Test:test_burn_succeeds() (gas: 114588)
 GovernanceToken_Test:test_constructor_succeeds() (gas: 21298)
 GovernanceToken_Test:test_decreaseAllowance_succeeds() (gas: 137008)
@@ -58,7 +58,7 @@ GovernanceToken_Test:test_mint_fromNotOwner_reverts() (gas: 17030)
 GovernanceToken_Test:test_mint_fromOwner_succeeds() (gas: 108592)
 GovernanceToken_Test:test_transferFrom_succeeds() (gas: 146273)
 GovernanceToken_Test:test_transfer_succeeds() (gas: 138108)
-Hashing_hashDepositSource_Test:test_hashDepositSource_succeeds() (gas: 588)
+Hashing_hashDepositSource_Test:test_hashDepositSource_succeeds() (gas: 633)
 L1BlockTest:test_basefee_succeeds() (gas: 7554)
 L1BlockTest:test_hash_succeeds() (gas: 7576)
 L1BlockTest:test_number_succeeds() (gas: 7629)
@@ -68,24 +68,24 @@ L1BlockTest:test_updateValues_succeeds() (gas: 60482)
 L1BlockNumberTest:test_fallback_succeeds() (gas: 18655)
 L1BlockNumberTest:test_getL1BlockNumber_succeeds() (gas: 10625)
 L1BlockNumberTest:test_receive_succeeds() (gas: 25384)
-L1CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 24781)
+L1CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 24759)
 L1CrossDomainMessenger_Test:test_pause_callerIsNotOwner_reverts() (gas: 24495)
 L1CrossDomainMessenger_Test:test_pause_succeeds() (gas: 52964)
 L1CrossDomainMessenger_Test:test_relayMessage_legacyOldReplay_reverts() (gas: 51545)
-L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailureThenSuccess_reverts() (gas: 230724)
-L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailure_succeeds() (gas: 204067)
+L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailureThenSuccess_reverts() (gas: 230679)
+L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterFailure_succeeds() (gas: 204045)
 L1CrossDomainMessenger_Test:test_relayMessage_legacyRetryAfterSuccess_reverts() (gas: 144222)
-L1CrossDomainMessenger_Test:test_relayMessage_legacy_succeeds() (gas: 77026)
-L1CrossDomainMessenger_Test:test_relayMessage_paused_reverts() (gas: 55447)
-L1CrossDomainMessenger_Test:test_relayMessage_reentrancyDiffMessage_succeeds() (gas: 723122)
-L1CrossDomainMessenger_Test:test_relayMessage_reentrancySameMessage_reverts() (gas: 660091)
-L1CrossDomainMessenger_Test:test_relayMessage_retryAfterFailure_succeeds() (gas: 198019)
+L1CrossDomainMessenger_Test:test_relayMessage_legacy_succeeds() (gas: 77004)
+L1CrossDomainMessenger_Test:test_relayMessage_paused_reverts() (gas: 55425)
+L1CrossDomainMessenger_Test:test_relayMessage_reentrancyDiffMessage_succeeds() (gas: 723166)
+L1CrossDomainMessenger_Test:test_relayMessage_reentrancySameMessage_reverts() (gas: 660069)
+L1CrossDomainMessenger_Test:test_relayMessage_retryAfterFailure_succeeds() (gas: 198063)
 L1CrossDomainMessenger_Test:test_relayMessage_succeeds() (gas: 73984)
 L1CrossDomainMessenger_Test:test_relayMessage_toSystemContract_reverts() (gas: 100533)
-L1CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 14471)
+L1CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 14494)
 L1CrossDomainMessenger_Test:test_replayMessage_withValue_reverts() (gas: 55573)
 L1CrossDomainMessenger_Test:test_sendMessage_succeeds() (gas: 299710)
-L1CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 1490566)
+L1CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 1490631)
 L1CrossDomainMessenger_Test:test_unpause_callerIsNotOwner_reverts() (gas: 24538)
 L1CrossDomainMessenger_Test:test_unpause_succeeds() (gas: 45203)
 L1CrossDomainMessenger_Test:test_xDomainMessageSender_reset_succeeds() (gas: 84446)
@@ -110,32 +110,32 @@ L1StandardBridge_BridgeETH_Test:test_bridgeETH_succeeds() (gas: 406840)
 L1StandardBridge_DepositERC20To_Test:test_depositERC20To_succeeds() (gas: 624916)
 L1StandardBridge_DepositERC20_Test:test_depositERC20_succeeds() (gas: 622617)
 L1StandardBridge_DepositERC20_TestFail:test_depositERC20_notEoa_reverts() (gas: 22320)
-L1StandardBridge_DepositETHTo_Test:test_depositETHTo_succeeds() (gas: 419718)
+L1StandardBridge_DepositETHTo_Test:test_depositETHTo_succeeds() (gas: 419696)
 L1StandardBridge_DepositETH_Test:test_depositETH_succeeds() (gas: 406934)
 L1StandardBridge_DepositETH_TestFail:test_depositETH_notEoa_reverts() (gas: 40780)
 L1StandardBridge_FinalizeBridgeETH_Test:test_finalizeBridgeETH_succeeds() (gas: 51674)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_incorrectValue_reverts() (gas: 34207)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_sendToMessenger_reverts() (gas: 34310)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_sendToSelf_reverts() (gas: 34279)
-L1StandardBridge_FinalizeERC20Withdrawal_Test:test_finalizeERC20Withdrawal_succeeds() (gas: 496453)
+L1StandardBridge_FinalizeERC20Withdrawal_Test:test_finalizeERC20Withdrawal_succeeds() (gas: 496501)
 L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_notMessenger_reverts() (gas: 31170)
 L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_notOtherBridge_reverts() (gas: 31526)
 L1StandardBridge_FinalizeETHWithdrawal_Test:test_finalizeETHWithdrawal_succeeds() (gas: 62188)
 L1StandardBridge_Getter_Test:test_getters_succeeds() (gas: 32173)
 L1StandardBridge_Initialize_Test:test_initialize_succeeds() (gas: 22050)
 L1StandardBridge_Receive_Test:test_receive_succeeds() (gas: 520242)
-L2CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 8412)
+L2CrossDomainMessenger_Test:test_messageVersion_succeeds() (gas: 8477)
 L2CrossDomainMessenger_Test:test_pause_notOwner_reverts() (gas: 10882)
-L2CrossDomainMessenger_Test:test_pause_succeeds() (gas: 31868)
-L2CrossDomainMessenger_Test:test_relayMessage_paused_reverts() (gas: 36545)
-L2CrossDomainMessenger_Test:test_relayMessage_reentrancyDiffMessage_succeeds() (gas: 683845)
-L2CrossDomainMessenger_Test:test_relayMessage_reentrancySameMessage_reverts() (gas: 629342)
+L2CrossDomainMessenger_Test:test_pause_succeeds() (gas: 31846)
+L2CrossDomainMessenger_Test:test_relayMessage_paused_reverts() (gas: 36523)
+L2CrossDomainMessenger_Test:test_relayMessage_reentrancyDiffMessage_succeeds() (gas: 683823)
+L2CrossDomainMessenger_Test:test_relayMessage_reentrancySameMessage_reverts() (gas: 629320)
 L2CrossDomainMessenger_Test:test_relayMessage_retry_succeeds() (gas: 169219)
 L2CrossDomainMessenger_Test:test_relayMessage_succeeds() (gas: 56875)
 L2CrossDomainMessenger_Test:test_relayMessage_toSystemContract_reverts() (gas: 53554)
-L2CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 13861)
+L2CrossDomainMessenger_Test:test_relayMessage_v2_reverts() (gas: 13839)
 L2CrossDomainMessenger_Test:test_sendMessage_succeeds() (gas: 122644)
-L2CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 134738)
+L2CrossDomainMessenger_Test:test_sendMessage_twice_succeeds() (gas: 134716)
 L2CrossDomainMessenger_Test:test_xDomainMessageSender_reset_succeeds() (gas: 56385)
 L2CrossDomainMessenger_Test:test_xDomainSender_senderNotSet_reverts() (gas: 10524)
 L2ERC721Bridge_Test:test_bridgeERC721To_localTokenZeroAddress_reverts() (gas: 26431)
@@ -157,32 +157,32 @@ L2OutputOracleTest:test_computeL2Timestamp_succeeds() (gas: 37206)
 L2OutputOracleTest:test_constructor_badTimestamp_reverts() (gas: 70812)
 L2OutputOracleTest:test_constructor_l2BlockTimeZero_reverts() (gas: 45808)
 L2OutputOracleTest:test_constructor_succeeds() (gas: 33695)
-L2OutputOracleTest:test_deleteL2Outputs_afterLatest_reverts() (gas: 211878)
+L2OutputOracleTest:test_deleteL2Outputs_afterLatest_reverts() (gas: 211900)
 L2OutputOracleTest:test_deleteL2Outputs_ifNotChallenger_reverts() (gas: 18894)
 L2OutputOracleTest:test_deleteL2Outputs_nonExistent_reverts() (gas: 107337)
 L2OutputOracleTest:test_deleteOutputs_multipleOutputs_succeeds() (gas: 302143)
-L2OutputOracleTest:test_deleteOutputs_singleOutput_succeeds() (gas: 180700)
+L2OutputOracleTest:test_deleteOutputs_singleOutput_succeeds() (gas: 180722)
 L2OutputOracleTest:test_getL2OutputIndexAfter_multipleOutputsExist_succeeds() (gas: 267204)
 L2OutputOracleTest:test_getL2OutputIndexAfter_noOutputsExis_reverts() (gas: 17936)
-L2OutputOracleTest:test_getL2OutputIndexAfter_previousBlock_succeeds() (gas: 96087)
+L2OutputOracleTest:test_getL2OutputIndexAfter_previousBlock_succeeds() (gas: 96064)
 L2OutputOracleTest:test_getL2OutputIndexAfter_sameBlock_succeeds() (gas: 96038)
 L2OutputOracleTest:test_getL2Output_succeeds() (gas: 101721)
 L2OutputOracleTest:test_latestBlockNumber_succeeds() (gas: 96983)
 L2OutputOracleTest:test_nextBlockNumber_succeeds() (gas: 17512)
 L2OutputOracleTest:test_proposeL2Output_emptyOutput_reverts() (gas: 26688)
-L2OutputOracleTest:test_proposeL2Output_futureTimetamp_reverts() (gas: 28690)
+L2OutputOracleTest:test_proposeL2Output_futureTimetamp_reverts() (gas: 28646)
 L2OutputOracleTest:test_proposeL2Output_notProposer_reverts() (gas: 25804)
 L2OutputOracleTest:test_proposeL2Output_proposeAnotherOutput_succeeds() (gas: 101071)
 L2OutputOracleTest:test_proposeL2Output_unexpectedBlockNumber_reverts() (gas: 28402)
-L2OutputOracleTest:test_proposeL2Output_unmatchedBlockhash_reverts() (gas: 29402)
+L2OutputOracleTest:test_proposeL2Output_unmatchedBlockhash_reverts() (gas: 29424)
 L2OutputOracleTest:test_proposeL2Output_wrongFork_reverts() (gas: 29005)
 L2OutputOracleTest:test_proposeWithBlockhashAndHeight_succeeds() (gas: 95274)
 L2OutputOracleUpgradeable_Test:test_initValuesOnProxy_succeeds() (gas: 26141)
-L2OutputOracleUpgradeable_Test:test_initializeImpl_alreadyInitialized_reverts() (gas: 15193)
-L2OutputOracleUpgradeable_Test:test_initializeProxy_alreadyInitialized_reverts() (gas: 20131)
+L2OutputOracleUpgradeable_Test:test_initializeImpl_alreadyInitialized_reverts() (gas: 15171)
+L2OutputOracleUpgradeable_Test:test_initializeProxy_alreadyInitialized_reverts() (gas: 20197)
 L2OutputOracleUpgradeable_Test:test_upgrading_succeeds() (gas: 180481)
 L2StandardBridge_BridgeERC20To_Test:test_bridgeERC20To_succeeds() (gas: 387815)
-L2StandardBridge_BridgeERC20To_Test:test_withdrawTo_withdrawingERC20_succeeds() (gas: 388063)
+L2StandardBridge_BridgeERC20To_Test:test_withdrawTo_withdrawingERC20_succeeds() (gas: 388045)
 L2StandardBridge_BridgeERC20_Test:test_bridgeERC20_succeeds() (gas: 383537)
 L2StandardBridge_BridgeERC20_Test:test_withdraw_notEOA_reverts() (gas: 251758)
 L2StandardBridge_BridgeERC20_Test:test_withdraw_withdrawingERC20_succeeds() (gas: 383723)
@@ -194,32 +194,32 @@ L2StandardBridge_Bridge_Test:test_finalizeDeposit_depositingETH_succeeds() (gas:
 L2StandardBridge_FinalizeBridgeETH_Test:test_finalizeBridgeETH_succeeds() (gas: 43155)
 L2StandardBridge_Test:test_initialize_succeeds() (gas: 24292)
 L2StandardBridge_Test:test_receive_succeeds() (gas: 174012)
-L2StandardBridge_Test:test_withdraw_ether_succeeds() (gas: 140478)
+L2StandardBridge_Test:test_withdraw_ether_succeeds() (gas: 140456)
 L2StandardBridge_Test:test_withdraw_insufficientValue_reverts() (gas: 16485)
 L2ToL1MessagePasserTest:test_burn_succeeds() (gas: 112572)
 L2ToL1MessagePasserTest:test_initiateWithdrawal_fromContract_succeeds() (gas: 70445)
-L2ToL1MessagePasserTest:test_initiateWithdrawal_fromEOA_succeeds() (gas: 75874)
-LegacyERC20ETH_Test:test_approve_doesNotExist_reverts() (gas: 10724)
-LegacyERC20ETH_Test:test_burn_doesNotExist_reverts() (gas: 10659)
-LegacyERC20ETH_Test:test_crossDomain_succeeds() (gas: 6318)
+L2ToL1MessagePasserTest:test_initiateWithdrawal_fromEOA_succeeds() (gas: 75896)
+LegacyERC20ETH_Test:test_approve_doesNotExist_reverts() (gas: 10702)
+LegacyERC20ETH_Test:test_burn_doesNotExist_reverts() (gas: 10637)
+LegacyERC20ETH_Test:test_crossDomain_succeeds() (gas: 6341)
 LegacyERC20ETH_Test:test_decreaseAllowance_doesNotExist_reverts() (gas: 10724)
 LegacyERC20ETH_Test:test_increaseAllowance_doesNotExist_reverts() (gas: 10690)
 LegacyERC20ETH_Test:test_metadata_succeeds() (gas: 15470)
 LegacyERC20ETH_Test:test_mint_doesNotExist_reverts() (gas: 10627)
 LegacyERC20ETH_Test:test_transferFrom_doesNotExist_reverts() (gas: 12957)
 LegacyERC20ETH_Test:test_transfer_doesNotExist_reverts() (gas: 10755)
-LegacyMessagePasser_Test:test_passMessageToL1_succeeds() (gas: 34546)
+LegacyMessagePasser_Test:test_passMessageToL1_succeeds() (gas: 34524)
 MerkleTrie_get_Test:test_get_corruptedProof_reverts() (gas: 5736)
 MerkleTrie_get_Test:test_get_extraProofElements_reverts() (gas: 60631)
-MerkleTrie_get_Test:test_get_invalidDataRemainder_reverts() (gas: 35874)
+MerkleTrie_get_Test:test_get_invalidDataRemainder_reverts() (gas: 35852)
 MerkleTrie_get_Test:test_get_invalidInternalNodeHash_reverts() (gas: 50810)
-MerkleTrie_get_Test:test_get_nonexistentKey1_reverts() (gas: 59693)
+MerkleTrie_get_Test:test_get_nonexistentKey1_reverts() (gas: 59671)
 MerkleTrie_get_Test:test_get_nonexistentKey2_reverts() (gas: 23385)
 MerkleTrie_get_Test:test_get_smallerPathThanKey1_reverts() (gas: 53525)
 MerkleTrie_get_Test:test_get_smallerPathThanKey2_reverts() (gas: 55006)
 MerkleTrie_get_Test:test_get_validProof10_succeeds() (gas: 50593)
 MerkleTrie_get_Test:test_get_validProof1_succeeds() (gas: 61688)
-MerkleTrie_get_Test:test_get_validProof2_succeeds() (gas: 71601)
+MerkleTrie_get_Test:test_get_validProof2_succeeds() (gas: 71579)
 MerkleTrie_get_Test:test_get_validProof3_succeeds() (gas: 32827)
 MerkleTrie_get_Test:test_get_validProof4_succeeds() (gas: 23623)
 MerkleTrie_get_Test:test_get_validProof5_succeeds() (gas: 84262)
@@ -227,18 +227,18 @@ MerkleTrie_get_Test:test_get_validProof6_succeeds() (gas: 73021)
 MerkleTrie_get_Test:test_get_validProof7_succeeds() (gas: 79719)
 MerkleTrie_get_Test:test_get_validProof8_succeeds() (gas: 50550)
 MerkleTrie_get_Test:test_get_validProof9_succeeds() (gas: 50550)
-MerkleTrie_get_Test:test_get_wrongKeyProof_reverts() (gas: 53893)
+MerkleTrie_get_Test:test_get_wrongKeyProof_reverts() (gas: 53871)
 MerkleTrie_get_Test:test_get_zeroBranchValueLength_reverts() (gas: 43248)
 MerkleTrie_get_Test:test_get_zeroLengthKey_reverts() (gas: 3632)
-MintManager_constructor_Test:test_constructor_succeeds() (gas: 10535)
-MintManager_mint_Test:test_mint_afterPeriodElapsed_succeeds() (gas: 148139)
+MintManager_constructor_Test:test_constructor_succeeds() (gas: 10579)
+MintManager_mint_Test:test_mint_afterPeriodElapsed_succeeds() (gas: 148117)
 MintManager_mint_Test:test_mint_beforePeriodElapsed_reverts() (gas: 140433)
-MintManager_mint_Test:test_mint_fromNotOwner_reverts() (gas: 11009)
-MintManager_mint_Test:test_mint_fromOwner_succeeds() (gas: 137264)
+MintManager_mint_Test:test_mint_fromNotOwner_reverts() (gas: 10987)
+MintManager_mint_Test:test_mint_fromOwner_succeeds() (gas: 137219)
 MintManager_mint_Test:test_mint_moreThanCap_reverts() (gas: 142523)
-MintManager_upgrade_Test:test_upgrade_fromNotOwner_reverts() (gas: 10996)
+MintManager_upgrade_Test:test_upgrade_fromNotOwner_reverts() (gas: 10974)
 MintManager_upgrade_Test:test_upgrade_fromOwner_succeeds() (gas: 23434)
-MintManager_upgrade_Test:test_upgrade_toZeroAddress_reverts() (gas: 11025)
+MintManager_upgrade_Test:test_upgrade_toZeroAddress_reverts() (gas: 11003)
 OptimismMintableERC20_Test:test_bridge_succeeds() (gas: 7643)
 OptimismMintableERC20_Test:test_burn_notBridge_reverts() (gas: 11164)
 OptimismMintableERC20_Test:test_burn_succeeds() (gas: 50996)
@@ -246,18 +246,18 @@ OptimismMintableERC20_Test:test_erc165_supportsInterface_succeeds() (gas: 7809)
 OptimismMintableERC20_Test:test_l1Token_succeeds() (gas: 7621)
 OptimismMintableERC20_Test:test_l2Bridge_succeeds() (gas: 7621)
 OptimismMintableERC20_Test:test_legacy_succeeds() (gas: 14344)
-OptimismMintableERC20_Test:test_mint_notBridge_reverts() (gas: 11165)
-OptimismMintableERC20_Test:test_mint_succeeds() (gas: 63544)
+OptimismMintableERC20_Test:test_mint_notBridge_reverts() (gas: 11121)
+OptimismMintableERC20_Test:test_mint_succeeds() (gas: 63566)
 OptimismMintableERC20_Test:test_remoteToken_succeeds() (gas: 7689)
 OptimismMintableERC20_Test:test_semver_succeeds() (gas: 8812)
-OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 7602)
+OptimismMintableTokenFactory_Test:test_bridge_succeeds() (gas: 7580)
 OptimismMintableTokenFactory_Test:test_createStandardL2Token_remoteIsZero_succeeds() (gas: 9390)
 OptimismMintableTokenFactory_Test:test_createStandardL2Token_sameTwice_succeeds() (gas: 2523203)
 OptimismMintableTokenFactory_Test:test_createStandardL2Token_succeeds() (gas: 1268564)
 OptimismMintableERC721_Test:test_burn_notBridge_reverts() (gas: 136966)
 OptimismMintableERC721_Test:test_burn_succeeds() (gas: 118832)
-OptimismMintableERC721_Test:test_constructor_succeeds() (gas: 28301)
-OptimismMintableERC721_Test:test_safeMint_notBridge_reverts() (gas: 11143)
+OptimismMintableERC721_Test:test_constructor_succeeds() (gas: 28279)
+OptimismMintableERC721_Test:test_safeMint_notBridge_reverts() (gas: 11098)
 OptimismMintableERC721_Test:test_safeMint_succeeds() (gas: 140524)
 OptimismMintableERC721_Test:test_tokenURI_succeeds() (gas: 163442)
 OptimismMintableERC721Factory_Test:test_constructor_succeeds() (gas: 8285)
@@ -268,35 +268,35 @@ OptimismPortalUpgradeable_Test:test_initialize_cannotInitProxy_reverts() (gas: 1
 OptimismPortalUpgradeable_Test:test_params_initValuesOnProxy_succeeds() (gas: 16056)
 OptimismPortalUpgradeable_Test:test_upgradeToAndCall_upgrading_succeeds() (gas: 180547)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputRootChanges_reverts() (gas: 198736)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputTimestampIsNotFinalized_reverts() (gas: 201055)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputTimestampIsNotFinalized_reverts() (gas: 201099)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalNotProven_reverts() (gas: 39650)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalProofNotOldEnough_reverts() (gas: 196122)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onInsufficientGas_reverts() (gas: 196945)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onRecentWithdrawal_reverts() (gas: 176842)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReentrancy_reverts() (gas: 235425)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReplay_reverts() (gas: 236906)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReentrancy_reverts() (gas: 235381)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReplay_reverts() (gas: 236884)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_provenWithdrawalHash_succeeds() (gas: 228647)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_targetFails_fails() (gas: 8797746687696163640)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_targetFails_fails() (gas: 8797746687696163638)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_timestampLessThanL2OracleStart_reverts() (gas: 192824)
-OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidOutputRootProof_reverts() (gas: 83520)
-OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidWithdrawalProof_reverts() (gas: 135223)
+OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidOutputRootProof_reverts() (gas: 83498)
+OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidWithdrawalProof_reverts() (gas: 135201)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onSelfCall_reverts() (gas: 50799)
-OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRootAndOutputIndex_succeeds() (gas: 344645)
-OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRoot_succeeds() (gas: 277297)
+OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRootAndOutputIndex_succeeds() (gas: 344623)
+OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRoot_succeeds() (gas: 277363)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProve_reverts() (gas: 190295)
-OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_validWithdrawalProof_succeeds() (gas: 178317)
-OptimismPortal_Test:test_constructor_succeeds() (gas: 17321)
-OptimismPortal_Test:test_depositTransaction_contractCreation_reverts() (gas: 14246)
-OptimismPortal_Test:test_depositTransaction_createWithZeroValueForContract_succeeds() (gas: 76761)
-OptimismPortal_Test:test_depositTransaction_createWithZeroValueForEOA_succeeds() (gas: 77039)
+OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_validWithdrawalProof_succeeds() (gas: 178382)
+OptimismPortal_Test:test_constructor_succeeds() (gas: 17299)
+OptimismPortal_Test:test_depositTransaction_contractCreation_reverts() (gas: 14224)
+OptimismPortal_Test:test_depositTransaction_createWithZeroValueForContract_succeeds() (gas: 76739)
+OptimismPortal_Test:test_depositTransaction_createWithZeroValueForEOA_succeeds() (gas: 77083)
 OptimismPortal_Test:test_depositTransaction_noValueContract_succeeds() (gas: 76735)
-OptimismPortal_Test:test_depositTransaction_noValueEOA_succeeds() (gas: 77036)
+OptimismPortal_Test:test_depositTransaction_noValueEOA_succeeds() (gas: 77014)
 OptimismPortal_Test:test_depositTransaction_smallGasLimit_reverts() (gas: 14257)
-OptimismPortal_Test:test_depositTransaction_withEthValueAndContractContractCreation_succeeds() (gas: 83718)
-OptimismPortal_Test:test_depositTransaction_withEthValueAndEOAContractCreation_succeeds() (gas: 75871)
-OptimismPortal_Test:test_depositTransaction_withEthValueFromContract_succeeds() (gas: 83400)
+OptimismPortal_Test:test_depositTransaction_withEthValueAndContractContractCreation_succeeds() (gas: 83696)
+OptimismPortal_Test:test_depositTransaction_withEthValueAndEOAContractCreation_succeeds() (gas: 75916)
+OptimismPortal_Test:test_depositTransaction_withEthValueFromContract_succeeds() (gas: 83465)
 OptimismPortal_Test:test_depositTransaction_withEthValueFromEOA_succeeds() (gas: 83993)
-OptimismPortal_Test:test_isOutputFinalized_succeeds() (gas: 119496)
+OptimismPortal_Test:test_isOutputFinalized_succeeds() (gas: 119474)
 OptimismPortal_Test:test_receive_succeeds() (gas: 127576)
 OptimismPortal_Test:test_simple_isOutputFinalized_succeeds() (gas: 24165)
 Proxy_Test:test_delegatesToImpl_succeeds() (gas: 45207)
@@ -333,7 +333,7 @@ ProxyAdmin_Test:test_setAddressManager_notOwner_reverts() (gas: 10578)
 ProxyAdmin_Test:test_setImplementationName_notOwner_reverts() (gas: 11111)
 ProxyAdmin_Test:test_setImplementationName_succeeds() (gas: 38945)
 ProxyAdmin_Test:test_setProxyType_notOwner_reverts() (gas: 10814)
-RLPReader_readBytes_Test:test_readBytes_bytestring00_succeeds() (gas: 1856)
+RLPReader_readBytes_Test:test_readBytes_bytestring00_succeeds() (gas: 1878)
 RLPReader_readBytes_Test:test_readBytes_bytestring01_succeeds() (gas: 1855)
 RLPReader_readBytes_Test:test_readBytes_bytestring7f_succeeds() (gas: 1876)
 RLPReader_readBytes_Test:test_readBytes_invalidListLength_reverts() (gas: 3903)
@@ -345,18 +345,18 @@ RLPReader_readList_Test:test_readList_dictTest1_succeeds() (gas: 23202)
 RLPReader_readList_Test:test_readList_empty_succeeds() (gas: 4612)
 RLPReader_readList_Test:test_readList_incorrectLengthInArray_reverts() (gas: 3976)
 RLPReader_readList_Test:test_readList_int32Overflow2_reverts() (gas: 4139)
-RLPReader_readList_Test:test_readList_int32Overflow_reverts() (gas: 4116)
+RLPReader_readList_Test:test_readList_int32Overflow_reverts() (gas: 4138)
 RLPReader_readList_Test:test_readList_invalidRemainder_reverts() (gas: 4114)
 RLPReader_readList_Test:test_readList_invalidShortList_reverts() (gas: 3967)
 RLPReader_readList_Test:test_readList_invalidValue_reverts() (gas: 3878)
 RLPReader_readList_Test:test_readList_leadingZerosInLongLengthArray1_reverts() (gas: 3982)
 RLPReader_readList_Test:test_readList_leadingZerosInLongLengthArray2_reverts() (gas: 3945)
 RLPReader_readList_Test:test_readList_leadingZerosInLongLengthList1_reverts() (gas: 3984)
-RLPReader_readList_Test:test_readList_listLongerThan32Elements_reverts() (gas: 38593)
+RLPReader_readList_Test:test_readList_listLongerThan32Elements_reverts() (gas: 38615)
 RLPReader_readList_Test:test_readList_listOfLists2_succeeds() (gas: 12169)
 RLPReader_readList_Test:test_readList_listOfLists_succeeds() (gas: 9504)
-RLPReader_readList_Test:test_readList_longList1_succeeds() (gas: 28394)
-RLPReader_readList_Test:test_readList_longList2_succeeds() (gas: 196877)
+RLPReader_readList_Test:test_readList_longList1_succeeds() (gas: 28416)
+RLPReader_readList_Test:test_readList_longList2_succeeds() (gas: 196834)
 RLPReader_readList_Test:test_readList_longListLessThan56Bytes_reverts() (gas: 4023)
 RLPReader_readList_Test:test_readList_longStringLength_reverts() (gas: 3946)
 RLPReader_readList_Test:test_readList_longStringLessThan56Bytes_reverts() (gas: 4009)
@@ -366,22 +366,22 @@ RLPReader_readList_Test:test_readList_nonOptimalLongLengthArray2_reverts() (gas:
 RLPReader_readList_Test:test_readList_notEnoughContentForList1_reverts() (gas: 4115)
 RLPReader_readList_Test:test_readList_notEnoughContentForList2_reverts() (gas: 4117)
 RLPReader_readList_Test:test_readList_notEnoughContentForString1_reverts() (gas: 4072)
-RLPReader_readList_Test:test_readList_notEnoughContentForString2_reverts() (gas: 4138)
+RLPReader_readList_Test:test_readList_notEnoughContentForString2_reverts() (gas: 4094)
 RLPReader_readList_Test:test_readList_notLongEnough_reverts() (gas: 3955)
 RLPReader_readList_Test:test_readList_shortListMax1_succeeds() (gas: 39769)
-RLPWriter_writeList_Test:test_writeList_dictTest1_succeeds() (gas: 37112)
-RLPWriter_writeList_Test:test_writeList_empty_succeeds() (gas: 1699)
+RLPWriter_writeList_Test:test_writeList_dictTest1_succeeds() (gas: 37134)
+RLPWriter_writeList_Test:test_writeList_empty_succeeds() (gas: 1721)
 RLPWriter_writeList_Test:test_writeList_listoflists2_succeeds() (gas: 16656)
 RLPWriter_writeList_Test:test_writeList_listoflists_succeeds() (gas: 10901)
 RLPWriter_writeList_Test:test_writeList_longlist1_succeeds() (gas: 40489)
-RLPWriter_writeList_Test:test_writeList_longlist2_succeeds() (gas: 281303)
-RLPWriter_writeList_Test:test_writeList_multiList_succeeds() (gas: 22524)
+RLPWriter_writeList_Test:test_writeList_longlist2_succeeds() (gas: 281280)
+RLPWriter_writeList_Test:test_writeList_multiList_succeeds() (gas: 22546)
 RLPWriter_writeList_Test:test_writeList_shortListMax1_succeeds() (gas: 36918)
 RLPWriter_writeList_Test:test_writeList_stringList_succeeds() (gas: 10742)
-RLPWriter_writeString_Test:test_writeString_bytestring00_succeeds() (gas: 954)
+RLPWriter_writeString_Test:test_writeString_bytestring00_succeeds() (gas: 976)
 RLPWriter_writeString_Test:test_writeString_bytestring01_succeeds() (gas: 976)
 RLPWriter_writeString_Test:test_writeString_bytestring7f_succeeds() (gas: 997)
-RLPWriter_writeString_Test:test_writeString_empty_succeeds() (gas: 1621)
+RLPWriter_writeString_Test:test_writeString_empty_succeeds() (gas: 1643)
 RLPWriter_writeString_Test:test_writeString_longstring2_succeeds() (gas: 258779)
 RLPWriter_writeString_Test:test_writeString_longstring_succeeds() (gas: 16972)
 RLPWriter_writeString_Test:test_writeString_shortstring2_succeeds() (gas: 15386)
@@ -391,22 +391,22 @@ RLPWriter_writeUint_Test:test_writeUint_mediumint3_succeeds() (gas: 9113)
 RLPWriter_writeUint_Test:test_writeUint_mediumint_succeeds() (gas: 8372)
 RLPWriter_writeUint_Test:test_writeUint_smallint2_succeeds() (gas: 7279)
 RLPWriter_writeUint_Test:test_writeUint_smallint3_succeeds() (gas: 7301)
-RLPWriter_writeUint_Test:test_writeUint_smallint4_succeeds() (gas: 7280)
-RLPWriter_writeUint_Test:test_writeUint_smallint_succeeds() (gas: 7324)
+RLPWriter_writeUint_Test:test_writeUint_smallint4_succeeds() (gas: 7302)
+RLPWriter_writeUint_Test:test_writeUint_smallint_succeeds() (gas: 7280)
 RLPWriter_writeUint_Test:test_writeUint_zero_succeeds() (gas: 7749)
-ResourceMetering_Test:test_meter_initialResourceParams_succeeds() (gas: 9005)
-ResourceMetering_Test:test_meter_updateNoGasDelta_succeeds() (gas: 2008164)
+ResourceMetering_Test:test_meter_initialResourceParams_succeeds() (gas: 8983)
+ResourceMetering_Test:test_meter_updateNoGasDelta_succeeds() (gas: 2008142)
 ResourceMetering_Test:test_meter_updateOneEmptyBlock_succeeds() (gas: 18171)
-ResourceMetering_Test:test_meter_updateParamsNoChange_succeeds() (gas: 13925)
+ResourceMetering_Test:test_meter_updateParamsNoChange_succeeds() (gas: 13903)
 ResourceMetering_Test:test_meter_updateTenEmptyBlocks_succeeds() (gas: 20963)
 ResourceMetering_Test:test_meter_updateTwoEmptyBlocks_succeeds() (gas: 20919)
-ResourceMetering_Test:test_meter_useMax_succeeds() (gas: 8017174)
-ResourceMetering_Test:test_meter_useMoreThanMax_reverts() (gas: 16067)
+ResourceMetering_Test:test_meter_useMax_succeeds() (gas: 8017218)
+ResourceMetering_Test:test_meter_useMoreThanMax_reverts() (gas: 16045)
 Semver_Test:test_behindProxy_succeeds() (gas: 506748)
-Semver_Test:test_version_succeeds() (gas: 9440)
+Semver_Test:test_version_succeeds() (gas: 9418)
 SequencerFeeVault_Test:test_constructor_succeeds() (gas: 5526)
 SequencerFeeVault_Test:test_minWithdrawalAmount_succeeds() (gas: 5442)
-SequencerFeeVault_Test:test_receive_succeeds() (gas: 17358)
+SequencerFeeVault_Test:test_receive_succeeds() (gas: 17373)
 SequencerFeeVault_Test:test_withdraw_notEnough_reverts() (gas: 9331)
 SequencerFeeVault_Test:test_withdraw_succeeds() (gas: 163206)
 SystemConfig_Initialize_TestFail:test_initialize_lowGasLimit_reverts() (gas: 62012)

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

@@ -50,7 +50,7 @@ contract CommonTest is Test {
 
     FFIInterface ffi;
 
-    function _setUp() public {
+    function setUp() public virtual {
         // Give alice and bob some ETH
         vm.deal(alice, 1 << 16);
         vm.deal(bob, 1 << 16);
@@ -117,9 +117,8 @@ contract L2OutputOracle_Initializer is CommonTest {
         vm.warp(oracle.computeL2Timestamp(_nextBlockNumber) + 1);
     }
 
-    function setUp() public virtual {
-        _setUp();
-
+    function setUp() public virtual override {
+        super.setUp();
         // By default the first block has timestamp and number zero, which will cause underflows in the
         // tests, so we'll move forward to these block values.
         initL1Time = startingTimestamp + 1;
@@ -163,7 +162,7 @@ contract Portal_Initializer is L2OutputOracle_Initializer {
     );
 
     function setUp() public virtual override {
-        L2OutputOracle_Initializer.setUp();
+        super.setUp();
 
         opImpl = new OptimismPortal(oracle, 7 days);
         Proxy proxy = new Proxy(multisig);

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

@@ -18,7 +18,8 @@ contract XDomainSetter is CrossDomainOwnable {
 contract CrossDomainOwnable_Test is CommonTest {
     XDomainSetter setter;
 
-    function setUp() external {
+    function setUp() public override {
+        super.setUp();
         setter = new XDomainSetter();
     }
 

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

@@ -7,7 +7,7 @@ import { DeployerWhitelist } from "../legacy/DeployerWhitelist.sol";
 contract DeployerWhitelist_Test is CommonTest {
     DeployerWhitelist list;
 
-    function setUp() external {
+    function setUp() public virtual override {
         list = new DeployerWhitelist();
     }
 

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

@@ -6,10 +6,6 @@ import { Types } from "../libraries/Types.sol";
 import { Encoding } from "../libraries/Encoding.sol";
 
 contract Encoding_Test is CommonTest {
-    function setUp() external {
-        _setUp();
-    }
-
     function testFuzz_nonceVersioning_succeeds(uint240 _nonce, uint16 _version) external {
         (uint240 nonce, uint16 version) = Encoding.decodeVersionedNonce(
             Encoding.encodeVersionedNonce(_nonce, _version)

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

@@ -25,7 +25,8 @@ contract GasPriceOracle_Test is CommonTest {
     uint256 constant l1FeeOverhead = 310;
     uint256 constant l1FeeScalar = 10;
 
-    function setUp() external {
+    function setUp() public virtual override {
+        super.setUp();
         // place the L1Block contract at the predeploy address
         vm.etch(Predeploys.L1_BLOCK_ATTRIBUTES, address(new L1Block()).code);
 

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

@@ -9,7 +9,8 @@ contract GovernanceToken_Test is CommonTest {
     address constant rando = address(0x5678);
     GovernanceToken internal gov;
 
-    function setUp() external {
+    function setUp() public virtual override {
+        super.setUp();
         vm.prank(owner);
         gov = new GovernanceToken();
     }

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

@@ -7,10 +7,6 @@ import { Hashing } from "../libraries/Hashing.sol";
 import { Encoding } from "../libraries/Encoding.sol";
 
 contract Hashing_hashDepositSource_Test is CommonTest {
-    function setUp() external {
-        _setUp();
-    }
-
     /**
      * @notice Tests that hashDepositSource returns the correct hash in a simple case.
      */
@@ -26,10 +22,6 @@ contract Hashing_hashDepositSource_Test is CommonTest {
 }
 
 contract Hashing_hashCrossDomainMessage_Test is CommonTest {
-    function setUp() external {
-        _setUp();
-    }
-
     /**
      * @notice Tests that hashCrossDomainMessage returns the correct hash in a simple case.
      */
@@ -54,10 +46,6 @@ contract Hashing_hashCrossDomainMessage_Test is CommonTest {
 }
 
 contract Hashing_hashWithdrawal_Test is CommonTest {
-    function setUp() external {
-        _setUp();
-    }
-
     /**
      * @notice Tests that hashWithdrawal returns the correct hash in a simple case.
      */
@@ -79,10 +67,6 @@ contract Hashing_hashWithdrawal_Test is CommonTest {
 }
 
 contract Hashing_hashOutputRootProof_Test is CommonTest {
-    function setUp() external {
-        _setUp();
-    }
-
     /**
      * @notice Tests that hashOutputRootProof returns the correct hash in a simple case.
      */
@@ -112,10 +96,6 @@ contract Hashing_hashOutputRootProof_Test is CommonTest {
 }
 
 contract Hashing_hashDepositTransaction_Test is CommonTest {
-    function setUp() external {
-        _setUp();
-    }
-
     /**
      * @notice Tests that hashDepositTransaction returns the correct hash in a simple case.
      */

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

@@ -9,7 +9,8 @@ contract L1BlockTest is CommonTest {
     address depositor;
     bytes32 immutable NON_ZERO_HASH = keccak256(abi.encode(1));
 
-    function setUp() external {
+    function setUp() public virtual override {
+        super.setUp();
         lb = new L1Block();
         depositor = lb.DEPOSITOR_ACCOUNT();
         vm.prank(depositor);

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

@@ -21,7 +21,8 @@ contract L2ToL1MessagePasserTest is CommonTest {
 
     event WithdrawerBalanceBurnt(uint256 indexed amount);
 
-    function setUp() public virtual {
+    function setUp() public virtual override {
+        super.setUp();
         messagePasser = new L2ToL1MessagePasser();
     }
 

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

@@ -8,7 +8,8 @@ import { Predeploys } from "../libraries/Predeploys.sol";
 contract LegacyERC20ETH_Test is CommonTest {
     LegacyERC20ETH eth;
 
-    function setUp() external {
+    function setUp() public virtual override {
+        super.setUp();
         eth = new LegacyERC20ETH();
     }
 

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

@@ -8,7 +8,8 @@ import { Predeploys } from "../libraries/Predeploys.sol";
 contract LegacyMessagePasser_Test is CommonTest {
     LegacyMessagePasser messagePasser;
 
-    function setUp() external {
+    function setUp() public virtual override {
+        super.setUp();
         messagePasser = new LegacyMessagePasser();
     }
 

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

@@ -5,10 +5,6 @@ import { CommonTest } from "./CommonTest.t.sol";
 import { MerkleTrie } from "../libraries/trie/MerkleTrie.sol";
 
 contract MerkleTrie_get_Test is CommonTest {
-    function setUp() public {
-        _setUp();
-    }
-
     function test_get_validProof1_succeeds() external {
         bytes32 root = 0xd582f99275e227a1cf4284899e5ff06ee56da8859be71b553397c69151bc942f;
         bytes memory key = hex"6b6579326262";

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

@@ -11,7 +11,9 @@ contract MintManager_Initializer is CommonTest {
     GovernanceToken internal gov;
     MintManager internal manager;
 
-    function setUp() external {
+    function setUp() public virtual override {
+        super.setUp();
+
         vm.prank(owner);
         gov = new GovernanceToken();
 

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

@@ -21,8 +21,8 @@ contract ResourceMetering_Test is CommonTest {
     MeterUser internal meter;
     uint64 initialBlockNum;
 
-    function setUp() external {
-        _setUp();
+    function setUp() public virtual override {
+        super.setUp();
         meter = new MeterUser();
         initialBlockNum = uint64(block.number);
     }

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

@@ -19,7 +19,7 @@ contract Semver_Test is CommonTest {
     /**
      * @notice Deploy a Semver contract
      */
-    function setUp() external {
+    function setUp() public virtual override {
         semver = new Semver(7, 8, 0);
     }
 

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

@@ -28,13 +28,13 @@ contract SequencerFeeVault_Test is Bridge_Initializer {
     }
 
     function test_receive_succeeds() external {
-        assertEq(address(vault).balance, 0);
+        uint256 balance = address(vault).balance;
 
         vm.prank(alice);
         (bool success, ) = address(vault).call{ value: 100 }(hex"");
 
         assertEq(success, true);
-        assertEq(address(vault).balance, 100);
+        assertEq(address(vault).balance, balance + 100);
     }
 
     function test_withdraw_notEnough_reverts() external {

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

@@ -7,7 +7,8 @@ import { SystemConfig } from "../L1/SystemConfig.sol";
 contract SystemConfig_Init is CommonTest {
     SystemConfig sysConf;
 
-    function setUp() external {
+    function setUp() public virtual override {
+        super.setUp();
         sysConf = new SystemConfig({
             _owner: alice,
             _overhead: 2100,

packages/contracts-bedrock/contracts/test/invariants/CrossDomainMessenger.t.sol

@@ -94,7 +94,7 @@ contract RelayActor is StdUtils {
 contract XDM_MinGasLimits is Messenger_Initializer {
     RelayActor actor;
 
-    function setUp() public override {
+    function setUp() public virtual override {
         // Set up the `L1CrossDomainMessenger` and `OptimismPortal` contracts.
         super.setUp();