Skip to content

feat: remove unused systemConfigs mapping from OPCM #13295

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
maurelian merged 2 commits into from
Dec 6, 2024
Merged

feat: remove unused systemConfigs mapping from OPCM #13295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68750d0
feat: remove unused systemConfigs mapping from OPCM
maurelian Dec 6, 2024
f521026
fix semver lock
maurelian Dec 6, 2024
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
19 changes: 0 additions & 19 deletions packages/contracts-bedrock/snapshots/abi/OPContractsManager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,25 +500,6 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "systemConfigs",
"outputs": [
{
"internalType": "contract ISystemConfig",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "version",
Expand Down
19 changes: 0 additions & 19 deletions packages/contracts-bedrock/snapshots/abi/OPContractsManagerInterop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,25 +500,6 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "systemConfigs",
"outputs": [
{
"internalType": "contract ISystemConfig",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "version",
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/snapshots/semver-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"sourceCodeHash": "0x8aafeffb41332fddf2fb1ef4fc033bd1f323cdc5b199c6951da73e3cb86276e6"
},
"src/L1/OPContractsManager.sol": {
"initCodeHash": "0x320a6d4417eb0d2597b4c6f4caa37bbf9e35f38d3ad27ddb57f149c680e6afff",
"sourceCodeHash": "0x3a6ac40939df1d9f4c88caa4e6139454de5e0ad4a241b27d1bab65a3ae44610d"
"initCodeHash": "0x1eb781ca3f3609dbf13ecb9fe34063155871510b148ac63348a4947858c196ba",
"sourceCodeHash": "0xf1e9fe3f37414e1f1824ce18cd6164c33ca64527b419d6fa52690b6351534822"
},
"src/L1/OptimismPortal.sol": {
"initCodeHash": "0xa8b2f8a6d1092c5e64529736462ebb35daa9ea9e67585f7de8e3e5394682ee64",
Expand Down
11 changes: 2 additions & 9 deletions packages/contracts-bedrock/snapshots/storageLayout/OPContractsManager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,18 @@
"slot": "0",
"type": "string"
},
{
"bytes": "32",
"label": "systemConfigs",
"offset": 0,
"slot": "1",
"type": "mapping(uint256 => contract ISystemConfig)"
},
{
"bytes": "256",
"label": "blueprint",
"offset": 0,
"slot": "2",
"slot": "1",
"type": "struct OPContractsManager.Blueprints"
},
{
"bytes": "288",
"label": "implementation",
"offset": 0,
"slot": "10",
"slot": "9",
"type": "struct OPContractsManager.Implementations"
}
]
11 changes: 2 additions & 9 deletions packages/contracts-bedrock/snapshots/storageLayout/OPContractsManagerInterop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,18 @@
"slot": "0",
"type": "string"
},
{
"bytes": "32",
"label": "systemConfigs",
"offset": 0,
"slot": "1",
"type": "mapping(uint256 => contract ISystemConfig)"
},
{
"bytes": "256",
"label": "blueprint",
"offset": 0,
"slot": "2",
"slot": "1",
"type": "struct OPContractsManager.Blueprints"
},
{
"bytes": "288",
"label": "implementation",
"offset": 0,
"slot": "10",
"slot": "9",
"type": "struct OPContractsManager.Implementations"
}
]
11 changes: 4 additions & 7 deletions packages/contracts-bedrock/src/L1/OPContractsManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ contract OPContractsManager is ISemver {

// -------- Constants and Variables --------

/// @custom:semver 1.0.0-beta.23
string public constant version = "1.0.0-beta.23";
/// @custom:semver 1.0.0-beta.24
string public constant version = "1.0.0-beta.24";

/// @notice Represents the interface version so consumers know how to decode the DeployOutput struct
/// that's emitted in the `Deployed` event. Whenever that struct changes, a new version should be used.
Expand All @@ -127,13 +127,10 @@ contract OPContractsManager is ISemver {
/// @notice Address of the ProtocolVersions contract shared by all chains.
IProtocolVersions public immutable protocolVersions;

// @notice L1 smart contracts release deployed by this version of OPCM. This is used in opcm to signal which version
// of the L1 smart contracts is deployed. It takes the format of `op-contracts/vX.Y.Z`.
/// @notice L1 smart contracts release deployed by this version of OPCM. This is used in opcm to signal which
/// version of the L1 smart contracts is deployed. It takes the format of `op-contracts/vX.Y.Z`.
string public l1ContractsRelease;

/// @notice Maps an L2 Chain ID to the SystemConfig for that chain.
mapping(uint256 => ISystemConfig) public systemConfigs;

/// @notice Addresses of the Blueprint contracts.
/// This is internal because if public the autogenerated getter method would return a tuple of
/// addresses, but we want it to return a struct.
Expand Down
2 changes: 0 additions & 2 deletions packages/contracts-bedrock/test/universal/Specs.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,6 @@ contract Specification_Test is CommonTest {
_addSpec({ _name: "OPContractsManager", _sel: _getSel("superchainConfig()") });
_addSpec({ _name: "OPContractsManager", _sel: _getSel("protocolVersions()") });
_addSpec({ _name: "OPContractsManager", _sel: _getSel("l1ContractsRelease()") });
_addSpec({ _name: "OPContractsManager", _sel: _getSel("systemConfigs(uint256)") });
_addSpec({ _name: "OPContractsManager", _sel: _getSel("OUTPUT_VERSION()") });
_addSpec({ _name: "OPContractsManager", _sel: OPContractsManager.deploy.selector });
_addSpec({ _name: "OPContractsManager", _sel: OPContractsManager.blueprints.selector });
Expand All @@ -850,7 +849,6 @@ contract Specification_Test is CommonTest {
_addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("superchainConfig()") });
_addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("protocolVersions()") });
_addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("l1ContractsRelease()") });
_addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("systemConfigs(uint256)") });
_addSpec({ _name: "OPContractsManagerInterop", _sel: _getSel("OUTPUT_VERSION()") });
_addSpec({ _name: "OPContractsManagerInterop", _sel: OPContractsManager.deploy.selector });
_addSpec({ _name: "OPContractsManagerInterop", _sel: OPContractsManager.blueprints.selector });
Expand Down