Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove the trace_decoder crate #659

Closed
wants to merge 22 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@
/zero/ @muursh @Nashtare @atanmarko
/smt_trie/ @0xaatif @muursh @Nashtare
/mpt_trie/ @0xaatif @Nashtare @muursh
/trace_decoder/ @0xaatif @muursh @Nashtare
.github/ @0xaatif @atanmarko @muursh @Nashtare
5 changes: 0 additions & 5 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
- changed-files:
- any-glob-to-any-file: evm_arithmetization/**

# Add 'crate: trace_decoder' label to any changes within 'trace_decoder' folder.
'crate: trace_decoder':
- changed-files:
- any-glob-to-any-file: trace_decoder/**
0xaatif marked this conversation as resolved.
Show resolved Hide resolved

# Add 'crate: zero_bin' label to any changes within 'zero' folder.
'crate: zero_bin':
- changed-files:
Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,39 +37,6 @@ jobs:

- name: Test in mpt_trie subdirectory
run: cargo test --manifest-path mpt_trie/Cargo.toml
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0
RUST_LOG: 1
CARGO_INCREMENTAL: 1
RUST_BACKTRACE: 1

test_trace_decoder:
name: Test trace_decoder
runs-on: zero-ci
timeout-minutes: 30
env:
RUST_LOG: info
CARGO_INCREMENTAL: 1
RUST_BACKTRACE: 1

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: build # build separately so test logs are actually nice
run: cargo build --tests --manifest-path trace_decoder/Cargo.toml

- name: test
run: cargo test --release --manifest-path trace_decoder/Cargo.toml -- --nocapture

test_evm_arithmetization:
name: Test evm_arithmetization
Expand Down Expand Up @@ -117,12 +84,6 @@ jobs:
run: |
cargo test --manifest-path zero/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
Expand All @@ -142,11 +103,6 @@ jobs:

- 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.
Expand Down
83 changes: 17 additions & 66 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ members = [
"mpt_trie",
"proc_macro",
"smt_trie",
"trace_decoder",
"zero",
]
resolver = "2"
Expand Down Expand Up @@ -104,7 +103,6 @@ winnow = "0.6.13"
evm_arithmetization = { path = "evm_arithmetization", version = "0.4.0", default-features = false }
mpt_trie = { path = "mpt_trie", version = "0.4.1" }
smt_trie = { path = "smt_trie", version = "0.1.1" }
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 = { path = "zero", default-features = false }
Expand Down
23 changes: 8 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ This repository contains the following Rust crates:

* [smt_trie](./smt_trie/README.md): A collection of types and functions to work with Polygon Hermez Sparse Merkle Trees (SMT).

* [trace_decoder](./trace_decoder/Cargo.toml): Flexible protocol designed to process Ethereum clients trace payloads into an IR format that can be
0xaatif marked this conversation as resolved.
Show resolved Hide resolved
understood by the zkEVM prover.

* [evm_arithmetization](./evm_arithmetization/README.md): Defines all the STARK constraints and recursive circuits to generate succinct proofs of EVM execution.
It uses starky and plonky2 as proving backend: https://github.com/0xPolygonZero/plonky2.

Expand All @@ -32,24 +29,20 @@ TODO: Update mermaid chart with `smt_trie` once type-2 is plugged in.
%%{init: {'theme':'dark'}}%%
flowchart LR
subgraph ps [proving systems]
A1{{plonky2}}
A2{{starky}}
A1{{plonky2}}
A2{{starky}}
end

ps --> zk_evm

subgraph zk_evm [zk_evm]
B[mpt_trie]
C[evm_arithmetization]
D[trace_decoder]
subgraph zk_evm
B[mpt_trie]
C[evm_arithmetization]

B --> C
B ---> D
C ---> D
B --> C

F{zero-bin}
C --> F
D --> F
F{zero-bin}
C --> F
end
```

Expand Down
81 changes: 0 additions & 81 deletions trace_decoder/Cargo.toml

This file was deleted.

Loading
Loading