Add Petersburg fork aka Constantinople that works

cburgdorf · cburgdorf · commit c977794fadd6 · 2019-02-21T09:08:29.000+01:00
diff --git a/docs/release_notes/index.rst b/docs/release_notes/index.rst
@@ -1,6 +1,12 @@
 Release notes
 =============
 
+Unreleased (latest source)
+--------------------------
+
+- `#1719 <https://github.com/ethereum/py-evm/pull/1719>`_: Implement and activate Petersburg fork (aka Constantinople fixed)
+
+
 0.2.0-alpha.40
 --------------
 
diff --git a/eth/chains/mainnet/__init__.py b/eth/chains/mainnet/__init__.py
@@ -13,7 +13,7 @@
 from .constants import (
     MAINNET_CHAIN_ID,
     BYZANTIUM_MAINNET_BLOCK,
-    CONSTANTINOPLE_MAINNET_BLOCK,
+    PETERSBURG_MAINNET_BLOCK,
     TANGERINE_WHISTLE_MAINNET_BLOCK,
     HOMESTEAD_MAINNET_BLOCK,
     SPURIOUS_DRAGON_MAINNET_BLOCK,
@@ -29,9 +29,9 @@
 from eth.vm.base import BaseVM  # noqa: F401
 from eth.vm.forks import (
     ByzantiumVM,
-    ConstantinopleVM,
     FrontierVM,
     HomesteadVM,
+    PetersburgVM,
     SpuriousDragonVM,
     TangerineWhistleVM,
 )
@@ -80,15 +80,15 @@ class MainnetHomesteadVM(MainnetDAOValidatorVM):
     TANGERINE_WHISTLE_MAINNET_BLOCK,
     SPURIOUS_DRAGON_MAINNET_BLOCK,
     BYZANTIUM_MAINNET_BLOCK,
-    CONSTANTINOPLE_MAINNET_BLOCK,
+    PETERSBURG_MAINNET_BLOCK,
 )
 MAINNET_VMS = (
     FrontierVM,
     MainnetHomesteadVM,
     TangerineWhistleVM,
     SpuriousDragonVM,
     ByzantiumVM,
-    ConstantinopleVM,
+    PetersburgVM,
 )
 
 MAINNET_VM_CONFIGURATION = tuple(zip(MAINNET_FORK_BLOCKS, MAINNET_VMS))
diff --git a/eth/chains/mainnet/constants.py b/eth/chains/mainnet/constants.py
@@ -39,6 +39,6 @@
 BYZANTIUM_MAINNET_BLOCK = BlockNumber(4370000)
 
 #
-# Constantinople Block
+# Petersburg Block
 #
-CONSTANTINOPLE_MAINNET_BLOCK = BlockNumber(9876543210)
+PETERSBURG_MAINNET_BLOCK = BlockNumber(7280000)
diff --git a/eth/chains/ropsten/__init__.py b/eth/chains/ropsten/__init__.py
@@ -4,6 +4,7 @@
 from .constants import (
     BYZANTIUM_ROPSTEN_BLOCK,
     CONSTANTINOPLE_ROPSTEN_BLOCK,
+    PETERSBURG_ROPSTEN_BLOCK,
     ROPSTEN_CHAIN_ID,
     SPURIOUS_DRAGON_ROPSTEN_BLOCK,
     TANGERINE_WHISTLE_ROPSTEN_BLOCK,
@@ -16,6 +17,7 @@
 from eth.vm.forks import (
     ByzantiumVM,
     ConstantinopleVM,
+    PetersburgVM,
     SpuriousDragonVM,
     TangerineWhistleVM,
 )
@@ -27,6 +29,7 @@
     (SPURIOUS_DRAGON_ROPSTEN_BLOCK, SpuriousDragonVM),
     (BYZANTIUM_ROPSTEN_BLOCK, ByzantiumVM),
     (CONSTANTINOPLE_ROPSTEN_BLOCK, ConstantinopleVM),
+    (PETERSBURG_ROPSTEN_BLOCK, PetersburgVM),
 )
 
 
