fix(ctb): remove unnecessary L2OO init param

Removes an unnecessary parameter from the L200 initialization function
since this parameter is already set in the constructor.

.changeset/poor-singers-dance.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Removes an unnecessary initializer parameter in the L200

op-chain-ops/genesis/layer_one.go

@@ -73,7 +73,6 @@ func BuildL1DeveloperGenesis(config *DeployConfig) (*core.Genesis, error) {
 	data, err := l2ooABI.Pack(
 		"initialize",
 		config.L2OutputOracleGenesisL2Output,
-		big.NewInt(0),
 		config.L2OutputOracleProposer,
 		config.L2OutputOracleOwner,
 	)

packages/contracts-bedrock/.gas-snapshot

-AddressAliasHelper_Test:test_fuzz_roundtrip(address) (runs: 256, μ: 466, ~: 466)
 GasBenchMark_L1CrossDomainMessenger:test_L1MessengerSendMessage_benchmark_0() (gas: 261333)
 GasBenchMark_L1CrossDomainMessenger:test_L1MessengerSendMessage_benchmark_1() (gas: 75493)
 GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 348072)
@@ -6,10 +5,9 @@ GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 1122
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 348094)
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 112225)
 GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 40569)
-GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 68671)
+GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 68693)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 74964)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 35777)
-CrossDomainMessenger_Test:testFuzz_baseGas(uint32) (runs: 256, μ: 20263, ~: 20263)
 CrossDomainMessenger_Test:test_baseGas() (gas: 20100)
 CrossDomainOwnableThroughPortal_Test:test_depositTransaction_crossDomainOwner() (gas: 61850)
 CrossDomainOwnable_Test:test_onlyOwner() (gas: 34945)
@@ -20,10 +18,6 @@ CrossDomainOwnable2_Test:test_revertNotSetOnlyOwner2() (gas: 14598)
 CrossDomainOwnable2_Test:test_revertOnlyOwner() (gas: 61586)
 DeployerWhitelist_Test:test_owner() (gas: 7591)
 DeployerWhitelist_Test:test_storageSlots() (gas: 33427)
-Encoding_Test:test_decodeVersionedNonce_differential(uint240,uint16) (runs: 256, μ: 13329, ~: 13345)
-Encoding_Test:test_encodeCrossDomainMessage_differential(uint240,uint8,address,address,uint256,uint256,bytes) (runs: 256, μ: 87650, ~: 91649)
-Encoding_Test:test_encodeDepositTransaction_differential(address,address,uint256,uint256,uint64,bool,bytes,uint256) (runs: 256, μ: 106526, ~: 101730)
-Encoding_Test:test_nonceVersioning(uint240,uint16) (runs: 256, μ: 652, ~: 652)
 GasPriceOracle_Test:test_baseFee() (gas: 8392)
 GasPriceOracle_Test:test_gasPrice() (gas: 8381)
 GasPriceOracle_Test:test_l1BaseFee() (gas: 10648)
@@ -37,18 +31,13 @@ GasPriceOracle_Test:test_setL1BaseFeeReverts() (gas: 11739)
 GasPriceOracle_Test:test_setOverhead() (gas: 36813)
 GasPriceOracle_Test:test_setScalar() (gas: 36820)
 GasPriceOracle_Test:test_storageLayout() (gas: 86777)
-Hashing_Test:test_hashCrossDomainMessage_differential(uint256,address,address,uint256,uint256,bytes) (runs: 256, μ: 23905, ~: 23788)
 Hashing_Test:test_hashDepositSource() (gas: 628)
-Hashing_Test:test_hashDepositTransaction_differential(address,address,uint256,uint256,uint64,bytes,uint256) (runs: 256, μ: 66710, ~: 66432)
-Hashing_Test:test_hashOutputRootProof_differential(bytes32,bytes32,bytes32,bytes32) (runs: 256, μ: 72062, ~: 93483)
-Hashing_Test:test_hashWithdrawal_differential(uint256,address,address,uint256,uint256,bytes) (runs: 256, μ: 23654, ~: 23478)
 L1BlockTest:test_basefee() (gas: 7575)
 L1BlockTest:test_hash() (gas: 7552)
 L1BlockTest:test_number() (gas: 7629)
 L1BlockTest:test_sequenceNumber() (gas: 7650)
 L1BlockTest:test_timestamp() (gas: 7661)
 L1BlockTest:test_updateValues() (gas: 28193)
