Develop -> Master

.changeset/early-cougars-eat.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/proxyd': patch
+---
+
+Improve robustness against unexpected JSON-RPC from upstream

.changeset/forty-guests-nail.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Re-deploy RetroReceiver

.changeset/green-donkeys-fry.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts': patch
+---
+
+goerli redeploy

.changeset/honest-ants-own.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Tweaks Drippie contract for client-side ease

.changeset/light-parrots-yell.md

@@ -0,0 +1,6 @@
+---
+"@eth-optimism/contracts-governance": patch
+"@eth-optimism/contracts": patch
+---
+
+package: contracts-governance

.changeset/rude-foxes-think.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/proxyd': patch
+---
+
+Fix concurrent write panic in WS

.changeset/shaggy-zebras-juggle.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Update comments and style for L1 contracts

.changeset/silver-planets-drop.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Adds new TeleportrWithdrawer contract for withdrawing from Teleportr

.changeset/slow-numbers-knock.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/drippie-mon': minor
+---
+
+Release drippie-mon

.changeset/ten-owls-return.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/common-ts': patch
+---
+
+Expose service internal options as environment or cli options

.circleci/config.yml

@@ -91,6 +91,7 @@ jobs:
             - packages/contracts-periphery/node_modules
             - packages/core-utils/node_modules
             - packages/data-transport-layer/node_modules
+            - packages/drippie-mon/node_modules
             - packages/fault-detector/node_modules
             - packages/message-relayer/node_modules
             - packages/replica-healthcheck/node_modules
@@ -178,6 +179,24 @@ jobs:
           command: yarn test:coverage
           working_directory: packages/contracts-periphery
 
+  contracts-governance-tests:
+    docker:
+      - image: ethereumoptimism/js-builder:latest
+    resource_class: xlarge
+    steps:
+      - restore_cache:
+          keys:
+            - v2-cache-yarn-build-{{ .Revision }}
+      - checkout
+      - run:
+          name: Lint
+          command: yarn lint:check
+          working_directory: packages/contracts-governance
+      - run:
+          name: Test
+          command: yarn test
+          working_directory: packages/contracts-governance
+
   dtl-tests:
     docker:
       - image: ethereumoptimism/js-builder:latest
@@ -518,6 +537,9 @@ workflows:
       - contracts-bedrock-tests:
           requires:
             - yarn-monorepo
+      - contracts-governance-tests:
+          requires:
+            - yarn-monorepo
       - js-lint-test:
           name: dtl-tests
           package_name: data-transport-layer
@@ -538,6 +560,11 @@ workflows:
           package_name: fault-detector
           requires:
             - yarn-monorepo
+      - js-lint-test:
+          name: drippie-mon-tests
+          package_name: drippie-mon
+          requires:
+            - yarn-monorepo
       - js-lint-test:
           name: message-relayer-tests
           package_name: message-relayer
@@ -628,6 +655,14 @@ workflows:
           target: fault-detector
           context:
             - optimism
+      - docker-publish:
+          name: drippie-mon-release
+          docker_file: ops/docker/Dockerfile.packages
+          docker_tags: ethereumoptimism/drippie-mon:nightly
+          docker_context: .
+          target: drippie-mon
+          context:
+            - optimism
       - docker-publish:
           name: message-relayer-release
           docker_file: ops/docker/Dockerfile.packages

.github/labeler.yml

@@ -7,6 +7,7 @@
   - 'packages/contracts/**/*'
   - 'packages/contracts-periphery/**/*'
   - 'packages/data-transport-layer/**/*'
+  - 'packages/drippie-mon/**/*'
   - 'packages/message-relayer/**/*'
   - 'packages/fault-detector/**/*'
   - 'patches/**/*'

.github/mergify.yml

@@ -27,12 +27,23 @@ pull_request_rules:
       queue:
         name: default
         method: squash
+  - name: Add merge train label
+    conditions:
+      - "queue-position >= 0"
+    actions:
       comment:
-        message: |
-          This PR has been added to the merge queue, and will be merged soon.
+          message: |
+            This PR has been added to the merge queue, and will be merged soon.
       label:
         add:
           - on-merge-train
+  - name: Remove merge train label
+    conditions:
+      - "queue-position = -1"
+    actions:
+      label:
+        remove:
+          - on-merge-train
   - name: Handle security critical PRs
     conditions:
       - "label=SR-Risk"
@@ -96,9 +107,6 @@ pull_request_rules:
       comment:
         message: |
           Merge failed. Please see automated check logs for more details.
-      label:
-        remove:
-          - on-merge-train
   - name: Nag changesets
     conditions:
       - and:

.github/workflows/publish-canary.yml

@@ -18,6 +18,7 @@ jobs:
       l2geth: ${{ steps.packages.outputs.l2geth }}
       message-relayer: ${{ steps.packages.outputs.message-relayer }}
       fault-detector: ${{ steps.packages.outputs.fault-detector }}
+      drippie-mon: ${{ steps.packages.outputs.drippie-mon }}
       data-transport-layer: ${{ steps.packages.outputs.data-transport-layer }}
       contracts: ${{ steps.packages.outputs.contracts }}
       gas-oracle: ${{ steps.packages.outputs.gas-oracle }}
@@ -229,6 +230,33 @@ jobs:
           push: true
           tags: ethereumoptimism/fault-detector:${{ needs.canary-publish.outputs.canary-docker-tag }}
 
