Merge branch 'main' into prover/feat/libdecompressor-abuseeth

Consensys · Oct 14, 2024 · 2aa44a8 · 2aa44a8
2 parents 8c749ba + 368e404
commit 2aa44a8
Show file tree

Hide file tree

Showing 40 changed files with 82 additions and 75 deletions.
diff --git a/.github/workflows/all-tools.yml b/.github/workflows/all-tools.yml
@@ -16,7 +16,7 @@ on:
 
 jobs:
  changes:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ 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: [self-hosted, ubuntu-22.04, X64, small]
+ 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: [self-hosted, ubuntu-22.04, X64, small]
+ 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: [self-hosted, ubuntu-22.04, X64, small]
+ 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 }}

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: [self-hosted, ubuntu-22.04, X64, small]
+ 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: [self-hosted, ubuntu-22.04, X64, small]
- 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

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: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Filter commit changes
  outputs:
  cache-images: ${{ steps.filter.outputs.cache-images }}
@@ -31,7 +31,7 @@ jobs:
  pull-and-cache-images:
  needs: [ changes ]
  if: ${{ always() && needs.changes.outputs.cache-images == 'true' }}
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  steps:
  - name: Checkout
  uses: actions/checkout@v3

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -18,7 +18,7 @@ on:
 jobs:
  analyze:
  name: Analyze
- runs-on: [self-hosted, ubuntu-22.04, X64, medium]
+ 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
@@ -33,7 +33,7 @@ concurrency:
 
 jobs:
  build-and-publish:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Coordinator build
  environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }}
  env:
@@ -55,7 +55,6 @@ jobs:
  run: |
  ./gradlew coordinator:app:distZip --no-daemon
  - name: Login to Docker Hub
- if: github.event_name != 'pull_request'
  uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}

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: [self-hosted, ubuntu-22.04, X64, small]
+ 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: [self-hosted, ubuntu-22.04, X64, small]
+ 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: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Filter commit changes
  outputs:
  coordinator: ${{ steps.filter.outputs.coordinator }}
@@ -191,7 +194,7 @@ jobs:
  cleanup-deployments:
  needs: [ run-e2e-tests, run-e2e-tests-geth-tracing ]
  if: ${{ always() }}
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ 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: [self-hosted, ubuntu-22.04, X64, small]
+ 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
@@ -33,7 +33,7 @@ concurrency:
 
 jobs:
  build-and-publish:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Postman build
  environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }}
  env:

diff --git a/.github/workflows/postman-testing.yml b/.github/workflows/postman-testing.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
  run-tests:
- runs-on: [self-hosted, Linux, X64, large]
+ runs-on: [self-hosted, ubuntu-22.04, X64, large]
  name: Postman & SDK tests
  steps:
  - name: Checkout

diff --git a/.github/workflows/prover-build-and-publish.yml b/.github/workflows/prover-build-and-publish.yml
@@ -36,7 +36,7 @@ env:
 
 jobs:
  build-and-publish:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Prover build
  environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }}
  env:

diff --git a/.github/workflows/prover-native-lib-blob-compressor-release.yml b/.github/workflows/prover-native-lib-blob-compressor-release.yml
@@ -22,7 +22,7 @@ on:
 jobs:
 
  build-linux:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  steps:
  - name: Checkout code
  uses: actions/checkout@v4
@@ -56,7 +56,7 @@ jobs:
  path: ./prover/target
 
  build-linux-arm64:
- runs-on: besu-arm64
+ runs-on: [self-hosted, ubuntu-20.04, ARM64, small]
  steps:
  - name: Checkout code
  uses: actions/checkout@v4
@@ -128,7 +128,7 @@ jobs:
  release_artefacts:
  name: Release artefacts
  needs: [ build-linux, build-linux-arm64, build-mac-os]
- runs-on: [self-hosted,ubuntu-22.04ARM64, small]
+ runs-on: [self-hosted, ubuntu-20.04, ARM64, small]
  steps:
  - name: Load cached binaries
  uses: actions/download-artifact@v4

diff --git a/.github/workflows/prover-testing.yml b/.github/workflows/prover-testing.yml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
  staticcheck:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Prover static check
  steps:
  - name: install Go
@@ -44,6 +44,7 @@ jobs:
  - name: golangci-lint
  uses: golangci/golangci-lint-action@v3
  with:
+ version: v1.61.0
  working-directory: prover
  args: --timeout=5m
  - name: generated files should not be modified
@@ -58,7 +59,7 @@ jobs:
  strategy:
  matrix:
  go-version: [1.23.x]
- runs-on: [self-hosted, Linux, X64, large]
+ runs-on: [self-hosted, ubuntu-22.04, X64, large]
  name: Prover testing
  needs:
  - staticcheck
@@ -99,7 +100,7 @@ jobs:
  needs:
  - staticcheck
  - test
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  steps:
  - name: Notify slack -- workflow failed
  id: slack
