Merge branch 'ethereum-optimism:develop' into develop

kansas1295 · Jul 7, 2024 · 4a517d9 · 4a517d9
2 parents 85bc442 + 7a7092a
commit 4a517d9
Show file tree

Hide file tree

Showing 663 changed files with 14,956 additions and 107,917 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -15,7 +15,7 @@
 /op-e2e         @ethereum-optimism/go-reviewers
 /op-heartbeat   @ethereum-optimism/go-reviewers
 /op-node        @ethereum-optimism/go-reviewers
-/op-node/rollup @protolambda @trianglesphere @ajsutton
+/op-node/rollup @protolambda @ajsutton
 /op-plasma      @ethereum-optimism/go-reviewers
 /op-preimage    @ethereum-optimism/go-reviewers
 /op-program     @ethereum-optimism/go-reviewers
@@ -33,7 +33,6 @@
 
 # Misc
 /proxyd           @ethereum-optimism/infra-reviewers
-/indexer          @ethereum-optimism/devxpod
 /infra            @ethereum-optimism/infra-reviewers
 /specs            @ethereum-optimism/contract-reviewers @ethereum-optimism/go-reviewers
 

diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -89,17 +89,6 @@ pull_request_rules:
       label:
         add:
           - A-cannon
-  - name: Add A-indexer label and ecopod reviewers
-    conditions:
-      - 'files~=^indexer/'
-      - '#label<5'
-    actions:
-      label:
-        add:
-          - A-indexer
-      request_reviews:
-        users:
-          - roninjin10
   - name: Add A-op-batcher label
     conditions:
       - 'files~=^op-batcher/'
@@ -239,14 +228,6 @@ pull_request_rules:
       request_reviews:
         users:
           - roninjin10
-  - name: Add A-proxyd label
-    conditions:
-      - 'files~=^proxyd/'
-      - '#label<5'
-    actions:
-      label:
-        add:
-          - A-proxyd
   - name: Add M-docs label
     conditions:
       - 'files~=^(docs|specs)\/'
@@ -264,7 +245,7 @@ pull_request_rules:
           - M-deletion
   - name: Add M-ci label when ci files are modified
     conditions:
-      - 'files~=^\.(github|circleci|husky)\/'
+      - 'files~=^\.(github|circleci)\/'
       - '#label<5'
     actions:
       label:

diff --git a/.github/workflows/release-docker-canary.yml b/.github/workflows/release-docker-canary.yml
@@ -16,7 +16,6 @@ jobs:
     # map the step outputs to job outputs
     outputs:
       balance-mon: ${{ steps.packages.outputs.balance-mon }}
-      drippie-mon: ${{ steps.packages.outputs.drippie-mon }}
       fault-mon: ${{ steps.packages.outputs.fault-mon }}
       multisig-mon: ${{ steps.packages.outputs.multisig-mon }}
       replica-mon: ${{ steps.packages.outputs.replica-mon }}
@@ -61,7 +60,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages
@@ -88,7 +87,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages
@@ -115,41 +114,14 @@ jobs:
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages
           target: multisig-mon
           push: true
           tags: ethereumoptimism/multisig-mon:${{ 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@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        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.canary-publish.outputs.canary-docker-tag }}
-
   wd-mon:
     name: Publish Withdrawal Monitor Version ${{ needs.canary-publish.outputs.canary-docker-tag }}
     needs: canary-publish
@@ -169,7 +141,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages
@@ -196,7 +168,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,6 @@ jobs:
     # map the step outputs to job outputs
     outputs:
       balance-mon: ${{ steps.packages.outputs.balance-mon }}
-      drippie-mon: ${{ steps.packages.outputs.drippie-mon }}
       fault-mon: ${{ steps.packages.outputs.fault-mon }}
       multisig-mon: ${{ steps.packages.outputs.multisig-mon }}
       replica-mon: ${{ steps.packages.outputs.replica-mon }}
@@ -98,7 +97,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages
@@ -125,7 +124,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages
@@ -152,7 +151,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages
@@ -179,41 +178,14 @@ jobs:
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages
           target: multisig-mon
           push: true
           tags: ethereumoptimism/multisig-mon:${{ needs.release.outputs.multisig-mon }},ethereumoptimism/multisig-mon: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@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        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
-
   replica-mon:
     name: Publish Replica Healthcheck Version ${{ needs.release.outputs.replica-mon }}
     needs: release
@@ -233,7 +205,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./ops/docker/Dockerfile.packages

diff --git a/.github/workflows/tag-service.yml b/.github/workflows/tag-service.yml
@@ -20,7 +20,6 @@ on:
         options:
           - ci-builder
           - ci-builder-rust
-          - indexer
           - op-heartbeat
           - chain-mon
           - op-node
@@ -31,7 +30,6 @@ on:
           - op-dispute-mon
           - op-ufm
           - da-server
-          - proxyd
           - op-contracts
           - op-conductor
       prerelease:

diff --git a/.husky/.gitignore b/.husky/.gitignore
diff --git a/.husky/pre-commit b/.husky/pre-commit