feat(ctb): remove historicalTotalBlocks

Removes historicalTotalBlocks from the L2OutputOracle.

.changeset/blue-hornets-jam.md

@@ -0,0 +1,5 @@
+---
+'@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/.gas-snapshot

@@ -6,7 +6,7 @@ GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 1123
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 348176)
 GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 112287)
 GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 40569)
-GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 68693)
+GasBenchMark_L2OutputOracle:test_proposeL2Output_benchmark() (gas: 68715)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark() (gas: 75002)
 GasBenchMark_OptimismPortal:test_depositTransaction_benchmark_1() (gas: 35795)
 CrossDomainMessenger_Test:testFuzz_baseGas(uint32) (runs: 256, μ: 20263, ~: 20263)
@@ -64,18 +64,18 @@ L1CrossDomainMessenger_Test:test_L1MessengerTwiceSendMessage() (gas: 1490486)
 L1CrossDomainMessenger_Test:test_L1MessengerUnpause() (gas: 45233)
 L1CrossDomainMessenger_Test:test_L1MessengerXDomainSenderReverts() (gas: 24283)
 L1CrossDomainMessenger_Test:test_L1MessengerxDomainMessageSenderResets() (gas: 84138)
-L1StandardBridge_DepositERC20To_Test:test_depositERC20To_success() (gas: 575801)
-L1StandardBridge_DepositERC20_Test:test_depositERC20_succeeds() (gas: 573669)
+L1StandardBridge_DepositERC20To_Test:test_depositERC20To_success() (gas: 575774)
+L1StandardBridge_DepositERC20_Test:test_depositERC20_succeeds() (gas: 573645)
 L1StandardBridge_DepositERC20_TestFail:test_depositERC20_revert_notEoa() (gas: 22321)
 L1StandardBridge_DepositETHTo_Test:test_depositETHTo() (gas: 324761)
 L1StandardBridge_DepositETH_Test:test_depositETH_success() (gas: 367608)
 L1StandardBridge_DepositETH_TestFail:test_DepositETH_revert_notEoa() (gas: 40781)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_revert_incorrectValue() (gas: 34229)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_revert_sendToMessenger() (gas: 34312)
 L1StandardBridge_FinalizeBridgeETH_TestFail:test_finalizeBridgeETH_revert_sendToSelf() (gas: 34279)
-L1StandardBridge_FinalizeERC20Withdrawal_Test:test_finalizeERC20Withdrawal() (gas: 484495)
-L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_revert_notMessenger() (gas: 31198)
-L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_revert_notOtherBridge() (gas: 31552)
+L1StandardBridge_FinalizeERC20Withdrawal_Test:test_finalizeERC20Withdrawal() (gas: 484473)
+L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_revert_notMessenger() (gas: 31183)
+L1StandardBridge_FinalizeERC20Withdrawal_TestFail:test_finalizeERC20Withdrawal_revert_notOtherBridge() (gas: 31537)
 L1StandardBridge_FinalizeETHWithdrawal_Test:test_finalizeETHWithdrawal() (gas: 58708)
 L1StandardBridge_Getter_Test:test_getters_success() (gas: 31568)
 L1StandardBridge_Initialize_Test:test_initialize_success() (gas: 22072)
@@ -93,40 +93,40 @@ L2CrossDomainMessenger_Test:test_L2MessengerSendMessage() (gas: 122445)
 L2CrossDomainMessenger_Test:test_L2MessengerTwiceSendMessage() (gas: 134610)
 L2CrossDomainMessenger_Test:test_L2MessengerXDomainSenderReverts() (gas: 10576)
 L2CrossDomainMessenger_Test:test_L2MessengerxDomainMessageSenderResets() (gas: 52673)
-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:testCannot_ProposeWithUnmatchedBlockhash() (gas: 26850)
+L2OutputOracleTest:testCannot_constructWithBadTimestamp() (gas: 50677)
+L2OutputOracleTest:testCannot_deleteL2Output_ifNotOwner() (gas: 25101)
+L2OutputOracleTest:testCannot_deleteL2Output_withWrongRoot() (gas: 91466)
+L2OutputOracleTest:testCannot_deleteL2Output_withWrongTime() (gas: 87449)
+L2OutputOracleTest:testCannot_proposeEmptyOutput() (gas: 24171)
+L2OutputOracleTest:testCannot_proposeFutureTimetamp() (gas: 26095)
+L2OutputOracleTest:testCannot_proposeL2OutputIfNotProposer() (gas: 23585)
+L2OutputOracleTest:testCannot_proposeOnWrongFork() (gas: 26402)
+L2OutputOracleTest:testCannot_proposeUnexpectedBlockNumber() (gas: 26026)
+L2OutputOracleTest:test_changeProposer() (gas: 55885)
 L2OutputOracleTest:test_computeL2Timestamp() (gas: 30192)
