Merge branch 'main' of github.com:lambdaclass/ethrex into refactor-ci-docker

Author: mpaulucci

.github/config/assertoor/network_params_blob.yaml

@@ -6,7 +6,7 @@ participants:
     validator_count: 32
     count: 2
   - el_type: ethrex
-    el_image: ethrex:latest
+    el_image: ethrex:ci
     cl_type: lighthouse
     cl_image: sigp/lighthouse:v7.1.0
     validator_count: 32

.github/config/assertoor/network_params_ethrex_multiple_cl.yaml

@@ -1,18 +1,18 @@
 participants:
   - el_type: ethrex
-    el_image: ethrex:latest
+    el_image: ethrex:ci
     cl_type: lighthouse
     cl_image: sigp/lighthouse:v7.1.0
     validator_count: 32
     ethereum_metrics_exporter_enabled: true
   - el_type: ethrex
-    el_image: ethrex:latest
+    el_image: ethrex:ci
     cl_type: teku
     cl_image: consensys/teku:25.6.0
     validator_count: 32
     ethereum_metrics_exporter_enabled: true
   - el_type: ethrex
-    el_image: ethrex:latest
+    el_image: ethrex:ci
     cl_type: prysm
     cl_image: gcr.io/offchainlabs/prysm/beacon-chain:v6.0.4
     validator_count: 32

.github/config/assertoor/network_params_tx.yaml

@@ -5,7 +5,7 @@ participants:
     cl_image: sigp/lighthouse:v7.1.0
     validator_count: 32
   - el_type: ethrex
-    el_image: ethrex:latest
+    el_image: ethrex:ci
     cl_type: lighthouse
     cl_image: sigp/lighthouse:v7.1.0
     validator_count: 32

fixtures/network/hive_clients/ethrex.yml renamed to .github/config/hive/clients.yaml

@@ -1,3 +1,4 @@
 - client: ethrex
   build_args:
     baseimage: ethrex
+    tag: ci

.github/workflows/common_hive_reports.yaml

@@ -55,7 +55,6 @@ jobs:
 
       - name: Build image
         if: ${{ inputs.job_type != 'main' }}
-        uses: ./.github/actions/setup-docker
         with:
           image_name: ethrex
           upload_artifact: false
@@ -67,7 +66,7 @@ jobs:
         run: |
           docker pull ghcr.io/lambdaclass/ethrex:unstable
           # Tests use ethrex:latest so we retag it
-          docker tag ghcr.io/lambdaclass/ethrex:unstable ethrex:latest
+          docker tag ghcr.io/lambdaclass/ethrex:unstable ethrex:ci
 
       - name: Setup Go
         uses: actions/setup-go@v5
@@ -87,7 +86,7 @@ jobs:
           fi
 
       - name: Run Hive Simulation
-        run: cd hive && ./hive --client-file ../fixtures/network/hive_clients/ethrex.yml --client ethrex --sim ${{ matrix.test.simulation }} --sim.parallelism 16 ${{ env.HIVE_FLAGS }} --sim.loglevel 1
+        run: cd hive && ./hive --client-file ../.github/config/hive/clients.yaml --client ethrex --sim ${{ matrix.test.simulation }} --sim.parallelism 16 ${{ env.HIVE_FLAGS }} --sim.loglevel 1
         continue-on-error: true
 
       - name: Upload results

.github/workflows/main_flamegraph_report.yaml

@@ -34,7 +34,7 @@ jobs:
             ${{ env.HOME }}/.cargo/bin/addr2line
             ${{ env.HOME }}/.cargo/bin/flamegraph
             ${{ env.HOME }}/.cargo/bin/inferno-*
-            ${{ env.HOME }}/ethrex/ethrex/cmd/ef_tests/state/vectors
+            ${{ env.HOME }}/ethrex/ethrex/tooling/ef_tests/state/vectors
           key: ${{ runner.os }}-extra-binaries
 
       - name: Change perf settings
@@ -85,8 +85,8 @@ jobs:
 
       - name: Download EF Tests
         run: |
