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
4ea2555c
Commit
4ea2555c
authored
Nov 29, 2022
by
Matthew Slipper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
op-node: Hardcode beta-1 config
parent
5ecb8169
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
89 additions
and
3 deletions
+89
-3
chains.go
op-node/chaincfg/chains.go
+61
-0
flags.go
op-node/flags/flags.go
+16
-3
service.go
op-node/service.go
+12
-0
No files found.
op-node/chaincfg/chains.go
0 → 100644
View file @
4ea2555c
package
chaincfg
import
(
"fmt"
"math/big"
"github.com/ethereum-optimism/optimism/op-node/eth"
"github.com/ethereum-optimism/optimism/op-node/rollup"
"github.com/ethereum/go-ethereum/common"
)
var
Beta1
=
rollup
.
Config
{
Genesis
:
rollup
.
Genesis
{
L1
:
eth
.
BlockID
{
Hash
:
common
.
HexToHash
(
"0x87ba22412f6d081a28ca0d8aafcf630d13a0d2fc16a7345eb3a0d5cd329f935e"
),
Number
:
7996739
,
},
L2
:
eth
.
BlockID
{
Hash
:
common
.
HexToHash
(
"0x76aac93f04b04b051c0232dc96cdfb2ebd150ce726aa9f776a4713c2ac524dc8"
),
Number
:
0
,
},
L2Time
:
1669088016
,
SystemConfig
:
eth
.
SystemConfig
{
BatcherAddr
:
common
.
HexToAddress
(
"0xc02551cde892e9716363b8e99d655298909e1a84"
),
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
),
P2PSequencerAddress
:
common
.
HexToAddress
(
"0x1491418a70b592f8ad0e4279bb700f496d3b9abb"
),
BatchInboxAddress
:
common
.
HexToAddress
(
"0x880fb147c4e76adeed5b90f11172abf234111dee"
),
DepositContractAddress
:
common
.
HexToAddress
(
"0xa581ca3353db73115c4625ffc7adf5db379434a8"
),
L1SystemConfigAddress
:
common
.
HexToAddress
(
"0x2a4daa073b98a092ee235badfed23b54f1d416c9"
),
}
var
NetworksByName
=
map
[
string
]
rollup
.
Config
{
"beta-1"
:
Beta1
,
}
func
AvailableNetworks
()
[]
string
{
var
networks
[]
string
for
name
:=
range
NetworksByName
{
networks
=
append
(
networks
,
name
)
}
return
networks
}
func
GetRollupConfig
(
name
string
)
(
rollup
.
Config
,
error
)
{
network
,
ok
:=
NetworksByName
[
name
]
if
!
ok
{
return
rollup
.
Config
{},
fmt
.
Errorf
(
"invalid network %s"
,
name
)
}
return
network
,
nil
}
op-node/flags/flags.go
View file @
4ea2555c
...
@@ -2,8 +2,11 @@ package flags
...
@@ -2,8 +2,11 @@ package flags
import
(
import
(
"fmt"
"fmt"
"strings"
"time"
"time"
"github.com/ethereum-optimism/optimism/op-node/chaincfg"
"github.com/urfave/cli"
"github.com/urfave/cli"
)
)
...
@@ -33,6 +36,11 @@ var (
...
@@ -33,6 +36,11 @@ var (
Usage
:
"Rollup chain parameters"
,
Usage
:
"Rollup chain parameters"
,
EnvVar
:
prefixEnvVar
(
"ROLLUP_CONFIG"
),
EnvVar
:
prefixEnvVar
(
"ROLLUP_CONFIG"
),
}
}
Network
=
cli
.
StringFlag
{
Name
:
"network"
,
Usage
:
fmt
.
Sprintf
(
"Predefined network selection. Available networks: %s"
,
strings
.
Join
(
chaincfg
.
AvailableNetworks
(),
", "
)),
EnvVar
:
prefixEnvVar
(
"NETWORK"
),
}
RPCListenAddr
=
cli
.
StringFlag
{
RPCListenAddr
=
cli
.
StringFlag
{
Name
:
"rpc.addr"
,
Name
:
"rpc.addr"
,
Usage
:
"RPC listening address"
,
Usage
:
"RPC listening address"
,
...
@@ -166,12 +174,13 @@ var (
...
@@ -166,12 +174,13 @@ var (
var
requiredFlags
=
[]
cli
.
Flag
{
var
requiredFlags
=
[]
cli
.
Flag
{
L1NodeAddr
,
L1NodeAddr
,
L2EngineAddr
,
L2EngineAddr
,
RollupConfig
,
RPCListenAddr
,
RPCListenAddr
,
RPCListenPort
,
RPCListenPort
,
}
}
var
optionalFlags
=
append
([]
cli
.
Flag
{
var
optionalFlags
=
append
([]
cli
.
Flag
{
RollupConfig
,
Network
,
L1TrustRPC
,
L1TrustRPC
,
L2EngineJWTSecret
,
L2EngineJWTSecret
,
VerifierL1Confs
,
VerifierL1Confs
,
...
@@ -207,8 +216,12 @@ func CheckRequired(ctx *cli.Context) error {
...
@@ -207,8 +216,12 @@ func CheckRequired(ctx *cli.Context) error {
return
fmt
.
Errorf
(
"flag %s is required"
,
L2EngineAddr
.
Name
)
return
fmt
.
Errorf
(
"flag %s is required"
,
L2EngineAddr
.
Name
)
}
}
rollupConfig
:=
ctx
.
GlobalString
(
RollupConfig
.
Name
)
rollupConfig
:=
ctx
.
GlobalString
(
RollupConfig
.
Name
)
if
rollupConfig
==
""
{
network
:=
ctx
.
GlobalString
(
Network
.
Name
)
return
fmt
.
Errorf
(
"flag %s is required"
,
RollupConfig
.
Name
)
if
rollupConfig
==
""
&&
network
==
""
{
return
fmt
.
Errorf
(
"flag %s or %s is required"
,
RollupConfig
.
Name
,
Network
.
Name
)
}
if
rollupConfig
!=
""
&&
network
!=
""
{
return
fmt
.
Errorf
(
"cannot specify both %s and %s"
,
RollupConfig
.
Name
,
Network
.
Name
)
}
}
rpcListenAddr
:=
ctx
.
GlobalString
(
RPCListenAddr
.
Name
)
rpcListenAddr
:=
ctx
.
GlobalString
(
RPCListenAddr
.
Name
)
if
rpcListenAddr
==
""
{
if
rpcListenAddr
==
""
{
...
...
op-node/service.go
View file @
4ea2555c
...
@@ -8,6 +8,8 @@ import (
...
@@ -8,6 +8,8 @@ import (
"os"
"os"
"strings"
"strings"
"github.com/ethereum-optimism/optimism/op-node/chaincfg"
"github.com/urfave/cli"
"github.com/urfave/cli"
"github.com/ethereum-optimism/optimism/op-node/flags"
"github.com/ethereum-optimism/optimism/op-node/flags"
...
@@ -137,6 +139,16 @@ func NewDriverConfig(ctx *cli.Context) (*driver.Config, error) {
...
@@ -137,6 +139,16 @@ func NewDriverConfig(ctx *cli.Context) (*driver.Config, error) {
}
}
func
NewRollupConfig
(
ctx
*
cli
.
Context
)
(
*
rollup
.
Config
,
error
)
{
func
NewRollupConfig
(
ctx
*
cli
.
Context
)
(
*
rollup
.
Config
,
error
)
{
network
:=
ctx
.
GlobalString
(
flags
.
Network
.
Name
)
if
network
!=
""
{
config
,
err
:=
chaincfg
.
GetRollupConfig
(
network
)
if
err
!=
nil
{
return
nil
,
err
}
return
&
config
,
nil
}
rollupConfigPath
:=
ctx
.
GlobalString
(
flags
.
RollupConfig
.
Name
)
rollupConfigPath
:=
ctx
.
GlobalString
(
flags
.
RollupConfig
.
Name
)
file
,
err
:=
os
.
Open
(
rollupConfigPath
)
file
,
err
:=
os
.
Open
(
rollupConfigPath
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
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