-L2OutputOracleTest:test_constructor() (gas: 49090)
-L2OutputOracleTest:test_deleteOutput() (gas: 77312)
-L2OutputOracleTest:test_getL2Output() (gas: 88610)
-L2OutputOracleTest:test_latestBlockNumber() (gas: 76241)
-L2OutputOracleTest:test_nextBlockNumber() (gas: 15254)
-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)
+L2OutputOracleTest:test_constructor() (gas: 45722)
+L2OutputOracleTest:test_deleteOutput() (gas: 77224)
+L2OutputOracleTest:test_getL2Output() (gas: 88456)
+L2OutputOracleTest:test_latestBlockNumber() (gas: 76263)
+L2OutputOracleTest:test_nextBlockNumber() (gas: 15231)
+L2OutputOracleTest:test_proposeWithBlockhashAndHeight() (gas: 75067)
+L2OutputOracleTest:test_proposingAnotherOutput() (gas: 76924)
+L2OutputOracleTest:test_updateOwner() (gas: 46227)
+L2OutputOracleUpgradeable_Test:test_cannotInitImpl() (gas: 17403)
+L2OutputOracleUpgradeable_Test:test_cannotInitProxy() (gas: 22399)
+L2OutputOracleUpgradeable_Test:test_initValuesOnProxy() (gas: 36198)
 L2OutputOracleUpgradeable_Test:test_upgrading() (gas: 180632)
 L2StandardBridge_Test:test_cannotWithdrawEthWithoutSendingIt() (gas: 21816)
 L2StandardBridge_Test:test_finalizeBridgeETH_incorrectValueReverts() (gas: 23800)
 L2StandardBridge_Test:test_finalizeBridgeETH_sendToMessengerReverts() (gas: 23938)
 L2StandardBridge_Test:test_finalizeBridgeETH_sendToSelfReverts() (gas: 23838)
-L2StandardBridge_Test:test_finalizeDeposit() (gas: 93603)
+L2StandardBridge_Test:test_finalizeDeposit() (gas: 93588)
 L2StandardBridge_Test:test_initialize() (gas: 10559)
 L2StandardBridge_Test:test_receive() (gas: 131887)
-L2StandardBridge_Test:test_withdraw() (gas: 347202)
-L2StandardBridge_Test:test_withdrawTo() (gas: 347975)
-L2StandardBridge_Test:test_withdraw_onlyEOA() (gas: 251656)
+L2StandardBridge_Test:test_withdraw() (gas: 347190)
+L2StandardBridge_Test:test_withdrawTo() (gas: 347963)
+L2StandardBridge_Test:test_withdraw_onlyEOA() (gas: 251644)
 L2ToL1MessagePasserTest:test_burn() (gas: 112531)
 L2ToL1MessagePasserTest:test_fuzz_initiateWithdrawal(address,address,uint256,uint256,bytes) (runs: 256, μ: 74040, ~: 73815)
 L2ToL1MessagePasserTest:test_initiateWithdrawal_fromContract() (gas: 70336)
@@ -142,13 +142,13 @@ LegacyERC20ETH_Test:test_transfer() (gas: 10829)
 LegacyERC20ETH_Test:test_transferFrom() (gas: 13008)
 LegacyMessagePasser_Test:test_LegacyMessagePasser_passMessageToL1_Succeeds() (gas: 34593)
 OptimismMintableERC20_Test:test_bridge() (gas: 9828)
-OptimismMintableERC20_Test:test_burn() (gas: 52788)
-OptimismMintableERC20_Test:test_burnRevertsFromNotBridge() (gas: 13228)
+OptimismMintableERC20_Test:test_burn() (gas: 52773)
+OptimismMintableERC20_Test:test_burnRevertsFromNotBridge() (gas: 13219)
 OptimismMintableERC20_Test:test_erc165_supportsInterface() (gas: 7828)
 OptimismMintableERC20_Test:test_l1Token() (gas: 9824)
 OptimismMintableERC20_Test:test_l2Bridge() (gas: 9746)
