Merge pull request #134 from carver/upgrade-pyevm

Upgrade py-evm to alpha 33

Author: carver

eth_tester/backends/pyevm/main.py

@@ -347,12 +347,13 @@ def take_snapshot(self):
 
     def revert_to_snapshot(self, snapshot):
         block = self.chain.get_block_by_hash(snapshot)
+        chaindb = self.chain.chaindb
         if block.number > 0:
-            self.chain.chaindb._set_as_canonical_chain_head(block.header)
+            chaindb._set_as_canonical_chain_head(chaindb.db, block.header.hash)
             self.chain.import_block(block)
         else:
-            self.chain.chaindb._set_as_canonical_chain_head(block.header)
-            self.chain = self.chain.from_genesis_header(self.chain.chaindb.db, block.header)
+            chaindb._set_as_canonical_chain_head(chaindb.db, block.header.hash)
+            self.chain = self.chain.from_genesis_header(chaindb.db, block.header)
 
     #
     # Meta

setup.py

@@ -23,7 +23,7 @@
     'py-evm': [
         # Pin py-evm to exact version, until it leaves alpha.
         # EVM is very high velocity and might change API at each alpha.
-        "py-evm==0.2.0a32",
+        "py-evm==0.2.0a33",
         "eth-hash[pysha3]>=0.1.4,<1.0.0;implementation_name=='cpython'",
         "eth-hash[pycryptodome]>=0.1.4,<1.0.0;implementation_name=='pypy'",
     ],
@@ -52,7 +52,7 @@
     install_requires=[
         "toolz>0.8.2,<1;implementation_name=='pypy'",
         "cytoolz>=0.8.2,<1.0.0;implementation_name=='cpython'",
-        "eth-utils>=1.0.1,<2.0.0",
+        "eth-utils>=1.1.1,<2.0.0",
         "rlp>=0.6.0,<2.0.0",
         "semantic_version>=2.6.0,<3.0.0",
         "eth-keys>=0.2.0-beta.3,<0.3.0",