Skip to content

remove IMIPS.sol/IMIPS2.sol #16914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Inphi merged 1 commit into from
Aug 1, 2025
Merged

remove IMIPS.sol/IMIPS2.sol #16914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 0 additions & 32 deletions packages/contracts-bedrock/interfaces/cannon/IMIPS.sol
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions packages/contracts-bedrock/interfaces/cannon/IMIPS2.sol
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions packages/contracts-bedrock/scripts/deploy/ChainAssertions.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol"
import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
import { IMIPS } from "interfaces/cannon/IMIPS.sol";
import { IMIPS64 } from "interfaces/cannon/IMIPS64.sol";
import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
import { IETHLockbox } from "interfaces/L1/IETHLockbox.sol";
import { IProxyAdminOwnedBase } from "interfaces/L1/IProxyAdminOwnedBase.sol";
Expand Down Expand Up @@ -200,7 +200,7 @@ library ChainAssertions {
}

/// @notice Asserts that the MIPs contract is setup correctly
function checkMIPS(IMIPS _mips, IPreimageOracle _oracle) internal view {
function checkMIPS(IMIPS64 _mips, IPreimageOracle _oracle) internal view {
console.log("Running chain assertions on the MIPS at %s", address(_mips));
require(address(_mips) != address(0), "CHECK-MIPS-10");

Expand Down Expand Up @@ -370,7 +370,7 @@ library ChainAssertions {
Types.ContractSet memory _impls,
Types.ContractSet memory _proxies,
IOPContractsManager _opcm,
IMIPS _mips,
IMIPS64 _mips,
IProxyAdmin _superchainProxyAdmin
)
internal
Expand Down
6 changes: 3 additions & 3 deletions packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
import { IMIPS } from "interfaces/cannon/IMIPS.sol";
import { IMIPS64 } from "interfaces/cannon/IMIPS64.sol";
import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
Expand Down Expand Up @@ -313,14 +313,14 @@ contract Deploy is Deployer {
);
ChainAssertions.checkDelayedWETHImpl(IDelayedWETH(payable(impls.DelayedWETH)), cfg.faultGameWithdrawalDelay());
ChainAssertions.checkMIPS({
_mips: IMIPS(address(dio.mipsSingleton)),
_mips: IMIPS64(address(dio.mipsSingleton)),
_oracle: IPreimageOracle(address(dio.preimageOracleSingleton))
});
ChainAssertions.checkOPContractsManager({
_impls: impls,
_proxies: _proxies(),
_opcm: IOPContractsManager(address(dio.opcm)),
_mips: IMIPS(address(dio.mipsSingleton)),
_mips: IMIPS64(address(dio.mipsSingleton)),
_superchainProxyAdmin: superchainProxyAdmin
});
ChainAssertions.checkSystemConfig({ _doi: DeployOPChainInput(address(0)), _contracts: impls, _isProxy: false });
Expand Down
11 changes: 5 additions & 6 deletions packages/contracts-bedrock/scripts/deploy/DeployImplementations.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";
import { IDelayedWETH } from "interfaces/dispute/IDelayedWETH.sol";
import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
import { IMIPS } from "interfaces/cannon/IMIPS.sol";
import { IMIPS2 } from "interfaces/cannon/IMIPS2.sol";
import { IMIPS64 } from "interfaces/cannon/IMIPS64.sol";
import { IDisputeGameFactory } from "interfaces/dispute/IDisputeGameFactory.sol";
import { IAnchorStateRegistry } from "interfaces/dispute/IAnchorStateRegistry.sol";
import {
Expand Down Expand Up @@ -71,7 +70,7 @@ contract DeployImplementations is Script {
IOptimismPortal optimismPortalImpl;
IETHLockbox ethLockboxImpl;
IPreimageOracle preimageOracleSingleton;
IMIPS mipsSingleton;
IMIPS64 mipsSingleton;
ISystemConfig systemConfigImpl;
IL1CrossDomainMessenger l1CrossDomainMessengerImpl;
IL1ERC721Bridge l1ERC721BridgeImpl;
Expand Down Expand Up @@ -419,10 +418,10 @@ contract DeployImplementations is Script {
}
}

IMIPS singleton = IMIPS(
IMIPS64 singleton = IMIPS64(
DeployUtils.createDeterministic({
_name: "MIPS64",
_args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS2.__constructor__, (preimageOracle, mipsVersion))),
_args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS64.__constructor__, (preimageOracle, mipsVersion))),
_salt: DeployUtils.DEFAULT_SALT
})
);
Expand Down Expand Up @@ -649,7 +648,7 @@ contract DeployImplementations is Script {
_impls: impls,
_proxies: proxies,
_opcm: IOPContractsManager(address(_output.opcm)),
_mips: IMIPS(address(_output.mipsSingleton)),
_mips: IMIPS64(address(_output.mipsSingleton)),
_superchainProxyAdmin: _input.superchainProxyAdmin
});

