Feat/CREATE Part C - bus-mapping and gadget implementation by KimiWu123 · Pull Request #1430 · privacy-ethereum/zkevm-circuits

KimiWu123 · 2023-05-23T06:06:26Z

Description

NOTE: This is an updated version of #1358

This PR is actually based on top of #1425

Issue Link

#1130

Type of change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
This change requires a documentation update

How Has This Been Tested?

Tests can be found here: https://github.com/scroll-tech/zkevm-circuits/blob/2d2bfc6ccf179ade1a8d063f9586b93e5283a557/zkevm-circuits/src/evm_circuit/execution/create.rs#L678

silathdiir

Add small comments, others LGTM.

Hi @KimiWu123, please help resolve the fixed conversations. Seems there is no Resolve conversation button on my side. Thanks.

miha-stopar

Great work! Added just a couple of questions.

miha-stopar · 2023-06-06T12:43:24Z

+        CircuitTestBuilder::new_from_test_ctx(ctx).run();
+    }
+
+    // RETURN or REVERT with data of [0x60; 5]


Can you add a short description why this particular initialization?

The init code content doesn't matter, could put any random data. We don't really run the piece of the code.

Yes, I thought so - perhaps just add a comment that any code would do.

fixed in ec9c6de

miha-stopar · 2023-06-06T12:43:45Z

+        code
+    }
+
+    fn creater_bytecode(


Nitpick: perhaps change creater to creator?

fixed in 59cf61f

miha-stopar · 2023-06-06T13:14:20Z

+        code.append(&bytecode! {
+            PUSH1(initialization_bytes.len()) // size
+            PUSH1(32 - initialization_bytes.len()) // length
+            PUSH2(23414) // value


Suggested change

PUSH2(23414) // value

PUSH2(23414) // value (endowment in CREATE2)

fixed in 59cf61f

miha-stopar · 2023-06-06T14:13:05Z

+        let gas_cost = GasCost::CREATE.expr() + memory_expansion.gas_cost() + keccak_gas_cost;
+        let gas_remaining = cb.curr.state.gas_left.expr() - gas_cost.clone();
+        let gas_left = ConstantDivisionGadget::construct(cb, gas_remaining.clone(), 64);
+        let callee_gas_left = gas_remaining - gas_left.quotient();


Does there need to be also the reduction of gas (for CreateDataGas) for storing the code when there is no error?

Yes, you're right! fixed in cccd6a8

ChihChengLiang

I approve for @silathdiir to make the auto-merge work.

KimiWu123 self-assigned this May 23, 2023

github-actions Bot added crate-bus-mapping Issues related to the bus-mapping workspace member crate-mock Issues related to the mock workspace member crate-zkevm-circuits Issues related to the zkevm-circuits workspace member labels May 23, 2023

KimiWu123 changed the title ~~[WIP] Feat/create part c - CREATE/CREATE2 implementation~~ [WIP] Feat/CREATE Part C - CREATE/CREATE2 implementation May 23, 2023

KimiWu123 changed the title ~~[WIP] Feat/CREATE Part C - CREATE/CREATE2 implementation~~ [WIP] Feat/CREATE Part C - bus-mapping and gadget implementation May 23, 2023

KimiWu123 mentioned this pull request May 26, 2023

[CREATE Part C] bus-mapping and gadget implementation #1358

Closed

4 tasks

KimiWu123 force-pushed the feat/create-part-c branch from d23050d to d37a19a Compare May 26, 2023 04:53

github-actions Bot removed the crate-mock Issues related to the mock workspace member label May 26, 2023

roynalnaruto added 2 commits May 26, 2023 13:32

feat: bus-mapping additions to support CREATE/CREATE2

8d57b53

feat: CREATE/CREATE2 opcode gadget and tests

6b274a1

KimiWu123 force-pushed the feat/create-part-c branch from d37a19a to 6b274a1 Compare May 26, 2023 05:33

KimiWu123 added 2 commits May 26, 2023 13:40

add missing functions in part b back

1aa26ec

refactor CREATE

a6ad558

KimiWu123 force-pushed the feat/create-part-c branch from 64a4d9f to a6ad558 Compare May 26, 2023 10:16

ed255 linked an issue May 31, 2023 that may be closed by this pull request

Implement CREATE & CREATE2 #1130

Closed

KimiWu123 added 3 commits June 1, 2023 18:19

CREATE is working

3bb1bb8

tests passed

d87c107

chore: housekeeping

0df9968

silathdiir reviewed Jun 5, 2023

View reviewed changes

Comment thread zkevm-circuits/src/evm_circuit/execution/create.rs Outdated

Comment thread zkevm-circuits/src/evm_circuit/execution/create.rs Outdated

KimiWu123 added 3 commits June 5, 2023 10:34

Merge branch 'main' into feat/create-part-c

82d3a8d

fix: merge error

6a85de5

fix: gas cost

7aa2d78

KimiWu123 marked this pull request as ready for review June 5, 2023 03:05

KimiWu123 changed the title ~~[WIP] Feat/CREATE Part C - bus-mapping and gadget implementation~~ Feat/CREATE Part C - bus-mapping and gadget implementation Jun 5, 2023

KimiWu123 added 4 commits June 5, 2023 11:17

test: fix test_create_address_collision_error

600de53

fix clippy

d9c0751

test: fix test_return_nonroot_create

52c3e00

chore: add comments

1bb1602

KimiWu123 requested a review from silathdiir June 5, 2023 09:44

silathdiir approved these changes Jun 5, 2023

View reviewed changes

Comment thread bus-mapping/src/evm/opcodes/callop.rs Outdated

Comment thread zkevm-circuits/src/evm_circuit/execution/create.rs

miha-stopar self-requested a review June 5, 2023 12:03

chore: remove unnecessary code

7d5f27d

KimiWu123 mentioned this pull request Jun 6, 2023

Complete EIP 3860 in CREATE circuit for Shanghai compatibility #1458

Closed

miha-stopar reviewed Jun 6, 2023

View reviewed changes

KimiWu123 added 2 commits June 7, 2023 10:14

chore: fix typo and add comment as reveiw request

59cf61f

feat: add gas cost of deployed code in return

cccd6a8

miha-stopar reviewed Jun 7, 2023

View reviewed changes

Comment thread zkevm-circuits/src/evm_circuit/execution/return_revert.rs

chore: add comment

ec9c6de

miha-stopar approved these changes Jun 8, 2023

View reviewed changes

Merge branch 'main' into feat/create-part-c

bc7a9c8

KimiWu123 enabled auto-merge June 9, 2023 00:49

KimiWu123 added this pull request to the merge queue Jun 9, 2023

ChihChengLiang approved these changes Jun 9, 2023

View reviewed changes

Merged via the queue into main with commit 9ab662b Jun 9, 2023

KimiWu123 deleted the feat/create-part-c branch June 9, 2023 13:26

ChihChengLiang mentioned this pull request Jun 13, 2023

circuit for invalid creation code #1292

Merged

1 task

This was referenced Jul 6, 2023

Handle ErrorDepth in CALL_OP and `CREATE #1312

Closed

Meta: Opcode spec + implementation status #477

Closed

implement ErrContractAddressCollision error state #1309

Open

lispc restored the feat/create-part-c branch October 3, 2023 10:24

	PUSH2(23414) // value
	PUSH2(23414) // value (endowment in CREATE2)

Conversation

KimiWu123 commented May 23, 2023

Description

Issue Link

Type of change

Contents

How Has This Been Tested?

Uh oh!

Uh oh!

Uh oh!

silathdiir left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

miha-stopar left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ChihChengLiang left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants