dirty

evm/chains/mainnet/__init__.py

@@ -5,6 +5,7 @@
     EIP150VM,
     FrontierVM,
     HomesteadVM,
+    SpuriousDragonVM,
 )
 
 
@@ -13,6 +14,7 @@
     vm_configuration=(
         (0, FrontierVM),
         (constants.HOMESTEAD_MAINNET_BLOCK, HomesteadVM),
-        (constants.EIP150_MAINNET_BLOCK, EIP150VM)
+        (constants.EIP150_MAINNET_BLOCK, EIP150VM),
+        (constants.SPURIOUS_DRAGON_MAINNET_BLOCK, SpuriousDragonVM),
     )
 )

evm/constants.py

@@ -181,3 +181,9 @@
 # EIP150
 #
 EIP150_MAINNET_BLOCK = 2463000
+
+
+#
+# Spurious Dragon
+#
+SPURIOUS_DRAGON_MAINNET_BLOCK = 2675000

evm/vm/forks/__init__.py

@@ -7,3 +7,6 @@
 from .homestead import (  # noqa: F401
     HomesteadVM,
 )
+from .spurious_dragon import (  # noqa: F401
+    SpuriousDragonVM,
+)

evm/vm/forks/spurious_dragon/__init__.py

@@ -0,0 +1,9 @@
+from ..homestead import HomesteadVM
+
+from .blocks import SpuriousDragonBlock
+
+
+SpuriousDragonVM = HomesteadVM.configure(
+    name='SpuriousDragonVM',
+    _block_class=SpuriousDragonBlock,
+)

evm/vm/forks/spurious_dragon/blocks.py

@@ -0,0 +1,21 @@
+from rlp.sedes import (
+    CountableList,
+)
+from evm.rlp.headers import (
+    BlockHeader,
+)
+from evm.vm.forks.homestead.blocks import (
+    HomesteadBlock,
+)
+from .transactions import (
+    SpuriousDragonTransaction,
+)
+
+
+class SpuriousDragonBlock(HomesteadBlock):
+    transaction_class = SpuriousDragonTransaction
+    fields = [
+        ('header', BlockHeader),
+        ('transactions', CountableList(SpuriousDragonTransaction)),
+        ('uncles', CountableList(BlockHeader))
+    ]

evm/vm/forks/spurious_dragon/transactions.py

@@ -5,6 +5,7 @@
 
 from evm.utils.transactions import (
     create_transaction_signature,
+    create_eip155_transaction_signature,
     is_eip_155_signed_transaction,
     validate_eip155_transaction_signature,
     validate_transaction_signature,
@@ -22,6 +23,12 @@ def as_unsigned_transaction(self):
             data=self.data,
         )
 
+    def check_signature_validity(self):
+        if is_eip_155_signed_transaction(self):
+            validate_eip155_transaction_signature(self)
+        else:
+            validate_transaction_signature(self)
+
     @classmethod
     def create_unsigned_transaction(cls, nonce, gas_price, gas, to, value, data):
         return HomesteadUnsignedTransaction(nonce, gas_price, gas, to, value, data)
@@ -31,16 +38,16 @@ class SpuriousDragonUnsignedTransaction(HomesteadUnsignedTransaction):
     def as_signed_transaction(self, private_key, chain_id=None):
         if chain_id is None:
             v, r, s = create_transaction_signature(self, private_key)
-            return SpuriousDragonTransaction(
-                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,
-            )
         else:
-            raise NotImplementedError("Have not implemented EIP155 signing")
+            v, r, s = create_eip155_transaction_signature(self, private_key)
+        return SpuriousDragonTransaction(
+            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,
+        )

tests/json-fixtures/test_blockchain.py

@@ -19,6 +19,7 @@
     EIP150VM,
     FrontierVM,
     HomesteadVM,
+    SpuriousDragonVM,
 )
 from evm.rlp.headers import (
     BlockHeader,

tests/json-fixtures/test_state.py

@@ -23,6 +23,7 @@
     EIP150VM,
     FrontierVM,
     HomesteadVM,
+    SpuriousDragonVM,
 )
 from evm.rlp.headers import (
     BlockHeader,
@@ -134,6 +135,10 @@ def get_block_hash_for_testing(self, block_number):
     name='EIP150VMForTesting',
     get_ancestor_hash=get_block_hash_for_testing,
 )
+SpuriousDragonVMForTesting = SpuriousDragonVM.configure(
+    name='SpuriousDragonVMForTesting',
+    get_ancestor_hash=get_block_hash_for_testing,
+)
 
 
 ChainForTesting = Chain.configure(
@@ -142,6 +147,7 @@ def get_block_hash_for_testing(self, block_number):
         (constants.GENESIS_BLOCK_NUMBER, FrontierVMForTesting),
         (constants.HOMESTEAD_MAINNET_BLOCK, HomesteadVMForTesting),
         (constants.EIP150_MAINNET_BLOCK, EIP150VMForTesting),
+        (constants.SPURIOUS_DRAGON_MAINNET_BLOCK, SpuriousDragonVMForTesting),
     ),
 )