-OptimismMintableERC20_Test:test_mint() (gas: 65763)
-OptimismMintableERC20_Test:test_mintRevertsFromNotBridge() (gas: 13252)
+OptimismMintableERC20_Test:test_mint() (gas: 65754)
+OptimismMintableERC20_Test:test_mintRevertsFromNotBridge() (gas: 13243)
 OptimismMintableERC20_Test:test_remoteToken() (gas: 9740)
 OptimismMintableTokenFactory_Test:test_bridge() (gas: 7672)
 OptimismMintableTokenFactory_Test:test_createStandardL2Token() (gas: 1109858)
@@ -158,22 +158,22 @@ OptimismPortalUpgradeable_Test:test_initialize_cannotInitImpl_reverts() (gas: 10
 OptimismPortalUpgradeable_Test:test_initialize_cannotInitProxy_reverts() (gas: 15834)
 OptimismPortalUpgradeable_Test:test_params_initValuesOnProxy_success() (gas: 16010)
 OptimismPortalUpgradeable_Test:test_upgradeToAndCall_upgrading_success() (gas: 180630)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_differential_success(address,address,uint256,uint256,bytes) (runs: 256, μ: 220459, ~: 220292)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputRootChanges_reverts() (gas: 192857)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputTimestampIsNotFinalized_reverts() (gas: 195122)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_differential_success(address,address,uint256,uint256,bytes) (runs: 256, μ: 220455, ~: 220288)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputRootChanges_reverts() (gas: 192813)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifOutputTimestampIsNotFinalized_reverts() (gas: 195081)
 OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalNotProven_reverts() (gas: 39628)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalProofNotOldEnough_reverts() (gas: 190555)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onInsufficientGas_reverts() (gas: 193103)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onRecentWithdrawal_reverts() (gas: 173032)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReentrancy_reverts() (gas: 233436)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReplay_reverts() (gas: 232836)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_provenWithdrawalHash_success() (gas: 224781)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_targetFails_fails() (gas: 327453)
-OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_timestampLessThanL2OracleStart_reverts() (gas: 191332)
-OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidOutputRootProof_reverts() (gas: 81377)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_ifWithdrawalProofNotOldEnough_reverts() (gas: 190511)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onInsufficientGas_reverts() (gas: 193099)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onRecentWithdrawal_reverts() (gas: 173035)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReentrancy_reverts() (gas: 233408)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_onReplay_reverts() (gas: 232704)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_provenWithdrawalHash_success() (gas: 224693)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_targetFails_fails() (gas: 327365)
+OptimismPortal_FinalizeWithdrawal_Test:test_finalizeWithdrawalTransaction_timestampLessThanL2OracleStart_reverts() (gas: 191288)
+OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onInvalidOutputRootProof_reverts() (gas: 81333)
 OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_onSelfCall_reverts() (gas: 50821)
-OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_oninvalidWithdrawalProof_reverts() (gas: 130170)
-OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_validWithdrawalProof_success() (gas: 176914)
+OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_oninvalidWithdrawalProof_reverts() (gas: 130134)
+OptimismPortal_FinalizeWithdrawal_Test:test_proveWithdrawalTransaction_validWithdrawalProof_success() (gas: 176870)
 OptimismPortal_Test:test_OptimismPortalConstructor() (gas: 17342)
 OptimismPortal_Test:test_OptimismPortalReceiveEth_success() (gas: 127528)
 OptimismPortal_Test:test_depositTransaction_NoValueContract_success() (gas: 76728)
@@ -185,7 +185,7 @@ OptimismPortal_Test:test_depositTransaction_withEthValueAndContractContractCreat
 OptimismPortal_Test:test_depositTransaction_withEthValueAndEOAContractCreation_success() (gas: 75897)
 OptimismPortal_Test:test_depositTransaction_withEthValueFromContract_success() (gas: 83414)
 OptimismPortal_Test:test_depositTransaction_withEthValueFromEOA_success() (gas: 84009)
-OptimismPortal_Test:test_isBlockFinalized_success() (gas: 113932)
+OptimismPortal_Test:test_isBlockFinalized_success() (gas: 113690)
 OptimismPortal_Test:test_simple_isBlockFinalized_success() (gas: 24222)
 Proxy_Test:test_clashingFunctionSignatures() (gas: 101427)
 Proxy_Test:test_implementationKey() (gas: 20942)

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',