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
e67e8508
Unverified
Commit
e67e8508
authored
Jan 18, 2022
by
Mark Tyneway
Committed by
GitHub
Jan 18, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2000 from ethereum-optimism/fix/geth-enforce-fees
fix: configurable L2 fee enforcement in ops
parents
ab407321
67fc72dc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
5 deletions
+19
-5
fluffy-teachers-greet.md
.changeset/fluffy-teachers-greet.md
+5
-0
flags.go
l2geth/cmd/utils/flags.go
+1
-1
README.md
ops/README.md
+9
-0
docker-compose.yml
ops/docker-compose.yml
+4
-0
geth.env
ops/envs/geth.env
+0
-4
No files found.
.changeset/fluffy-teachers-greet.md
0 → 100644
View file @
e67e8508
---
'
@eth-optimism/l2geth'
:
patch
---
Correctly parse fee enforcement via config to allow turning off L2 fees for development
l2geth/cmd/utils/flags.go
View file @
e67e8508
...
@@ -1127,7 +1127,7 @@ func setRollup(ctx *cli.Context, cfg *rollup.Config) {
...
@@ -1127,7 +1127,7 @@ func setRollup(ctx *cli.Context, cfg *rollup.Config) {
cfg
.
Backend
=
backend
cfg
.
Backend
=
backend
}
}
if
ctx
.
GlobalIsSet
(
RollupEnforceFeesFlag
.
Name
)
{
if
ctx
.
GlobalIsSet
(
RollupEnforceFeesFlag
.
Name
)
{
cfg
.
EnforceFees
=
true
cfg
.
EnforceFees
=
ctx
.
GlobalBool
(
RollupEnforceFeesFlag
.
Name
)
}
}
if
ctx
.
GlobalIsSet
(
RollupFeeThresholdDownFlag
.
Name
)
{
if
ctx
.
GlobalIsSet
(
RollupFeeThresholdDownFlag
.
Name
)
{
val
:=
ctx
.
GlobalFloat64
(
RollupFeeThresholdDownFlag
.
Name
)
val
:=
ctx
.
GlobalFloat64
(
RollupFeeThresholdDownFlag
.
Name
)
...
...
ops/README.md
View file @
e67e8508
...
@@ -58,6 +58,15 @@ A Makefile has been provided for convience. The following targets are available.
...
@@ -58,6 +58,15 @@ A Makefile has been provided for convience. The following targets are available.
-
make up-metrics
-
make up-metrics
-
make down-metrics
-
make down-metrics
## Turning off L2 Fee Enforcement
Fees can be turned off at runtime by setting the environment variable
`ROLLUP_ENFORCE_FEES`
to
`false`
.
```
bash
ROLLUP_ENFORCE_FEES
=
false
docker-compose up
```
## Using the Go Batch Submitter
## Using the Go Batch Submitter
The existing Typescript batch submitter is in the process of being reimplemented
The existing Typescript batch submitter is in the process of being reimplemented
...
...
ops/docker-compose.yml
View file @
e67e8508
...
@@ -101,6 +101,10 @@ services:
...
@@ -101,6 +101,10 @@ services:
# no need to keep this secret, only used internally to sign blocks
# no need to keep this secret, only used internally to sign blocks
BLOCK_SIGNER_KEY
:
"
6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27"
BLOCK_SIGNER_KEY
:
"
6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27"
BLOCK_SIGNER_ADDRESS
:
"
0x00000398232E2064F896018496b4b44b3D62751F"
BLOCK_SIGNER_ADDRESS
:
"
0x00000398232E2064F896018496b4b44b3D62751F"
ROLLUP_ENFORCE_FEES
:
${ROLLUP_ENFORCE_FEES:-true}
ROLLUP_FEE_THRESHOLD_DOWN
:
0.9
ROLLUP_FEE_THRESHOLD_UP
:
1.1
ports
:
ports
:
-
${L2GETH_HTTP_PORT:-8545}:8545
-
${L2GETH_HTTP_PORT:-8545}:8545
-
${L2GETH_WS_PORT:-8546}:8546
-
${L2GETH_WS_PORT:-8546}:8546
...
...
ops/envs/geth.env
View file @
e67e8508
...
@@ -6,7 +6,6 @@ ETH1_CONFIRMATION_DEPTH=0
...
@@ -6,7 +6,6 @@ ETH1_CONFIRMATION_DEPTH=0
ROLLUP_CLIENT_HTTP=
ROLLUP_CLIENT_HTTP=
ROLLUP_POLL_INTERVAL_FLAG=500ms
ROLLUP_POLL_INTERVAL_FLAG=500ms
ROLLUP_ENABLE_L2_GAS_POLLING=true
ROLLUP_ENABLE_L2_GAS_POLLING=true
ROLLUP_ENFORCE_FEES=true
RPC_ENABLE=true
RPC_ENABLE=true
RPC_ADDR=0.0.0.0
RPC_ADDR=0.0.0.0
...
@@ -36,6 +35,3 @@ BLOCK_SIGNER_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d2
...
@@ -36,6 +35,3 @@ BLOCK_SIGNER_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d2
BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F
L2_BLOCK_GAS_LIMIT=15000000
L2_BLOCK_GAS_LIMIT=15000000
ROLLUP_FEE_THRESHOLD_DOWN=0.9
ROLLUP_FEE_THRESHOLD_UP=1.1
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