Develop -> Master

.changeset/brown-dots-whisper.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/data-transport-layer': patch
+---
+
+Patch for Kovan DTL halting issue

.changeset/cuddly-geese-allow.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/l2geth': patch
+---
+
+Skip TestWSAttachWelcome

.changeset/fair-cows-think.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/common-ts': patch
+---
+
+Adds hard stop to BaseServiceV2 when multiple exit signals are received

.changeset/four-flowers-run.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/l2geth': patch
+---
+
+Skip some geth console tests that flake in CI

.changeset/lovely-weeks-hang.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/gas-oracle': patch
+---
+
+Fixes a bug that would cause the service to crash on startup if the RPC URLs were not immediately available

.changeset/moody-drinks-lie.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/integration-tests': patch
+---
+
+Update chainid

.changeset/new-jokes-walk.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/data-transport-layer': patch
+---
+
+Add new metrics to the data-transport-layer

.changeset/popular-plants-change.md

@@ -0,0 +1,12 @@
+---
+'@eth-optimism/integration-tests': patch
+'@eth-optimism/common-ts': patch
+'@eth-optimism/contracts': patch
+'@eth-optimism/core-utils': patch
+'@eth-optimism/data-transport-layer': patch
+'@eth-optimism/message-relayer': patch
+'@eth-optimism/replica-healthcheck': patch
+'@eth-optimism/sdk': patch
+---
+
+Update Dockerfile to use Alpine

.changeset/sharp-terms-pay.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/common-ts': patch
+---
+
+Have BaseServiceV2 throw when options are undefined

.changeset/tender-scissors-report.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/common-ts': patch
+---
+
+Adds the jsonRpcProvider validator as an input validator

.changeset/tiny-melons-float.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/l2geth': patch
+---
+
+Adds a flag for changing the genesis fetch timeout

.changeset/twelve-shrimps-add.md

@@ -0,0 +1,9 @@
+---
+'@eth-optimism/contracts': patch
+'@eth-optimism/data-transport-layer': patch
+'@eth-optimism/integration-tests': patch
+'@eth-optimism/message-relayer': patch
+'@eth-optimism/sdk': patch
+---
+
+Bump to hardhat@2.9.1

.changeset/weak-walls-cross.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/hardhat-node': patch
+---
+
+Bump to hardhat@2.9.1

.circleci/config.yml

@@ -208,23 +208,23 @@ jobs:
     steps:
       - restore_cache:
           keys:
-            - v1-source-{{ .Branch }}-{{ .Revision }}
-            - v1-source-{{ .Branch }}
+            - v2-cache-source-{{ .Branch }}-{{ .Revision }}
+            - v2-cache-source-{{ .Branch }}
       - checkout
       - save_cache:
-          key: v1-source-{{ .Branch }}-{{ .Revision }}
+          key: v2-cache-source-{{ .Branch }}-{{ .Revision }}
           paths:
             - ".git"
       - restore_cache:
           keys:
-            - v1-yarn-install-{{ checksum "yarn.lock" }}
-            - v1-yarn-install
+            - v2-cache-yarn-install-{{ checksum "yarn.lock" }}
+            - v2-cache-yarn-install
       - run:
           name: Install dependencies
           command: yarn --frozen-lockfile
       - save_cache:
-          key: v1-yarn-install-{{ checksum "yarn.lock" }}
-          paths: 
+          key: v2-cache-yarn-install-{{ checksum "yarn.lock" }}
+          paths:
             - node_modules
             - packages/common-ts/node_modules
             - packages/contracts/node_modules
@@ -238,7 +238,7 @@ jobs:
           name: Build monorepo
           command: yarn build
       - save_cache:
-          key: v1-yarn-build-{{ .Revision }}
+          key: v2-cache-yarn-build-{{ .Revision }}
           paths:
             - "."
 
@@ -248,7 +248,7 @@ jobs:
     steps:
       - restore_cache:
           keys:
-            - v1-yarn-build-{{ .Revision }}
+            - v2-cache-yarn-build-{{ .Revision }}
       - checkout
       - run:
           name: Run Slither
@@ -262,12 +262,16 @@ jobs:
     steps:
       - restore_cache:
           keys:
