Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions interfaces/L2/IBaseTime.sol

This file was deleted.

1 change: 0 additions & 1 deletion scripts/Artifacts.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ contract Artifacts {
_predeploys[keccak256("OperatorFeeVault")] = payable(Predeploys.OPERATOR_FEE_VAULT);
_predeploys[keccak256("SchemaRegistry")] = payable(Predeploys.SCHEMA_REGISTRY);
_predeploys[keccak256("EAS")] = payable(Predeploys.EAS);
_predeploys[keccak256("BaseTime")] = payable(Predeploys.BASE_TIME);
}

/// @notice Returns the address of a deployment. Also handles the predeploys.
Expand Down
6 changes: 0 additions & 6 deletions scripts/L2Genesis.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ contract L2Genesis is Script {
// 1C,1D,1E,1F: not used.
setSchemaRegistry(); // 20
setEAS(); // 21
setBaseTime(); // 30
}

function setProxyAdmin(Input memory _input) internal {
Expand Down Expand Up @@ -314,11 +313,6 @@ contract L2Genesis is Script {
});
}

/// @notice This predeploy is following the safety invariant #1.
function setBaseTime() internal {
_setImplementationCode(Predeploys.BASE_TIME);
}

/// @notice This predeploy is following the safety invariant #1.
function setSchemaRegistry() internal {
_setImplementationCode(Predeploys.SCHEMA_REGISTRY);
Expand Down
64 changes: 0 additions & 64 deletions snapshots/abi/BaseTime.json

This file was deleted.

4 changes: 0 additions & 4 deletions snapshots/semver-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@
"initCodeHash": "0x812f8ec3945f0b2e2a9615cd7c5cdd60dbe8927f41e606cb2bd488c5e6dec02a",
"sourceCodeHash": "0xcb329746df0baddd3dc03c6c88da5d6bdc0f0a96d30e6dc78d0891bb1e935032"
},
"src/L2/BaseTime.sol:BaseTime": {
"initCodeHash": "0xfcd48af0cfd907d0ce91f61ea437c81c9a98269ca2071d7d27291f20c483ccc0",
"sourceCodeHash": "0x98e246b6ff058ecb8aaeacaa33ce70674f4d3d4a8dcabe91df6f772c6d237667"
},
"src/L2/FeeDisburser.sol:FeeDisburser": {
"initCodeHash": "0x1278027e3756e2989e80c0a7b513e221a5fe0d3dbd9ded108375a29b2c1f3d57",
"sourceCodeHash": "0xac49a0ecf22b8a7bb3ebef830a2d27b19050f9b08941186e8563d5113cf0ce9c"
Expand Down
9 changes: 0 additions & 9 deletions snapshots/storageLayout/BaseTime.json

This file was deleted.

36 changes: 0 additions & 36 deletions src/L2/BaseTime.sol

This file was deleted.

7 changes: 1 addition & 6 deletions src/libraries/Predeploys.sol
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ library Predeploys {
/// @notice Address of the EAS predeploy.
address internal constant EAS = 0x4200000000000000000000000000000000000021;

/// @notice Address of the BaseTime predeploy.
address internal constant BASE_TIME = 0x4200000000000000000000000000000000000030;

/// @custom:legacy
/// @notice Address of the LegacyERC20ETH predeploy. Deprecated. Balances are migrated to the
/// state trie as of the Bedrock upgrade. Contract has been locked and write functions
Expand Down Expand Up @@ -93,7 +90,6 @@ library Predeploys {
if (_addr == SCHEMA_REGISTRY) return "SchemaRegistry";
if (_addr == EAS) return "EAS";
if (_addr == LEGACY_ERC20_ETH) return "LegacyERC20ETH";
if (_addr == BASE_TIME) return "BaseTime";
revert("Predeploys: unnamed predeploy");
}

Expand All @@ -108,8 +104,7 @@ library Predeploys {
|| _addr == L2_STANDARD_BRIDGE || _addr == SEQUENCER_FEE_WALLET || _addr == OPTIMISM_MINTABLE_ERC20_FACTORY
|| _addr == L2_ERC721_BRIDGE || _addr == L1_BLOCK_ATTRIBUTES || _addr == L2_TO_L1_MESSAGE_PASSER
|| _addr == OPTIMISM_MINTABLE_ERC721_FACTORY || _addr == PROXY_ADMIN || _addr == BASE_FEE_VAULT
|| _addr == L1_FEE_VAULT || _addr == OPERATOR_FEE_VAULT || _addr == SCHEMA_REGISTRY || _addr == EAS
|| _addr == BASE_TIME;
|| _addr == L1_FEE_VAULT || _addr == OPERATOR_FEE_VAULT || _addr == SCHEMA_REGISTRY || _addr == EAS;
}

function isPredeployNamespace(address _addr) internal pure returns (bool) {
Expand Down
87 changes: 0 additions & 87 deletions test/L2/BaseTime.t.sol

This file was deleted.

8 changes: 0 additions & 8 deletions test/scripts/L2Genesis.t.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { EIP1967Helper } from "test/mocks/EIP1967Helper.sol";
import { L2Genesis } from "scripts/L2Genesis.s.sol";
import { Predeploys } from "src/libraries/Predeploys.sol";
import { LATEST_FORK } from "scripts/libraries/Config.sol";
import { IBaseTime } from "interfaces/L2/IBaseTime.sol";
import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
import { IOptimismMintableERC721Factory } from "interfaces/L2/IOptimismMintableERC721Factory.sol";
import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
Expand Down Expand Up @@ -60,12 +59,6 @@ abstract contract L2Genesis_TestInit is Test {
assertGt(Predeploys.WETH.code.length, 0);
}

function _assertBaseTime() internal view {
assertEq(Predeploys.BASE_TIME, 0x4200000000000000000000000000000000000030);
assertTrue(Predeploys.isSupportedPredeploy(Predeploys.BASE_TIME));
assertEq(IBaseTime(Predeploys.BASE_TIME).timestampMillisPart(), 0);
}

function _assertFeeVaultsWithoutRevenueShare() internal view {
_assertFeeVault(
Predeploys.BASE_FEE_VAULT,
Expand Down Expand Up @@ -167,7 +160,6 @@ contract L2Genesis_Run_Test is L2Genesis_TestInit {

_assertProxyAdmin();
_assertPredeploys();
_assertBaseTime();
_assertFeeVaultsWithoutRevenueShare();
_assertFactories();
_assertForks();
Expand Down
Loading