contracts-bedrock: fix style

packages/contracts-bedrock/.gas-snapshot

@@ -234,14 +234,14 @@ L2ERC721Bridge_Test:test_finalizeBridgeERC721_notFromRemoteMessenger_reverts() (
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_notViaLocalMessenger_reverts() (gas: 16126)
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_selfToken_reverts() (gas: 17681)
 L2ERC721Bridge_Test:test_finalizeBridgeERC721_succeeds() (gas: 169375)
-L2OutputOracleUpgradeable_Test:test_initValuesOnImpl_succeeds() (gas: 23891)
-L2OutputOracleUpgradeable_Test:test_initValuesOnProxy_succeeds() (gas: 46789)
+L2OutputOracleUpgradeable_Test:test_initValuesOnImpl_succeeds() (gas: 23902)
+L2OutputOracleUpgradeable_Test:test_initValuesOnProxy_succeeds() (gas: 46800)
 L2OutputOracleUpgradeable_Test:test_initializeImpl_alreadyInitialized_reverts() (gas: 15216)
 L2OutputOracleUpgradeable_Test:test_initializeProxy_alreadyInitialized_reverts() (gas: 20216)
 L2OutputOracleUpgradeable_Test:test_upgrading_succeeds() (gas: 191346)
 L2OutputOracle_constructor_Test:test_constructor_l2BlockTimeZero_reverts() (gas: 39209)
 L2OutputOracle_constructor_Test:test_constructor_submissionInterval_reverts() (gas: 39219)
-L2OutputOracle_constructor_Test:test_constructor_succeeds() (gas: 51766)
+L2OutputOracle_constructor_Test:test_constructor_succeeds() (gas: 51777)
 L2OutputOracle_constructor_Test:test_initialize_badTimestamp_reverts() (gas: 12353)
 L2OutputOracle_deleteOutputs_Test:test_deleteL2Outputs_afterLatest_reverts() (gas: 217031)
 L2OutputOracle_deleteOutputs_Test:test_deleteL2Outputs_finalized_reverts() (gas: 113258)
@@ -371,7 +371,7 @@ OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalid
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidWithdrawalProof_reverts() (gas: 111317)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onSelfCall_reverts() (gas: 52973)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_paused_reverts() (gas: 58846)
-OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRootAndOutputIndex_succeeds() (gas: 297500)
+OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRootAndOutputIndex_succeeds() (gas: 297494)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProveChangedOutputRoot_succeeds() (gas: 227596)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_replayProve_reverts() (gas: 166699)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_validWithdrawalProof_succeeds() (gas: 154430)
@@ -387,7 +387,7 @@ OptimismPortal_Test:test_depositTransaction_withEthValueAndContractContractCreat
 OptimismPortal_Test:test_depositTransaction_withEthValueAndEOAContractCreation_succeeds() (gas: 75932)
 OptimismPortal_Test:test_depositTransaction_withEthValueFromContract_succeeds() (gas: 83479)
 OptimismPortal_Test:test_depositTransaction_withEthValueFromEOA_succeeds() (gas: 84072)
-OptimismPortal_Test:test_isOutputFinalized_succeeds() (gas: 126755)
+OptimismPortal_Test:test_isOutputFinalized_succeeds() (gas: 126749)
 OptimismPortal_Test:test_minimumGasLimit_succeeds() (gas: 17430)
 OptimismPortal_Test:test_pause_onlyGuardian_reverts() (gas: 24487)
 OptimismPortal_Test:test_pause_succeeds() (gas: 27344)

packages/contracts-bedrock/.storage-layout

@@ -49,8 +49,8 @@
 | startingBlockNumber | uint256                       | 1    | 0      | 32    | src/L1/L2OutputOracle.sol:L2OutputOracle |
 | startingTimestamp   | uint256                       | 2    | 0      | 32    | src/L1/L2OutputOracle.sol:L2OutputOracle |
 | l2Outputs           | struct Types.OutputProposal[] | 3    | 0      | 32    | src/L1/L2OutputOracle.sol:L2OutputOracle |
-| CHALLENGER          | address                       | 4    | 0      | 20    | src/L1/L2OutputOracle.sol:L2OutputOracle |
-| PROPOSER            | address                       | 5    | 0      | 20    | src/L1/L2OutputOracle.sol:L2OutputOracle |
+| challenger          | address                       | 4    | 0      | 20    | src/L1/L2OutputOracle.sol:L2OutputOracle |
+| proposer            | address                       | 5    | 0      | 20    | src/L1/L2OutputOracle.sol:L2OutputOracle |
 
 =======================
 ➡ src/L1/OptimismPortal.sol:OptimismPortal

packages/contracts-bedrock/semver-lock.json

@@ -2,7 +2,7 @@
   "src/L1/L1CrossDomainMessenger.sol": "0x2b276f14475869cfd81868b03dc72b91dd726a787c9568caf4849fe34830b207",
   "src/L1/L1ERC721Bridge.sol": "0xac9d8e236a1b35c358f9800834f65375cf4270155e817cf3d0f2bac1968f9107",
   "src/L1/L1StandardBridge.sol": "0x26fd79e041c403f4bc68758c410fcc801975e7648c0b51a2c4a6e8c44fabcbfd",
-  "src/L1/L2OutputOracle.sol": "0x7c3245c8f37475aab4e43b6ed753ed140b5d4c38d25de797af56ee63258c002a",
+  "src/L1/L2OutputOracle.sol": "0x8f32ccb4c5cb63a459a0e79ee412177dc03fd279fdaaf1dac69e8c714902e857",
   "src/L1/OptimismPortal.sol": "0xeaa47a63e8a3bcfdb7dfd3e6c8608369e34e362d9de82f3acf13cbc27c070bf7",
   "src/L1/SystemConfig.sol": "0x8e2b5103d2eb93b74af2e2f96a4505e637cdc3c44d80cf5ec2eca70060e1deff",
   "src/L2/BaseFeeVault.sol": "0xa596e60762f16192cfa86459fcb9f4da9d8f756106eedac643a1ffeafbbfcc5f",

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

@@ -40,19 +40,13 @@ contract L2OutputOracle is Initializable, Semver {
     /// @notice An array of L2 output proposals.
     Types.OutputProposal[] internal l2Outputs;
 
-    /// @notice The address of the challenger. Can be updated via upgrade.
-    ///         Public getter is legacy and will be removed in the future.
-    ///         Use `challenger` instead.
+    /// @notice The address of the challenger. Can be updated via reinitialize.
     /// @custom:network-specific
-    /// @custom:legacy
-    address public CHALLENGER;
+    address public challenger;
 
-    /// @notice The address of the proposer. Can be updated via upgrade.
-    ///         Public getter is legacy and will be removed in the future.
-    ///         Use `proposer` instead.
+    /// @notice The address of the proposer. Can be updated via reinitialize.
     /// @custom:network-specific
-    /// @custom:legacy
-    address public PROPOSER;
+    address public proposer;
 
     /// @notice Emitted when an output is proposed.
     /// @param outputRoot    The output root.
@@ -118,9 +112,8 @@ contract L2OutputOracle is Initializable, Semver {
 
         startingTimestamp = _startingTimestamp;
         startingBlockNumber = _startingBlockNumber;
-
-        PROPOSER = _proposer;
-        CHALLENGER = _challenger;
+        proposer = _proposer;
+        challenger = _challenger;
     }
 
     /// @notice Getter for the output proposal submission interval.
@@ -138,14 +131,18 @@ contract L2OutputOracle is Initializable, Semver {
         return FINALIZATION_PERIOD_SECONDS;
     }
 
-    /// @notice Getter for the challenger address.
-    function challenger() external view returns (address) {
-        return CHALLENGER;
+    /// @notice Getter for the challenger address. This will be removed
+    ///         in the future, use `challenger` instead.
+    /// @custom:legacy
+    function CHALLENGER() external view returns (address) {
+        return challenger;
     }
 
-    /// @notice Getter for the proposer address.
-    function proposer() external view returns (address) {
-        return PROPOSER;
+    /// @notice Getter for the proposer address. This will be removed in the
+    ///         future, use `proposer` instead.
+    /// @custom:legacy
+    function PROPOSER() external view returns (address) {
+        return proposer;
     }
 
     /// @notice Deletes all output proposals after and including the proposal that corresponds to
@@ -155,7 +152,7 @@ contract L2OutputOracle is Initializable, Semver {
     // solhint-disable-next-line ordering
     function deleteL2Outputs(uint256 _l2OutputIndex) external {
         require(
-            msg.sender == CHALLENGER,
+            msg.sender == challenger,
             "L2OutputOracle: only the challenger address can delete outputs"
         );
 
@@ -195,7 +192,7 @@ contract L2OutputOracle is Initializable, Semver {
         uint256 _l1BlockNumber
     ) external payable {
         require(
-            msg.sender == PROPOSER,
+            msg.sender == proposer,
             "L2OutputOracle: only the proposer address can propose new outputs"
         );