-          if [ ! -f "$HOME/ethrex/ethrex/cmd/ef_tests/state/vectors" ]; then
-            cd cmd/ef_tests/state
+          if [ ! -f "$HOME/ethrex/ethrex/tooling/ef_tests/state/vectors" ]; then
+            cd tooling/ef_tests/state
             make download-evm-ef-tests
           fi
 

.github/workflows/main_prover_l1.yaml

@@ -2,6 +2,10 @@ name: Replay proving
 on:
   push:
     branches: ["main"]
+  pull_request:
+    branches: ["**"]
+    paths:
+      - ".github/workflows/main_prover_l1.yaml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -58,11 +62,11 @@ jobs:
         env:
           # TODO(): use RPC
           # RPC_URL: $${{ secrets.ETHREX_L2_RPC_URL }}
-          RPC_URL: "http://dummy"
+          RPC_URL: "http://eth-testnet-rpc:8547"
         run: |
-          cp fixtures/cache/rpc_prover/cache_690403.json cmd/ethrex_replay
+          cp fixtures/cache/rpc_prover/cache_hoodi_974567.json cmd/ethrex_replay
           cd cmd/ethrex_replay
-          make prove-${{ matrix.backend }}-gpu-ci BLOCK_NUMBER=690403 NETWORK=hoodi
+          make prove-${{ matrix.backend }}-gpu-ci BLOCK_NUMBER=974567 NETWORK=hoodi
 
       - name: Store benchmark result
         uses: benchmark-action/github-action-benchmark@v1

.github/workflows/manual_docker_performance_publish.yaml

@@ -1,4 +1,4 @@
-name: Publish Docker
+name: Publish Performance tag Docker
 
 on:
   workflow_dispatch:

.github/workflows/pr-main_l1.yaml

@@ -67,7 +67,7 @@ jobs:
 
       - name: Run Blockchain EF tests
         run: |
-          make -C cmd/ef_tests/blockchain test
+          make -C tooling/ef_tests/blockchain test
 
   docker_build:
     name: Build Docker
@@ -226,7 +226,7 @@ jobs:
           docker load --input /tmp/${{ needs.docker_build.outputs.artifact_filename }}
 
       - name: Run Hive Simulation
-        run: chmod +x hive && ./hive --client-file fixtures/network/hive_clients/ethrex.yml --client ethrex --sim ${{ matrix.simulation }} --sim.limit "${{ matrix.test_pattern }}" --sim.parallelism 16 --sim.loglevel 1
+        run: chmod +x hive && ./hive --client-file .github/config/hive/clients.yaml --client ethrex --sim ${{ matrix.simulation }} --sim.limit "${{ matrix.test_pattern }}" --sim.parallelism 16 --sim.loglevel 1
 
   # The purpose of this job is to add it as a required check in GitHub so that we don't have to add every individual job as a required check
   all-tests:

.github/workflows/pr-main_levm.yaml

@@ -6,10 +6,10 @@ on:
   pull_request:
     branches: ["**"]
     paths:
-      - "cmd/ef_tests/state/**"
+      - "tooling/ef_tests/state/**"
       - "crates/vm/levm/**"
       - ".github/workflows/pr-main_levm.yaml"
-      - "cmd/ef_tests/state"
+      - "tooling/ef_tests/state"
   workflow_dispatch:
 
 concurrency:
@@ -32,34 +32,34 @@ jobs:
 
       - name: Download EF Tests
         run: |
-          cd cmd/ef_tests/state
+          cd tooling/ef_tests/state
           make download-evm-ef-tests
 
       - name: Run tests
         run: |
-          cd cmd/ef_tests/state
+          cd tooling/ef_tests/state
           set -o pipefail
           make run-evm-ef-tests-ci | tee test_result_pr.txt
 
       - name: Show test summary -- full
         run: |
-          cd cmd/ef_tests/state && awk '/Summary: /,0' test_result_pr.txt
+          cd tooling/ef_tests/state && awk '/Summary: /,0' test_result_pr.txt
 
       - name: Show test summary -- short
         run: |
-          bash .github/scripts/parse_test_result.sh cmd/ef_tests/state/test_result_pr.txt | tee cmd/ef_tests/state/test_result_pr_short.txt
+          bash .github/scripts/parse_test_result.sh tooling/ef_tests/state/test_result_pr.txt | tee tooling/ef_tests/state/test_result_pr_short.txt
           echo "PR's test results:"
