Merge branch 'main' into core/prometheus_grafana

lambdaclass · Dec 23, 2024 · 3635e2d · 3635e2d
2 parents 4a66505 + a2c65eb
commit 3635e2d
Show file tree

Hide file tree

Showing 88 changed files with 5,257 additions and 1,338 deletions.
diff --git a/.github/workflows/ci_l1.yaml b/.github/workflows/ci_l1.yaml
@@ -101,6 +101,20 @@ jobs:
           name: ethrex_image
           path: /tmp/ethrex_image.tar
 
+  setup-hive:
+    name: "Setup Hive"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Hive
+        run: make setup-hive
+      - name: Upload hive artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: hive
+          path: hive
+
+
   run-assertoor:
     name: Assertoor - ${{ matrix.name }}
     runs-on: ubuntu-latest
@@ -119,7 +133,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Download artifacts
+      - name: Download etherex image artifact
         uses: actions/download-artifact@v4
         with:
           name: ethrex_image
@@ -141,7 +155,7 @@ jobs:
   run-hive:
     name: Hive - ${{ matrix.name }}
     runs-on: ubuntu-latest
-    needs: [docker_build]
+    needs: [docker_build, setup-hive]
     if: ${{ github.event_name != 'merge_group' }}
     strategy:
       matrix:
@@ -157,7 +171,7 @@ jobs:
             test_pattern: /AccountRange|StorageRanges|ByteCodes|TrieNodes
           - name: "Devp2p eth tests"
             simulation: devp2p
-            test_pattern: eth/Status|GetBlockHeaders|SimultaneousRequests|SameRequestID|ZeroRequestID|GetBlockBodies|MaliciousHandshake|MaliciousStatus|Transaction|InvalidTxs|NewPooledTxs
+            test_pattern: eth/Status|GetBlockHeaders|SimultaneousRequests|SameRequestID|ZeroRequestID|GetBlockBodies|MaliciousHandshake|MaliciousStatus|Transaction|InvalidTxs|NewPooledTxs|GetBlockReceipts
           - name: "Engine Auth and EC tests"
             simulation: ethereum/engine
             test_pattern: engine-(auth|exchange-capabilities)/
@@ -168,32 +182,26 @@ jobs:
             simulation: ethereum/engine
             test_pattern: "engine-api/RPC|Re-Org Back to Canonical Chain From Syncing Chain|Re-org to Previously Validated Sidechain Payload|Re-Org Back into Canonical Chain, Depth=5|Safe Re-Org|Transaction Re-Org|Inconsistent|Suggested Fee|PrevRandao|Fork ID|Unknown|Invalid PayloadAttributes|Bad Hash|Unique Payload ID|Re-Execute Payload|In-Order|Multiple New Payloads|Valid NewPayload|NewPayload with|Invalid NewPayload|Payload Build|Invalid NewPayload, Transaction|ParentHash equals|Build Payload|Invalid Missing Ancestor ReOrg"
     steps:
-      - name: Download artifacts
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Download ethrex image artifact
         uses: actions/download-artifact@v4
         with:
           name: ethrex_image
           path: /tmp
 
+      - name: Download hive artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: hive
+
       - name: Load image
         run: |
           docker load --input /tmp/ethrex_image.tar
 
-      - name: Checkout sources
-        uses: actions/checkout@v4
-
-      - name: Rustup toolchain install
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: ${{ env.RUST_VERSION }}
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-
-      - name: Setup Hive
-        run: make setup-hive
-
       - name: Run Hive Simulation
-        run: cd hive && ./hive --client ethrex --sim ${{ matrix.simulation }} --sim.limit "${{ matrix.test_pattern }}" --sim.parallelism 4
+        run: chmod +x hive && ./hive --client ethrex --sim ${{ matrix.simulation }} --sim.limit "${{ matrix.test_pattern }}" --sim.parallelism 4
 
   # 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:

diff --git a/.github/workflows/ci_l2_prover.yaml b/.github/workflows/ci_l2_prover.yaml
@@ -43,17 +43,29 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
       # Use cargo-risczero v1.2.0
       # The risc0-zkvm crate should match this version
-      - name: RISC-V zkVM toolchain install
+      - name: RISC-V RISC0 toolchain install
         run: |
           curl -L https://risczero.com/install | bash
           ~/.risc0/bin/rzup install
           ~/.risc0/bin/rzup extension install cargo-risczero v1.2.0
           ~/.risc0/bin/rzup extension use cargo-risczero v1.2.0
-      - name: Build prover and zkVM
+      - name: Build prover and RISC0's zkVM
         run: |
           cd crates/l2/prover
-          cargo build --release --features build_zkvm
+          cargo build --release --features build_risc0
       - name: Test Prover Execution
         run: |
           cd crates/l2/prover
-          RUST_LOG=info make perf_test_proving
+          RUST_LOG=info make perf-risc0
+      - name: RISC-V SP1 toolchain install
+        run: |
+          curl -L https://sp1.succinct.xyz | bash
+          ~/.sp1/bin/sp1up
+      - name: Build prover and SP1's zkVM
+        run: |
+          cd crates/l2/prover
+          cargo build --release --features build_sp1
+      - name: Test Prover Execution
+        run: |
+          cd crates/l2/prover
+          RUST_LOG=info make perf-sp1
diff --git a/.github/workflows/ci_levm.yaml b/.github/workflows/ci_levm.yaml
@@ -41,7 +41,12 @@ jobs:
       - name: Run tests
         run: |
           cd crates/vm/levm
-          make run-evm-ef-tests-ci
+          make run-evm-ef-tests-ci | tee test_result.txt
+
+      - name: Show test summary
+        run: |
+          cd crates/vm/levm
+          awk '/Summary: /,0' test_result.txt
   test:
     # "Test" is a required check, don't change the name
     name: Test