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

Merge develop head to hi-lo #1057

Merged
merged 5 commits into from
Dec 6, 2023
Merged

Merge develop head to hi-lo #1057

merged 5 commits into from
Dec 6, 2023

Conversation

lightsing
Copy link
Member

No description provided.

zhenfeizhang and others added 5 commits December 6, 2023 14:09
* 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>
…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>
# Conflicts:
#	Cargo.lock
#	zkevm-circuits/src/evm_circuit/execution/begin_tx.rs
#	zkevm-circuits/src/evm_circuit/execution/precompiles/ecrecover.rs
#	zkevm-circuits/src/evm_circuit/step.rs
#	zkevm-circuits/src/evm_circuit/util/math_gadget/modulo.rs
#	zkevm-circuits/src/pi_circuit.rs
#	zktrie/Cargo.toml
# Conflicts:
#	zkevm-circuits/src/evm_circuit/execution/begin_tx.rs
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants