Skip to content
This repository has been archived by the owner on Jul 5, 2024. It is now read-only.

Commit

Permalink
sync main branch to word-lo-hi branch (#1470)
Browse files Browse the repository at this point in the history
### 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 <chihchengliang@gmail.com>
Co-authored-by: adria0.eth <5526331+adria0@users.noreply.github.com>
Co-authored-by: adria0 <adria0@nowhere>
Co-authored-by: Eduard S <eduardsanou@posteo.net>
Co-authored-by: Han <tinghan0110@gmail.com>
Co-authored-by: Paul <108982045+ChengYueJia@users.noreply.github.com>
Co-authored-by: Steven <asongala@163.com>
Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com>
Co-authored-by: KimiWu <leonhartwu@gmail.com>
Co-authored-by: Raphael <raphael.r.toledo@gmail.com>
Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>
Co-authored-by: naure <naure@users.noreply.github.com>
Co-authored-by: Aurélien Nicolas <info@nau.re>
Co-authored-by: Enrico Bottazzi <85900164+enricobottazzi@users.noreply.github.com>
Co-authored-by: Raphael <contact@raphael-toledo.com>
  • Loading branch information
16 people committed Jun 13, 2023
1 parent adac146 commit fab8e2e
Show file tree
Hide file tree
Showing 198 changed files with 5,357 additions and 6,050 deletions.
2 changes: 0 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ crate-geth-utils:
- geth-utils/**/*
crate-integration-tests:
- integration-tests/**/*
crate-keccak:
- keccak256/**/*
crate-mock:
- mock/**/*
crate-prover:
Expand Down
29 changes: 0 additions & 29 deletions .github/release-drafter.yml

This file was deleted.

Loading

0 comments on commit fab8e2e

Please sign in to comment.