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
73e8e423
Commit
73e8e423
authored
Mar 17, 2023
by
Mark Tyneway
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op-chain-ops: portal guardian config support
parent
d877b333
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
config.go
op-chain-ops/genesis/config.go
+5
-0
layer_one.go
op-chain-ops/genesis/layer_one.go
+1
-1
test-deploy-config-full.json
op-chain-ops/genesis/testdata/test-deploy-config-full.json
+1
-0
No files found.
op-chain-ops/genesis/config.go
View file @
73e8e423
...
@@ -76,6 +76,8 @@ type DeployConfig struct {
...
@@ -76,6 +76,8 @@ type DeployConfig struct {
ProxyAdminOwner
common
.
Address
`json:"proxyAdminOwner"`
ProxyAdminOwner
common
.
Address
`json:"proxyAdminOwner"`
// Owner of the system on L1
// Owner of the system on L1
FinalSystemOwner
common
.
Address
`json:"finalSystemOwner"`
FinalSystemOwner
common
.
Address
`json:"finalSystemOwner"`
// GUARDIAN account in the OptimismPortal
PortalGuardian
common
.
Address
`json:"portalGuardian"`
// L1 recipient of fees accumulated in the BaseFeeVault
// L1 recipient of fees accumulated in the BaseFeeVault
BaseFeeVaultRecipient
common
.
Address
`json:"baseFeeVaultRecipient"`
BaseFeeVaultRecipient
common
.
Address
`json:"baseFeeVaultRecipient"`
// L1 recipient of fees accumulated in the L1FeeVault
// L1 recipient of fees accumulated in the L1FeeVault
...
@@ -128,6 +130,9 @@ func (d *DeployConfig) Check() error {
...
@@ -128,6 +130,9 @@ func (d *DeployConfig) Check() error {
if
d
.
FinalizationPeriodSeconds
==
0
{
if
d
.
FinalizationPeriodSeconds
==
0
{
return
fmt
.
Errorf
(
"%w: FinalizationPeriodSeconds cannot be 0"
,
ErrInvalidDeployConfig
)
return
fmt
.
Errorf
(
"%w: FinalizationPeriodSeconds cannot be 0"
,
ErrInvalidDeployConfig
)
}
}
if
d
.
PortalGuardian
==
(
common
.
Address
{})
{
return
fmt
.
Errorf
(
"%w: PortalGuardian cannot be address(0)"
,
ErrInvalidDeployConfig
)
}
if
d
.
MaxSequencerDrift
==
0
{
if
d
.
MaxSequencerDrift
==
0
{
return
fmt
.
Errorf
(
"%w: MaxSequencerDrift cannot be 0"
,
ErrInvalidDeployConfig
)
return
fmt
.
Errorf
(
"%w: MaxSequencerDrift cannot be 0"
,
ErrInvalidDeployConfig
)
}
}
...
...
op-chain-ops/genesis/layer_one.go
View file @
73e8e423
...
@@ -295,7 +295,7 @@ func deployL1Contracts(config *DeployConfig, backend *backends.SimulatedBackend)
...
@@ -295,7 +295,7 @@ func deployL1Contracts(config *DeployConfig, backend *backends.SimulatedBackend)
Name
:
"OptimismPortal"
,
Name
:
"OptimismPortal"
,
Args
:
[]
interface
{}{
Args
:
[]
interface
{}{
predeploys
.
DevL2OutputOracleAddr
,
predeploys
.
DevL2OutputOracleAddr
,
config
.
FinalSystemOwner
,
config
.
PortalGuardian
,
true
,
// _paused
true
,
// _paused
},
},
},
},
...
...
op-chain-ops/genesis/testdata/test-deploy-config-full.json
View file @
73e8e423
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
"l1GenesisBlockGasLimit"
:
"0xe4e1c0"
,
"l1GenesisBlockGasLimit"
:
"0xe4e1c0"
,
"l1GenesisBlockDifficulty"
:
"0x1"
,
"l1GenesisBlockDifficulty"
:
"0x1"
,
"finalSystemOwner"
:
"0x0000000000000000000000000000000000000111"
,
"finalSystemOwner"
:
"0x0000000000000000000000000000000000000111"
,
"portalGuardian"
:
"0x0000000000000000000000000000000000000112"
,
"finalizationPeriodSeconds"
:
2
,
"finalizationPeriodSeconds"
:
2
,
"l1GenesisBlockMixHash"
:
"0x0000000000000000000000000000000000000000000000000000000000000000"
,
"l1GenesisBlockMixHash"
:
"0x0000000000000000000000000000000000000000000000000000000000000000"
,
"l1GenesisBlockCoinbase"
:
"0x0000000000000000000000000000000000000000"
,
"l1GenesisBlockCoinbase"
:
"0x0000000000000000000000000000000000000000"
,
...
...
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