Merge branch 'develop' of github.com:ethereum/pyethereum into develop

Author: vbuterin

ethereum/state.py

@@ -258,8 +258,11 @@ def revert(self, snapshot):
         h, L, auxvars = snapshot
         three_touched = self.cache[THREE].touched if THREE in self.cache else False # Compatibility with weird geth+parity bug
         while len(self.journal) > L:
-            lastitem = self.journal.pop()
-            lastitem()
+            try:
+                lastitem = self.journal.pop()
+                lastitem()
+            except Exception as e:
+                print(e)
         if h != self.trie.root_hash:
             assert L == 0
             self.trie.root_hash = h

ethereum/tools/tester.py

@@ -57,7 +57,7 @@ class TransactionFailed(Exception):
 import types
 
 STARTGAS = 3141592
-GASPRICE = 1
+GASPRICE = 0
 
 from ethereum.slogging import configure_logging
 config_string = ':info'

ethereum/vm.py

@@ -637,7 +637,7 @@ def vm_execute(ext, msg, code):
                 # Get result
                 result, gas, data = ext.msg(call_msg)
                 if result == 0:
-                    stk.append(0)
+                    return vm_exception('Child Call Failed')
                 else:
                     stk.append(1)
                 # Set output memory