Skip to content

N
nebula
Commit 4da39879 authored by Matt Solomon's avatar Matt Solomon Committed by GitHub
Browse files
Options

chore: removal of unused system config inputs (#13773)

parent dcc3d7f0
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 124 deletions
packages/contracts-bedrock/interfaces/L1/IL1CrossDomainMessenger.sol
View file @ 4da39879
......@@ -4,19 +4,16 @@ pragma solidity ^0.8.0;
import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
import { IOptimismPortal2 as IOptimismPortal } from "interfaces/L1/IOptimismPortal2.sol";
import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
interface IL1CrossDomainMessenger is ICrossDomainMessenger {
function PORTAL() external view returns (IOptimismPortal);
function initialize(
ISuperchainConfig _superchainConfig,
IOptimismPortal _portal,
ISystemConfig _systemConfig
IOptimismPortal _portal
)
external;
function portal() external view returns (IOptimismPortal);
function superchainConfig() external view returns (ISuperchainConfig);
function systemConfig() external view returns (ISystemConfig);
function version() external view returns (string memory);
function __constructor__() external;
......
packages/contracts-bedrock/interfaces/L1/IL1StandardBridge.sol
View file @ 4da39879
......@@ -4,7 +4,6 @@ pragma solidity ^0.8.0;
import { IStandardBridge } from "interfaces/universal/IStandardBridge.sol";
import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
interface IL1StandardBridge is IStandardBridge {
event ERC20DepositInitiated(
......@@ -64,13 +63,11 @@ interface IL1StandardBridge is IStandardBridge {
payable;
function initialize(
ICrossDomainMessenger _messenger,
ISuperchainConfig _superchainConfig,
ISystemConfig _systemConfig
ISuperchainConfig _superchainConfig
)
external;
function l2TokenBridge() external view returns (address);
function superchainConfig() external view returns (ISuperchainConfig);
function systemConfig() external view returns (ISystemConfig);
function version() external view returns (string memory);
function __constructor__() external;
......
packages/contracts-bedrock/snapshots/.gas-snapshot
View file @ 4da39879
......@@ -6,8 +6,8 @@ GasBenchMark_L1Block_SetValuesEcotone:test_setL1BlockValuesEcotone_benchmark() (
GasBenchMark_L1Block_SetValuesEcotone_Warm:test_setL1BlockValuesEcotone_benchmark() (gas: 7597)
GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_0() (gas: 356487)
GasBenchMark_L1CrossDomainMessenger:test_sendMessage_benchmark_1() (gas: 2954716)
GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 551636)
GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4063829)
GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 450322)
GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3496221)
GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_0() (gas: 551591)
GasBenchMark_L1StandardBridge_Deposit:test_depositERC20_benchmark_1() (gas: 4063784)
GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_0() (gas: 450277)
GasBenchMark_L1StandardBridge_Deposit:test_depositETH_benchmark_1() (gas: 3496176)
GasBenchMark_L1StandardBridge_Finalize:test_finalizeETHWithdrawal_benchmark() (gas: 59849)
\ No newline at end of file
packages/contracts-bedrock/snapshots/abi/L1CrossDomainMessenger.json
View file @ 4da39879
......@@ -188,11 +188,6 @@
"internalType": "contract IOptimismPortal2",
"name": "_portal",
"type": "address"
},
{
"internalType": "contract ISystemConfig",
"name": "_systemConfig",
"type": "address"
}
],
"name": "initialize",
......@@ -345,19 +340,6 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "systemConfig",
"outputs": [
{
"internalType": "contract ISystemConfig",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "version",
......
packages/contracts-bedrock/snapshots/abi/L1StandardBridge.json
View file @ 4da39879
......@@ -425,11 +425,6 @@
"internalType": "contract ISuperchainConfig",
"name": "_superchainConfig",
"type": "address"
},
{
"internalType": "contract ISystemConfig",
"name": "_systemConfig",
"type": "address"
}
],
"name": "initialize",
......@@ -502,19 +497,6 @@
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "systemConfig",
"outputs": [
{
"internalType": "contract ISystemConfig",
"name": "",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "version",
......
packages/contracts-bedrock/snapshots/semver-lock.json
View file @ 4da39879
......@@ -4,20 +4,20 @@
"sourceCodeHash": "0xae49c741c8cd546981ab59b85b88e9fc1055c4fae085e7078d601b42464f86e6"
},
"src/L1/L1CrossDomainMessenger.sol": {
"initCodeHash": "0x4b045c9e0fcfa37838edf154e6e75be4a60406204eccf0d606dfd55da80d266d",
"sourceCodeHash": "0xc92887952f5108a770c3fee8a61c70f740a0a55c2e9ed0aebe266a7c53c71dc3"
"initCodeHash": "0xcff231ee7465984e853572c5050e761f746575d78f709eba65c982178de3e718",
"sourceCodeHash": "0x9726b6f646269f4288ff8dc1b8228dedbdf960e90df1d11793bc534297328e96"
},
"src/L1/L1ERC721Bridge.sol": {
"initCodeHash": "0x280488bce8b4fb364740c59de14c423851902088f384e077bccc79b9df48528a",
"sourceCodeHash": "0xe12b9e6c4e4ac2e2c9a03f07c7689f6bf2231922536072812cf1f37a5a276e73"
},
"src/L1/L1StandardBridge.sol": {
"initCodeHash": "0xe5f5ab77cc5586ecd94cc687b98f25d8fd7f9bb146a942653a2ec9be7e68f070",
"sourceCodeHash": "0x51f0876ab8410ce32838483f8f59ad6d1c5b4a368e47415b30e44baf291a394b"
"initCodeHash": "0xe69e972e18930d3feaaad20b8e0e15625df9a71ad8304ee7d89c17d32644e152",
"sourceCodeHash": "0xc6613d35d1ad95cbef26a503a10b5dd8663ceb80426f8c528835d39f79e4b4cf"
},
"src/L1/OPContractsManager.sol": {
"initCodeHash": "0x88a6d99e668340e3af5c728c29e94e7229d89da0762b4bbf93bc10e596795c9f",
"sourceCodeHash": "0x2d21506cc51ebe0b60bcf89883aff5e9b1269567ce44ee779de3d3940e23fb65"
"initCodeHash": "0x1acc2f3d7cf2b0dd380fbf3230648a8beb77e8d3eca05fb5da46efdb91c08530",
"sourceCodeHash": "0xdfd5c91e5ddbbf2ad82b867cbf7403437decd6ca70b87891eec935665f17ffd5"
},
"src/L1/OptimismPortal2.sol": {
"initCodeHash": "0x2121a97875875150106a54a71c6c4c03afe90b3364e416be047f55fdeab57204",
......
packages/contracts-bedrock/snapshots/storageLayout/L1CrossDomainMessenger.json
View file @ 4da39879
......@@ -141,9 +141,9 @@
},
{
"bytes": "20",
"label": "systemConfig",
"label": "spacer_253_0_20",
"offset": 0,
"slot": "253",
"type": "contract ISystemConfig"
"type": "address"
}
]
\ No newline at end of file
packages/contracts-bedrock/snapshots/storageLayout/L1StandardBridge.json
View file @ 4da39879
......@@ -64,9 +64,9 @@
},
{
"bytes": "20",
"label": "systemConfig",
"label": "spacer_51_0_20",
"offset": 0,
"slot": "51",
"type": "contract ISystemConfig"
"type": "address"
}
]
\ No newline at end of file
packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
View file @ 4da39879
......@@ -11,7 +11,6 @@ import { Constants } from "src/libraries/Constants.sol";
// Interfaces
import { ISemver } from "interfaces/universal/ISemver.sol";
import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
import { IOptimismPortal2 as IOptimismPortal } from "interfaces/L1/IOptimismPortal2.sol";
/// @custom:proxied true
......@@ -27,12 +26,14 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver {
/// @custom:network-specific
IOptimismPortal public portal;
/// @notice Address of the SystemConfig contract.
ISystemConfig public systemConfig;
/// @custom:legacy
/// @custom:spacer systemConfig
/// @notice Spacer taking up the legacy `systemConfig` slot.
address private spacer_253_0_20;
/// @notice Semantic version.
/// @custom:semver 2.4.1-beta.6
string public constant version = "2.4.1-beta.6";
/// @custom:semver 2.4.1-beta.7
string public constant version = "2.4.1-beta.7";
/// @notice Constructs the L1CrossDomainMessenger contract.
constructor() {
......@@ -42,18 +43,9 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver {
/// @notice Initializes the contract.
/// @param _superchainConfig Contract of the SuperchainConfig contract on this network.
/// @param _portal Contract of the OptimismPortal contract on this network.
/// @param _systemConfig Contract of the SystemConfig contract on this network.
function initialize(
ISuperchainConfig _superchainConfig,
IOptimismPortal _portal,
ISystemConfig _systemConfig
)
external
initializer
{
function initialize(ISuperchainConfig _superchainConfig, IOptimismPortal _portal) external initializer {
superchainConfig = _superchainConfig;
portal = _portal;
systemConfig = _systemConfig;
__CrossDomainMessenger_init({ _otherMessenger: CrossDomainMessenger(Predeploys.L2_CROSS_DOMAIN_MESSENGER) });
}
......
packages/contracts-bedrock/src/L1/L1StandardBridge.sol
View file @ 4da39879
......@@ -12,7 +12,6 @@ import { Constants } from "src/libraries/Constants.sol";
import { ISemver } from "interfaces/universal/ISemver.sol";
import { ICrossDomainMessenger } from "interfaces/universal/ICrossDomainMessenger.sol";
import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
/// @custom:proxied true
/// @title L1StandardBridge
......@@ -76,14 +75,16 @@ contract L1StandardBridge is StandardBridge, ISemver {
);
/// @notice Semantic version.
/// @custom:semver 2.2.1-beta.6
string public constant version = "2.2.1-beta.6";
/// @custom:semver 2.2.1-beta.7
string public constant version = "2.2.1-beta.7";
/// @notice Address of the SuperchainConfig contract.
ISuperchainConfig public superchainConfig;
/// @notice Address of the SystemConfig contract.
ISystemConfig public systemConfig;
/// @custom:legacy
/// @custom:spacer systemConfig
/// @notice Spacer taking up the legacy `systemConfig` slot.
address private spacer_51_0_20;
/// @notice Constructs the L1StandardBridge contract.
constructor() StandardBridge() {
......@@ -93,16 +94,8 @@ contract L1StandardBridge is StandardBridge, ISemver {
/// @notice Initializer.
/// @param _messenger Contract for the CrossDomainMessenger on this network.
/// @param _superchainConfig Contract for the SuperchainConfig on this network.
function initialize(
ICrossDomainMessenger _messenger,
ISuperchainConfig _superchainConfig,
ISystemConfig _systemConfig
)
external
initializer
{
function initialize(ICrossDomainMessenger _messenger, ISuperchainConfig _superchainConfig) external initializer {
superchainConfig = _superchainConfig;
systemConfig = _systemConfig;
__StandardBridge_init({
_messenger: _messenger,
_otherBridge: StandardBridge(payable(Predeploys.L2_STANDARD_BRIDGE))
......
packages/contracts-bedrock/src/L1/OPContractsManager.sol
View file @ 4da39879
......@@ -135,8 +135,8 @@ contract OPContractsManager is ISemver {
// -------- Constants and Variables --------
/// @custom:semver 1.0.0-beta.30
string public constant version = "1.0.0-beta.30";
/// @custom:semver 1.0.0-beta.31
string public constant version = "1.0.0-beta.31";
/// @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.
......@@ -649,10 +649,7 @@ contract OPContractsManager is ISemver {
virtual
returns (bytes memory)
{
return abi.encodeCall(
IL1CrossDomainMessenger.initialize,
(superchainConfig, _output.optimismPortalProxy, _output.systemConfigProxy)
);
return abi.encodeCall(IL1CrossDomainMessenger.initialize, (superchainConfig, _output.optimismPortalProxy));
}
/// @notice Helper method for encoding the L1StandardBridge initializer data.
......@@ -662,10 +659,7 @@ contract OPContractsManager is ISemver {
virtual
returns (bytes memory)
{
return abi.encodeCall(
IL1StandardBridge.initialize,
(_output.l1CrossDomainMessengerProxy, superchainConfig, _output.systemConfigProxy)
);
return abi.encodeCall(IL1StandardBridge.initialize, (_output.l1CrossDomainMessengerProxy, superchainConfig));
}
function encodeDisputeGameFactoryInitializer() internal view virtual returns (bytes memory) {
......
packages/contracts-bedrock/test/L1/L1CrossDomainMessenger.t.sol
View file @ 4da39879
......@@ -16,7 +16,6 @@ import { Encoding } from "src/libraries/Encoding.sol";
import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
import { IOptimismPortal2 } from "interfaces/L1/IOptimismPortal2.sol";
import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
contract L1CrossDomainMessenger_Test is CommonTest {
/// @dev The receiver address
......@@ -731,9 +730,7 @@ contract L1CrossDomainMessenger_ReinitReentryTest is CommonTest {
vm.store(address(l1CrossDomainMessenger), 0, bytes32(uint256(0)));
// call the initializer function
l1CrossDomainMessenger.initialize(
ISuperchainConfig(superchainConfig), IOptimismPortal2(optimismPortal2), ISystemConfig(systemConfig)
);
l1CrossDomainMessenger.initialize(ISuperchainConfig(superchainConfig), IOptimismPortal2(optimismPortal2));
// attempt to re-replay the withdrawal
vm.expectEmit(address(l1CrossDomainMessenger));
......
packages/contracts-bedrock/test/L1/L1StandardBridge.t.sol
View file @ 4da39879
......@@ -28,9 +28,6 @@ contract L1StandardBridge_Getter_Test is CommonTest {
assert(address(l1StandardBridge.messenger()) == address(l1CrossDomainMessenger));
assert(address(l1StandardBridge.MESSENGER()) == address(l1CrossDomainMessenger));
assert(l1StandardBridge.superchainConfig() == superchainConfig);
returnIfForkTest("L1StandardBridge_Getter_Test: systemConfig() getter DNE on op mainnet");
assert(l1StandardBridge.systemConfig() == systemConfig);
}
}
......@@ -49,7 +46,6 @@ contract L1StandardBridge_Initialize_Test is CommonTest {
assertEq(address(impl.OTHER_BRIDGE()), address(0));
assertEq(address(impl.otherBridge()), address(0));
assertEq(address(l2StandardBridge), Predeploys.L2_STANDARD_BRIDGE);
assertEq(address(impl.systemConfig()), address(0));
}
/// @dev Test that the initialize function sets the correct values.
......@@ -60,9 +56,6 @@ contract L1StandardBridge_Initialize_Test is CommonTest {
assertEq(address(l1StandardBridge.OTHER_BRIDGE()), Predeploys.L2_STANDARD_BRIDGE);
assertEq(address(l1StandardBridge.otherBridge()), Predeploys.L2_STANDARD_BRIDGE);
assertEq(address(l2StandardBridge), Predeploys.L2_STANDARD_BRIDGE);
returnIfForkTest("L1StandardBridge_Initialize_Test: systemConfig() getter DNE on op mainnet");
assertEq(address(l1StandardBridge.systemConfig()), address(systemConfig));
}
}
......
packages/contracts-bedrock/test/universal/Specs.t.sol
View file @ 4da39879
......@@ -120,12 +120,11 @@ contract Specification_Test is CommonTest {
_addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("RELAY_RESERVED_GAS()") });
_addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("baseGas(bytes,uint32)") });
_addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("failedMessages(bytes32)") });
_addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("initialize(address,address,address)") });
_addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("initialize(address,address)") });
_addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("messageNonce()") });
_addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("paused()") });
_addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("otherMessenger()") });
_addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("portal()") });
_addSpec({ _name: "L1CrossDomainMessenger", _sel: _getSel("systemConfig()") });
_addSpec({
_name: "L1CrossDomainMessenger",
_sel: _getSel("relayMessage(uint256,address,address,uint256,uint256,bytes)"),
......@@ -200,14 +199,13 @@ contract Specification_Test is CommonTest {
_auth: Role.MESSENGER,
_pausable: true
});
_addSpec({ _name: "L1StandardBridge", _sel: _getSel("initialize(address,address,address)") });
_addSpec({ _name: "L1StandardBridge", _sel: _getSel("initialize(address,address)") });
_addSpec({ _name: "L1StandardBridge", _sel: _getSel("l2TokenBridge()") });
_addSpec({ _name: "L1StandardBridge", _sel: _getSel("messenger()") });
_addSpec({ _name: "L1StandardBridge", _sel: _getSel("otherBridge()") });
_addSpec({ _name: "L1StandardBridge", _sel: _getSel("paused()") });
_addSpec({ _name: "L1StandardBridge", _sel: _getSel("superchainConfig()") });
_addSpec({ _name: "L1StandardBridge", _sel: _getSel("version()") });
_addSpec({ _name: "L1StandardBridge", _sel: _getSel("systemConfig()") });
// OptimismPortalInterop
_addSpec({
......
packages/contracts-bedrock/test/vendor/Initializable.t.sol
View file @ 4da39879
......@@ -75,9 +75,7 @@ contract Initializer_Test is CommonTest {
InitializeableContract({
name: "L1CrossDomainMessengerImpl",
target: addressManager.getAddress("OVM_L1CrossDomainMessenger"),
initCalldata: abi.encodeCall(
l1CrossDomainMessenger.initialize, (superchainConfig, optimismPortal2, systemConfig)
)
initCalldata: abi.encodeCall(l1CrossDomainMessenger.initialize, (superchainConfig, optimismPortal2))
})
);
// L1CrossDomainMessengerProxy
......@@ -85,9 +83,7 @@ contract Initializer_Test is CommonTest {
InitializeableContract({
name: "L1CrossDomainMessengerProxy",
target: address(l1CrossDomainMessenger),
initCalldata: abi.encodeCall(
l1CrossDomainMessenger.initialize, (superchainConfig, optimismPortal2, systemConfig)
)
initCalldata: abi.encodeCall(l1CrossDomainMessenger.initialize, (superchainConfig, optimismPortal2))
})
);
// DisputeGameFactoryImpl
......@@ -249,9 +245,7 @@ contract Initializer_Test is CommonTest {
InitializeableContract({
name: "L1StandardBridgeImpl",
target: EIP1967Helper.getImplementation(address(l1StandardBridge)),
initCalldata: abi.encodeCall(
l1StandardBridge.initialize, (l1CrossDomainMessenger, superchainConfig, systemConfig)
)
initCalldata: abi.encodeCall(l1StandardBridge.initialize, (l1CrossDomainMessenger, superchainConfig))
})
);
// L1StandardBridgeProxy
......@@ -259,9 +253,7 @@ contract Initializer_Test is CommonTest {
InitializeableContract({
name: "L1StandardBridgeProxy",
target: address(l1StandardBridge),
initCalldata: abi.encodeCall(
l1StandardBridge.initialize, (l1CrossDomainMessenger, superchainConfig, systemConfig)
)
initCalldata: abi.encodeCall(l1StandardBridge.initialize, (l1CrossDomainMessenger, superchainConfig))
})
);
// L1ERC721BridgeImpl
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment