Merge pull request #3973 from ethereum-optimism/sc/ctb-rm-hist-blocks

feat(ctb): remove historicalTotalBlocks

.changeset/blue-hornets-jam.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Removes historicalTotalBlocks from the L2OutputOracle

op-chain-ops/genesis/layer_one.go

@@ -277,7 +277,6 @@ func deployL1Contracts(config *DeployConfig, backend *backends.SimulatedBackend)
 				uint642Big(config.L2OutputOracleSubmissionInterval),
 				[32]byte(config.L2OutputOracleGenesisL2Output),
 				big.NewInt(0),
-				big.NewInt(0),
 				uint642Big(uint64(config.L1GenesisBlockTimestamp)),
 				uint642Big(config.L2BlockTime),
 				config.L2OutputOracleProposer,
@@ -342,9 +341,8 @@ func l1Deployer(backend *backends.SimulatedBackend, opts *bind.TransactOpts, dep
 			deployment.Args[2].(*big.Int),
 			deployment.Args[3].(*big.Int),
 			deployment.Args[4].(*big.Int),
-			deployment.Args[5].(*big.Int),
+			deployment.Args[5].(common.Address),
 			deployment.Args[6].(common.Address),
-			deployment.Args[7].(common.Address),
 		)
 	case "OptimismPortal":
 		_, tx, _, err = bindings.DeployOptimismPortal(

op-chain-ops/genesis/layer_one_test.go

@@ -55,10 +55,6 @@ func TestBuildL1DeveloperGenesis(t *testing.T) {
 	require.NoError(t, err)
 	require.EqualValues(t, config.L2OutputOracleSubmissionInterval, interval.Uint64())
 
-	histBlocks, err := oracle.HISTORICALTOTALBLOCKS(callOpts)
-	require.NoError(t, err)
-	require.EqualValues(t, 0, histBlocks.Uint64())
-
 	startBlock, err := oracle.STARTINGBLOCKNUMBER(callOpts)
 	require.NoError(t, err)
 	require.EqualValues(t, 0, startBlock.Uint64())

op-e2e/setup.go

@@ -160,11 +160,6 @@ func writeDefaultJWT(t *testing.T) string {
 	return jwtPath
 }
 
-type L2OOContractConfig struct {
-	SubmissionFrequency   *big.Int
-	HistoricalTotalBlocks *big.Int
-}
-
 type DepositContractConfig struct {
 	L2Oracle           common.Address
 	FinalizationPeriod *big.Int

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

@@ -21,11 +21,6 @@ contract L2OutputOracle is OwnableUpgradeable, Semver {
      */
     uint256 public immutable SUBMISSION_INTERVAL;
 
-    /**
-     * @notice The number of blocks in the chain before the first block in this contract.
-     */
-    uint256 public immutable HISTORICAL_TOTAL_BLOCKS;
-
     /**
      * @notice The number of the first L2 block recorded in this contract.
      */
@@ -105,7 +100,6 @@ contract L2OutputOracle is OwnableUpgradeable, Semver {
      *
      * @param _submissionInterval    Interval in blocks at which checkpoints must be submitted.
      * @param _genesisL2Output       The initial L2 output of the L2 chain.
-     * @param _historicalTotalBlocks Number of blocks preceding this L2 chain.
      * @param _startingBlockNumber   The number of the first L2 block.
      * @param _startingTimestamp     The timestamp of the first L2 block.
      * @param _l2BlockTime           The time per L2 block, in seconds.
@@ -115,7 +109,6 @@ contract L2OutputOracle is OwnableUpgradeable, Semver {
     constructor(
         uint256 _submissionInterval,
         bytes32 _genesisL2Output,
-        uint256 _historicalTotalBlocks,
         uint256 _startingBlockNumber,
         uint256 _startingTimestamp,
         uint256 _l2BlockTime,
@@ -128,7 +121,6 @@ contract L2OutputOracle is OwnableUpgradeable, Semver {
         );
 
         SUBMISSION_INTERVAL = _submissionInterval;
-        HISTORICAL_TOTAL_BLOCKS = _historicalTotalBlocks;
         STARTING_BLOCK_NUMBER = _startingBlockNumber;
         STARTING_TIMESTAMP = _startingTimestamp;
         L2_BLOCK_TIME = _l2BlockTime;

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

@@ -98,7 +98,6 @@ contract L2OutputOracle_Initializer is CommonTest {
     uint256 internal submissionInterval = 1800;
     uint256 internal l2BlockTime = 2;
     bytes32 internal genesisL2Output = keccak256(abi.encode(0));
-    uint256 internal historicalTotalBlocks = 199;
     uint256 internal startingBlockNumber = 200;
     uint256 internal startingTimestamp = 1000;
 
@@ -122,7 +121,6 @@ contract L2OutputOracle_Initializer is CommonTest {
         oracleImpl = new L2OutputOracle(
             submissionInterval,
             genesisL2Output,
-            historicalTotalBlocks,
             startingBlockNumber,
             startingTimestamp,
             l2BlockTime,

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

@@ -16,7 +16,6 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
     function test_constructor() external {
         assertEq(oracle.owner(), owner);
         assertEq(oracle.SUBMISSION_INTERVAL(), submissionInterval);
-        assertEq(oracle.HISTORICAL_TOTAL_BLOCKS(), historicalTotalBlocks);
         assertEq(oracle.latestBlockNumber(), startingBlockNumber);
         assertEq(oracle.STARTING_BLOCK_NUMBER(), startingBlockNumber);
         assertEq(oracle.STARTING_TIMESTAMP(), startingTimestamp);
@@ -34,7 +33,6 @@ contract L2OutputOracleTest is L2OutputOracle_Initializer {
         new L2OutputOracle(
             submissionInterval,
             genesisL2Output,
-            historicalTotalBlocks,
             startingBlockNumber,
             // startingTimestamp is in the future
             block.timestamp + 1,
@@ -367,7 +365,6 @@ contract L2OutputOracleUpgradeable_Test is L2OutputOracle_Initializer {
 
     function test_initValuesOnProxy() external {
         assertEq(submissionInterval, oracleImpl.SUBMISSION_INTERVAL());
-        assertEq(historicalTotalBlocks, oracleImpl.HISTORICAL_TOTAL_BLOCKS());
         assertEq(startingBlockNumber, oracleImpl.STARTING_BLOCK_NUMBER());
         assertEq(startingTimestamp, oracleImpl.STARTING_TIMESTAMP());
         assertEq(l2BlockTime, oracleImpl.L2_BLOCK_TIME());

packages/contracts-bedrock/deploy/009-L2OutputOracleImpl.ts

@@ -32,7 +32,6 @@ const deployFn: DeployFunction = async (hre) => {
     args: [
       hre.deployConfig.l2OutputOracleSubmissionInterval,
       hre.deployConfig.l2OutputOracleGenesisL2Output,
-      hre.deployConfig.l2OutputOracleHistoricalTotalBlocks,
       hre.deployConfig.l2OutputOracleStartingBlockNumber,
       deployL2StartingTimestamp,
       hre.deployConfig.l2BlockTime,
@@ -50,11 +49,6 @@ const deployFn: DeployFunction = async (hre) => {
         'STARTING_BLOCK_NUMBER',
         hre.deployConfig.l2OutputOracleStartingBlockNumber
       )
-      await assertContractVariable(
-        contract,
-        'HISTORICAL_TOTAL_BLOCKS',
-        hre.deployConfig.l2OutputOracleHistoricalTotalBlocks
-      )
       await assertContractVariable(
         contract,
         'STARTING_TIMESTAMP',

packages/contracts-bedrock/hardhat.config.ts

@@ -161,11 +161,6 @@ const config: HardhatUserConfig = {
       type: 'string',
       default: ethers.constants.HashZero,
     },
-    // uint256 - Number of blocks preceding this L2 chain.
-    l2OutputOracleHistoricalTotalBlocks: {
-      type: 'number',
-      default: 0,
-    },
     // uint256 - The number of the first L2 block.
     l2OutputOracleStartingBlockNumber: {
       type: 'number',