diff --git a/eth/chains/ropsten/constants.py b/eth/chains/ropsten/constants.py
@@ -40,3 +40,9 @@
 # Constantinople
 #
 CONSTANTINOPLE_ROPSTEN_BLOCK = BlockNumber(4230000)
+
+
+#
+# Petersburg
+#
+PETERSBURG_ROPSTEN_BLOCK = BlockNumber(4939394)
diff --git a/eth/vm/forks/__init__.py b/eth/vm/forks/__init__.py
@@ -16,3 +16,6 @@
 from .constantinople import (  # noqa: F401
     ConstantinopleVM,
 )
+from .petersburg import (  # noqa: F401
+    PetersburgVM,
+)
diff --git a/eth/vm/forks/constantinople/computation.py b/eth/vm/forks/constantinople/computation.py
@@ -1,7 +1,3 @@
-from eth_utils.toolz import (
-    merge,
-)
-
 from eth.vm.forks.byzantium.computation import (
     BYZANTIUM_PRECOMPILES
 )
@@ -15,12 +11,7 @@
 
 from .opcodes import CONSTANTINOPLE_OPCODES
 
-CONSTANTINOPLE_PRECOMPILES = merge(
-    BYZANTIUM_PRECOMPILES,
-    {
-        # TODO: add new precompiles
-    },
-)
+CONSTANTINOPLE_PRECOMPILES = BYZANTIUM_PRECOMPILES
 
 
 class ConstantinopleComputation(ByzantiumComputation):
diff --git a/eth/vm/forks/petersburg/__init__.py b/eth/vm/forks/petersburg/__init__.py
@@ -0,0 +1,38 @@
+from typing import (  # noqa: F401
+    Type,
+)
+
+from eth.rlp.blocks import BaseBlock  # noqa: F401
+from eth.vm.forks.byzantium import (
+    ByzantiumVM,
+    get_uncle_reward,
+)
+from eth.vm.state import BaseState  # noqa: F401
+
+from .blocks import PetersburgBlock
+from .constants import EIP1234_BLOCK_REWARD
+from .headers import (
+    compute_petersburg_difficulty,
+    configure_petersburg_header,
+    create_petersburg_header_from_parent,
+)
+from .state import PetersburgState
+
+
+class PetersburgVM(ByzantiumVM):
+    # fork name
+    fork = 'petersburg'
+
+    # classes
+    block_class = PetersburgBlock  # type: Type[BaseBlock]
+    _state_class = PetersburgState  # type: Type[BaseState]
+
+    # Methods
+    create_header_from_parent = staticmethod(create_petersburg_header_from_parent)  # type: ignore  # noqa: E501
+    compute_difficulty = staticmethod(compute_petersburg_difficulty)    # type: ignore
+    configure_header = configure_petersburg_header
+    get_uncle_reward = staticmethod(get_uncle_reward(EIP1234_BLOCK_REWARD))
+
+    @staticmethod
+    def get_block_reward() -> int:
+        return EIP1234_BLOCK_REWARD
diff --git a/eth/vm/forks/petersburg/blocks.py b/eth/vm/forks/petersburg/blocks.py
@@ -0,0 +1,22 @@
+from rlp.sedes import (
+    CountableList,
+)
+from eth.rlp.headers import (
+    BlockHeader,
+)
+from eth.vm.forks.byzantium.blocks import (
+    ByzantiumBlock,
+)
+
+from .transactions import (
+    PetersburgTransaction,
+)
+
+
+class PetersburgBlock(ByzantiumBlock):
+    transaction_class = PetersburgTransaction
+    fields = [
+        ('header', BlockHeader),
+        ('transactions', CountableList(transaction_class)),
+        ('uncles', CountableList(BlockHeader))
+    ]
diff --git a/eth/vm/forks/petersburg/computation.py b/eth/vm/forks/petersburg/computation.py
@@ -0,0 +1,20 @@
+from eth.vm.forks.byzantium.computation import (
+    BYZANTIUM_PRECOMPILES
+)
+from eth.vm.forks.byzantium.computation import (
+    ByzantiumComputation
+)
+
+from .opcodes import PETERSBURG_OPCODES
+
+PETERSBURG_PRECOMPILES = BYZANTIUM_PRECOMPILES
+
+
+class PetersburgComputation(ByzantiumComputation):
+    """
+    A class for all execution computations in the ``Petersburg`` fork.
+    Inherits from :class:`~eth.vm.forks.byzantium.computation.ByzantiumComputation`
+    """
+    # Override
+    opcodes = PETERSBURG_OPCODES
+    _precompiles = PETERSBURG_PRECOMPILES
diff --git a/eth/vm/forks/petersburg/constants.py b/eth/vm/forks/petersburg/constants.py
@@ -0,0 +1,6 @@
+from eth_utils import denoms
+
+
+GAS_EXTCODEHASH_EIP1052 = 400
+
+EIP1234_BLOCK_REWARD = 2 * denoms.ether
diff --git a/eth/vm/forks/petersburg/headers.py b/eth/vm/forks/petersburg/headers.py
@@ -0,0 +1,13 @@
+from eth.vm.forks.byzantium.headers import (
+    configure_header,
+    create_header_from_parent,
+    compute_difficulty,
+)
+
+
+compute_petersburg_difficulty = compute_difficulty(5000000)
+
+create_petersburg_header_from_parent = create_header_from_parent(
+    compute_petersburg_difficulty
+)
+configure_petersburg_header = configure_header(compute_petersburg_difficulty)
diff --git a/eth/vm/forks/petersburg/opcodes.py b/eth/vm/forks/petersburg/opcodes.py
@@ -0,0 +1,60 @@
+import copy
+from eth_utils.toolz import (
+    merge
+)
+
+from eth import (
+    constants
+)
+from eth.vm import (
+    mnemonics,
+    opcode_values,
+)
+from eth.vm.forks.byzantium.opcodes import (
+    BYZANTIUM_OPCODES,
+)
+from eth.vm.forks.petersburg.constants import (
+    GAS_EXTCODEHASH_EIP1052
+)
+from eth.vm.logic import (
+    arithmetic,
+    context,
+    system,
+)
+from eth.vm.opcode import (
+    as_opcode
+)
+
+
+UPDATED_OPCODES = {
+    opcode_values.SHL: as_opcode(
+        logic_fn=arithmetic.shl,
+        mnemonic=mnemonics.SHL,
+        gas_cost=constants.GAS_VERYLOW,
+    ),
+    opcode_values.SHR: as_opcode(
+        logic_fn=arithmetic.shr,
+        mnemonic=mnemonics.SHR,
+        gas_cost=constants.GAS_VERYLOW,
+    ),
+    opcode_values.SAR: as_opcode(
+        logic_fn=arithmetic.sar,
+        mnemonic=mnemonics.SAR,
+        gas_cost=constants.GAS_VERYLOW,
+    ),
+    opcode_values.EXTCODEHASH: as_opcode(
+        logic_fn=context.extcodehash,
+        mnemonic=mnemonics.EXTCODEHASH,
+        gas_cost=GAS_EXTCODEHASH_EIP1052,
+    ),
+    opcode_values.CREATE2: system.Create2.configure(
+        __name__='opcode:CREATE2',
+        mnemonic=mnemonics.CREATE2,
+        gas_cost=constants.GAS_CREATE,
+    )(),
+}
+
+PETERSBURG_OPCODES = merge(
+    copy.deepcopy(BYZANTIUM_OPCODES),
+    UPDATED_OPCODES,
+)
diff --git a/eth/vm/forks/petersburg/state.py b/eth/vm/forks/petersburg/state.py
@@ -0,0 +1,9 @@
+from eth.vm.forks.byzantium.state import (
+    ByzantiumState
+)
+
+from .computation import PetersburgComputation
+
+
+class PetersburgState(ByzantiumState):
+    computation_class = PetersburgComputation
diff --git a/eth/vm/forks/petersburg/transactions.py b/eth/vm/forks/petersburg/transactions.py
@@ -0,0 +1,42 @@
+from eth_keys.datatypes import PrivateKey
+from eth_typing import Address
+
+from eth.vm.forks.byzantium.transactions import (
+    ByzantiumTransaction,
+    ByzantiumUnsignedTransaction,
+)
+
+from eth._utils.transactions import (
+    create_transaction_signature,
+)
+
+
+class PetersburgTransaction(ByzantiumTransaction):
+    @classmethod
+    def create_unsigned_transaction(cls,
+                                    *,
+                                    nonce: int,
+                                    gas_price: int,
+                                    gas: int,
+                                    to: Address,
+                                    value: int,
+                                    data: bytes) -> 'PetersburgUnsignedTransaction':
+        return PetersburgUnsignedTransaction(nonce, gas_price, gas, to, value, data)
+
+
+class PetersburgUnsignedTransaction(ByzantiumUnsignedTransaction):
+    def as_signed_transaction(self,
+                              private_key: PrivateKey,
+                              chain_id: int=None) -> PetersburgTransaction:
+        v, r, s = create_transaction_signature(self, private_key, chain_id=chain_id)
+        return PetersburgTransaction(
+            nonce=self.nonce,
+            gas_price=self.gas_price,
+            gas=self.gas,
+            to=self.to,
+            value=self.value,
+            data=self.data,
+            v=v,
+            r=r,
+            s=s,
+        )
diff --git a/fixtures b/fixtures
@@ -1 +1 @@
-Subproject commit 725dbc73a54649e22a00330bd0f4d6699a5060e5
+Subproject commit 6b85703b568f4456582a00665d8a3e5c3b20b484
diff --git a/tests/core/tester/test_generate_vm_configuration.py b/tests/core/tester/test_generate_vm_configuration.py
@@ -16,6 +16,7 @@ class Forks(enum.Enum):
     SpuriousDragon = 3
     Byzantium = 4
     Constantinople = 5
