Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
be8d68a3
Commit
be8d68a3
authored
Feb 17, 2023
by
Mark Tyneway
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contracts-bedrock: better initialize
parent
4144e692
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
27 additions
and
24 deletions
+27
-24
optimismportal.go
op-bindings/bindings/optimismportal.go
+14
-14
optimismportal_more.go
op-bindings/bindings/optimismportal_more.go
+1
-1
layer_one.go
op-chain-ops/genesis/layer_one.go
+1
-1
OptimismPortal.sol
packages/contracts-bedrock/contracts/L1/OptimismPortal.sol
+3
-2
SystemDictator.sol
...contracts-bedrock/contracts/deployment/SystemDictator.sol
+2
-2
CommonTest.t.sol
packages/contracts-bedrock/contracts/test/CommonTest.t.sol
+3
-1
OptimismPortal.t.sol
...ges/contracts-bedrock/contracts/test/OptimismPortal.t.sol
+2
-2
013-OptimismPortalImpl.ts
packages/contracts-bedrock/deploy/013-OptimismPortalImpl.ts
+1
-1
No files found.
op-bindings/bindings/optimismportal.go
View file @
be8d68a3
This source diff could not be displayed because it is too large. You can
view the blob
instead.
op-bindings/bindings/optimismportal_more.go
View file @
be8d68a3
This diff is collapsed.
Click to expand it.
op-chain-ops/genesis/layer_one.go
View file @
be8d68a3
...
...
@@ -123,7 +123,7 @@ func BuildL1DeveloperGenesis(config *DeployConfig) (*core.Genesis, error) {
if
err
!=
nil
{
return
nil
,
err
}
data
,
err
=
portalABI
.
Pack
(
"initialize"
)
data
,
err
=
portalABI
.
Pack
(
"initialize"
,
false
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"cannot abi encode initialize for OptimismPortal: %w"
,
err
)
}
...
...
packages/contracts-bedrock/contracts/L1/OptimismPortal.sol
View file @
be8d68a3
...
...
@@ -159,14 +159,15 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
L2_ORACLE = _l2Oracle;
GUARDIAN = _guardian;
FINALIZATION_PERIOD_SECONDS = _finalizationPeriodSeconds;
initialize();
initialize(
true
);
}
/**
* @notice Initializer.
*/
function initialize() public initializer {
function initialize(
bool _paused
) public initializer {
l2Sender = Constants.DEFAULT_L2_SENDER;
paused = _paused;
__ResourceMetering_init();
}
...
...
packages/contracts-bedrock/contracts/deployment/SystemDictator.sol
View file @
be8d68a3
...
...
@@ -310,11 +310,11 @@ contract SystemDictator is OwnableUpgradeable {
)
);
// Upgrade and initialize the OptimismPortal.
// Upgrade and initialize the OptimismPortal
as paused
.
config.globalConfig.proxyAdmin.upgradeAndCall(
payable(config.proxyAddressConfig.optimismPortalProxy),
address(config.implementationAddressConfig.optimismPortalImpl),
abi.encodeCall(OptimismPortal.initialize, ())
abi.encodeCall(OptimismPortal.initialize, (
true
))
);
// Upgrade the L1CrossDomainMessenger.
...
...
packages/contracts-bedrock/contracts/test/CommonTest.t.sol
View file @
be8d68a3
...
...
@@ -175,7 +175,7 @@ contract Portal_Initializer is L2OutputOracle_Initializer {
vm.prank(multisig);
proxy.upgradeToAndCall(
address(opImpl),
abi.encodeWithSelector(OptimismPortal.initialize.selector)
abi.encodeWithSelector(OptimismPortal.initialize.selector
, false
)
);
op = OptimismPortal(payable(address(proxy)));
}
...
...
@@ -235,6 +235,8 @@ contract Messenger_Initializer is L2OutputOracle_Initializer {
_finalizationPeriodSeconds: 7 days
});
vm.label(address(op), "OptimismPortal");
vm.prank(op.GUARDIAN());
op.unpause();
// Deploy the address manager
vm.prank(multisig);
...
...
packages/contracts-bedrock/contracts/test/OptimismPortal.t.sol
View file @
be8d68a3
...
...
@@ -1059,12 +1059,12 @@ contract OptimismPortalUpgradeable_Test is Portal_Initializer {
function test_initialize_cannotInitProxy_reverts() external {
vm.expectRevert("Initializable: contract is already initialized");
OptimismPortal(payable(proxy)).initialize();
OptimismPortal(payable(proxy)).initialize(
false
);
}
function test_initialize_cannotInitImpl_reverts() external {
vm.expectRevert("Initializable: contract is already initialized");
OptimismPortal(opImpl).initialize();
OptimismPortal(opImpl).initialize(
false
);
}
function test_upgradeToAndCall_upgrading_succeeds() external {
...
...
packages/contracts-bedrock/deploy/013-OptimismPortalImpl.ts
View file @
be8d68a3
...
...
@@ -18,8 +18,8 @@ const deployFn: DeployFunction = async (hre) => {
name
:
'
OptimismPortal
'
,
args
:
[
L2OutputOracleProxy
.
address
,
hre
.
deployConfig
.
finalizationPeriodSeconds
,
hre
.
deployConfig
.
finalSystemOwner
,
hre
.
deployConfig
.
finalizationPeriodSeconds
,
],
postDeployAction
:
async
(
contract
)
=>
{
await
assertContractVariable
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment