Opcode `SHL` #578

silathdiir · 2022-06-19T22:32:28Z

Spec: privacy-scaling-explorations/zkevm-specs#225

Summary

Fix to use MulAddWordsGadget to implement both SHL and SHR circuits.
Merge new SHL spec into SHR.

and sperate the word array to `quotient`, `divisor`, `remiander` and `dividend`.

…SHL and SHR`.

`SHR`.

silathdiir · 2022-08-22T00:12:49Z

I tried to check this Circuit code, it has already been synchronized with Spec.

Hi @adria0, since you helped review the Spec PR, could you also help review this Circuit PR when you have time? Thanks.

DreamWuGit

LGTM！

zkevm-circuits/src/evm_circuit/execution/shl_shr.rs

Co-authored-by: z2trillion <z2trillion@users.noreply.github.com>

zkevm-circuits/src/evm_circuit/execution/shl_shr.rs

adria0

LGTM 😄

Co-authored-by: adria0.eth <5526331+adria0@users.noreply.github.com>

…S auditors (#572) * fix finding 3 (#575) * Fix zellic finding 4 (#576) * fix finding 3 (#575) * fix finding 4 --------- Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> * add range check on diffs (#586) * Fix finding 10 (#578) * fix finding 3 (#575) * fix finding 10 * Fix finding 13 (#579) * fix finding 3 (#575) * fix finding 13 * Fix zellic finding 14 (#580) * fix finding 3 (#575) * fix finding 14 * Fix zellic finding 5 (#584) * fix finding 3 (#575) * fix finding 5 * refine comments * fmt * Fix finding 17 (#602) * add q_last * fix * add more diff range check * fix finding 7 (#625) * tx_id = 1 when sm starts * Fix finding 11 : use length for rlc in rlp table (#719) * fix: use tag_bytes_rlc and tag_length to copy tag's bytes around * fix lookup input for Len & RLC & GasCost fields in tx circuit * refactor * fix * refactor * fix col phase issue * refactor bytes_rlc type * Fix the bugs in Tx & PI circuits reported by Zellic & KALOS auditors (#612) * lookup chain_id to RLP table * fix finding 22 (#614) * fix finding 21 (#613) * fix finding 23 (#618) * fix finding 26 (#622) * fix finding 28 (#624) Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> * fix finding 29 (#623) Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> * enforce is_final is true at the last row and fix RLC related vul (#735) * Fix finding 30 (#733) * enforce all txs in a block are included in the tx table * clippy --------- Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> * Fix Zellic / Kalos finding25 (#619) * fix finding 25 * add comment --------- Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> * fix conflicts --------- Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com> * use q_first instead * fmt --------- Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>

* add row counting interface for keccak * add class level capacity calculator for keccak * remove f capacity from core * remove capacity calculator in aggregator util * remove unnecessary imports * replace max keccak round in core * replace reference for max keccak * remove unnecessary keccak imports and constants * remove max keccak constant * remove constants in hash cell parsing * remove constant column sanity check * add state column usage log * adjust input bytes column * add long column padding * correct fmt * fix fmt * minor fixes * fix * Fix: allow skipping of L1Msg tx part 2 (calculate num_all_txs in tx circuit) (#778) * calculate num_l1_msgs and num_l2_txs in tx circuit * fix * fmt and clippy * fix: non-last tx requires next is calldata * add NumAllTxs in block table and copy it from pi to block table * add lookup for NumAllTxs in tx circuit * clippy * add block num diff check to avoid two real block have same num * clippy * address comments * Fix the bugs in RLP/Tx/PI circuit which are reported by Zellic & KALOS auditors (#572) * fix finding 3 (#575) * Fix zellic finding 4 (#576) * fix finding 3 (#575) * fix finding 4 --------- Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> * add range check on diffs (#586) * Fix finding 10 (#578) * fix finding 3 (#575) * fix finding 10 * Fix finding 13 (#579) * fix finding 3 (#575) * fix finding 13 * Fix zellic finding 14 (#580) * fix finding 3 (#575) * fix finding 14 * Fix zellic finding 5 (#584) * fix finding 3 (#575) * fix finding 5 * refine comments * fmt * Fix finding 17 (#602) * add q_last * fix * add more diff range check * fix finding 7 (#625) * tx_id = 1 when sm starts * Fix finding 11 : use length for rlc in rlp table (#719) * fix: use tag_bytes_rlc and tag_length to copy tag's bytes around * fix lookup input for Len & RLC & GasCost fields in tx circuit * refactor * fix * refactor * fix col phase issue * refactor bytes_rlc type * Fix the bugs in Tx & PI circuits reported by Zellic & KALOS auditors (#612) * lookup chain_id to RLP table * fix finding 22 (#614) * fix finding 21 (#613) * fix finding 23 (#618) * fix finding 26 (#622) * fix finding 28 (#624) Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> * fix finding 29 (#623) Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> * enforce is_final is true at the last row and fix RLC related vul (#735) * Fix finding 30 (#733) * enforce all txs in a block are included in the tx table * clippy --------- Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> * Fix Zellic / Kalos finding25 (#619) * fix finding 25 * add comment --------- Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> * fix conflicts --------- Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com> * use q_first instead * fmt --------- Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com> Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com> * add pi comments * rename preimage col idx * add keccak rows check * rename input bytes col finder fn * modify keccak row env constaint * modify keccak row env constaint * add named constant setup vars * modify keccak row check * clippy advised * add comments on chunk hash * fmt * avoid constant lookup table * avoid repetitive computation of input_bytes_col_idx --------- Co-authored-by: Zhuo Zhang <mycinbrin@gmail.com> Co-authored-by: xkx <xiakunxian130@gmail.com> Co-authored-by: Rohit Narurkar <rohit.narurkar@protonmail.com>

silathdiir added 23 commits May 19, 2022 17:05

Add ShlGadget.

1714ac5

Add ShlWordsGadget to math_gadget.rs.

558fd36

Merge remote-tracking branch 'origin/main' into feat/opcode-shl

4dd4f9b

Merge remote-tracking branch 'origin/main' into feat/opcode-shl

85686bb

Merge remote-tracking branch 'origin/main' into feat/opcode-shl

7cbbe28

Merge both opcode SHL and SHR into `MulDivModShlShrGadget.