+    Petersburg = 6
 
 
 class CustomFrontierVM(FrontierVM):
@@ -28,7 +29,7 @@ class CustomFrontierVM(FrontierVM):
         (
             tuple(),
             {},
-            ((0, Forks.Constantinople),),
+            ((0, Forks.Petersburg),),
         ),
         (
             ((0, 'tangerine-whistle'), (1, 'spurious-dragon')),
@@ -109,6 +110,23 @@ class CustomFrontierVM(FrontierVM):
                 (3, Forks.Byzantium),
             ),
         ),
+        (
+            (
+                (0, 'frontier'),
+                (1, 'homestead'),
+                (2, 'tangerine-whistle'),
+                (3, 'byzantium'),
+                (5, 'petersburg')
+            ),
+            {},
+            (
+                (0, Forks.Frontier),
+                (1, Forks.Homestead),
+                (2, Forks.TangerineWhistle),
+                (3, Forks.Byzantium),
+                (5, Forks.Petersburg),
+            ),
+        ),
     ),
 )
 def test_generate_vm_configuration(args, kwargs, expected):
@@ -142,6 +160,8 @@ def test_generate_vm_configuration(args, kwargs, expected):
             assert 'Byzantium' in left_vm.__name__
         elif right_vm == Forks.Constantinople:
             assert 'Constantinople' in left_vm.__name__
+        elif right_vm == Forks.Petersburg:
+            assert 'Petersburg' in left_vm.__name__
         elif right_vm == Forks.Custom:
             assert 'CustomFrontier' in left_vm.__name__
         else:

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,6 @@`
`39`	`39`	`BYZANTIUM_MAINNET_BLOCK = BlockNumber(4370000)`
`40`	`40`
`41`	`41`	`#`
`42`		`-# Constantinople Block`
	`42`	`+# Petersburg Block`
`43`	`43`	`#`
`44`		`-CONSTANTINOPLE_MAINNET_BLOCK = BlockNumber(9876543210)`
	`44`	`+PETERSBURG_MAINNET_BLOCK = BlockNumber(7280000)`
Original file line number	Diff line number	Diff line change
`@@ -16,3 +16,6 @@`
`16`	`16`	`from .constantinople import ( # noqa: F401`
`17`	`17`	`ConstantinopleVM,`
`18`	`18`	`)`
	`19`	`+from .petersburg import ( # noqa: F401`
	`20`	`+ PetersburgVM,`
	`21`	`+)`