Add create2 #269

NIC619 · 2018-01-14T12:13:29Z

How was it fixed?

Add CREATE2 opcode

update intrinsic gas calculation of sharing transaction
add CREATE2 address check in execute_transaction to make sure transaction.to is the same as computed contract address
add CREATE2 opcode and remove CREATE from sharding opcodes
test

Cute Animal Picture

hwwhww · 2018-01-14T13:44:59Z

link #224

…_address

hwwhww · 2018-01-14T14:04:59Z

evm/vm/forks/sharding/transactions.py

@@ -43,5 +44,6 @@ def _get_sharding_intrinsic_gas(transaction_data, transaction_code):
    return (
        GAS_TX +
        num_zero_bytes * GAS_TXDATAZERO +
-        num_non_zero_bytes * GAS_TXDATANONZERO
+        num_non_zero_bytes * GAS_TXDATANONZERO +
+        GAS_TXCREATE


I may miss something, could you tell me why GAS_TXCREATE is included in every sharding tx?

You are right. It should not be included in every tx.

hwwhww · 2018-01-14T14:22:34Z

evm/logic/system.py

@@ -190,3 +191,69 @@ def __call__(self, computation):
        if computation.msg.is_static:
            raise WriteProtection("Cannot modify state while inside of a STATICCALL context")
        return super(CreateEIP150, self).__call__(computation)
+
+
+class Create2(CreateEIP150):


Is there a reason for inheriting CreateEIP150 instead of CreateByzantium?

CreateByzantium and Create2 both override __call__ function so I make Create2 inherit from CreateEIP150 and copy the is_static check from CreateByzantium.

hwwhww

Since the shard chain doesn’t have as many JSON test cases as the non-shard chain now, add some boundary test cases might help.
Some test cases like:

When contract_address != transaction.to?
When is_collision is True?
Assert vm.block.header.gas_used after apply_transaction

hwwhww · 2018-01-15T08:33:00Z

tests/core/vm/test_sharding_vm.py

+    simple_transfer_contract_address,
+    simple_contract_factory_bytecode,
+    CREATE2_contract_bytecode,
+    CREATE2_contract_address,
 )


 def test_sharding_transaction(shard_chain_without_block_validation):  # noqa: F811


Since it's a test in ~~test_vm_state.py~~ test_sharding_vm.py, mind updating the test name to test_sharding_apply_transaction?

Sure. I will update the name. Do you mean also moving it to test_vm_state.py?

ohhhhh sorry, I meant test_sharding_vm.py!

NIC619 · 2018-01-16T05:30:58Z

Tests updated. Thanks.

pipermerriam

Some cleanup suggestions.

pipermerriam · 2018-01-16T19:29:00Z

evm/vm/forks/sharding/opcodes.py

 }


 SHARDING_OPCODES = merge(
    copy.deepcopy(BYZANTIUM_OPCODES),
    NEW_OPCODES
 )
+
+
+SHARDING_OPCODES.pop(opcode_values.CREATE)


Instead of popping this value out, can we do the following a few lines up.

from cytoolz import dissoc SHARDING_OPCODES = merge( dissoc(copy.deepcopy(BYZANTIUM_OPCODES), opcode_values.CREATE), NEW_OPCODES )

pipermerriam · 2018-01-16T19:30:49Z

tests/core/vm/test_sharding_vm.py