@@ -122,7 +123,7 @@ jobs:
  needs:
  - staticcheck
  - test
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  steps:
  - name: Notify slack -- workflow succeeded
  id: slack

diff --git a/.github/workflows/reuse-check-images-tags-and-push.yml b/.github/workflows/reuse-check-images-tags-and-push.yml
@@ -50,7 +50,7 @@ concurrency:
 
 jobs:
  check_image_tags_exist:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Check image tags exist
  outputs:
  last_commit_tag_exists_coordinator: ${{ steps.check_image_tags_exist_coordinator.outputs.last_commit_tag_exists }}
@@ -110,7 +110,7 @@ jobs:
  docker_password: ${{ secrets.DOCKERHUB_TOKEN }}
 
  image_tag_push:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Tag and push images
  needs: [ check_image_tags_exist ]
  outputs:

diff --git a/.github/workflows/reuse-run-e2e-tests.yml b/.github/workflows/reuse-run-e2e-tests.yml
@@ -75,7 +75,7 @@ jobs:
  GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN_RELEASE_ACCESS }}
  outputs:
  tests_outcome: ${{ steps.run_e2e_tests.outcome }}
- runs-on: [self-hosted, Linux, X64, large]
+ runs-on: [self-hosted, ubuntu-22.04, X64, large]
  environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }}
  steps:
  - name: Setup upterm session
@@ -88,7 +88,6 @@ jobs:
  with:
  pnpm-install-options: '--frozen-lockfile --prefer-offline'
  - name: Login to Docker Hub
- if: github.event_name != 'pull_request'
  uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}

diff --git a/.github/workflows/reuse-store-image-name-and-tags.yml b/.github/workflows/reuse-store-image-name-and-tags.yml
@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
  store_image_name_and_tags:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Compute version tags
  env:
  # REF_NAME: ${{ github.ref_name }}

diff --git a/.github/workflows/reuse-tag-without-untested-suffix.yml b/.github/workflows/reuse-tag-without-untested-suffix.yml
@@ -22,14 +22,13 @@ on:
 
 jobs:
  tag-without-untested-suffix:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: tag without untested suffix
  strategy:
  matrix:
  image_name: ${{ fromJSON(inputs.image_names) }}
  steps:
  - name: Login to Docker Hub
- if: github.event_name != 'pull_request'
  uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}

diff --git a/.github/workflows/run-smc-tests.yml b/.github/workflows/run-smc-tests.yml
@@ -1,7 +1,14 @@
 name: Smart contracts test
 
 on:
+ pull_request:
+ paths:
+ - 'contracts/**'
+ - 'testdata/**'
+ - 'prover/**'
  push:
+ branches:
+ - main
  paths:
  - 'contracts/**'
  - 'testdata/**'
@@ -12,7 +19,7 @@ env:
 
 jobs:
  run-contract-tests:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Run smart contracts tests
  steps:
  - uses: actions/checkout@v4
@@ -61,7 +68,7 @@ jobs:
  token: ${{ secrets.CODECOV_TOKEN }}
 
  solidity-format-check:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Solidity format check
  steps:
  - uses: actions/checkout@v4

diff --git a/.github/workflows/security-report-to-csv.yml b/.github/workflows/security-report-to-csv.yml
@@ -2,7 +2,7 @@ name: Export Security Report to CSV
 on: workflow_dispatch
 jobs:
  data_gathering:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  steps:
  - name: CSV export
  uses: advanced-security/ghas-to-csv@v2

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -11,7 +11,7 @@ permissions:
 
 jobs:
  stale:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  steps:
  - uses: actions/stale@v8
  with:

diff --git a/.github/workflows/traces-api-facade-build-and-publish.yml b/.github/workflows/traces-api-facade-build-and-publish.yml
@@ -33,7 +33,7 @@ concurrency:
 
 jobs:
  build-and-publish:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Traces api facade build
  environment: ${{ github.ref != 'refs/heads/main' && 'docker-build-and-e2e' || '' }}
  env:
@@ -58,7 +58,6 @@ jobs:
  ./gradlew traces-api-facade:app:shadowJar
  echo ${{ github.workspace }}
  - name: Login to Docker Hub
- if: github.event_name != 'pull_request'
  uses: docker/login-action@v3
  with:
  username: ${{ secrets.DOCKERHUB_USERNAME }}

diff --git a/.github/workflows/traces-api-facade-testing.yml b/.github/workflows/traces-api-facade-testing.yml
@@ -21,7 +21,7 @@ concurrency:
 
 jobs:
  run-tests:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
  name: Traces api facade tests
  steps:
  - name: Checkout

diff --git a/.github/workflows/valid-audit-pr-has-tags.yml b/.github/workflows/valid-audit-pr-has-tags.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
  check:
- runs-on: [self-hosted, ubuntu-22.04, X64, small]
+ runs-on: [self-hosted, ubuntu-20.04, X64, small]
 
  steps:
  - name: Checkout code