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
60b30032
Unverified
Commit
60b30032
authored
Apr 25, 2023
by
OptimismBot
Committed by
GitHub
Apr 25, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5535 from ethereum-optimism/aj/remove-beta1
op-node: Remove beta-1 config
parents
837eac37
44769bd0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
40 deletions
+0
-40
chains.go
op-node/chaincfg/chains.go
+0
-30
main_test.go
op-program/host/cmd/main_test.go
+0
-10
No files found.
op-node/chaincfg/chains.go
View file @
60b30032
...
@@ -10,35 +10,6 @@ import (
...
@@ -10,35 +10,6 @@ import (
"github.com/ethereum-optimism/optimism/op-node/rollup"
"github.com/ethereum-optimism/optimism/op-node/rollup"
)
)
var
Beta1
=
rollup
.
Config
{
Genesis
:
rollup
.
Genesis
{
L1
:
eth
.
BlockID
{
Hash
:
common
.
HexToHash
(
"0x59c72db5fec5bf231e61ba59854cff33945ff6652699c55f2431ac2c010610d5"
),
Number
:
8046397
,
},
L2
:
eth
.
BlockID
{
Hash
:
common
.
HexToHash
(
"0xa89b19033c8b43365e244f425a7e4acb5bae21d1893e1be0eb8cddeb29950d72"
),
Number
:
0
,
},
L2Time
:
1669088016
,
SystemConfig
:
eth
.
SystemConfig
{
BatcherAddr
:
common
.
HexToAddress
(
"0x793b6822fd651af8c58039847be64cb9ee854bc9"
),
Overhead
:
eth
.
Bytes32
(
common
.
HexToHash
(
"0x0000000000000000000000000000000000000000000000000000000000000834"
)),
Scalar
:
eth
.
Bytes32
(
common
.
HexToHash
(
"0x00000000000000000000000000000000000000000000000000000000000f4240"
)),
GasLimit
:
30000000
,
},
},
BlockTime
:
2
,
MaxSequencerDrift
:
3600
,
SeqWindowSize
:
120
,
ChannelTimeout
:
30
,
L1ChainID
:
big
.
NewInt
(
5
),
L2ChainID
:
big
.
NewInt
(
902
),
BatchInboxAddress
:
common
.
HexToAddress
(
"0xFb3aECf08940785D4fB3Ad87cDC6e1Ceb20e9aac"
),
DepositContractAddress
:
common
.
HexToAddress
(
"0xf91795564662DcC9a17de67463ec5BA9C6DC207b"
),
L1SystemConfigAddress
:
common
.
HexToAddress
(
"0x686df068eaa71af78dadc1c427e35600e0fadac5"
),
}
var
Goerli
=
rollup
.
Config
{
var
Goerli
=
rollup
.
Config
{
Genesis
:
rollup
.
Genesis
{
Genesis
:
rollup
.
Genesis
{
L1
:
eth
.
BlockID
{
L1
:
eth
.
BlockID
{
...
@@ -70,7 +41,6 @@ var Goerli = rollup.Config{
...
@@ -70,7 +41,6 @@ var Goerli = rollup.Config{
}
}
var
NetworksByName
=
map
[
string
]
rollup
.
Config
{
var
NetworksByName
=
map
[
string
]
rollup
.
Config
{
"beta-1"
:
Beta1
,
"goerli"
:
Goerli
,
"goerli"
:
Goerli
,
}
}
...
...
op-program/host/cmd/main_test.go
View file @
60b30032
...
@@ -79,12 +79,6 @@ func TestNetwork(t *testing.T) {
...
@@ -79,12 +79,6 @@ func TestNetwork(t *testing.T) {
expected
:=
cfg
expected
:=
cfg
t
.
Run
(
"Network_"
+
name
,
func
(
t
*
testing
.
T
)
{
t
.
Run
(
"Network_"
+
name
,
func
(
t
*
testing
.
T
)
{
args
:=
replaceRequiredArg
(
"--network"
,
name
)
args
:=
replaceRequiredArg
(
"--network"
,
name
)
if
name
==
"beta-1"
{
// No built-in config for beta-1 which is fine as it's no longer in use.
// Newly added named networks should hook up the L2 chain config
genesisFile
:=
writeValidGenesis
(
t
)
args
=
append
(
args
,
"--l2.genesis"
,
genesisFile
)
}
cfg
:=
configForArgs
(
t
,
args
)
cfg
:=
configForArgs
(
t
,
args
)
require
.
Equal
(
t
,
expected
,
*
cfg
.
Rollup
)
require
.
Equal
(
t
,
expected
,
*
cfg
.
Rollup
)
})
})
...
@@ -120,10 +114,6 @@ func TestL2Genesis(t *testing.T) {
...
@@ -120,10 +114,6 @@ func TestL2Genesis(t *testing.T) {
cfg
:=
configForArgs
(
t
,
replaceRequiredArg
(
"--network"
,
"goerli"
))
cfg
:=
configForArgs
(
t
,
replaceRequiredArg
(
"--network"
,
"goerli"
))
require
.
Equal
(
t
,
config
.
OPGoerliChainConfig
,
cfg
.
L2ChainConfig
)
require
.
Equal
(
t
,
config
.
OPGoerliChainConfig
,
cfg
.
L2ChainConfig
)
})
})
t
.
Run
(
"RequiredForNamedNetworkWithNoL2ChainConfig"
,
func
(
t
*
testing
.
T
)
{
verifyArgsInvalid
(
t
,
"flag l2.genesis is required"
,
replaceRequiredArg
(
"--network"
,
"beta-1"
))
})
}
}
func
TestL2Head
(
t
*
testing
.
T
)
{
func
TestL2Head
(
t
*
testing
.
T
)
{
...
...
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