Merge branch 'main' into state-reconstruction-app

# Conflicts: # contracts/abi/LineaRollupV6.0.abi # contracts/contracts/LineaRollup.sol # contracts/contracts/ZkEvmV2.sol # contracts/test/LineaRollup.ts # contracts/test/common/helpers/dataGeneration.ts
Consensys · Oct 16, 2024 · 352c2de · 352c2de
2 parents 3aadad6 + 48e1001
commit 352c2de
Show file tree

Hide file tree

Showing 270 changed files with 8,429 additions and 7,977 deletions.
diff --git a/.github/workflows/all-tools.yml b/.github/workflows/all-tools.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   changes:
-    runs-on: besu-arm64
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     name: Filter commit changes
     outputs:
       all-tools: ${{ steps.filter.outputs['all-tools'] }}
@@ -39,7 +39,7 @@ jobs:
     uses: ./.github/workflows/reuse-store-image-name-and-tags.yml
 
   check_image_tags_exist:
-    runs-on: besu-arm64
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     name: Check image tags exist
     needs: [ changes, store_image_name_and_tags ]
     if: ${{ needs.changes.outputs['all-tools'] == 'false' }}
@@ -56,7 +56,7 @@ jobs:
           docker_password: ${{ secrets.DOCKERHUB_TOKEN }}
 
   all-tools-tag-only:
-    runs-on: besu-arm64
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     name: All tools tag only
     needs: [ changes, store_image_name_and_tags, check_image_tags_exist ]
     if: ${{ github.event_name != 'pull_request' && needs.changes.outputs['all-tools'] == 'false' }}
@@ -83,7 +83,7 @@ jobs:
   build-and-publish:
     needs: [ changes, store_image_name_and_tags, all-tools-tag-only ]
     if: ${{ always() && (needs.changes.outputs['all-tools'] == 'true' || needs.all-tools-tag-only.result != 'success' || needs.all-tools-tag-only.outputs.image_tagged != 'true') }}
-    runs-on: ubuntu-22.04
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     env:
       COMMIT_TAG: ${{ needs.store_image_name_and_tags.outputs.commit_tag }}
       DEVELOP_TAG: ${{ needs.store_image_name_and_tags.outputs.develop_tag }}
@@ -97,7 +97,7 @@ jobs:
           submodules: true
           persist-credentials: false
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/.github/workflows/bridge-ui-e2e-tests.yml b/.github/workflows/bridge-ui-e2e-tests.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   run-e2e-tests:
-    runs-on: besu-arm64
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/bridge-ui-publish.yml b/.github/workflows/bridge-ui-publish.yml
@@ -14,8 +14,7 @@ on:
 
 jobs:
   publish:
-    runs-on: ubuntu-22.04
-    if: github.event_name != 'pull_request' || (github.event_name == 'pull_request' && github.event.pull_request.draft == false)
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -31,13 +30,13 @@ jobs:
         run: echo "DOCKER_TAG=${GITHUB_SHA:0:7}-$(date +%s)-bridge-ui-${{ steps.package-version.outputs.current-version }}" | tee $GITHUB_ENV
 
       - name: Login to Docker Repository
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      
+
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Docker Image Build and Publish
         id: docker-build-publish

diff --git a/.github/workflows/cache-docker-images.yml b/.github/workflows/cache-docker-images.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   changes:
-    runs-on: besu-arm64
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     name: Filter commit changes
     outputs:
       cache-images: ${{ steps.filter.outputs.cache-images }}
@@ -31,12 +31,12 @@ jobs:
   pull-and-cache-images:
     needs: [ changes ]
     if: ${{ always() && needs.changes.outputs.cache-images == 'true' }}
-    runs-on: ubuntu-22.04
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -18,7 +18,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, ubuntu-20.04, X64, medium]
     permissions:
       actions: read
       contents: read

diff --git a/.github/workflows/coordinator-build-and-publish.yml b/.github/workflows/coordinator-build-and-publish.yml
@@ -29,13 +29,12 @@ on:
 
 concurrency:
   group: coordinator-build-and-publish-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref_name != 'main' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build-and-publish:
-    runs-on: ubuntu-22.04
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     name: Coordinator build
-    environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }}
     env:
       COMMIT_TAG: ${{ inputs.commit_tag }}
       DEVELOP_TAG: ${{ inputs.develop_tag }}
