merge

.env

@@ -1,8 +1,11 @@
 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
+ARITHMETIC_CIRCUIT_SIZE=16..21
+BYTE_PACKING_CIRCUIT_SIZE=8..21
+CPU_CIRCUIT_SIZE=8..21
+KECCAK_CIRCUIT_SIZE=4..20
+KECCAK_SPONGE_CIRCUIT_SIZE=8..17
+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

@@ -1,2 +1,7 @@
 * @muursh @Nashtare
-/evm_arithmetization/ @wborgeaud @muursh @Nashtare
+/evm_arithmetization/ @wborgeaud @muursh @Nashtare @LindaGuiga
+/zero_bin/ @muursh @Nashtare @atanmarko
+/smt_trie/ @0xaatif @muursh @Nashtare
+/mpt_trie/ @0xaatif @Nashtare @muursh
+/trace_decoder/ @0xaatif @muursh @Nashtare
+.github/ @0xaatif @atanmarko @muursh @Nashtare

.github/labeler.yml

@@ -23,7 +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

@@ -0,0 +1,61 @@
+name: zkEVM mdbook
+
+on:
+  push:
+    branches: [develop, main]
+  pull_request:
+    branches:
+      - "**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+
+      - name: Install mdbook
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          args: mdbook
+
+      - name: Install preprocessors
+        uses: actions-rs/cargo@v1
+        with:
+          command: install
+          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_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./book/book

.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

@@ -10,7 +10,6 @@ on:
     branches:
       - "**"
 
-
 env:
   CARGO_TERM_COLOR: always
   REGISTRY: ghcr.io
@@ -26,24 +25,24 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Checkout test-jerigon-network sources
-        uses: actions/checkout@v4        
+        uses: actions/checkout@v4
         with:
           repository: 0xPolygonZero/jerigon-test-network
-          ref: 'feat/kurtosis-network' 
+          ref: "feat/kurtosis-network"
           path: jerigon-test-network
 
       - name: Install nightly toolchain
         uses: dtolnay/rust-toolchain@nightly
-  
+
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3        
+        uses: docker/setup-qemu-action@v3
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}        
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2
@@ -58,41 +57,37 @@ jobs:
 
       #It is much easier to use cast tool in scripts so install foundry
       - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1          
+        uses: foundry-rs/foundry-toolchain@v1
 
       - name: Run cancun test network
         run: |
           docker pull ghcr.io/0xpolygonzero/erigon:feat-zero
-          kurtosis run --enclave cancun-testnet github.com/ethpandaops/[email protected] --args-file jerigon-test-network/network_params.yml  
+          kurtosis run --enclave cancun-testnet github.com/ethpandaops/[email protected] --args-file jerigon-test-network/network_params.yml
 
       - name: Generate blocks with transactions
         run: |
-            ETH_RPC_URL="$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
-            cast rpc eth_blockNumber --rpc-url $ETH_RPC_URL
-            cd jerigon-test-network && set -a && source .env && set +a
-            bash ./tests/generate_transactions.sh
- 
+          ETH_RPC_URL="$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
+          cast rpc eth_blockNumber --rpc-url $ETH_RPC_URL
+          cd jerigon-test-network && set -a && source .env && set +a
+          bash ./tests/generate_transactions.sh
+
       - name: Run prove blocks with native tracer in test_only mode
         run: |
           ETH_RPC_URL="$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
           cd zero_bin/tools
           ulimit -n 8192
-          OUTPUT_TO_TERMINAL=true ./prove_rpc.sh 0x5 0xf $ETH_RPC_URL native true 3000 100 test_only
+          OUTPUT_TO_TERMINAL=true ./prove_rpc.sh 0x1 0xf $ETH_RPC_URL native true 3000 100 test_only
           echo "Proving blocks in test_only mode finished"
 
-
       - name: Run prove blocks with native tracer in real mode
         run: |
           ETH_RPC_URL="$(kurtosis port print cancun-testnet el-2-erigon-lighthouse ws-rpc)"
           cd zero_bin/tools
           rm -rf proofs/* circuits/* ./proofs.json test.out verify.out leader.out
-          OUTPUT_TO_TERMINAL=true RUN_VERIFICATION=true ./prove_rpc.sh 0x5 0x7 $ETH_RPC_URL native true 3000 100
+          OUTPUT_TO_TERMINAL=true RUN_VERIFICATION=true ./prove_rpc.sh 0x4 0x7 $ETH_RPC_URL native true 3000 100
           echo "Proving blocks in real mode finished"
-          
+
       - name: Shut down network
         run: |
           kurtosis enclave rm -f cancun-testnet
           kurtosis engine stop
-
-
-

.github/workflows/jerigon-zero.yml

@@ -43,7 +43,7 @@ jobs:
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}        
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up rust cache
         uses: Swatinem/rust-cache@v2

.gitignore

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