eth/vm/logic/system: fix CREATE2 failures on BadOpcode test fixture.

2 COMMITS SQUASHED:

eth/vm/logic/system: CREATE2 consumes the fixed 32000 gas that CREATE does.

For reference, EIP-1014:

https://eips.ethereum.org/EIPS/eip-1014

eth/vm/logic/system: increment nonce in CREATE2 (was missing).

Author: veox

eth/vm/logic/system.py

@@ -227,13 +227,14 @@ def get_stack_data(self, computation: BaseComputation) -> CreateOpcodeStackData:
         return CreateOpcodeStackData(endowment, memory_start, memory_length, salt)
 
     def get_gas_cost(self, data: CreateOpcodeStackData) -> int:
-        return constants.GAS_SHA3WORD * ceil32(data.memory_length) // 32
+        return constants.GAS_CREATE + constants.GAS_SHA3WORD * ceil32(data.memory_length) // 32
 
     def generate_contract_address(self,
                                   stack_data: CreateOpcodeStackData,
                                   call_data: bytes,
                                   computation: BaseComputation) -> Address:
 
+        computation.state.account_db.increment_nonce(computation.msg.storage_address)
         return generate_safe_contract_address(
             computation.msg.storage_address,
             stack_data.salt,