-L1BlockTest:test_updatesValues(uint64,uint64,uint256,bytes32,uint64) (runs: 256, μ: 35307, ~: 35717)
 L1BlockNumberTest:test_fallback() (gas: 18677)
 L1BlockNumberTest:test_getL1BlockNumber() (gas: 10668)
 L1BlockNumberTest:test_receive() (gas: 25340)
@@ -67,7 +56,7 @@ L1CrossDomainMessenger_Test:test_L1MessengerSendMessage() (gas: 299487)
 L1CrossDomainMessenger_Test:test_L1MessengerTwiceSendMessage() (gas: 1490366)
 L1CrossDomainMessenger_Test:test_L1MessengerUnpause() (gas: 41003)
 L1CrossDomainMessenger_Test:test_L1MessengerXDomainSenderReverts() (gas: 24283)
-L1CrossDomainMessenger_Test:test_L1MessengerxDomainMessageSenderResets() (gas: 81945)
+L1CrossDomainMessenger_Test:test_L1MessengerxDomainMessageSenderResets() (gas: 81927)
 L1StandardBridge_DepositERC20To_Test:test_depositERC20To_success() (gas: 575569)
 L1StandardBridge_DepositERC20_Test:test_depositERC20_succeeds() (gas: 573459)
 L1StandardBridge_DepositERC20_TestFail:test_depositERC20_revert_notEoa() (gas: 22343)
