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

Zero bin merge #279

Merged
merged 212 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
212 commits
Select commit Hold shift + click to select a range
8e20a9a
Initial commit
cpubot Oct 11, 2023
90efff4
Add CI
cpubot Oct 11, 2023
3626eba
Add note about http mode
cpubot Oct 11, 2023
9b5de54
Remove unnecessary with_state
cpubot Oct 11, 2023
187958d
Updated deps
BGluth Oct 11, 2023
67702d1
Instrument with paladin
cpubot Oct 24, 2023
d5a6625
Add dockerfiles
cpubot Oct 24, 2023
f1c6919
Remove unused dependencies
cpubot Oct 24, 2023
dd914e4
Integrate proof_protocol_decoder
cpubot Oct 25, 2023
19d7dbb
Update `ProverInput` to expect `BlockTrace`
cpubot Oct 27, 2023
5ba2b25
bump paladin
cpubot Oct 29, 2023
6c58533
Add jerigon run mode
cpubot Nov 3, 2023
a0636d4
bump protocol deps
cpubot Nov 3, 2023
3e5a485
Avoid running CI twice on PR
cpubot Nov 4, 2023
5154771
Write proof output to directory in `http` mode
cpubot Nov 6, 2023
3d2779d
Pin nightly version to avoid regression
cpubot Nov 6, 2023
25416ea
Pin CI workflow to working nightly version
cpubot Nov 6, 2023
98bae3d
Write proof results to stdout for jerigon and stdio modes
cpubot Nov 6, 2023
e659366
Add verifier binary
cpubot Nov 7, 2023
015db1d
Improve error logging in rpc module
cpubot Nov 7, 2023
5cf87a2
Add RPC command
cpubot Nov 7, 2023
4bfd9a5
bump protocol deps (fixes de/serialization of contract writes)
cpubot Nov 7, 2023
584222d
Now includes dummy previous block hashes
BGluth Nov 9, 2023
2b91692
Move toolchain back to standard nightly
cpubot Nov 9, 2023
3d2da54
Update leader.Dockerfile
cpubot Nov 9, 2023
c96ddd8
bump protocol deps
cpubot Nov 9, 2023
47d1818
Dep bump
BGluth Nov 9, 2023
acc9215
Add support for paladin num-workers flag
cpubot Nov 10, 2023
39c0339
Retrieve chain_id from RPC node
cpubot Nov 10, 2023
50d0e73
Upgrade to paladin 0.2.0. Use fatal error strategy
cpubot Nov 16, 2023
280cd81
Populate `prev_hashes` in rpc module
cpubot Nov 17, 2023
9d07ee7
Add an option for passing in a previous proof to the prover
cpubot Nov 17, 2023
dfbca30
Write prover state to disk
cpubot Nov 17, 2023
3751eba
Use `Config` type
cpubot Nov 17, 2023
d6d0ee7
Fixed two prog args using same short char
BGluth Nov 21, 2023
5d5e547
Bump to paladin 0.3.2
cpubot Nov 23, 2023
8c996c4
Overhaul leader CLI such that flags are grouped by subcommand
cpubot Nov 23, 2023
6e2f6be
Merge pull request #2 from 0xPolygonZero/zbrown/leader-cli-improvements
cpubot Nov 23, 2023
d161bf1
Enable specifying prover circuit sizes in .env and CLI (#3)
cpubot Nov 25, 2023
a358f55
DNM! Prints and fixes
BGluth Nov 13, 2023
e7a97e5
Bumped deps
BGluth Nov 15, 2023
b93b514
Lock bump
BGluth Nov 15, 2023
5c35b45
Lock bump
BGluth Nov 15, 2023
61c81b7
Lock bump
BGluth Nov 15, 2023
a4d143e
Lock bump
BGluth Nov 15, 2023
8be0637
Lock bump
BGluth Nov 17, 2023
f0feb1f
Update Cargo.lock
Nashtare Nov 17, 2023
7a28608
Lock bump
BGluth Nov 17, 2023
2d0fe9d
Two fixes
BGluth Nov 20, 2023
3e13635
Fixed a few bugs
BGluth Nov 20, 2023
3b1ce97
Revision fixes
BGluth Nov 20, 2023
b33b3f7
Bump lock
Nashtare Nov 24, 2023
32eb622
Fix genesis root
Nashtare Nov 24, 2023
984f2f0
Fix block_hashes
Nashtare Nov 25, 2023
f228e48
Remove comment
Nashtare Nov 25, 2023
e12ae99
Fix fetching of previous block_hashes
Nashtare Nov 27, 2023
e2adb6d
Fix
Nashtare Nov 27, 2023
b05a7a0
Bump lock
Nashtare Nov 27, 2023
5795e91
Now queries the genesis state root
BGluth Nov 28, 2023
d92c46f
Lock bump
BGluth Nov 28, 2023
77a06ef
Added prog arg to specific specific path for proof output
BGluth Nov 28, 2023
de99262
Fixed generated proofs using wrong path
BGluth Nov 28, 2023
5214c52
Added a simple script to generate a range of proofs
BGluth Nov 28, 2023
61ba3f0
Lock bump
BGluth Nov 28, 2023
9843c7b
Lock bump
Nashtare Nov 28, 2023
d96a363
Lock bump
Nashtare Nov 29, 2023
a3e2c68
Lock bump
BGluth Nov 29, 2023
8a2d872
Lock bump
BGluth Nov 29, 2023
2636707
Lock bump
BGluth Nov 29, 2023
19cd34e
Lock bump
BGluth Nov 30, 2023
6b19ab6
Release builds are now more optimized
BGluth Nov 30, 2023
128cf07
Bump plonky2
Nashtare Nov 30, 2023
0c8c0d8
Update default ranges
Nashtare Nov 30, 2023
486ca5e
Update ranges
Nashtare Nov 30, 2023
c4886ca
Now uses revs for all of our deps
BGluth Nov 30, 2023
9e8f06c
Cleaned up the `Cargo.toml` for `rpc`
BGluth Nov 30, 2023
f7931a3
Requested changes for PR #5
BGluth Nov 30, 2023
0eb6d48
Requested changes for PR #5 (2)
BGluth Nov 30, 2023
55f4bb3
Merge pull request #5 from 0xPolygonZero/proof_fixes
BGluth Nov 30, 2023
c437aa8
migrate to paladin 0.4.0
cpubot Dec 1, 2023
32dba2f
Update dockerfiles
cpubot Dec 1, 2023
c9a4d29
Dep bump
BGluth Dec 1, 2023
183b0bc
Update block_hashes fetching
Nashtare Dec 1, 2023
2345dc8
Fix log wiping
Nashtare Dec 1, 2023
863fceb
paladin 0.4.1
cpubot Dec 3, 2023
4fa21d8
Merge pull request #6 from 0xPolygonZero/speed_up_blockhashes
Nashtare Dec 4, 2023
17c9bb9
Add licenses (#9)
cpubot Dec 5, 2023
30f140e
Add support for providing checkpoint block
cpubot Dec 22, 2023
d063843
Fix `fetch_previous_block_hashes` going out of bounds (#12)
cpubot Dec 23, 2023
cf1dffd
Allow verifier to load only necessary data
Nashtare Jan 20, 2024
9356bcc
Clippy
Nashtare Jan 21, 2024
2f08b98
Add verifier_state_* to .gitignore
Nashtare Jan 21, 2024
e0d0f11
Create output directory if non-existent
Nashtare Jan 21, 2024
ab4daf6
Add checkpoint height to script
Nashtare Jan 21, 2024
40cab23
Merge pull request #14 from 0xPolygonZero/output_dir_err_msg
Nashtare Jan 21, 2024
03f1d80
Small typo fix
muursh Jan 22, 2024
4e1d363
Merge pull request #15 from 0xPolygonZero/script_checkpoint
Nashtare Jan 22, 2024
81a3b07
Merge pull request #13 from 0xPolygonZero/verifier_state
Nashtare Jan 23, 2024
5e998e0
Update dependencies
Nashtare Feb 21, 2024
e6da9fa
Pacify clippy
Nashtare Feb 21, 2024
d2cc50b
More clippy
Nashtare Feb 21, 2024
28356c0
Logic to parse withdrawals from the full node
BGluth Feb 21, 2024
c3cdba1
Merge pull request #20 from 0xPolygonZero/move_deps
Nashtare Feb 21, 2024
44d8060
Implement on-demand recursive circuit table loading (#21)
cpubot Feb 23, 2024
3a1a81d
Create CODEOWNERS
muursh Feb 27, 2024
edb0b71
Merge pull request #22 from 0xPolygonZero/code_owners
muursh Feb 27, 2024
cc9b043
Bump h2 from 0.3.21 to 0.3.24
dependabot[bot] Mar 1, 2024
0811297
Update deps
Nashtare Mar 1, 2024
7c42df1
Add testing mode for debugging
Nashtare Mar 1, 2024
6430137
Add block debugging script
Nashtare Mar 1, 2024
3fb04e2
Merge pull request #23 from 0xPolygonZero/dependabot/cargo/h2-0.3.24
muursh Mar 1, 2024
07d8d27
Clippy
Nashtare Mar 1, 2024
b1020c5
Revert changes on prove_blocks script
Nashtare Mar 1, 2024
8db68b9
Address comments
Nashtare Mar 1, 2024
f5120b2
Remove dummy agg proof layer for testing
Nashtare Mar 1, 2024
5d1534f
Merge pull request #24 from 0xPolygonZero/test-tooling
Nashtare Mar 2, 2024
6dca99d
Fix checkpoint block for debug script
Nashtare Mar 6, 2024
7ba1576
Fix arithmetic circuit typos
Nashtare Mar 6, 2024
33c4c20
Merge pull request #29 from 0xPolygonZero/fix_old_blocks_debug_script
Nashtare Mar 6, 2024
7a738a6
Rework CI
Nashtare Mar 6, 2024
710a96e
Bump mio from 0.8.9 to 0.8.11
dependabot[bot] Mar 6, 2024
3ce315a
Merge pull request #31 from 0xPolygonZero/dependabot/cargo/mio-0.8.11
muursh Mar 6, 2024
55ee6da
Update circuit location
Nashtare Mar 6, 2024
1deb141
Merge pull request #30 from 0xPolygonZero/ci
Nashtare Mar 6, 2024
6f10bd8
Merge pull request #32 from 0xPolygonZero/circuits_folder
Nashtare Mar 6, 2024
f88151c
Bump deps and fix compile failure
Nashtare Mar 11, 2024
a4f1db3
Merge pull request #35 from 0xPolygonZero/fix-nightly-bump-deps
Nashtare Mar 11, 2024
410a1cc
Fixed proof gen debug script not forcing `1` worker
BGluth Mar 12, 2024
0e3e5c9
Added a section about branches and testing
BGluth Mar 12, 2024
1579645
Increased stack size for testing
BGluth Mar 12, 2024
f5a4c7e
Merge pull request #37 from 0xPolygonZero/testing_note_in_readme
BGluth Mar 12, 2024
77259df
Merge pull request #36 from 0xPolygonZero/debug_proof_script_fix
BGluth Mar 12, 2024
aea9355
Fix dead link in README
julianbraha Mar 15, 2024
c2df0fc
Merge pull request #39 from julianbraha/develop
muursh Mar 16, 2024
2661d84
Update CODEOWNERS
muursh Mar 18, 2024
53bc5e2
Merge pull request #40 from 0xPolygonZero/update_codeowners
muursh Mar 19, 2024
3984a91
Fix new nightly clippy warning (#41)
cpubot Mar 19, 2024
3d9c98e
Ran `cargo update`
BGluth Mar 19, 2024
e91515d
Also ran `cargo upgrades` and updated deps further
BGluth Mar 19, 2024
d04f78a
fix axum api
muursh Mar 21, 2024
601a014
Merge pull request #42 from 0xPolygonZero/dep_update
muursh Mar 21, 2024
d8c9759
Updated `.gitignore` to ignore generated plonky2 state
BGluth Mar 26, 2024
3d23565
Merge pull request #43 from 0xPolygonZero/gitignore_prover_state
BGluth Mar 26, 2024
72df63e
Update prover default features (#46)
Nashtare Mar 28, 2024
32bb50e
feat: add circuit version consistency check
lastminutedev Apr 2, 2024
f3c1062
fix: use circuits code digests instead of evm_arithmetization pkg ver…
lastminutedev Apr 3, 2024
522d02a
fix: fix clippy issue
lastminutedev Apr 3, 2024
76a3b0c
Reduce verbosity in logs
Nashtare Apr 8, 2024
cd0b29b
Bump h2 from 0.3.25 to 0.3.26
dependabot[bot] Apr 8, 2024
e272b81
Merge pull request #50 from 0xPolygonZero/dependabot/cargo/h2-0.3.26
Nashtare Apr 8, 2024
af81644
Merge pull request #49 from 0xPolygonZero/verbosity
Nashtare Apr 8, 2024
6c65436
fix: add pr comments fixes
lastminutedev Apr 9, 2024
c7cabda
Debug & proving scripts now use indentical logging
BGluth Apr 10, 2024
a8ec4ac
Merge pull request #52 from 0xPolygonZero/script_logging_improvement
BGluth Apr 10, 2024
a5a9912
Add flag to scripts
Nashtare Apr 11, 2024
0a8ab51
Merge pull request #53 from 0xPolygonZero/script-native
Nashtare Apr 11, 2024
ddd6f11
Allow verifier to load .env file
Nashtare Apr 12, 2024
d429120
Add logging info from verifier side
Nashtare Apr 12, 2024
ab6f1f4
Merge pull request #55 from 0xPolygonZero/load_env_verifier
Nashtare Apr 12, 2024
cea7424
Merge pull request #47 from 0xPolygonZero/add_circuit_version_check
muursh Apr 16, 2024
427648d
Updated docs for new parameter in `prove_blocks.sh`
BGluth Apr 17, 2024
bb37594
Apply suggestions from code review (Nashtare)
BGluth Apr 17, 2024
d1535f0
Merge pull request #59 from 0xPolygonZero/docs/missing_param_in_prove…
BGluth Apr 17, 2024
204a443
Now logs time to generate proofs
BGluth Apr 19, 2024
17535a9
Removed agg & block proof timing logic
BGluth Apr 19, 2024
ae915a2
Merge pull request #61 from 0xPolygonZero/proof_timing
BGluth Apr 19, 2024
f99f4a6
Fixed txn proof logs not rendering correctly
BGluth Apr 19, 2024
211983b
Cleaned up txn proof timing output even more
BGluth Apr 19, 2024
4dd7bc3
Merge pull request #63 from 0xPolygonZero/fix/txn_log_times_cleanup
BGluth Apr 19, 2024
e92f3b3
feat: adding block proof ci
praetoriansentry Apr 22, 2024
3a008ed
Update tools/simple_test.sh
praetoriansentry Apr 22, 2024
26427f9
Merge pull request #65 from 0xPolygonZero/jhilliard/block-proof-ci
praetoriansentry Apr 22, 2024
1798fde
Cargo audit updates (#66)
muursh Apr 23, 2024
75e8dc1
Implement RAII span for transaction timing to avoid cloning input (#67)
cpubot Apr 23, 2024
5ac1350
feat: provide IR for debugging upon failure (#48)
vladimir-trifonov Apr 24, 2024
35fb73a
fix: fix circuit version consistency check (#58)
vladimir-trifonov Apr 24, 2024
e49ef4b
Reduce sizes and add distinction with test_only mode (#69)
Nashtare Apr 24, 2024
ecfe184
mark: 0xaatif/ethers2alloy
0xaatif May 23, 2024
eda823a
wip
0xaatif May 23, 2024
de66688
refactor: migrate prover
0xaatif May 23, 2024
9d34e13
wip: migrate rpc
0xaatif May 23, 2024
fabc7ee
refactor: migrate leader
0xaatif May 23, 2024
8fbb52c
chore: clean up deps
0xaatif May 23, 2024
e08b62a
feat: fill out compat
0xaatif May 23, 2024
b209c1b
try: used
0xaatif May 23, 2024
2f31116
Revert "try: used"
0xaatif May 23, 2024
da32ab0
fix: -Zlinker-features=-lld
0xaatif May 23, 2024
22a4ad9
Fix linkme lld issue in CI (#79)
cpubot May 23, 2024
ebcd0ed
Revert "fix: -Zlinker-features=-lld"
0xaatif May 23, 2024
9e91f16
refactor: common::Compat -> rpc::Compat
0xaatif May 23, 2024
0e678fa
tweak: trivial review changes
0xaatif May 26, 2024
3658940
Merge pull request #78 from 0xPolygonZero/0xaatif/ethers2alloy
0xaatif May 28, 2024
ef5270c
fix: fix compilation with `test_only` feature (#84)
Nashtare May 28, 2024
f685308
chore: remove duplicate print in script and lighten circuit loading (…
Nashtare May 28, 2024
cd604d3
Remove `Monolithic` load stragegy `restriction` for `InMemory` leader…
Nashtare Jun 8, 2024
3c75186
feat: block interval and parallel block proving (#90)
atanmarko Jun 10, 2024
893bb13
fix: docker images (#108)
leovct Jun 12, 2024
ade0466
feat: add transaction hash to zero trace (#103)
atanmarko Jun 12, 2024
c2e2331
fix: discard intermediate proofs (#106)
atanmarko Jun 14, 2024
3a3a16e
feat: stdio parallel proving (#109)
atanmarko Jun 14, 2024
c5433a2
Fixes related to nightly and alloy (#101)
LindaGuiga Jun 17, 2024
aa12938
Introduce native tracer support (#81)
frisitano Jun 17, 2024
91c665a
chore: bump alloy to v0.1.1 (#111)
atanmarko Jun 17, 2024
de8f0b5
Merge remote-tracking branch 'zero_bin/develop' into zero_bin_merge
BGluth Jun 17, 2024
236e2a4
A few dep updates to get `zero-bin` to build
BGluth Jun 17, 2024
9b61f59
cargo `autoinherit` pass
BGluth Jun 17, 2024
1bafd90
A few more dep changes to move to `workspace` deps
BGluth Jun 17, 2024
0fb571d
Requested PR changes for #279
BGluth Jun 18, 2024
a9eff88
fix: formatting
atanmarko Jun 18, 2024
a38af27
fix: ci tests
atanmarko Jun 18, 2024
8de4e4f
fix: ci tests 2
atanmarko Jun 18, 2024
5c0c165
fix: .gitignore
atanmarko Jun 18, 2024
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
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
72 changes: 72 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,78 @@ 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

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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ Cargo.lock
*.iml
.idea/
.vscode

94 changes: 85 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,34 +1,110 @@
[workspace]
members = ["mpt_trie", "proof_gen", "trace_decoder", "evm_arithmetization"]
members = ["mpt_trie",
"proof_gen",
"trace_decoder",
"evm_arithmetization",
"zero_bin/leader",
"zero_bin/worker",
"zero_bin/common",
"zero_bin/ops",
"zero_bin/verifier",
"zero_bin/rpc",
"zero_bin/prover"]
resolver = "2"

[workspace.package]
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/0xPolygonZero/zk_evm"
homepage = "https://github.com/0xPolygonZero/zk_evm"
keywords = ["cryptography", "STARK", "plonky2", "ethereum", "zk"]
categories = ["cryptography::cryptocurrencies"]

[workspace.dependencies]
alloy = { git = "https://github.com/alloy-rs/alloy", tag='v0.1.1', default-features = false, features = [
"consensus",
"reqwest",
"json-rpc",
"rlp",
"rpc",
"rpc-client",
"rpc-types-eth",
"rpc-types-trace",
"providers",
"transports",
"transport-http",
"rpc-types-debug"
] }
anyhow = "1.0.40"
async-stream = "0.3.5"
axum = "0.7.4"
bytes = "1.5.0"
ciborium = "0.2.1"
ciborium-io = "0.2.1"
clap = { version = "4.4.6", features = ["derive", "env"] }
__compat_primitive_types = "0.12.2"
criterion = "0.5.1"
dotenvy = "0.15.7"
enum-as-inner = "0.6.0"
enumn = "0.1.12"
env_logger = "0.10.0"
ethereum-types = "0.14.1"
eth_trie = "0.4.0"
evm_arithmetization = { path = "evm_arithmetization", version = "0.2.0" }
futures = "0.3.29"
hashbrown = "0.14.0"
hex = "0.4.3"
hex-literal = "0.4.1"
impl-codec = "0.6.0"
impl-num-traits = "0.1.2"
impl-rlp = "0.3.0"
impl-serde = "0.4.0"
itertools = "0.13.0"
keccak-hash = "0.10.0"
log = "0.4.20"
mpt_trie = { path = "mpt_trie", version = "0.3.0" }
num = "0.4.1"
num-bigint = "0.4.3"
num-traits = "0.2.19"
once_cell = "1.13.0"
paladin-core = "0.4.2"
parking_lot = "0.12.1"
paste = "1.0.14"
pest = "2.1.3"
pest_derive = "2.1.0"
pretty_env_logger = "0.5.0"
proof_gen = { path = "proof_gen", version = "0.2.0" }
rand = "0.8.5"
rand_chacha = "0.3.1"
ripemd = "0.1.3"
rlp = "0.5.2"
rlp-derive = "0.1.0"
ruint = "1.12.1"
serde = "1.0.166"
serde_json = "1.0.96"
serde_path_to_error = "0.1.14"
serde_with = "3.4.0"
sha2 = "0.10.6"
static_assertions = "1.1.0"
thiserror = "1.0.49"
tiny-keccak = "2.0.2"
tokio = { version = "1.33.0", features = ["full"] }
toml = "0.8.12"
tower = "0.4"
trace_decoder = { path = "trace_decoder", version = "0.4.0" }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
uint = "0.9.5"
url = "2.5.0"

# zero-bin releated deps
ops = { path = "zero_bin/ops" }
prover = { path = "zero_bin/prover" }
rpc = { path = "zero_bin/rpc" }
zero_bin_common = { path = "zero_bin/common" }

# plonky2-related dependencies
plonky2 = "0.2.2"
plonky2_maybe_rayon = "0.2.0"
plonky2_util = "0.2.0"
starky = "0.4.0"


[workspace.package]
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/0xPolygonZero/zk_evm"
homepage = "https://github.com/0xPolygonZero/zk_evm"
keywords = ["cryptography", "STARK", "plonky2", "ethereum", "zk"]
28 changes: 14 additions & 14 deletions evm_arithmetization/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,45 +12,45 @@ homepage.workspace = true
keywords.workspace = true

[dependencies]
anyhow = "1.0.40"
anyhow = { workspace = true }
bytes = { workspace = true }
env_logger = { workspace = true }
ethereum-types = { workspace = true }
hex = { workspace = true, optional = true }
hex-literal = { workspace = true }
itertools = "0.11.0"
itertools = { workspace = true }
keccak-hash = { workspace = true }
log = { workspace = true }
plonky2_maybe_rayon = { workspace = true }
num = { workspace = true }
num-bigint = "0.4.3"
once_cell = "1.13.0"
pest = "2.1.3"
pest_derive = "2.1.0"
num-bigint = { workspace = true }
once_cell = { workspace = true }
pest = { workspace = true }
pest_derive = { workspace = true }
plonky2 = { workspace = true }
plonky2_util = { workspace = true }
starky = { workspace = true }
rand = { workspace = true }
rand_chacha = "0.3.1"
rand_chacha = { workspace = true }
rlp = { workspace = true }
rlp-derive = { workspace = true }
serde = { workspace = true, features = ["derive"] }
static_assertions = "1.1.0"
hashbrown = { version = "0.14.0" }
tiny-keccak = "2.0.2"
static_assertions = { workspace = true }
hashbrown = { workspace = true }
tiny-keccak = { workspace = true }
serde_json = { workspace = true }

# Local dependencies
mpt_trie = { version = "0.3.0", path = "../mpt_trie" }
mpt_trie = { workspace = true }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason why the version is removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mistake, I'll re-add this, thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually yeah I was missing version in the root Cargo.toml, but here I think we can just use workspace = true since it will pull from that version (I think right?).

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's easier for version publishing to have version numbers. But regardless, I don't understand why it would complain now for crates that were already here before?


[target.'cfg(not(target_env = "msvc"))'.dependencies]
jemallocator = "0.5.0"

[dev-dependencies]
criterion = "0.5.1"
criterion = { workspace = true }
hex = { workspace = true }
ripemd = "0.1.3"
sha2 = "0.10.6"
ripemd = { workspace = true }
sha2 = { workspace = true }

[features]
default = ["parallel"]
Expand Down
18 changes: 9 additions & 9 deletions mpt_trie/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@ enum-as-inner = { workspace = true }
ethereum-types = { workspace = true }
hex = { workspace = true }
keccak-hash = { workspace = true }
parking_lot = { version = "0.12.1", features = ["serde"] }
parking_lot = { workspace = true, features = ["serde"] }
thiserror = { workspace = true }
log = { workspace = true }
num = { workspace = true, optional = true }
num-traits = "0.2.15"
uint = "0.9.5"
num-traits = { workspace = true }
uint = { workspace = true }
rlp = { workspace = true }
serde = { workspace = true, features = ["derive", "rc"] }
impl-rlp = "0.3.0"
impl-codec = "0.6.0"
impl-serde = "0.4.0"
impl-num-traits = "0.1.2"
impl-rlp = { workspace = true }
impl-codec = { workspace = true }
impl-serde = { workspace = true }
impl-num-traits = { workspace = true }

[dev-dependencies]
eth_trie = "0.4.0"
pretty_env_logger = "0.5.0"
eth_trie = { workspace = true }
pretty_env_logger = { workspace = true }
rand = { workspace = true }
rlp-derive = { workspace = true }
serde_json = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions proof_gen/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ keywords.workspace = true
[dependencies]
ethereum-types = { workspace = true }
log = { workspace = true }
paste = "1.0.14"
paste = { workspace = true }
plonky2 = { workspace = true }
serde = { workspace = true }

# Local dependencies
evm_arithmetization = { version = "0.2.0", path = "../evm_arithmetization" }
evm_arithmetization = { workspace = true }
BGluth marked this conversation as resolved.
Show resolved Hide resolved
16 changes: 8 additions & 8 deletions trace_decoder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ keywords.workspace = true

[dependencies]
bytes = { workspace = true }
ciborium = "0.2.1"
ciborium-io = "0.2.1"
ciborium = { workspace = true }
ciborium-io = { workspace = true }
enum-as-inner = { workspace = true }
enumn = "0.1.12"
enumn = { workspace = true }
ethereum-types = { workspace = true }
hex = { workspace = true }
hex-literal = { workspace = true }
Expand All @@ -23,16 +23,16 @@ log = { workspace = true }
rlp = { workspace = true }
rlp-derive = { workspace = true }
serde = { workspace = true }
serde_with = "3.4.0"
serde_with = { workspace = true }
thiserror = { workspace = true }

# Local dependencies
mpt_trie = { version = "0.3.0", path = "../mpt_trie" }
evm_arithmetization = { version = "0.2.0", path = "../evm_arithmetization" }
mpt_trie = { workspace = true }
evm_arithmetization = { workspace = true }
BGluth marked this conversation as resolved.
Show resolved Hide resolved

[dev-dependencies]
criterion = "0.5.1"
pretty_env_logger = "0.5.0"
criterion = { workspace = true }
pretty_env_logger = { workspace = true }
serde_json = { workspace = true }

[[bench]]
Expand Down
4 changes: 4 additions & 0 deletions zero_bin/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[build]
# https://github.com/rust-lang/rust/pull/124129
# https://github.com/dtolnay/linkme/pull/88
rustflags = ["-Zlinker-features=-lld"]
15 changes: 15 additions & 0 deletions zero_bin/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Default extension for generated block proofs
*.zkproof

# Folder containing all the locally generated circuit data
circuits/

# Folders containing logs from the utility scripts in tools/
debug/
proofs/

# Files generated from the tools script tests
test.out
proofs.json
verify.out
leader.out
Loading
Loading