Merge develop into feat/continuations

.cargo/config.toml

@@ -0,0 +1,4 @@
+[build]
+# https://github.com/rust-lang/rust/pull/124129
+# https://github.com/dtolnay/linkme/pull/88
+rustflags = ["-Z", "linker-features=-lld"]

.dockerignore

@@ -0,0 +1,28 @@
+# this is loosely based on `docker init`'s rust template.
+
+**/.DS_Store
+**/.classpath
+**/.dockerignore
+# **/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/charts
+**/docker-compose*
+**/compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/secrets.dev.yaml
+**/values.dev.yaml
+/bin
+/target
+LICENSE
+README.md

.env

@@ -0,0 +1,10 @@
+AMQP_URI=amqp://localhost:5672
+ARITHMETIC_CIRCUIT_SIZE=16..23
+BYTE_PACKING_CIRCUIT_SIZE=9..21
+CPU_CIRCUIT_SIZE=12..25
+KECCAK_CIRCUIT_SIZE=14..20
+KECCAK_SPONGE_CIRCUIT_SIZE=9..15
+LOGIC_CIRCUIT_SIZE=12..18
+MEMORY_CIRCUIT_SIZE=17..28
+MEMORY_BEFORE_CIRCUIT_SIZE=7..23
+MEMORY_AFTER_CIRCUIT_SIZE=7..27

.github/CODEOWNERS

@@ -1,2 +1,2 @@
-* @muursh @Nashtare @cpubot
-/evm_arithmetization/ @wborgeaud @muursh @Nashtare @cpubot
+* @muursh @Nashtare
+/evm_arithmetization/ @wborgeaud @muursh @Nashtare

.github/labeler.yml