@@ -96,30 +85,30 @@ L2CrossDomainMessenger_Test:test_L2MessengerRelayShouldRevertIfPaused() (gas: 41
 L2CrossDomainMessenger_Test:test_L2MessengerSendMessage() (gas: 120648)
 L2CrossDomainMessenger_Test:test_L2MessengerTwiceSendMessage() (gas: 136338)
 L2CrossDomainMessenger_Test:test_L2MessengerXDomainSenderReverts() (gas: 10576)
-L2CrossDomainMessenger_Test:test_L2MessengerxDomainMessageSenderResets() (gas: 50459)
-L2OutputOracleTest:testCannot_ProposeWithUnmatchedBlockhash() (gas: 26829)
-L2OutputOracleTest:testCannot_constructWithBadTimestamp() (gas: 52842)
-L2OutputOracleTest:testCannot_deleteL2Output_ifNotOwner() (gas: 25123)
-L2OutputOracleTest:testCannot_deleteL2Output_withWrongRoot() (gas: 91467)
-L2OutputOracleTest:testCannot_deleteL2Output_withWrongTime() (gas: 87450)
-L2OutputOracleTest:testCannot_proposeEmptyOutput() (gas: 24150)
-L2OutputOracleTest:testCannot_proposeFutureTimetamp() (gas: 26074)
-L2OutputOracleTest:testCannot_proposeL2OutputIfNotProposer() (gas: 23564)
-L2OutputOracleTest:testCannot_proposeOnWrongFork() (gas: 26381)
-L2OutputOracleTest:testCannot_proposeUnexpectedBlockNumber() (gas: 26005)
-L2OutputOracleTest:test_changeProposer() (gas: 56127)
-L2OutputOracleTest:test_computeL2Timestamp() (gas: 30284)
-L2OutputOracleTest:test_constructor() (gas: 49046)
-L2OutputOracleTest:test_deleteOutput() (gas: 77260)
-L2OutputOracleTest:test_getL2Output() (gas: 88523)
-L2OutputOracleTest:test_latestBlockNumber() (gas: 76242)
+L2CrossDomainMessenger_Test:test_L2MessengerxDomainMessageSenderResets() (gas: 50440)
+L2OutputOracleTest:testCannot_ProposeWithUnmatchedBlockhash() (gas: 26828)
+L2OutputOracleTest:testCannot_constructWithBadTimestamp() (gas: 52850)
+L2OutputOracleTest:testCannot_deleteL2Output_ifNotOwner() (gas: 25145)
+L2OutputOracleTest:testCannot_deleteL2Output_withWrongRoot() (gas: 91488)
+L2OutputOracleTest:testCannot_deleteL2Output_withWrongTime() (gas: 87471)
+L2OutputOracleTest:testCannot_proposeEmptyOutput() (gas: 24149)
+L2OutputOracleTest:testCannot_proposeFutureTimetamp() (gas: 26073)
+L2OutputOracleTest:testCannot_proposeL2OutputIfNotProposer() (gas: 23563)
+L2OutputOracleTest:testCannot_proposeOnWrongFork() (gas: 26380)
+L2OutputOracleTest:testCannot_proposeUnexpectedBlockNumber() (gas: 26004)
+L2OutputOracleTest:test_changeProposer() (gas: 56149)
+L2OutputOracleTest:test_computeL2Timestamp() (gas: 30173)
+L2OutputOracleTest:test_constructor() (gas: 49090)
+L2OutputOracleTest:test_deleteOutput() (gas: 77312)
+L2OutputOracleTest:test_getL2Output() (gas: 88572)
+L2OutputOracleTest:test_latestBlockNumber() (gas: 76241)
 L2OutputOracleTest:test_nextBlockNumber() (gas: 15254)
-L2OutputOracleTest:test_proposeWithBlockhashAndHeight() (gas: 75046)
-L2OutputOracleTest:test_proposingAnotherOutput() (gas: 76903)
-L2OutputOracleTest:test_updateOwner() (gas: 46095)
-L2OutputOracleUpgradeable_Test:test_cannotInitImpl() (gas: 19555)
-L2OutputOracleUpgradeable_Test:test_cannotInitProxy() (gas: 24554)
-L2OutputOracleUpgradeable_Test:test_initValuesOnProxy() (gas: 39086)
+L2OutputOracleTest:test_proposeWithBlockhashAndHeight() (gas: 75045)
+L2OutputOracleTest:test_proposingAnotherOutput() (gas: 76902)
+L2OutputOracleTest:test_updateOwner() (gas: 46161)
+L2OutputOracleUpgradeable_Test:test_cannotInitImpl() (gas: 17381)
+L2OutputOracleUpgradeable_Test:test_cannotInitProxy() (gas: 22377)
+L2OutputOracleUpgradeable_Test:test_initValuesOnProxy() (gas: 39108)
 L2OutputOracleUpgradeable_Test:test_upgrading() (gas: 180632)
 L2StandardBridge_Test:test_cannotWithdrawEthWithoutSendingIt() (gas: 21816)
 L2StandardBridge_Test:test_finalizeBridgeETH_incorrectValueReverts() (gas: 23835)
@@ -132,7 +121,6 @@ L2StandardBridge_Test:test_withdraw() (gas: 347893)
 L2StandardBridge_Test:test_withdrawTo() (gas: 348648)
 L2StandardBridge_Test:test_withdraw_onlyEOA() (gas: 251656)
 L2ToL1MessagePasserTest:test_burn() (gas: 113395)
-L2ToL1MessagePasserTest:test_fuzz_initiateWithdrawal(address,address,uint256,uint256,bytes) (runs: 256, μ: 76163, ~: 75939)
 L2ToL1MessagePasserTest:test_initiateWithdrawal_fromContract() (gas: 72486)
 L2ToL1MessagePasserTest:test_initiateWithdrawal_fromEOA() (gas: 76434)
 LegacyERC20ETH_Test:test_approve() (gas: 10796)
@@ -162,16 +150,15 @@ OptimismPortalUpgradeable_Test:test_cannotInitImpl() (gas: 10813)
 OptimismPortalUpgradeable_Test:test_cannotInitProxy() (gas: 15789)
 OptimismPortalUpgradeable_Test:test_initValuesOnProxy() (gas: 15967)
 OptimismPortalUpgradeable_Test:test_upgrading() (gas: 180632)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_differential(address,address,uint256,uint256,bytes) (runs: 256, μ: 258471, ~: 259036)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOnInsufficientGas() (gas: 158312)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOnInvalidOutputRootProof() (gas: 81265)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOnRecentWithdrawal() (gas: 50525)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOnReentrancy() (gas: 202902)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOnReplay() (gas: 278777)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOnInsufficientGas() (gas: 160812)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOnInvalidOutputRootProof() (gas: 81287)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOnRecentWithdrawal() (gas: 53025)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOnReentrancy() (gas: 205402)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOnReplay() (gas: 278821)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOnSelfCall() (gas: 50563)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOninvalidWithdrawalProof() (gas: 148586)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_succeeds() (gas: 186825)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_targetFails() (gas: 289474)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_revertsOninvalidWithdrawalProof() (gas: 148608)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_succeeds() (gas: 186847)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_targetFails() (gas: 289496)
 OptimismPortal_Test:test_OptimismPortalConstructor() (gas: 17341)
 OptimismPortal_Test:test_OptimismPortalContractCreationReverts() (gas: 14199)
 OptimismPortal_Test:test_OptimismPortalReceiveEth() (gas: 127534)
@@ -183,20 +170,20 @@ OptimismPortal_Test:test_depositTransaction_withEthValueAndContractContractCreat
 OptimismPortal_Test:test_depositTransaction_withEthValueAndEOAContractCreation() (gas: 75881)
 OptimismPortal_Test:test_depositTransaction_withEthValueFromContract() (gas: 83333)
 OptimismPortal_Test:test_depositTransaction_withEthValueFromEOA() (gas: 83993)
-OptimismPortal_Test:test_isBlockFinalized() (gas: 113744)
-OptimismPortal_Test:test_simple_isBlockFinalized() (gas: 24130)
+OptimismPortal_Test:test_isBlockFinalized() (gas: 113878)
+OptimismPortal_Test:test_simple_isBlockFinalized() (gas: 26630)
 Proxy_Test:test_clashingFunctionSignatures() (gas: 101427)
 Proxy_Test:test_implementationKey() (gas: 20942)
 Proxy_Test:test_implementationProxyCallIfNotAdmin() (gas: 30021)
 Proxy_Test:test_implementationZeroAddress() (gas: 47604)
 Proxy_Test:test_itDelegatesToTheImplementation() (gas: 45251)
 Proxy_Test:test_ownerKey() (gas: 19091)
-Proxy_Test:test_ownerProxyCallIfNotAdmin() (gas: 34729)
+Proxy_Test:test_ownerProxyCallIfNotAdmin() (gas: 34711)
 Proxy_Test:test_payableUpgradeToAndCall() (gas: 53865)
-Proxy_Test:test_revertUpgradeToAndCall() (gas: 104727)
+Proxy_Test:test_revertUpgradeToAndCall() (gas: 104654)
 Proxy_Test:test_upgradeToAndCall() (gas: 125305)
 Proxy_Test:test_zeroAddressCaller() (gas: 14825)
-ProxyAdmin_Test:test_chugsplashChangeProxyAdmin() (gas: 35642)
+ProxyAdmin_Test:test_chugsplashChangeProxyAdmin() (gas: 35623)
 ProxyAdmin_Test:test_chugsplashGetProxyAdmin() (gas: 15683)
 ProxyAdmin_Test:test_chugsplashGetProxyImplementation() (gas: 51149)
 ProxyAdmin_Test:test_chugsplashUpgrade() (gas: 48960)
@@ -206,7 +193,7 @@ ProxyAdmin_Test:test_delegateResolvedGetProxyAdmin() (gas: 17699)
 ProxyAdmin_Test:test_delegateResolvedGetProxyImplementation() (gas: 62115)
 ProxyAdmin_Test:test_delegateResolvedUpgrade() (gas: 58520)
 ProxyAdmin_Test:test_delegateResolvedUpgradeAndCall() (gas: 97989)
-ProxyAdmin_Test:test_erc1967ChangeProxyAdmin() (gas: 33870)
+ProxyAdmin_Test:test_erc1967ChangeProxyAdmin() (gas: 33851)
 ProxyAdmin_Test:test_erc1967GetProxyAdmin() (gas: 15669)
 ProxyAdmin_Test:test_erc1967GetProxyImplementation() (gas: 52093)
 ProxyAdmin_Test:test_erc1967Upgrade() (gas: 50030)
@@ -301,7 +288,6 @@ ResourceMetering_Test:test_updateTenEmptyBlocks() (gas: 20571)
 ResourceMetering_Test:test_updateTwoEmptyBlocks() (gas: 20594)
 ResourceMetering_Test:test_useMaxSucceeds() (gas: 8017134)
 ResourceMetering_Test:test_useMoreThanMaxReverts() (gas: 16058)
-SafeCall_Test:test_safeCall(address,address,uint256,uint64,bytes) (runs: 256, μ: 43632, ~: 45833)
 Semver_Test:test_behindProxy() (gas: 506906)
 Semver_Test:test_version() (gas: 9487)
 SequencerFeeVault_Test:test_constructor() (gas: 7678)

packages/contracts-bedrock/contracts/L1/L2OutputOracle.sol

@@ -138,7 +138,27 @@ contract L2OutputOracle is OwnableUpgradeable, Semver {
         STARTING_TIMESTAMP = _startingTimestamp;
         L2_BLOCK_TIME = _l2BlockTime;
 
-        initialize(_genesisL2Output, _startingBlockNumber, _proposer, _owner);
+        initialize(_genesisL2Output, _proposer, _owner);
+    }
+
+    /**
+     * @notice Initializer.
+     *
+     * @param _genesisL2Output     The initial L2 output of the L2 chain.
+     * @param _proposer            The address of the proposer.
+     * @param _owner               The address of the owner.
+     */
+    function initialize(
+        bytes32 _genesisL2Output,
+        address _proposer,
+        address _owner
+    ) public initializer {
+        require(_proposer != _owner, "L2OutputOracle: proposer cannot be the same as the owner");
+        l2Outputs[STARTING_BLOCK_NUMBER] = Types.OutputProposal(_genesisL2Output, block.timestamp);
+        latestBlockNumber = STARTING_BLOCK_NUMBER;
+        __Ownable_init();
+        changeProposer(_proposer);
+        _transferOwnership(_owner);
     }
 
     /**
@@ -257,28 +277,6 @@ contract L2OutputOracle is OwnableUpgradeable, Semver {
         return output;
     }
 
-    /**
-     * @notice Initializer.
-     *
-     * @param _genesisL2Output     The initial L2 output of the L2 chain.
-     * @param _startingBlockNumber The timestamp to start L2 block at.
-     * @param _proposer            The address of the proposer.
-     * @param _owner               The address of the owner.
-     */
-    function initialize(
-        bytes32 _genesisL2Output,
-        uint256 _startingBlockNumber,
-        address _proposer,
-        address _owner
-    ) public initializer {
-        require(_proposer != _owner, "L2OutputOracle: proposer cannot be the same as the owner");
-        l2Outputs[_startingBlockNumber] = Types.OutputProposal(_genesisL2Output, block.timestamp);
-        latestBlockNumber = _startingBlockNumber;
-        __Ownable_init();
-        changeProposer(_proposer);
-        _transferOwnership(_owner);
-    }
-
     /**
      * @notice Overrides the standard implementation of transferOwnership
      *         to add the requirement that the owner and proposer are distinct.

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

@@ -130,12 +130,13 @@ contract L2OutputOracle_Initializer is CommonTest {
         vm.prank(multisig);
         proxy.upgradeToAndCall(
             address(oracleImpl),
-            abi.encodeWithSelector(
-                L2OutputOracle.initialize.selector,
-                genesisL2Output,
-                startingBlockNumber,
-                proposer,
-                owner
+            abi.encodeCall(
+                L2OutputOracle.initialize,
+                (
+                    genesisL2Output,
+                    proposer,
+                    owner
+                )
             )
         );
         oracle = L2OutputOracle(address(proxy));

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

@@ -384,7 +384,6 @@ contract L2OutputOracleUpgradeable_Test is L2OutputOracle_Initializer {
         vm.expectRevert("Initializable: contract is already initialized");
         L2OutputOracle(payable(proxy)).initialize(
             genesisL2Output,
-            startingBlockNumber,
             proposer,
             owner
         );
@@ -394,7 +393,6 @@ contract L2OutputOracleUpgradeable_Test is L2OutputOracle_Initializer {
         vm.expectRevert("Initializable: contract is already initialized");
         L2OutputOracle(oracleImpl).initialize(
             genesisL2Output,
-            startingBlockNumber,
             proposer,
             owner
         );

packages/contracts-bedrock/deploy/001-InitImplementations.deploy.ts

@@ -10,7 +10,6 @@ const upgradeABIs = {
     'initialize(bytes32,uint256,address,address)',
     [
       deployConfig.l2OutputOracleGenesisL2Output,
-      deployConfig.l2OutputOracleStartingBlockNumber,
       deployConfig.l2OutputOracleProposer,
       deployConfig.l2OutputOracleOwner,
     ],