Merge pull request #1832 from ethereum-optimism/develop

Develop -> Master PR

.changeset/itchy-worms-cheat.md

+---
+'@eth-optimism/gas-oracle': patch
+---
+
+Fixed gas-oacle tx/not_significant metric name

.changeset/metal-cherries-march.md

+---
+'@eth-optimism/proxyd': patch
+---
+
+Trigger release of proxyd

.changeset/plenty-gifts-tell.md

+---
+'@eth-optimism/proxyd': patch
+---
+
+Bump proxyd to test release build workflow

.changeset/soft-countries-heal.md

+---
+'@eth-optimism/message-relayer': patch
+---
+
+Fix dockerfile

.github/workflows/release.yml

@@ -184,9 +184,12 @@ jobs:
           username: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME }}
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
 
-      - name: Set env
+      - name: Set build args
+        id: build_args
         run: |
-          echo "GITDATE=$(date)" >> $GITHUB_ENV"
+          echo ::set-output name=GITDATE::"$(date +%d-%m-%Y)"
+          echo ::set-output name=GITVERSION::$(jq -r .version ./go/proxyd/package.json)
+          echo ::set-output name=GITCOMMIT::"$GITHUB_SHA"
 
       - name: Build and push
         uses: docker/build-push-action@v2
@@ -196,14 +199,15 @@ jobs:
           push: true
           tags: ethereumoptimism/proxyd:${{ needs.release.outputs.proxyd }},ethereumoptimism/proxyd:latest
           build-args: |
-            GITCOMMIT=$GITHUB_SHA
-            GITDATE=$GITDATE
+            GITDATE=${{ steps.build_args.outputs.GITDATE }}
+            GITCOMMIT=${{ steps.build_args.outputs.GITCOMMIT }}
+            GITVERSION=${{ steps.build_args.outputs.GITVERSION }}
 
   rpc-proxy:
     name: Publish rpc-proxy Version ${{ needs.release.outputs.rpc-proxy }}
     needs: release
     if: needs.release.outputs.rpc-proxy != ''
-    runs-on: ubuntu:latest
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout

go/gas-oracle/oracle/updater_interface.go

@@ -18,7 +18,7 @@ import (
 
 var (
 	txSendCounter           = metrics.NewRegisteredCounter("tx/send", ometrics.DefaultRegistry)
-	txNotSignificantCounter = metrics.NewRegisteredCounter("tx/not-significant", ometrics.DefaultRegistry)
+	txNotSignificantCounter = metrics.NewRegisteredCounter("tx/not_significant", ometrics.DefaultRegistry)
 	gasPriceGauge           = metrics.NewRegisteredGauge("gas_price", ometrics.DefaultRegistry)
 	txConfTimer             = metrics.NewRegisteredTimer("tx/confirmed", ometrics.DefaultRegistry)
 	txSendTimer             = metrics.NewRegisteredTimer("tx/send", ometrics.DefaultRegistry)

ops/README.md

@@ -52,6 +52,17 @@ A Makefile has been provided for convience. The following targets are available.
 - make up-metrics
 - make down-metrics
 
+## Cross domain communication
+
+By default, the `message-relayer` service is turned off. This means that
+any tests must manually submit withdrawals. The `message-relayer` will
+automatically look for withdrawals and submit the proofs. To run with the
+`message-relayer` on, use the command:
+
+```bash
+$ docker-compose up --scale relayer=1
+```
+
 ## Authentication
 
 Influxdb has authentication disabled.

ops/docker-compose.yml

@@ -102,6 +102,8 @@ services:
       - l1_chain
       - deployer
       - l2geth
+    deploy:
+      replicas: 0
     build:
       context: ..
       dockerfile: ./ops/docker/Dockerfile.packages

ops/docker/Dockerfile.packages

@@ -57,6 +57,6 @@ CMD ["yarn", "test:integration"]
 
 
 FROM base as relayer
-WORKDIR /opt/optimism/packages/message-relayer
+WORKDIR /optimism/packages/message-relayer
 COPY ./ops/scripts/relayer.sh .
-ENTRYPOINT ["npm", "run", "start"]
\ No newline at end of file
+CMD ["npm", "run", "start"]