Merge branch 'main' into l2_fix_nonce_state_diff

.github/workflows/asertoor.yaml

@@ -1,14 +1,8 @@
 name: Assertoor
 on:
-  pull_request:
-    branches: ["**"]
-    paths-ignore:
-      - "README.md"
-      - "LICENSE"
-      - "**/README.md"
-      - "**/docs/**"
-      - "crates/vm/levm/**"
-      - "crates/l2/**"
+  workflow_run:
+    workflows: [Docker build]
+    types: [completed]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -18,13 +12,10 @@ env:
   RUST_VERSION: 1.80.1
 
 jobs:
-  build:
-    uses: ./.github/workflows/docker_build.yaml
-
   run-assertoor:
     name: Stability Check
     runs-on: ubuntu-latest
-    needs: [build]
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
       - uses: actions/checkout@v4
 
@@ -33,6 +24,8 @@ jobs:
         with:
           name: ethrex_image
           path: /tmp
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
 
       - name: Load image
         run: |
@@ -41,7 +34,7 @@ jobs:
       - name: Setup kurtosis testnet and run assertoor tests
         uses: ethpandaops/kurtosis-assertoor-github-action@v1
         with:
-          kurtosis_version: "1.3.1"
+          kurtosis_version: "1.4.2"
           ethereum_package_url: "github.com/lambdaclass/ethereum-package"
           ethereum_package_branch: "ethrex-integration"
           ethereum_package_args: "./test_data/network_params.yaml"

.github/workflows/ci.yaml

@@ -1,14 +1,16 @@
 name: CI
 on:
+  push:
+    branches: ["main"]
   merge_group:
   pull_request:
     branches: ["**"]
-    paths-ignore:
-      - "README.md"
-      - "LICENSE"
-      - "**/README.md"
-      - "**/docs/**"
-      - "crates/vm/levm/**" # We run this in a separate workflow
+    # paths-ignore:
+    #   - "README.md"
+    #   - "LICENSE"
+    #   - "**/README.md"
+    #   - "**/docs/**"
+    #   - "crates/vm/levm/**" # We run this in a separate workflow
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}

.github/workflows/ci_l2.yaml

@@ -1,5 +1,7 @@
 name: CI (L2)
 on:
+  push:
+    branches: ["main"]
   merge_group:
   pull_request:
     branches: ["**"]

.github/workflows/ci_levm.yaml

@@ -1,9 +1,9 @@
 name: CI LEVM
 
 on:
+  push:
+    branches: ["main"]
   merge_group:
-    paths:
-      - "crates/vm/levm/**"
   pull_request:
     branches: ["**"]
     paths:

.github/workflows/docker_build.yaml

@@ -1,8 +1,17 @@
 name: Docker build
 
+# This workflow is later used in assertoor and hive workflows
 on:
-  workflow_call:
+  push:
+    branches: ["main"]
   merge_group:
+  pull_request:
+    branches: ["**"]
+    # paths-ignore:
+    #   - "README.md"
+    #   - "LICENSE"
+    #   - "**/README.md"
+    #   - "**/docs/**"
 
 jobs:
   docker_build:

.github/workflows/docker_publish.yaml

@@ -1,15 +1,17 @@
-name: Publish docker image to Github Packages
+name: Publish Docker
 
 on:
   push:
-    branches: ['main']
+    branches: ["main"]
+  workflow_dispatch:
 
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   build-and-push-image:
+    name: Build and push Docker image
     runs-on: ubuntu-latest
 
     # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
@@ -44,13 +46,11 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
       - name: Generate artifact attestation
         uses: actions/attest-build-provenance@v1
         with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
+          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
           subject-digest: ${{ steps.push.outputs.digest }}
           push-to-registry: true
-

.github/workflows/hive.yaml

@@ -1,14 +1,8 @@
 name: Hive
 on:
-  pull_request:
-    branches: ["**"]
-    paths-ignore:
-      - "README.md"
-      - "LICENSE"
-      - "**/README.md"
-      - "**/docs/**"
-      - "crates/vm/levm/**"
-      - "crates/l2/**"
+  workflow_run:
+    workflows: [Docker build]
+    types: [completed]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -18,13 +12,10 @@ env:
   RUST_VERSION: 1.80.1
 
 jobs:
-  build:
-    uses: ./.github/workflows/docker_build.yaml
-
   run-hive:
     name: ${{ matrix.name }}
-    needs: [build]
     runs-on: ubuntu-latest
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     strategy:
       matrix:
         include:
@@ -55,6 +46,8 @@ jobs:
         with:
           name: ethrex_image
           path: /tmp
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          run-id: ${{ github.event.workflow_run.id }}
 
       - name: Load image
         run: |

.github/workflows/hive_coverage.yaml

@@ -10,24 +10,14 @@ env:
   RUST_VERSION: 1.80.1
 
 jobs:
-  build:
-    uses: ./.github/workflows/docker_build.yaml
-
   hive-coverage:
-    name: Run engine hive simulator to gather coverage information.
+    name: Daily Hive Coverage
     runs-on: ubuntu-latest
