Merge pull request #8478 from ethereum-optimism/ctb/deploy-nonces

contracts-bedrock: be mindful of nonce management

packages/contracts-bedrock/.gas-snapshot

 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 352278)
 GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2950440)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 540654)
-GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4052847)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 442004)
-GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3487753)
-GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 55373)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 540648)
+GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4052841)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 442007)
+GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3487756)
+GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 55367)
 GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 86629)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68462)
-GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68911)
-GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 153498)
\ No newline at end of file
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 68450)
+GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 68899)
+GasBenchMark_OptimismPortal:test_proveWithdrawalTransaction_benchmark() (gas: 153501)
\ No newline at end of file

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

@@ -17,7 +17,13 @@ contract CommonTest is Setup, Test, Events {
     FFIInterface ffi;
 
     function setUp() public virtual override {
+        alice = makeAddr("alice");
+        bob = makeAddr("bob");
+        vm.deal(alice, 10000 ether);
+        vm.deal(bob, 10000 ether);
+
         Setup.setUp();
+        vm.prank(deployer);
         ffi = new FFIInterface();
 
         // Make sure the base fee is non zero
@@ -27,11 +33,6 @@ contract CommonTest is Setup, Test, Events {
         vm.warp(deploy.cfg().l2OutputOracleStartingTimestamp() + 1);
         vm.roll(deploy.cfg().l2OutputOracleStartingBlockNumber() + 1);
 
-        alice = makeAddr("alice");
-        bob = makeAddr("bob");
-        vm.deal(alice, 10000 ether);
-        vm.deal(bob, 10000 ether);
-
         // Deploy L1
         Setup.L1();
         // Deploy L2

packages/contracts-bedrock/test/setup/Setup.sol

@@ -41,6 +41,7 @@ contract Setup {
     Vm private constant vm = Vm(0x7109709ECfa91a80626fF3989D68f67F5b1DD12D);
 
     Deploy internal deploy;
+    address deployer = address(0xd3607);
 
     OptimismPortal optimismPortal;
     L2OutputOracle l2OutputOracle;
@@ -80,8 +81,11 @@ contract Setup {
         deploy.setUp();
     }
 
-    /// @dev Simple wrapper around the `create` opcode
+    /// @dev Simple wrapper around the `create` opcode that uses a particular
+    ///      deployer account.
     function _create(bytes memory _code) internal returns (address addr_) {
+        vm.deal(deployer, 1 ether);
+        vm.prank(deployer);
         assembly {
             addr_ := create(0, add(_code, 0x20), mload(_code))
         }