Skip to content

Commit

Permalink
Merge branch 'feat/cancun' into type2_cancun
Browse files Browse the repository at this point in the history
  • Loading branch information
Nashtare committed Jun 24, 2024
2 parents e7a561d + b7cea48 commit 2a901f0
Show file tree
Hide file tree
Showing 72 changed files with 14,817 additions and 78 deletions.
8 changes: 8 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
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
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
* @muursh @Nashtare @cpubot
/evm_arithmetization/ @wborgeaud @muursh @Nashtare @cpubot
* @muursh @Nashtare
/evm_arithmetization/ @wborgeaud @muursh @Nashtare
5 changes: 5 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,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:
Expand Down
74 changes: 74 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,80 @@ 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

# TODO: Update artifact files

# 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: Rustdoc, Formatting and Clippy
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Cargo.lock
/**/target
/target
**/*.rs.bk
*.iml
.idea/
.vscode

Loading

0 comments on commit 2a901f0

Please sign in to comment.