This repository has been archived by the owner on Jul 5, 2024. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sync main branch to word-lo-hi branch (#1470)
### Description merge main to word-lo-hi branch ### Issue Link N/A ##### File conflicts list, other file merge from main successfully ``` Conflict file path: deleted: keccak256/src/gate_helpers.rs both modified: zkevm-circuits/src/copy_circuit.rs both modified: zkevm-circuits/src/evm_circuit/execution.rs both modified: zkevm-circuits/src/evm_circuit/execution/balance.rs both modified: zkevm-circuits/src/evm_circuit/execution/begin_tx.rs both modified: zkevm-circuits/src/evm_circuit/execution/end_tx.rs both modified: zkevm-circuits/src/evm_circuit/execution/logs.rs both modified: zkevm-circuits/src/evm_circuit/step.rs both modified: zkevm-circuits/src/evm_circuit/util.rs both modified: zkevm-circuits/src/evm_circuit/util/common_gadget.rs both modified: zkevm-circuits/src/state_circuit.rs both modified: zkevm-circuits/src/state_circuit/constraint_builder.rs both modified: zkevm-circuits/src/table.rs both modified: zkevm-circuits/src/witness/rw.rs ``` After fixing conflict, file change list ``` modified: zkevm-circuits/src/evm_circuit/execution/create.rs modified: zkevm-circuits/src/evm_circuit/util/constraint_builder.rs modified: zkevm-circuits/src/table/block_table.rs modified: zkevm-circuits/src/table/bytecode_table.rs modified: zkevm-circuits/src/table/copy_table.rs modified: zkevm-circuits/src/table/keccak_table.rs modified: zkevm-circuits/src/table/mpt_table.rs modified: zkevm-circuits/src/table/rw_table.rs modified: zkevm-circuits/src/table/tx_table.rs modified: zkevm-circuits/src/util/word.rs ``` --------- Co-authored-by: Chih Cheng Liang <[email protected]> Co-authored-by: adria0.eth <[email protected]> Co-authored-by: adria0 <adria0@nowhere> Co-authored-by: Eduard S <[email protected]> Co-authored-by: Han <[email protected]> Co-authored-by: Paul <[email protected]> Co-authored-by: Steven <[email protected]> Co-authored-by: Rohit Narurkar <[email protected]> Co-authored-by: KimiWu <[email protected]> Co-authored-by: Raphael <[email protected]> Co-authored-by: Zhang Zhuo <[email protected]> Co-authored-by: naure <[email protected]> Co-authored-by: Aurélien Nicolas <[email protected]> Co-authored-by: Enrico Bottazzi <[email protected]> Co-authored-by: Raphael <[email protected]>
- Loading branch information