+    # Second test: contract that deploy new contract with CREATE2
+    second_deploy_tx = new_sharding_transaction(
+        CREATE2_contract_address,
+        b'',


Can you change this to use keyword arguments so that it's clear what all of these similar parameters are.

pipermerriam · 2018-01-16T19:31:08Z

tests/core/vm/test_sharding_vm.py

+    chain = shard_chain_without_block_validation
+    first_failed_deploy_tx = new_sharding_transaction(
+        simple_transfer_contract_address,
+        b'',


Same request here regarding keyword arguments.

pipermerriam · 2018-01-16T19:31:15Z

tests/core/vm/test_sharding_vm.py

+    # Next, complete deploying the contract
+    successful_deploy_tx = new_sharding_transaction(
+        simple_transfer_contract_address,
+        b'',


pipermerriam · 2018-01-16T19:33:01Z

tests/core/vm/test_sharding_vm.py

+    # Second case: deploy to existing account
+    second_failed_deploy_tx = successful_deploy_tx
+    computation = vm.apply_transaction(second_failed_deploy_tx)
+    assert computation.is_error


Maybe add a check that isinstance(computation._error, ContractCreationCollision)

pipermerriam · 2018-01-16T19:33:33Z

tests/core/vm/test_sharding_vm.py

+
+    vm = chain.get_vm()
+    computation = vm.apply_transaction(first_failed_deploy_tx)
+    assert computation.is_error


Maybe add a check for isinstance(computation._error, IncorrectContractCreationAddress)

… readability

pipermerriam

LGTM

update sharding transaction intrinsic gas calculation

78da048

NIC619 added PR state: WIP eth2.0 labels Jan 14, 2018

NIC619 requested a review from pipermerriam January 14, 2018 12:13

NIC619 force-pushed the add_create2 branch from 061e5a3 to efc31a9 Compare January 14, 2018 13:43

NIC619 added 3 commits January 14, 2018 21:49

add prepare_child_shard_message in BaseComputation

1a19232

add CREATE2 address check in execute_transaction

18fc399

add CREATE2 opcode

9e9ed39

NIC619 force-pushed the add_create2 branch from efc31a9 to dfee0ae Compare January 14, 2018 13:52

rename generate_create2_contract_address to generate_CREATE2_contract…

f77eb52

…_address

NIC619 force-pushed the add_create2 branch from dfee0ae to 3721490 Compare January 14, 2018 14:06

hwwhww reviewed Jan 14, 2018

View reviewed changes

NIC619 added 4 commits January 15, 2018 13:08

remove CREATE from sharding opcodes

e617837

fix sharding transaction intrinsic gas calculation

9e8e9fe

fix on cleaned up state_db context

849d9f8

add CREATE2 contract add test

ad81d76

NIC619 force-pushed the add_create2 branch from b984c7f to ad81d76 Compare January 15, 2018 05:58

hwwhww reviewed Jan 15, 2018

View reviewed changes

NIC619 added 3 commits January 16, 2018 11:58

add edge case test cases for CREATE2 contract deployment

b843645

fix missing CREATE2 gas cost and logger naming

e1998b2

update consumed gas check in test_sharding_vm.py

0268f65

NIC619 added Needs Review and removed PR state: WIP labels Jan 16, 2018

jannikluhn mentioned this pull request Jan 16, 2018

Sharding related opcodes vyperlang/vyper#632

Closed

flake8'ed

9fda613

pipermerriam approved these changes Jan 16, 2018

View reviewed changes

NIC619 added 2 commits January 17, 2018 13:23

remove opcode by cytoolz.dissoc and improve function argument passing…

fb421a9

… readability

update state_db usage in CREATE2 based on ethereum#276

362d82e

hwwhww mentioned this pull request Jan 17, 2018

Check access restrictions during tx execution #276

Closed

pipermerriam approved these changes Jan 17, 2018

View reviewed changes

NIC619 merged commit 01a07cc into ethereum:sharding Jan 18, 2018

Georgi87 mentioned this pull request Aug 6, 2018

Refactor contracts to use CREATE2 opcode safe-global/safe-smart-account#44

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add create2 #269

Add create2 #269

NIC619 commented Jan 14, 2018 •

edited

Loading

hwwhww commented Jan 14, 2018

hwwhww Jan 14, 2018

NIC619 Jan 14, 2018

hwwhww Jan 14, 2018 •

edited

Loading

NIC619 Jan 14, 2018

hwwhww left a comment

hwwhww Jan 15, 2018 •

edited

Loading

NIC619 Jan 15, 2018

hwwhww Jan 15, 2018

NIC619 commented Jan 16, 2018

pipermerriam left a comment

pipermerriam Jan 16, 2018

pipermerriam Jan 16, 2018

pipermerriam Jan 16, 2018

pipermerriam Jan 16, 2018

pipermerriam Jan 16, 2018

pipermerriam Jan 16, 2018

pipermerriam left a comment

Add create2 #269

Add create2 #269

Conversation

NIC619 commented Jan 14, 2018 • edited Loading

How was it fixed?

Cute Animal Picture

hwwhww commented Jan 14, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hwwhww Jan 14, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hwwhww left a comment

Choose a reason for hiding this comment

hwwhww Jan 15, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

NIC619 commented Jan 16, 2018

pipermerriam left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pipermerriam left a comment

Choose a reason for hiding this comment

NIC619 commented Jan 14, 2018 •

edited

Loading

hwwhww Jan 14, 2018 •

edited

Loading

hwwhww Jan 15, 2018 •

edited

Loading