+  drippie-mon:
+    name: Publish Drippie Monitor Version ${{ needs.canary-publish.outputs.canary-docker-tag }}
+    needs: canary-publish
+    if: needs.canary-publish.outputs.drippie-mon != ''
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./ops/docker/Dockerfile.packages
+          target: relayer
+          push: true
+          tags: ethereumoptimism/drippie-mon:${{ needs.canary-publish.outputs.canary-docker-tag }}
+
   data-transport-layer:
     name: Publish Data Transport Layer Version ${{ needs.canary-publish.outputs.canary-docker-tag }}
     needs: canary-publish

.github/workflows/release.yml

@@ -14,6 +14,7 @@ jobs:
       l2geth: ${{ steps.packages.outputs.l2geth }}
       message-relayer: ${{ steps.packages.outputs.message-relayer }}
       fault-detector: ${{ steps.packages.outputs.fault-detector }}
+      drippie-mon: ${{ steps.packages.outputs.drippie-mon }}
       data-transport-layer: ${{ steps.packages.outputs.data-transport-layer }}
       contracts: ${{ steps.packages.outputs.contracts }}
       gas-oracle: ${{ steps.packages.outputs.gas-oracle }}
@@ -372,6 +373,33 @@ jobs:
           push: true
           tags: ethereumoptimism/fault-detector:${{ needs.release.outputs.fault-detector }},ethereumoptimism/fault-detector:latest
 
+  drippie-mon:
+    name: Publish Drippie Monitor Version ${{ needs.release.outputs.drippie-mon }}
+    needs: release
+    if: needs.release.outputs.drippie-mon != ''
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./ops/docker/Dockerfile.packages
+          target: drippie-mon
+          push: true
+          tags: ethereumoptimism/drippie-mon:${{ needs.release.outputs.drippie-mon }},ethereumoptimism/drippie-mon:latest
+
   data-transport-layer:
     name: Publish Data Transport Layer Version ${{ needs.release.outputs.data-transport-layer }}
     needs: release

.vscode/settings.json

@@ -9,6 +9,7 @@
     {"directory": "packages/contracts", "changeProcessCWD": true },
     {"directory": "packages/contracts-periphery", "changeProcessCWD": true },
     {"directory": "packages/data-transport-layer", "changeProcessCWD": true },
+    {"directory": "packages/drippie-mon", "changeProcessCWD": true },
     {"directory": "packages/batch-submitter", "changeProcessCWD": true },
     {"directory": "packages/message-relayer", "changeProcessCWD": true },
     {"directory": "packages/fault-detector", "changeProcessCWD": true },

CONTRIBUTING.md

@@ -64,6 +64,7 @@ You'll need the following:
 * [Yarn](https://classic.yarnpkg.com/en/docs/install)
 * [Docker](https://docs.docker.com/get-docker/)
 * [Docker Compose](https://docs.docker.com/compose/install/)
+* [Foundry](https://getfoundry.sh)
 
 ### Setup
 
@@ -85,6 +86,10 @@ nvm use
 
 ### Building the TypeScript packages
 
+[foundry](https://github.com/foundry-rs/foundry) is used for some smart contract
+development in the monorepo. It is required to build the TypeScript packages
+and compile the smart contracts. Install foundry [here](https://getfoundry.sh/).
+
 To build all of the [TypeScript packages](./packages), run:
 
 ```bash

Makefile

@@ -59,8 +59,8 @@ devnet-clean:
 	rm -rf ./packages/contracts-bedrock/deployments/devnetL1
 	rm -rf ./.devnet
 	cd ./ops-bedrock && docker-compose down
-	docker image ls | grep ops-bedrock_ | cut -d ' ' -f 1 | xargs docker rmi
-	docker volume ls | grep ops-bedrock_ | cut -d ' ' -f 1 | xargs docker volume rm
+	docker image ls 'ops-bedrock*' --format='{{.Repository}}' | xargs docker rmi
+	docker volume ls --filter name=ops-bedrock --format='{{.Name}}' | xargs docker volume rm
 
 .PHONY: devnet-clean
 

README.md

@@ -36,7 +36,8 @@ root
 │   ├── <a href="./packages/contracts-periphery">contracts-periphery</a>: Peripheral contracts for Optimism
 │   ├── <a href="./packages/core-utils">core-utils</a>: Low-level utilities that make building Optimism easier
 │   ├── <a href="./packages/data-transport-layer">data-transport-layer</a>: Service for indexing Optimism-related L1 data
-│   ├── <a href="./packages/fault-detector">fault-detector</a>:
+│   ├── <a href="./packages/drippie-mon">drippie-mon</a>: Service for monitoring Drippie instances
+│   ├── <a href="./packages/fault-detector">fault-detector</a>: Service for detecting Sequencer faults
 │   ├── <a href="./packages/integration-tests-bedrock">integration-tests-bedrock</a> (BEDROCK upgrade): Bedrock integration tests.
 │   ├── <a href="./packages/message-relayer">message-relayer</a>: Tool for automatically relaying L1<>L2 messages in development
 │   ├── <a href="./packages/replica-healthcheck">replica-healthcheck</a>: Service for monitoring the health of a replica node

go.work

@@ -15,6 +15,7 @@ use (
 	./op-proposer
 	./proxyd
 	./teleportr
+	./state-surgery
 )
 
 replace github.com/ethereum/go-ethereum v1.10.17 => github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220602230953-dd2e24b3359f