Merge with develop

.env

@@ -8,3 +8,4 @@ LOGIC_CIRCUIT_SIZE=4..21
 MEMORY_CIRCUIT_SIZE=17..24
 MEMORY_BEFORE_CIRCUIT_SIZE=16..23
 MEMORY_AFTER_CIRCUIT_SIZE=7..23
+POSEIDON_CIRCUIT_SIZE=4..25

.github/CODEOWNERS

@@ -4,3 +4,4 @@
 /smt_trie/ @0xaatif @muursh @Nashtare
 /mpt_trie/ @0xaatif @Nashtare @muursh
 /trace_decoder/ @0xaatif @muursh @Nashtare
+.github/ @0xaatif @atanmarko @muursh @Nashtare

.github/labeler.yml

@@ -23,12 +23,17 @@
 - changed-files:
   - any-glob-to-any-file: zero_bin/**
 
-# Add 'specs' label to any changes within 'docs' folder.
+# Add 'specs' label to any changes within 'docs' or `book` folder.
 'specs':
 - changed-files:
-  - any-glob-to-any-file: docs/**
+  - any-glob-to-any-file: ['docs/**', 'book/**']
 
 # Add 'crate: common' label to any changes within 'common' folder.
 'crate: common':
   - changed-files:
       - any-glob-to-any-file: common/**
+
+# Add 'ci' label to any changes within '.github' folder.
+'ci':
+  - changed-files:
+      - any-glob-to-any-file: .github/**

.github/workflows/book.yml

@@ -3,9 +3,12 @@ name: zkEVM mdbook
 on:
   push:
     branches: [develop, main]
+  pull_request:
+    branches:
+      - "**"
 
 jobs:
-  deploy:
+  build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -20,15 +23,37 @@ jobs:
           command: install
           args: mdbook
 
-      - name: Install mdbook-katex and mdbook-bib
+      - name: Install preprocessors
         uses: actions-rs/cargo@v1
         with:
           command: install
-          args: mdbook-katex mdbook-bib
+          args: mdbook-katex mdbook-bib mdbook-mermaid
+
+      - name: Initialize mermaid preprocessor
+        run: mdbook-mermaid install book
 
       - name: Build book
         run: mdbook build book
 
+      - name: Upload built book
+        uses: actions/upload-artifact@v3
+        with:
+          name: built-mdbook
+          path: ./book/book
+
+  deploy:
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop')
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Download built book
+        uses: actions/download-artifact@v3
+        with:
+          name: built-mdbook
+          path: ./book/book
+
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:

.github/workflows/ci.yml

@@ -237,7 +237,10 @@ jobs:
         run: cargo fmt --all --check
 
       - name: Run cargo clippy
-        run: cargo clippy --all-features --all-targets -- -D warnings -A incomplete-features
+        run: cargo clippy --all-targets -- -D warnings -A incomplete-features
+
+      - name: Run cargo clippy (with `cdk_erigon` flag)
+        run: cargo clippy --all-targets --no-default-features --features cdk_erigon -- -D warnings -A incomplete-features
 
       - name: Rustdoc
         run: cargo doc --all

.github/workflows/jerigon-native.yml

@@ -44,12 +44,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Login to Dockerhub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB }}
-          password: ${{ secrets.DOCKERHUB_KEY }}
-
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
         with:

.github/workflows/jerigon-zero.yml

@@ -45,12 +45,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Login to Dockerhub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB }}
-          password: ${{ secrets.DOCKERHUB_KEY }}
-
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
         with:

.gitignore

@@ -4,4 +4,5 @@
 *.iml
 .idea/
 .vscode
+**/output.log
 

Cargo.toml

@@ -111,19 +111,19 @@ vergen = { version = "9.0.0", features = ["build", "rustc"] }
 winnow = "0.6.13"
 
 # local dependencies
-evm_arithmetization = { path = "evm_arithmetization", version = "0.4.0" }
+evm_arithmetization = { path = "evm_arithmetization", version = "0.4.0", default-features = false }
 mpt_trie = { path = "mpt_trie", version = "0.4.1" }
-proof_gen = { path = "proof_gen", version = "0.4.0" }
+proof_gen = { path = "proof_gen", version = "0.4.0", default-features = false }
 smt_trie = { path = "smt_trie", version = "0.1.1" }
-trace_decoder = { path = "trace_decoder", version = "0.6.0" }
+trace_decoder = { path = "trace_decoder", version = "0.6.0", default-features = false }
 zk_evm_common = { path = "common", version = "0.1.0" }
 zk_evm_proc_macro = { path = "proc_macro", version = "0.1.0" }
 
 # zero-bin related dependencies
-ops = { path = "zero_bin/ops" }
-prover = { path = "zero_bin/prover" }
-rpc = { path = "zero_bin/rpc" }
-zero_bin_common = { path = "zero_bin/common" }
+ops = { path = "zero_bin/ops", default-features = false }
+prover = { path = "zero_bin/prover", default-features = false }
+rpc = { path = "zero_bin/rpc", default-features = false }
+zero_bin_common = { path = "zero_bin/common", default-features = false }
 
 # plonky2-related dependencies
 plonky2 = { git = "https://github.com/0xPolygonZero/plonky2.git", rev = "dc77c77f2b06500e16ad4d7f1c2b057903602eed" }

README.md

@@ -28,9 +28,10 @@ EVM block proofs.
 Below is a simplified view of the dependency graph, including the proving system backends and the application layer defined within [zero-bin](https://github.com/0xPolygonZero/zero-bin).
 
 <!---
-TODO: Update mermaid chard with `smt_trie` once type-2 is plugged in.
+TODO: Update mermaid chart with `smt_trie` once type-2 is plugged in.
 -->
 ```mermaid
+%%{init: {'theme':'dark'}}%%
 flowchart LR
     subgraph ps [proving systems]
     A1{{plonky2}}

book/.gitignore

@@ -1 +1,6 @@
 book
+
+# Mermaid initialization files
+# Obtained with `mdbook-mermaid install book`.
+mermaid-init.js
+mermaid.min.js

book/book.toml

@@ -20,7 +20,11 @@ create-missing = true
 [preprocessor.bib]
 bibliography = "bibliography.bib"
 
+[preprocessor.mermaid]
+command = "mdbook-mermaid"
+
 [output.html]
+additional-js = ["mermaid.min.js", "mermaid-init.js"]
 
 [output.html.print]
 # Disable page break