-          cat cmd/ef_tests/state/test_result_pr_short.txt
+          cat tooling/ef_tests/state/test_result_pr_short.txt
 
       - name: Upload PR branch EF-test results.
         uses: actions/upload-artifact@v4
         with:
           name: pr-ef-test-data
-          path: cmd/ef_tests/state/test_result_pr_short.txt
+          path: tooling/ef_tests/state/test_result_pr_short.txt
 
       - name: Check EF-TESTS status is 100%
         run: |
-          cd cmd/ef_tests/state
+          cd tooling/ef_tests/state
           if [ "$(awk '/Summary:/ {print $(NF)}' test_result_pr_short.txt)" != "(100.00%)" ]; then
               echo "Percentage is not 100%."
               # exit 1 # uncomment when we expect 100% pass-rate
@@ -77,30 +77,30 @@ jobs:
 
       - name: Download EF Tests
         run: |
-          cd cmd/ef_tests/state
+          cd tooling/ef_tests/state
           make download-evm-ef-tests
 
       - name: Run tests
         run: |
-          cd cmd/ef_tests/state
+          cd tooling/ef_tests/state
           set -o pipefail
           make run-evm-ef-tests-ci | tee test_result_main.txt
 
       - name: Show test summary -- full
         run: |
-          cd cmd/ef_tests/state && awk '/Summary: /,0' test_result_main.txt
+          cd tooling/ef_tests/state && awk '/Summary: /,0' test_result_main.txt
 
       - name: Show test summary -- short
         run: |
-          bash .github/scripts/parse_test_result.sh cmd/ef_tests/state/test_result_main.txt | tee cmd/ef_tests/state/test_result_main_short.txt
+          bash .github/scripts/parse_test_result.sh tooling/ef_tests/state/test_result_main.txt | tee tooling/ef_tests/state/test_result_main_short.txt
           echo "Main's test results:"
-          cat cmd/ef_tests/state/test_result_main_short.txt
+          cat tooling/ef_tests/state/test_result_main_short.txt
 
       - name: Upload main branch EF-test results.
         uses: actions/upload-artifact@v4
         with:
           name: main-ef-test-data
-          path: cmd/ef_tests/state/test_result_main_short.txt
+          path: tooling/ef_tests/state/test_result_main_short.txt
 
   compare-ef-tests:
     if: ${{ github.event_name != 'merge_group' }}
@@ -115,26 +115,26 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: main-ef-test-data
-          path: cmd/ef_tests/state/
+          path: tooling/ef_tests/state/
 
       - name: Download PR branch ef tests
         uses: actions/download-artifact@v4
         with:
           name: pr-ef-test-data
-          path: cmd/ef_tests/state/
+          path: tooling/ef_tests/state/
 
       # NOTE: diff will exit with a non 0 exit code when there are differences
       - name: Compare files
         id: branch_diffs
         continue-on-error: true
         run: |
-          cd cmd/ef_tests/state
+          cd tooling/ef_tests/state
           diff test_result_main_short.txt test_result_pr_short.txt
 
       - name: Compare results
         if: ${{ steps.branch_diffs.outcome == 'failure' && github.event_name == 'pull_request' }}
         run: |
-          bash .github/scripts/compare_ef_tests.sh cmd/ef_tests/state/test_result_main_short.txt cmd/ef_tests/state/test_result_pr_short.txt | tee cmd/ef_tests/state/ef_tests_comparison.md
+          bash .github/scripts/compare_ef_tests.sh tooling/ef_tests/state/test_result_main_short.txt tooling/ef_tests/state/test_result_pr_short.txt | tee tooling/ef_tests/state/ef_tests_comparison.md
 
       - name: Find comment
         continue-on-error: true
@@ -154,7 +154,7 @@ jobs:
           comment-id: ${{ steps.fc.outputs.comment-id }}
           token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.pull_request.number }}
-          body-path: cmd/ef_tests/state/ef_tests_comparison.md
+          body-path: tooling/ef_tests/state/ef_tests_comparison.md
           edit-mode: replace
 
       # If we don't have a failure, means that there are no differences in EF-tests.