d738dd4

Add test cases.

eb89a00

Delete old SHL and SHR gadgets.

a57c20e

Use generate_lagrange_base_polynomial to check opcode (as is_mul)

df635e7

and sperate the word array to `quotient`, `divisor`, `remiander` and `dividend`.

Add a constraint `pop1 == pop1.cells[0] when divisor != 0 for opcode …

0f59351

…SHL and SHR`.

Add shf_mod64 and shf_div64 lookup constraints for opcode SHL and

7d187ed

`SHR`.

Fix Infra doc issue.

45a37bd

Fix shf_div64 and shf_mod64 to shf_div128 and shf_mod128.

dbcb834

Delete commenting for tests.

de5caed

Merge remote-tracking branch 'origin/main' into feat/opcode-shl

a0c98b3

Fix contraint divisor_hi == shf_div128.

b0655f1

Fix clippy issue.

51bd0a2

Fix comments.

b99dc14

Fix to shf_lo and shf_hi.

d450aaf

Merge remote-tracking branch 'origin/main' into feat/opcode-shl

926a4da

Merge remote-tracking branch 'origin/main' into feat/opcode-shl

c763b78

Fix Pow2 lookup table and update to use shf0 for lookup.

98c0ef3

Add missing limit divisor != 0 for Pow2 lookup.

eaba996

github-actions bot added the crate-zkevm-circuits Issues related to the zkevm-circuits workspace member label Jun 19, 2022

This was referenced Jun 19, 2022

Spec for opcode SHL privacy-scaling-explorations/zkevm-specs#225

Merged

Opcode SHL scroll-tech/zkevm-circuits#157

Closed

silathdiir marked this pull request as draft June 19, 2022 23:16

pinkiebell mentioned this pull request Jun 22, 2022

Required opcodes for basic L2 Bridge #369

Closed

19 tasks

silathdiir added 2 commits August 1, 2022 21:45

Merge remote-tracking branch 'upstream/main' into feat/opcode-shl

435c14c

Revert to only merge both opcode SHL and SHR.

26999d2

silathdiir marked this pull request as ready for review August 2, 2022 07:23

silathdiir marked this pull request as draft August 2, 2022 07:34

silathdiir and others added 5 commits August 10, 2022 11:01

Fix to always constrain push to zero if divisor == 0 (shift > 255).

2823eab

Merge remote-tracking branch 'upstream/main' into feat/opcode-shl

681a4ed

Merge branch 'main' into feat/opcode-shl

b804e66

Merge branch 'main' into feat/opcode-shl

416c099

Merge branch 'main' into feat/opcode-shl

acabdae

lispc marked this pull request as ready for review August 19, 2022 04:45

Merge branch 'main' into feat/opcode-shl

29a0c03

DreamWuGit approved these changes Aug 23, 2022

View reviewed changes

DreamWuGit and others added 3 commits August 23, 2022 16:55

Merge branch 'main' into feat/opcode-shl

d668bfb

Merge branch 'main' into feat/opcode-shl

4091a3c

Merge branch 'main' into feat/opcode-shl

df2113c

z2trillion approved these changes Aug 25, 2022

View reviewed changes

zkevm-circuits/src/evm_circuit/execution/shl_shr.rs Outdated Show resolved Hide resolved

silathdiir and others added 3 commits August 26, 2022 10:06

Update zkevm-circuits/src/evm_circuit/execution/shl_shr.rs

d32d9d8

Co-authored-by: z2trillion <z2trillion@users.noreply.github.com>

Merge branch 'main' into feat/opcode-shl

76365e0

Merge branch 'main' into feat/opcode-shl

8514290

adria0 reviewed Aug 30, 2022

View reviewed changes

zkevm-circuits/src/evm_circuit/execution/shl_shr.rs Outdated Show resolved Hide resolved

adria0 approved these changes Aug 30, 2022

View reviewed changes

silathdiir and others added 3 commits August 31, 2022 09:29

Simplify to compute with divisor.

5bc7320

Co-authored-by: adria0.eth <5526331+adria0@users.noreply.github.com>

Add missing comma.

e226ee9

Merge branch 'main' into feat/opcode-shl

52b7b06

lispc merged commit ec9c4ff into privacy-scaling-explorations:main Aug 31, 2022

lispc deleted the feat/opcode-shl branch August 31, 2022 04:30

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Opcode `SHL` #578

Opcode `SHL` #578

silathdiir commented Jun 19, 2022 •

edited

Loading

silathdiir commented Aug 22, 2022

DreamWuGit left a comment

adria0 left a comment

Opcode SHL #578

Opcode SHL #578

Conversation

silathdiir commented Jun 19, 2022 • edited Loading

Summary

silathdiir commented Aug 22, 2022

DreamWuGit left a comment

Choose a reason for hiding this comment

adria0 left a comment

Choose a reason for hiding this comment

Opcode `SHL` #578

Opcode `SHL` #578

silathdiir commented Jun 19, 2022 •

edited

Loading