From c9fd6ec2bbae4d62c2cdb7b1975001379e0045ef Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Wed, 22 Dec 2021 13:47:34 -0800 Subject: [PATCH 1/3] l2geth: parse fees config Parse `ROLLUP_ENFORCE_FEES` when set to false --- .changeset/fluffy-teachers-greet.md | 5 +++++ l2geth/cmd/utils/flags.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/fluffy-teachers-greet.md diff --git a/.changeset/fluffy-teachers-greet.md b/.changeset/fluffy-teachers-greet.md new file mode 100644 index 0000000000000..1fa18f332cb4a --- /dev/null +++ b/.changeset/fluffy-teachers-greet.md @@ -0,0 +1,5 @@ +--- +'@eth-optimism/l2geth': patch +--- + +Correctly parse fee enforcement via config to allow turning off L2 fees for development diff --git a/l2geth/cmd/utils/flags.go b/l2geth/cmd/utils/flags.go index 3195889dbac68..99667003fb9cd 100644 --- a/l2geth/cmd/utils/flags.go +++ b/l2geth/cmd/utils/flags.go @@ -1127,7 +1127,7 @@ func setRollup(ctx *cli.Context, cfg *rollup.Config) { cfg.Backend = backend } if ctx.GlobalIsSet(RollupEnforceFeesFlag.Name) { - cfg.EnforceFees = true + cfg.EnforceFees = ctx.GlobalBool(RollupEnforceFeesFlag.Name) } if ctx.GlobalIsSet(RollupFeeThresholdDownFlag.Name) { val := ctx.GlobalFloat64(RollupFeeThresholdDownFlag.Name) From 1da160068cf1c4bec032df6f62998273e27b7847 Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Wed, 22 Dec 2021 13:48:16 -0800 Subject: [PATCH 2/3] ops: allow configurable fees --- ops/docker-compose.yml | 4 ++++ ops/envs/geth.env | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ops/docker-compose.yml b/ops/docker-compose.yml index 1c428bbebfda9..574beb29f42d7 100644 --- a/ops/docker-compose.yml +++ b/ops/docker-compose.yml @@ -101,6 +101,10 @@ services: # no need to keep this secret, only used internally to sign blocks BLOCK_SIGNER_KEY: "6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d27" BLOCK_SIGNER_ADDRESS: "0x00000398232E2064F896018496b4b44b3D62751F" + + ROLLUP_ENFORCE_FEES: ${ROLLUP_ENFORCE_FEES:-true} + ROLLUP_FEE_THRESHOLD_DOWN: 0.9 + ROLLUP_FEE_THRESHOLD_UP: 1.1 ports: - ${L2GETH_HTTP_PORT:-8545}:8545 - ${L2GETH_WS_PORT:-8546}:8546 diff --git a/ops/envs/geth.env b/ops/envs/geth.env index d3863718f1cf7..36b2a00990bb3 100644 --- a/ops/envs/geth.env +++ b/ops/envs/geth.env @@ -6,7 +6,6 @@ ETH1_CONFIRMATION_DEPTH=0 ROLLUP_CLIENT_HTTP= ROLLUP_POLL_INTERVAL_FLAG=500ms ROLLUP_ENABLE_L2_GAS_POLLING=true -ROLLUP_ENFORCE_FEES=true RPC_ENABLE=true RPC_ADDR=0.0.0.0 @@ -36,6 +35,3 @@ BLOCK_SIGNER_KEY=6587ae678cf4fc9a33000cdbf9f35226b71dcc6a4684a31203241f9bcfd55d2 BLOCK_SIGNER_ADDRESS=0x00000398232E2064F896018496b4b44b3D62751F L2_BLOCK_GAS_LIMIT=15000000 - -ROLLUP_FEE_THRESHOLD_DOWN=0.9 -ROLLUP_FEE_THRESHOLD_UP=1.1 From 67fc72dc4cd0e683e0a29c5ae2c3b2775233745b Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Tue, 11 Jan 2022 15:12:20 -0800 Subject: [PATCH 3/3] ops: document how to turn off L2 fees for development --- ops/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ops/README.md b/ops/README.md index 49319933fda53..8062187de97f2 100644 --- a/ops/README.md +++ b/ops/README.md @@ -58,6 +58,15 @@ A Makefile has been provided for convience. The following targets are available. - make up-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 The existing Typescript batch submitter is in the process of being reimplemented