Expand Down
15 changes: 7 additions & 8 deletions packages/contracts-bedrock/scripts/deploy/DeployMIPS.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import { DeployUtils } from "scripts/libraries/DeployUtils.sol";

// Interfaces
import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
import { IMIPS } from "interfaces/cannon/IMIPS.sol";
import { IMIPS2 } from "interfaces/cannon/IMIPS2.sol";
import { IMIPS64 } from "interfaces/cannon/IMIPS64.sol";
import { StandardConstants } from "scripts/deploy/StandardConstants.sol";

/// @title DeployMIPSInput
Expand Down Expand Up @@ -54,18 +53,18 @@ contract DeployMIPSInput is BaseDeployIO {

/// @title DeployMIPSOutput
contract DeployMIPSOutput is BaseDeployIO {
IMIPS internal _mipsSingleton;
IMIPS64 internal _mipsSingleton;

function set(bytes4 _sel, address _value) public {
if (_sel == this.mipsSingleton.selector) {
require(_value != address(0), "DeployMIPS: mipsSingleton cannot be zero address");
_mipsSingleton = IMIPS(_value);
_mipsSingleton = IMIPS64(_value);
} else {
revert("DeployMIPS: unknown selector");
}
}

function mipsSingleton() public view returns (IMIPS) {
function mipsSingleton() public view returns (IMIPS64) {
DeployUtils.assertValidContractAddress(address(_mipsSingleton));
return _mipsSingleton;
}
Expand All @@ -82,10 +81,10 @@ contract DeployMIPS is Script {
uint256 mipsVersion = _mi.mipsVersion();
IPreimageOracle preimageOracle = IPreimageOracle(_mi.preimageOracle());

IMIPS singleton = IMIPS(
IMIPS64 singleton = IMIPS64(
DeployUtils.createDeterministic({
_name: "MIPS64",
_args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS2.__constructor__, (preimageOracle, mipsVersion))),
_args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS64.__constructor__, (preimageOracle, mipsVersion))),
_salt: DeployUtils.DEFAULT_SALT
})
);
Expand All @@ -100,7 +99,7 @@ contract DeployMIPS is Script {
}

function assertValidMipsSingleton(DeployMIPSInput _mi, DeployMIPSOutput _mo) internal view {
IMIPS mips = _mo.mipsSingleton();
IMIPS64 mips = _mo.mipsSingleton();
require(address(mips.oracle()) == address(_mi.preimageOracle()), "MIPS-10");
}
}
9 changes: 4 additions & 5 deletions packages/contracts-bedrock/scripts/deploy/DeployMIPS2.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import { DeployUtils } from "scripts/libraries/DeployUtils.sol";

// Interfaces
import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
import { IMIPS } from "interfaces/cannon/IMIPS.sol";
import { IMIPS2 } from "interfaces/cannon/IMIPS2.sol";
import { IMIPS64 } from "interfaces/cannon/IMIPS64.sol";
import { StandardConstants } from "scripts/deploy/StandardConstants.sol";

/// @title DeployMIPS
Expand All @@ -23,7 +22,7 @@ contract DeployMIPS2 is Script {
}

struct Output {
IMIPS mipsSingleton;
IMIPS64 mipsSingleton;
}