@@ -54,17 +53,16 @@ jobs:
       - name: Build dist
         run: |
           ./gradlew coordinator:app:distZip --no-daemon
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
       - name: Login to Docker Hub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3
       - name: Docker meta
         id: coordinator
         uses: docker/metadata-action@v3

diff --git a/.github/workflows/coordinator-testing.yml b/.github/workflows/coordinator-testing.yml
@@ -14,7 +14,7 @@ on:
 
 concurrency:
   group: coordinator-testing-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref_name != 'main' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   cache-docker-images:
@@ -24,7 +24,7 @@ jobs:
     env:
       COMMIT_TAG: ${{ inputs.commit_tag }}
       GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN_RELEASE_ACCESS }}
-    runs-on: ubuntu-22.04
+    runs-on: [self-hosted, ubuntu-22.04, X64, medium]
     name: Coordinator tests
     steps:
       - name: Checkout
@@ -51,6 +51,11 @@ jobs:
       - name: Build coordinator and Unit tests
         run: |
           ./gradlew -V coordinator:app:buildNeeded
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Run integration tests
         run: |
           ./gradlew integrationTest
@@ -64,40 +69,6 @@ jobs:
           if-no-files-found: error
           path: |
             ${{ github.workspace }}/build/reports/jacoco/jacocoRootReport/jacocoRootReport.xml
-      - name: Setup .NET Core # Required to execute ReportGenerator
-        uses: actions/setup-dotnet@v3
-        with:
-          dotnet-version: 8.x
-          dotnet-quality: 'ga'
-      - name: ReportGenerator
-        uses: danielpalme/ReportGenerator-GitHub-Action@5.2.4
-        with:
-          reports: '${{ github.workspace }}/build/reports/jacoco/jacocoRootReport/*.xml'
-          targetdir: '${{ github.workspace }}/build/reports/jacoco/jacocoRootReport/coverageReports'
-          reporttypes: MarkdownSummary
-          historydir: '${{ github.workspace }}/build/reports/jacoco/jacocoRootReport/coverageReports'
-          title: 'Kotlin Code Coverage'
-      - name: DeltaReportGenerator
-        uses: danielpalme/ReportGenerator-GitHub-Action@5.2.4
-        with:
-          reports: '${{ github.workspace }}/build/reports/jacoco/jacocoRootReport/*.xml'
-          targetdir: '${{ github.workspace }}/build/reports/jacoco/jacocoRootReport/coverageDeltaReports'
-          reporttypes: MarkdownDeltaSummary
-          historydir: '${{ github.workspace }}/build/reports/jacoco/jacocoRootReport/coverageReports'
-          title: 'Kotlin Code Coverage'
-      - name: Upload coverage report artifact
-        id: upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: CoverageReport
-          path: |
-            ${{ github.workspace }}/build/reports/jacoco/jacocoRootReport/coverageReports
-      - name: Write code coverage delta to PR
-        uses: mshick/add-pr-comment@v2
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          message-path: |
-            ${{ github.workspace }}/build/reports/jacoco/jacocoRootReport/coverageDeltaReports/DeltaSummary.md
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4
         with:

diff --git a/.github/workflows/finalized-tag-updater-github-release.yml b/.github/workflows/finalized-tag-updater-github-release.yml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-24.04
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml
@@ -27,7 +27,7 @@ concurrency:
 
 jobs:
   run-load-test:
-    runs-on: besu-arm64
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     name: Run Load Test
     steps:
       - name: Checkout

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,14 +1,17 @@
 name: main
 
 on:
+  pull_request:
   push:
+    branches:
+      - main
 
 jobs:
   store-image-name-and-tags:
     uses: ./.github/workflows/reuse-store-image-name-and-tags.yml
 
   filter-commit-changes:
-    runs-on: besu-arm64
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     name: Filter commit changes
     outputs:
       coordinator: ${{ steps.filter.outputs.coordinator }}
@@ -106,8 +109,17 @@ jobs:
       traces_api_facade_changed: ${{ needs.filter-commit-changes.outputs.traces-api-facade }}
     secrets: inherit
 
