Merge pull request #1250 from ethereum-optimism/develop

Develop -> Master
ethereum-optimism · Jul 9, 2021 · fdc3059 · fdc3059
2 parents a54e19f + 90149ac
commit fdc3059
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 19 deletions.
diff --git a/.changeset/forty-pigs-study.md b/.changeset/forty-pigs-study.md
diff --git a/.changeset/plenty-walls-compare.md b/.changeset/plenty-walls-compare.md
@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts': patch
+---
+
+Run lint over the tasks directory
diff --git a/.changeset/slimy-experts-travel.md b/.changeset/slimy-experts-travel.md
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -133,7 +133,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.gas-oracle
           push: true
-          tags: ethereumoptimism/gas-oracle:${{ needs.release.outputs.gas-oracle }}
+          tags: ethereumoptimism/gas-oracle:${{ needs.release.outputs.gas-oracle }},ethereumoptimism/gas-oracle:latest
 
   # pushes the base builder image to dockerhub
   builder:

diff --git a/l2geth/CHANGELOG.md b/l2geth/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.4.4
+
+### Patch Changes
+
+- 0404c964: Allow zero gas price transactions from the `OVM_GasPriceOracle.owner` when enforce fees is set to true. This is to prevent the need to manage an additional hot wallet as well as prevent any situation where a bug causes the fees to go too high that it is not possible to lower the fee by sending a transaction
+- c612a903: Add sequencer fee buffer with config options `ROLLUP_FEE_THRESHOLD_UP` and `ROLLUP_FEE_THRESHOLD_DOWN` that are interpreted as floating point numbers
+
 ## 0.4.3
 
 ### Patch Changes

diff --git a/l2geth/package.json b/l2geth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eth-optimism/l2geth",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "private": true,
   "devDependencies": {}
 }
diff --git a/ops/scripts/ci-versions.js b/ops/scripts/ci-versions.js
@@ -6,10 +6,18 @@ const os = require('os')
 data = process.argv[2]
 data = JSON.parse(data)
 
+// Packages that do not depend on the builder.
+// There are more packages that depend on the
+// builder than not, so keep track of this list instead
+const nonBuilders = new Set([
+  'l2geth',
+  'gas-oracle',
+])
+
 builder = false
 for (const i of data) {
   const name = i.name.replace("@eth-optimism/", "")
-  if (name !== 'l2geth') {
+  if (!nonBuilders.has(name)) {
     builder = true
   }
   const version = i.version

diff --git a/packages/contracts/tasks/l2-gasprice.ts b/packages/contracts/tasks/l2-gasprice.ts
@@ -8,12 +8,7 @@ import { getContractDefinition } from '../src/contract-defs'
 
 task('set-l2-gasprice')
   .addOptionalParam('l2GasPrice', 'Gas Price to set on L2', 0, types.int)
-  .addOptionalParam(
-    'transactionGasPrice',
-    'tx.gasPrice',
-    undefined,
-    types.int
-  )
+  .addOptionalParam('transactionGasPrice', 'tx.gasPrice', undefined, types.int)
   .addOptionalParam(
     'contractsRpcUrl',
     'Sequencer HTTP Endpoint',