@@ -18,6 +18,11 @@
 - changed-files:
   - any-glob-to-any-file: proof_gen/**
 
+# Add 'crate: zero_bin' label to any changes within 'zero_bin' folder.
+'crate: zero_bin':
+- changed-files:
+  - any-glob-to-any-file: zero_bin/**
+
 # Add 'specs' label to any changes within 'docs' folder.
 'specs':
 - changed-files:

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: Continuous Integration
 
 on:
   push:
-    branches: [main]
+    branches: [develop, main]
   pull_request:
     branches:
       - "**"
@@ -15,7 +15,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-    CARGO_TERM_COLOR: always
+  CARGO_TERM_COLOR: always
 
 jobs:
   test_mpt_trie:
@@ -33,7 +33,7 @@ jobs:
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
         with:
-            cache-on-failure: true
+          cache-on-failure: true
 
       - name: Test in mpt_trie subdirectory
         run: cargo test --manifest-path mpt_trie/Cargo.toml
@@ -58,7 +58,7 @@ jobs:
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
         with:
-            cache-on-failure: true
+          cache-on-failure: true
 
       - name: Test in trace_decoder subdirectory
         run: cargo test --manifest-path trace_decoder/Cargo.toml
@@ -83,7 +83,7 @@ jobs:
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
         with:
-            cache-on-failure: true
+          cache-on-failure: true
 
       - name: Test in proof_gen subdirectory
         run: cargo test --manifest-path proof_gen/Cargo.toml
@@ -108,7 +108,7 @@ jobs:
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
         with:
-            cache-on-failure: true
+          cache-on-failure: true
 
       - name: Test in evm_arithmetization subdirectory
         run: cargo test --manifest-path evm_arithmetization/Cargo.toml
@@ -118,8 +118,105 @@ jobs:
           CARGO_INCREMENTAL: 1
           RUST_BACKTRACE: 1
 
+  test_zero_bin:
+    name: Test zero_bin
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Install nightly toolchain
+        uses: dtolnay/rust-toolchain@nightly
+
+      - name: Set up rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+            cache-on-failure: true
+
+      - name: Test in zero_bin subdirectory
+        run: |
+          cargo test --manifest-path zero_bin/common/Cargo.toml
+          cargo test --manifest-path zero_bin/leader/Cargo.toml
+          cargo test --manifest-path zero_bin/ops/Cargo.toml
+          cargo test --manifest-path zero_bin/prover/Cargo.toml
+          cargo test --manifest-path zero_bin/rpc/Cargo.toml
+          cargo test --manifest-path zero_bin/verifier/Cargo.toml
+          cargo test --manifest-path zero_bin/worker/Cargo.toml
+
+        env:
+          RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0
+          RUST_LOG: 1
+          CARGO_INCREMENTAL: 1
+          RUST_BACKTRACE: 1
+
+  test_zk_evm_proc_macro:
+    name: Test zk_evm_proc_macro
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Install nightly toolchain
+        uses: dtolnay/rust-toolchain@nightly
+
+      - name: Set up rust cache
+        uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+
+      - name: Test in proc_macro subdirectory
+        run: cargo test --manifest-path proc_macro/Cargo.toml
+        env:
+          RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0
+          RUST_LOG: 1
+          CARGO_INCREMENTAL: 1
+          RUST_BACKTRACE: 1
+
+  simple_proof_regular:
+    name: Execute bash script to generate and verify a proof for a small block.
+    runs-on: zero-ci
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Run the script
+        run: |
+          pushd zero_bin/tools
+          ./prove_stdio.sh artifacts/witness_b19240705.json
+
+  simple_proof_witness_only:
+    name: Execute bash script to generate the proof witness for a small block.
+    runs-on: zero-ci
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Run the script
+        run: |
+          pushd zero_bin/tools
+          ./prove_stdio.sh artifacts/witness_b19240705.json test_only
+
+  multi_blocks_proof_regular:
+    name: Execute bash script to generate and verify a proof for multiple blocks using parallel proving.
+    runs-on: zero-ci
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Run the script
+        run: |
+          pushd zero_bin/tools
+          ./prove_stdio.sh artifacts/witness_b2_b7.json
+
   lints:
-    name: Formatting and Clippy
+    name: Rustdoc, Formatting and Clippy
     runs-on: ubuntu-latest
     timeout-minutes: 10
     if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
@@ -130,15 +227,18 @@ jobs:
       - name: Install nightly toolchain
         uses: dtolnay/rust-toolchain@nightly
         with:
-            components: rustfmt, clippy
+          components: rustfmt, clippy
 
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
         with:
-            cache-on-failure: true
+          cache-on-failure: true
 
       - name: Run cargo fmt
         run: cargo fmt --all --check
 
       - name: Run cargo clippy
         run: cargo clippy --all-features --all-targets -- -D warnings -A incomplete-features
+
+      - name: Rustdoc
+        run: cargo doc --all

.github/workflows/docker_build.yml

@@ -0,0 +1,26 @@
+name: Docker Build & Run
+
+on:
+  push:
+    branches: [develop, main]
+  pull_request:
+    branches:
+      - "**"
+  workflow_dispatch:
+    branches:
+      - "**"
+
+jobs:
+  docker:
+    name: Regression test docker images
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - run: |
+          docker build --progress=plain --build-arg=PROFILE=dev --tag scratch .
+          docker run --rm --init --entrypoint leader scratch --help
+          docker run --rm --init --entrypoint worker scratch --help
+          docker run --rm --init --entrypoint rpc scratch --help
+          docker run --rm --init --entrypoint verifier scratch --help

.github/workflows/docker_build_push.yml

@@ -0,0 +1,55 @@
+name: Docker Build & Push
+
+on:
+  push:
+    branches: [develop, main]
+  release:
+    types: [created]
+
+env:
+  REGISTRY: ghcr.io
+
+jobs:
+  docker:
+    name: Build and push leader and worker docker images to GitHub Container Registry
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels)
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            name=${{ env.REGISTRY }}/${{ github.repository }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      - name: Push to GitHub Container Registry
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          # platforms: linux/amd64,linux/arm64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max