function run(Input memory _input) public returns (Output memory output_) {
Expand All @@ -37,11 +36,11 @@ contract DeployMIPS2 is Script {
function deployMipsSingleton(Input memory _input, Output memory _output) internal {
uint256 mipsVersion = _input.mipsVersion;

IMIPS singleton = IMIPS(
IMIPS64 singleton = IMIPS64(
DeployUtils.createDeterministic({
_name: "MIPS64",
_args: DeployUtils.encodeConstructor(
abi.encodeCall(IMIPS2.__constructor__, (_input.preimageOracle, mipsVersion))
abi.encodeCall(IMIPS64.__constructor__, (_input.preimageOracle, mipsVersion))
),
_salt: DeployUtils.DEFAULT_SALT
})
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/scripts/deploy/ReadImplementationAddresses.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { IProxy } from "interfaces/universal/IProxy.sol";
import { Script } from "forge-std/Script.sol";
import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
import { DeployOPChainOutput } from "scripts/deploy/DeployOPChain.s.sol";
import { IMIPS } from "interfaces/cannon/IMIPS.sol";
import { IMIPS64 } from "interfaces/cannon/IMIPS64.sol";
import { IOPContractsManager } from "interfaces/L1/IOPContractsManager.sol";
import { IAddressManager } from "interfaces/legacy/IAddressManager.sol";
import { IStaticL1ChugSplashProxy } from "interfaces/legacy/IL1ChugSplashProxy.sol";
Expand Down Expand Up @@ -159,7 +159,7 @@ contract ReadImplementationAddresses is Script {
IAddressManager am = _rii.addressManager();
_rio.set(_rio.l1CrossDomainMessenger.selector, am.getAddress("OVM_L1CrossDomainMessenger"));

address preimageOracle = address(IMIPS(mipsLogic).oracle());
address preimageOracle = address(IMIPS64(mipsLogic).oracle());
_rio.set(_rio.preimageOracleSingleton.selector, preimageOracle);

address ethLockbox = _rii.opcm().implementations().ethLockboxImpl;
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
import { IMIPS2 } from "interfaces/cannon/IMIPS2.sol";
import { IMIPS64 } from "interfaces/cannon/IMIPS64.sol";
import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
import { IProxy } from "interfaces/universal/IProxy.sol";
import { IProxyAdmin } from "interfaces/universal/IProxyAdmin.sol";
Expand Down Expand Up @@ -601,7 +601,7 @@ contract OPContractsManager_TestInit is Test {
mipsImpl: DeployUtils.create1({
_name: "MIPS64",
_args: DeployUtils.encodeConstructor(
abi.encodeCall(IMIPS2.__constructor__, (oracle, StandardConstants.MIPS_VERSION))
abi.encodeCall(IMIPS64.__constructor__, (oracle, StandardConstants.MIPS_VERSION))
)
})
});
Expand Down
10 changes: 5 additions & 5 deletions packages/contracts-bedrock/test/cannon/MIPS64.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Test } from "forge-std/Test.sol";
import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
import { UnsupportedStateVersion } from "src/cannon/libraries/CannonErrors.sol";
import { IPreimageOracle } from "interfaces/cannon/IPreimageOracle.sol";
import { IMIPS2 } from "interfaces/cannon/IMIPS2.sol";
import { IMIPS64 } from "interfaces/cannon/IMIPS64.sol";

/// @title MIPS64_TestInit
/// @notice Reusable test initialization for `MIPS64` tests.
Expand Down Expand Up @@ -39,11 +39,11 @@ contract MIPS64_TestInit is Test {
}

/// @notice Deploys new MIPS64 contract with the given version parameter.
function deployVm(uint256 version) internal returns (IMIPS2) {
return IMIPS2(
function deployVm(uint256 version) internal returns (IMIPS64) {
return IMIPS64(
DeployUtils.create1({
_name: "MIPS64",
_args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS2.__constructor__, (oracle, version)))
_args: DeployUtils.encodeConstructor(abi.encodeCall(IMIPS64.__constructor__, (oracle, version)))
})
);
}
Expand All @@ -57,7 +57,7 @@ contract MIPS64_Unclassified_Test is MIPS64_TestInit {
function test_deploy_supportedVersions_succeeds() external {
for (uint256 i = 0; i < validVersions.length; i++) {
uint256 version = validVersions[i];
IMIPS2 mips = deployVm(version);
IMIPS64 mips = deployVm(version);
assertNotEq(address(mips), address(0));
}
}
Expand Down