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
Conversation
* 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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.