merge develop

.github/CODEOWNERS

@@ -1,6 +1,6 @@
 * @muursh @Nashtare
 /evm_arithmetization/ @wborgeaud @muursh @Nashtare @LindaGuiga
-/zero_bin/ @muursh @Nashtare @atanmarko
+/zero/ @muursh @Nashtare @atanmarko
 /smt_trie/ @0xaatif @muursh @Nashtare
 /mpt_trie/ @0xaatif @Nashtare @muursh
 /trace_decoder/ @0xaatif @muursh @Nashtare

.github/labeler.yml

@@ -18,10 +18,10 @@
 - changed-files:
   - any-glob-to-any-file: proof_gen/**
 
-# Add 'crate: zero_bin' label to any changes within 'zero_bin' folder.
+# Add 'crate: zero_bin' label to any changes within 'zero' folder.
 'crate: zero_bin':
 - changed-files:
-  - any-glob-to-any-file: zero_bin/**
+  - any-glob-to-any-file: zero/**
 
 # Add 'specs' label to any changes within 'docs' or `book` folder.
 'specs':

.github/workflows/ci.yml

@@ -140,13 +140,7 @@ jobs:
 
       - 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
+          cargo test --manifest-path zero/Cargo.toml
 
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0
@@ -188,9 +182,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run the script
-        run: |
-          pushd zero_bin/tools
-          ./prove_stdio.sh artifacts/witness_b19807080.json
+        run: ./scripts/prove_stdio.sh artifacts/witness_b19807080.json
 
   simple_proof_witness_only:
     name: Execute bash script to generate the proof witness for a small block.
@@ -201,9 +193,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run the script
-        run: |
-          pushd zero_bin/tools
-          ./prove_stdio.sh artifacts/witness_b19807080.json test_only
+        run: ./scripts/prove_stdio.sh artifacts/witness_b19807080.json test_only
 
   multi_blocks_proof_regular:
     name: Execute bash script to generate and verify a proof for multiple blocks using parallel proving.
@@ -214,9 +204,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run the script
-        run: |
-          pushd zero_bin/tools
-          ./prove_stdio.sh artifacts/witness_b3_b6.json
+        run: ./scripts/prove_stdio.sh artifacts/witness_b3_b6.json
 
   lints:
     name: Rustdoc, Formatting and Clippy
@@ -244,7 +232,7 @@ jobs:
         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
+        run: cargo clippy --package zero --all-targets --no-default-features --features cdk_erigon -- -D warnings -A incomplete-features
 
       - name: Rustdoc
         run: cargo doc --all

.github/workflows/jerigon-native.yml

@@ -74,17 +74,15 @@ jobs:
       - 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 0x1 0xf $ETH_RPC_URL native true 3000 100 test_only
+          OUTPUT_TO_TERMINAL=true ./scripts/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 0x4 0x7 $ETH_RPC_URL native true 3000 100
+          OUTPUT_TO_TERMINAL=true RUN_VERIFICATION=true ./scripts/prove_rpc.sh 0x4 0x7 $ETH_RPC_URL native true 3000 100
           echo "Proving blocks in real mode finished"
 
       - name: Shut down network

.github/workflows/jerigon-zero.yml

@@ -75,18 +75,16 @@ jobs:
       - name: Run prove blocks with zero 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 0x1 0xf $ETH_RPC_URL jerigon true 3000 100 test_only
+          OUTPUT_TO_TERMINAL=true ./scripts/prove_rpc.sh 0x1 0xf $ETH_RPC_URL jerigon true 3000 100 test_only
           echo "Proving blocks in test_only mode finished"
 
 
       - name: Run prove blocks with zero 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 0x2 0x5 $ETH_RPC_URL jerigon true 3000 100
+          OUTPUT_TO_TERMINAL=true RUN_VERIFICATION=true ./scripts/prove_rpc.sh 0x2 0x5 $ETH_RPC_URL jerigon true 3000 100
           echo "Proving blocks in real mode finished"
           
       - name: Shut down network

.gitignore

@@ -1,8 +1,25 @@
-/**/target
+# Alphabetically, by-category
+
+# Build artifacts
+#################
 /target
-**/*.rs.bk
-*.iml
-.idea/
-.vscode
+
+# Editors
+#########
+/.idea/
+/.vscode
+/*.iml
+
+# Misc
+######
 /**/*.ignoreme
-**/output.log
+/**/*.ipynb
+/**/*.log
+/**/*.out
+# Hardcoded in https://github.com/0xPolygonZero/zk_evm/blob/v0.6.0/zero_bin/common/src/debug_utils.rs#L9
+/debug
+
+# Proof artifacts
+#################
+/proofs
+/**/*.zkproof