Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.

Bus Parallel Assignments #1064

Merged
merged 18 commits into from
Dec 13, 2023
Merged

Bus Parallel Assignments #1064

merged 18 commits into from
Dec 13, 2023

Conversation

naure
Copy link

@naure naure commented Dec 13, 2023 •
edited
Loading

This PR:

  • Resolves merge conflicts from develop into Bus Lookups (auto version) #1031 .
  • Supports any region correctly (previously only regions starting at offset=0).
  • Adds support for parallel assignments with assign_regions.

noel2004 and others added 18 commits November 20, 2023 16:35
@noel2004 @silathdiir
[FEAT] support mainnet block in mainnet.rs (#814) (#1004)
0c3b39f 
* patch for L2 node rpc

* constrain max_txs to pass pi circuit

* revert get access set to the same implement as upstream

* update for using prestateTracer for state

* fix coinbase issue

* apply mock fill root

* better form for mock filling mpt

* dep issue

* some trivial optimizations

* grep mpt standlone circuit from test

* update poseidon row params

* fix issues in old_root setting

* update ethblock for some fields

* update more fields

* update keccak inputs

* update prev state root

* update more fields for state root

* update code size

* fix storage issue on missing field

* optimize the pre state handling

* induce relax mode to raise some restrict

* picking coinbase/difficulity from block instead of default constants

* custom diff/coinbase in padding

* fix the max_txs issue in pi_circuit

* clippy and fmt

* support single tx test

* adjust params

* rebuild mpt state in mock tx proven

* fmt

* resume some fields in prestate trace

* test creating supercircuit from dummy witness block

* revert most params

* mitigate an issue in prestate tracer

* add timeout spec for robust API call

* fmt

* add readme for test

* add more comment according to review

---------

Co-authored-by: Steven <asongala@163.com>
@silathdiir
fix: only enable circuit for BASEFEE opcode (without opcode mapping) (
abb7564 
#1033)

* Enable `BlockCtxU256Gadget` for `BASEFEE` opcode in `scroll` feature.

* Fix to restrict `DIFFICULTY` execution state only for scroll (to avoid soundness).
@silathdiir
Disable applying MPT if non-scroll in integration-tests. (#1034)
8dbfa1c
@silathdiir
Add AccessListGasCost to TxContextFieldTag. (#1041)
8e0fd2e
@lightsing
[feat] enum error in GethExecStep (#1037)
b638992 
* make error enum

* remove non_exhaustive
@lightsing
[feat] add feature switch of memory/stack/storage (#1038)
876d234 
* add feature switch

* add missing

* fix merge
@lispc @silathdiir
parallel assignment of evm circuit (#1027)
947ca7e 
* done

* retry

* seem done

* fix

* Temp to comment out `Cached assign at ...` log.

* clean-codes

---------

Co-authored-by: Steven Gu <asongala@163.com>
@roynalnaruto
Refactor PI Circuit (#1042)
0b71e66 
* refactor assign into sub-methods, more docs

* fmt

* fix: doc escape square braces

* fix offset increment
@lispc
fix macos build (#1047)
bfd47e1
@lispc
remove halo2wrong (#1048)
17351c6
@silathdiir @roynalnaruto
feat: Add TxEip2930Gadget to handle EIP-2930 (for evm-circuit part) (…
07cf6bd 
…#1045)

* Add `TxEip2930Gadget` to begin-tx to handle EIP-2930 in evm circuit.

* Move `AccessList*` to the front of `BlockNumber` to fix tx-circuit tests.

* Merge `CopyDataType` of access list to `AccessListAddresses` and `AccessListStorageKeys`.

* Delete `is_eip1559_tx` function which should be better to add in the EIP-1559 PR.

* Rename function `access_list_address_and_storage_key_sizes` to `access_list_size`.

* Add `AccessListRLC` to tx-table.

* Fix test.

* Remove `AccessListGasCost`, and try to calculate it by `AccessListAddressesLen` and `AccessListStorageKeysLen`

---------

Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com>
@noel2004
[FEAT] precompile-sha256 (#1032)
7fa17b1 
* init table16 with generic refactoring

* update cargo

* add required cfgs

* add benchmarking

* customable bench

* fmt

* config gates for sha256 circuit

* complete sha256 circuit

* induce SHA256 in bus mapping

* better challenge spec

* integrate sha256 circuit into super

* readme (wip)

* complete precompile and sha256 table

* clippies

* fmt

* better tests

* fix issues and better printing for circuit layout

* refine and fix issues

* fix digest in table16

* fix layout, clippy and fmt

* complete sha256 table

* fix rw

* fix rlc on padding

* clippy and fmt

* more tests

* test added

* sha256: update row cost per block

* update readme (wip)

* lookup input len

* enable sha256

* more tests cases

* refactoring aux data

* fmt

* fix precompile call test

* fix another callop test

* + update bench to circuit-sha256,
+ update readme

* fix vk issue, add more test

* trivial fixs

* move sha256 circuit into zkevm-circuits

* purge unused sha256 dir

* bump halo2 version

* fix blank comment
@noel2004
fix fmt (#1049)
88e28e4
@zhenfeizhang @noel2004
@lispc @silathdiir
chore: upgrade group/ff/halo2 and rust version (#1022)
618fd1e 
* wip

* enforce eth v2.0.7

* update links

* clean up zktrie

* fix keccak circuit

* fix gadgets

* fix bus-mapping

* everything compiles now

* compiles

* compiles

* clean up

* update zktrie links

* update dep for zktrie

* Fix all dep/compliation issues in Sync ff 0.13 (#1056)

* fix all dep issue

* use updated misc-precompile

* fix test issue

* purge lock file by upgrading mpt-circuit

* final update for dep of mpt-circuits

* update deps

* build?

---------

Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>

* upgrade halo2;

* build

* Upgrade rust-toolchain to `nightly-2023-10-27` in CI.

* Fix some byte values (u8) from `u128` to `u64` in `SAR`.

* uncomment unit tests for aggregator

* fix clippy

* uncomment sig circuit and tx circuit

* uncomment rlc gates unit tests

* fix make doc

* uncomment sig/ecc related code

* minor fix

* clippy

* undo last clippy..

* disable some super circuit tests

---------

Co-authored-by: Ho Vei <noelwei@gmail.com>
Co-authored-by: Ho <noel.wei@gmail.com>
Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>
Co-authored-by: Steven Gu <asongala@163.com>
@lispc @zhenfeizhang
@noel2004 @lightsing @silathdiir
[chore] update rust toolchain to 1.76 nightly; replace lazy_static/on…
fb271ea 
…ce_cell with std::sync::LazyLock (#1050)

* part1

* part2

* wip

* enforce eth v2.0.7

* update links

* clean up zktrie

* fix keccak circuit

* fix gadgets

* fix bus-mapping

* everything compiles now

* compiles

* compiles

* clean up

* update zktrie links

* update dep for zktrie

* [chore] update rust toolchain to 1.76 nightly

* Fix all dep/compliation issues in Sync ff 0.13 (#1056)

* fix all dep issue

* use updated misc-precompile

* fix test issue

* purge lock file by upgrading mpt-circuit

* final update for dep of mpt-circuits

* update deps

* build?

---------

Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>

* upgrade halo2;

* remove lazy_static and once_cell

* update snark-verifier

* build

* Upgrade rust-toolchain to `nightly-2023-10-27` in CI.

* Fix some byte values (u8) from `u128` to `u64` in `SAR`.

* uncomment unit tests for aggregator

* fix clippy

* uncomment sig circuit and tx circuit

* uncomment rlc gates unit tests

* fix make doc

* uncomment sig/ecc related code

* minor fix

* clippy

* undo last clippy..

* disable some super circuit tests

* update ci script

* fix missing

* post merge

* soundness fix

* fix missing

* fix missing

---------

Co-authored-by: zhenfei <zhenfei.zhang@hotmail.com>
Co-authored-by: Ho Vei <noelwei@gmail.com>
Co-authored-by: lightsing <light.tsing@gmail.com>
Co-authored-by: Ho <noel.wei@gmail.com>
Co-authored-by: Steven Gu <asongala@163.com>
Merge branch 'develop' into bus-auto-merge
6126059
bus-auto: fixes after merge
0d54829
bus-auto: support for parallel assign_regions
9c52286
@naure naure merged commit 015a993 into bus-auto Dec 13, 2023
@naure naure deleted the bus-auto-merge branch December 13, 2023 15:08
@naure
Copy link
Author

naure commented Dec 13, 2023

Reverted because "squash" messed up the branch.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
CI crate-bus-mapping crate-circuit-benchmarks crate-eth-types crate-external-tracer crate-gadgets crate-geth-utils crate-integration-tests crate-keccak crate-mock crate-prover crate-zkevm-circuits T-bench
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@naure @noel2004 @silathdiir @lightsing @lispc @roynalnaruto @zhenfeizhang