-  docker-build:
+  manual-docker-build-and-e2e-tests:
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     needs: [ store-image-name-and-tags, filter-commit-changes, check-and-tag-images ]
+    environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }}
+    steps:
+      - name: Deploy environment
+        run: |
+          echo "Build and e2e test environment deployed"
+
+  docker-build:
+    needs: [ store-image-name-and-tags, filter-commit-changes, check-and-tag-images, manual-docker-build-and-e2e-tests ]
     uses: ./.github/workflows/build-and-publish.yml
     with:
       commit_tag: ${{ needs.store-image-name-and-tags.outputs.commit_tag }}
@@ -150,11 +162,11 @@ jobs:
     secrets: inherit
 
   run-e2e-tests-geth-tracing:
-    needs: [ store-image-name-and-tags, docker-build ]
+    needs: [ store-image-name-and-tags, docker-build, manual-docker-build-and-e2e-tests ]
     if: ${{ always() && needs.docker-build.result == 'success' }}
     concurrency:
       group: run-e2e-tests-geth-tracing-${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: ${{ github.ref_name != 'main' }}
+      cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
     uses: ./.github/workflows/reuse-run-e2e-tests.yml
     with:
       commit_tag: ${{ needs.store-image-name-and-tags.outputs.commit_tag }}
@@ -164,11 +176,11 @@ jobs:
     secrets: inherit
 
   run-e2e-tests:
-    needs: [ store-image-name-and-tags, docker-build ]
+    needs: [ store-image-name-and-tags, docker-build, manual-docker-build-and-e2e-tests ]
     if: ${{ always() && needs.docker-build.result == 'success' }}
     concurrency:
       group: run-e2e-tests-${{ github.workflow }}-${{ github.ref }}
-      cancel-in-progress: ${{ github.ref_name != 'main' }}
+      cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
     uses: ./.github/workflows/reuse-run-e2e-tests.yml
     with:
       commit_tag: ${{ needs.store-image-name-and-tags.outputs.commit_tag }}
@@ -191,7 +203,7 @@ jobs:
   cleanup-deployments:
     needs: [ run-e2e-tests, run-e2e-tests-geth-tracing ]
     if: ${{ always() }}
-    runs-on: besu-arm64
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     steps:
       - uses: strumwolf/delete-deployment-environment@v2
         with:

diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
@@ -18,7 +18,7 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-24.04
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

diff --git a/.github/workflows/postman-build-and-publish.yml b/.github/workflows/postman-build-and-publish.yml
@@ -29,13 +29,12 @@ on:
 
 concurrency:
   group: postman-build-and-publish-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref_name != 'main' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   build-and-publish:
-    runs-on: ubuntu-22.04
+    runs-on: [self-hosted, ubuntu-20.04, X64, small]
     name: Postman build
-    environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }}
     env:
       COMMIT_TAG: ${{ inputs.commit_tag }}
       DEVELOP_TAG: ${{ inputs.develop_tag }}
@@ -49,16 +48,16 @@ jobs:
           submodules: true
           persist-credentials: false
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: 'arm64,arm'
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Show the "version" build argument
         run: |
           echo "We inject the commit tag in the docker image ${{ env.COMMIT_TAG }}"
@@ -72,7 +71,11 @@ jobs:
           push: true
           tags: |
             ${{ env.IMAGE_NAME }}:${{ env.COMMIT_TAG }}-${{ env.UNTESTED_TAG_SUFFIX }}
-          cache-from: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache
-          cache-to: type=registry,ref=${{ env.IMAGE_NAME }}:buildcache,mode=max
+          cache-from: |
+            type=registry,ref=${{ env.IMAGE_NAME }}:buildcache-amd64,platform=linux/amd64
+            type=registry,ref=${{ env.IMAGE_NAME }}:buildcache-arm64,platform=linux/arm64
+          cache-to: |
+            type=registry,ref=${{ env.IMAGE_NAME }}:buildcache-amd64,mode=max,platform=linux/amd64
+            type=registry,ref=${{ env.IMAGE_NAME }}:buildcache-arm64,mode=max,platform=linux/arm64
           build-args: |
             NATIVE_LIBS_RELEASE_TAG=blob-libs-v1.0.1
diff --git a/.github/workflows/postman-testing.yml b/.github/workflows/postman-testing.yml
@@ -10,11 +10,11 @@ on:
 
 concurrency:
   group: postman-testing-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{ github.ref_name != 'main' }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
 
 jobs:
   run-tests:
-    runs-on: ubuntu-22.04
+    runs-on: [self-hosted, ubuntu-22.04, X64, large]
     name: Postman & SDK tests
     steps:
       - name: Checkout