From bcc0fbaff75566b4fd79475b86de2cf62a621587 Mon Sep 17 00:00:00 2001 From: Maurelian Date: Fri, 4 Oct 2024 15:38:28 -0400 Subject: [PATCH] fix: import error --- packages/contracts-bedrock/scripts/DeployOPChain.s.sol | 7 ++++--- packages/contracts-bedrock/src/libraries/Constants.sol | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/contracts-bedrock/scripts/DeployOPChain.s.sol b/packages/contracts-bedrock/scripts/DeployOPChain.s.sol index b05161b32474c..140c2bba6b651 100644 --- a/packages/contracts-bedrock/scripts/DeployOPChain.s.sol +++ b/packages/contracts-bedrock/scripts/DeployOPChain.s.sol @@ -13,7 +13,8 @@ import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol"; import { ISuperchainConfig } from "src/L1/interfaces/ISuperchainConfig.sol"; import { IBigStepper } from "src/dispute/interfaces/IBigStepper.sol"; import { Predeploys } from "src/libraries/Predeploys.sol"; -import { Constants } from "scripts/libraries/Constants.sol"; +import { Constants } from "src/libraries/Constants.sol"; +import { Constants as ScriptConstants } from "scripts/libraries/Constants.sol"; import { IProxyAdmin } from "src/universal/interfaces/IProxyAdmin.sol"; import { IProxy } from "src/universal/interfaces/IProxy.sol"; @@ -161,10 +162,10 @@ contract DeployOPChainInput is BaseDeployIO { // because to to update to the permissionless game, we will need to update its starting // anchor root and deploy a new permissioned dispute game contract anyway. // - // You can `console.logBytes(abi.encode(Constants.DEFAULT_STARTING_ANCHOR_ROOTS()))` to get the bytes that + // You can `console.logBytes(abi.encode(ScriptConstants.DEFAULT_STARTING_ANCHOR_ROOTS()))` to get the bytes that // are hardcoded into `op-chain-ops/deployer/opcm/opchain.go` - return abi.encode(Constants.DEFAULT_STARTING_ANCHOR_ROOTS()); + return abi.encode(ScriptConstants.DEFAULT_STARTING_ANCHOR_ROOTS()); } function opcmProxy() public returns (OPContractsManager) { diff --git a/packages/contracts-bedrock/src/libraries/Constants.sol b/packages/contracts-bedrock/src/libraries/Constants.sol index 029e3db26fc97..1cbd61d21a5e0 100644 --- a/packages/contracts-bedrock/src/libraries/Constants.sol +++ b/packages/contracts-bedrock/src/libraries/Constants.sol @@ -2,8 +2,6 @@ pragma solidity ^0.8.0; import { IResourceMetering } from "src/L1/interfaces/IResourceMetering.sol"; -import { IAnchorStateRegistry } from "src/dispute/interfaces/IAnchorStateRegistry.sol"; -import { GameTypes, OutputRoot, Hash } from "src/dispute/lib/Types.sol"; /// @title Constants /// @notice Constants is a library for storing constants. Simple! Don't put everything in here, just