-            - v1-yarn-build-{{ .Revision }}
+            - v2-cache-yarn-build-{{ .Revision }}
       - checkout
       - run:
           name: Lint
           command: yarn lint:check
           working_directory: packages/contracts
+      - run:
+          name: Check deployment docs
+          command: yarn autogen:markdown && git diff --exit-code
+          working_directory: packages/contracts
       - run:
           name: Slither
           command: yarn test:slither
@@ -283,7 +287,7 @@ jobs:
     steps:
       - restore_cache:
           keys:
-            - v1-yarn-build-{{ .Revision }}
+            - v2-cache-yarn-build-{{ .Revision }}
       - checkout
       - run:
           name: Test
@@ -306,7 +310,7 @@ jobs:
     steps:
       - restore_cache:
           keys:
-            - v1-yarn-build-{{ .Revision }}
+            - v2-cache-yarn-build-{{ .Revision }}
       - checkout
       # Note: The below needs to be manually configured whenever we
       # add a new package to CI.
@@ -362,7 +366,7 @@ jobs:
           name: Bring up the stack
           command: |
             docker-compose build --progress=plain
-            docker-compose up -d --scale replica-healthcheck=1
+            docker-compose up -d --scale replica_healthcheck=1
           working_directory: ops
       - run:
           name: Wait for sequencer
@@ -385,7 +389,7 @@ jobs:
     steps:
       - restore_cache:
           keys:
-            - v1-yarn-build-{{ .Revision }}
+            - v2-cache-yarn-build-{{ .Revision }}
       - checkout
       - run:
           name: Lint

.github/labeler.yml

@@ -10,7 +10,7 @@
   - 'patches/**/*'
 
 M-ci:
-  - any: ['.github/**/*']
+  - any: ['.github/**/*', '.circleci/**/*']
 
 M-l2geth:
   - any: ['l2geth/**/*']
@@ -35,3 +35,9 @@ M-sdk:
 
 M-ops:
   - any: ['ops/**/*']
+
+C-Protocol-Critical:
+  - any:
+    - 'packages/data-transport-layer/**/*.ts'
+    - 'packages/contracts/**/*.sol'
+    - 'l2geth/**/*.go'

.github/mergify.yml

@@ -0,0 +1,80 @@
+queue_rules:
+  - name: default
+    conditions: []
+
+pull_request_rules:
+  - name: Automatic merge on approval
+    conditions:
+        - or:
+          - and:
+            - "label!=SR-Risk"
+            - "label!=C-Protocol-Critical"
+            - "#approved-reviews-by>=2"
+          - and:
+            - "label=SR-Risk"
+            - "#approved-reviews-by>=2"
+            - "approved-reviews-by=maurelian"
+          - and:
+            - "label=C-Protocol-Critical"
+            - "#approved-reviews-by>=2"
+            - or:
+              - "approved-reviews-by=tynes"
+              - "approved-reviews-by=smartcontracts"
+    actions:
+      queue:
+        name: default
+        method: squash
+      comment:
+        message: |
+          This PR has been added to the merge queue, and will be merged soon.
+      label:
+        add:
+          - on-merge-train
+  - name: Handle security critical PRs
+    conditions:
+      - "label=SR-Risk"
+    actions:
+      request_reviews:
+        users:
+          - "maurelian"
+      comment:
+        message: |
+          Hey there @{{author}}! You flagged this PR as security critical. To make review easier, please add a comment describing
+
+          1. The risks present in this PR.
+          2. The mitigations you have added to try and reduce those risks.
+  - name: Request reviewers
+    conditions:
+      - -closed
+    actions:
+      request_reviews:
+        users:
+          - cfromknecht
+          - tynes
+          - mslipper
+          - inphi
+          - tuxcanfly
+          - smartcontracts
+        random_count: 2
+  - name: Request protocol critical reviewers
+    conditions:
+      - label=C-Protocol-Critical
+    actions:
+      request_reviews:
+        users:
+          - tynes
+          - smartcontracts
+        random_count: 1
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+    actions:
+      comment:
+        message: Hey @{{author}}! This PR has merge conflicts. Please fix them before continuing review.
+  - name: Notify author when added to merge queue
+    conditions:
+      - "check-pending=Queue: Embarked in merge train"
+    actions:
+      comment:
+        message: |
+          This PR is next in line to be merged, and will be merged as soon as checks pass.