Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade py-evm to alpha 33 #134

Merged
merged 2 commits into from
Oct 4, 2018
Merged

Upgrade py-evm to alpha 33 #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcd1aba
Upgrade py-evm to alpha 33
carver Oct 4, 2018
fca1214
setting canonical head now needs db arg, in py-evm
carver Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions eth_tester/backends/pyevm/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'",
],
Expand Down Expand Up @@ -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",
Expand Down