-    needs: [build]
     steps:
-      # TODO: Maybe this can be reused as well.
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: ethrex_image
-          path: /tmp
-
-      - name: Load image
+      - name: Pull image
         run: |
-          docker load --input /tmp/ethrex_image.tar
+          docker pull ghcr.io/lambdaclass/ethrex:latest
+          docker tag ghcr.io/lambdaclass/ethrex:latest ethrex:latest
 
       - name: Checkout sources
         uses: actions/checkout@v3
@@ -70,4 +60,4 @@ jobs:
       - name: Post results to levm slack channel
         env:
           url: ${{ secrets.LEVM_SLACK_WEBHOOK }}
-        run: sh publish.sh
+        run: sh .github/scripts/publish.sh

.github/workflows/l2_contracts.yaml

@@ -1,8 +1,8 @@
 name: L2 Contracts CI
 on:
+  push:
+    branches: ["main"]
   merge_group:
-    paths:
-      - "crates/l2/contracts/**"
   pull_request:
     branches: ["**"]
     paths:

.github/workflows/l2_prover_ci.yaml

@@ -1,5 +1,7 @@
 name: L2 Prover CI
 on:
+  push:
+    branches: ["main"]
   merge_group:
   pull_request:
     branches: ["**"]

.github/workflows/lint_pr_title.yml

@@ -5,7 +5,6 @@ on:
     types:
       - opened
       - edited
-      - synchronize
 
 jobs:
   main:

.github/workflows/loc.yaml

@@ -37,14 +37,14 @@ jobs:
       - name: Post results to ethrex L1 slack channel
         env:
           url: ${{ secrets.ETHREX_L1_SLACK_WEBHOOK }}
-        run: sh publish_loc.sh
+        run: sh .github/scripts/publish_loc.sh
 
       - name: Post results to ethrex L2 slack channel
         env:
           url: ${{ secrets.ETHREX_L2_SLACK_WEBHOOK }}
-        run: sh publish_loc.sh
+        run: sh .github/scripts/publish_loc.sh
 
       - name: Post results to levm slack channel
         env:
           url: ${{ secrets.LEVM_SLACK_WEBHOOK }}
-        run: sh publish_loc.sh
+        run: sh .github/scripts/publish_loc.sh

README.md

@@ -295,8 +295,8 @@ At a high level, the following new parts are added to the node:
 | 6         | Support multiple L2s sharing the same bridge contract on L1 for seamless interoperability.               | ❌     |
 | 7         | The L2 can also be deployed using a custom native token, meaning that a certain ERC20 can be the common currency that's used for paying network fees.                                                                                                                                                                              | ❌     |
 | 8         | The L2 has added security mechanisms in place, running on Trusted Execution Environments and Multi Prover setup where multiple guarantees (Execution on TEEs, zkVMs/proving systems) are required for settlement on the L1. This better protects against possible security bugs on implementations.                                                         | ❌     |
-| 9         | The network can be run as a Based Rollup, meaning sequencing is done by the Ethereum Validator set; transactions are sent to a private mempool and L1 Validators that opt into the L2 sequencing propose blocks for the L2 on every L1 block.                                                                                                                                                                  | ❌     |
-| 10         | The L2 can be initialized in Validium Mode, meaning the Data Availability layer is no longer the L1, but rather a DA layer of the user's choice.                                                                                                                                                                  | ❌     |
+| 9         | The L2 can be initialized in Validium Mode, meaning the Data Availability layer is no longer the L1, but rather a DA layer of the user's choice.                                                                                                                                                                  | ❌     |
+| 10         | The network can be run as a Based Rollup, meaning sequencing is done by the Ethereum Validator set; transactions are sent to a private mempool and L1 Validators that opt into the L2 sequencing propose blocks for the L2 on every L1 block.                                                                                                                                                                  | ❌     |
 
 ### Milestone 0
 
@@ -416,7 +416,11 @@ The L2 has added security mechanisms in place, running on Trusted Execution Envi
 | Support verifying multiple different zkVM executions on the `onChainProposer` L1 contract. | ❌      |
 | Support running the operator on a TEE environment                                          | ❌      |
 
-### Milestone 9: Based Contestable Rollup
+### Milestone 9: Validium
+
+The L2 can be initialized in Validium Mode, meaning the Data Availability layer is no longer the L1, but rather a DA layer of the user's choice.
+
+### Milestone 10: Based Contestable Rollup
 
 The network can be run as a Based Rollup, meaning sequencing is done by the Ethereum Validator set; transactions are sent to a private mempool and L1 Validators that opt into the L2 sequencing propose blocks for the L2 on every L1 block.
 
@@ -428,10 +432,6 @@ The network can be run as a Based Rollup, meaning sequencing is done by the Ethe
 
 TODO: Expand on this.
 
-### Milestone 10: Validium
-
-The L2 can be initialized in Validium Mode, meaning the Data Availability layer is no longer the L1, but rather a DA layer of the user's choice.
-
 #### Status
 
 | Task Description                                                                                                                  | Status |