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

Author: vbuterin

ethereum/tools/tester2.py

@@ -112,7 +112,7 @@ def __init__(self, alloc=None, env=None):
 
     @property
     def last_tx(self):
-        return self.txs_this_block[-1] if self.txs_this_block else None
+        return self.block.transactions[-1] if self.block.transactions else None
 
     def tx(self, sender=k0, to=b'\x00' * 20, value=0, data=b'', startgas=STARTGAS, gasprice=GASPRICE):
         sender_addr = privtoaddr(sender)
@@ -135,7 +135,7 @@ def contract(self, sourcecode, args=[], sender=k0, value=0, language='evm', star
             code = compiler.compile(sourcecode) + (ct.encode_constructor_arguments(args) if args else b'')
             addr = self.tx(sender=sender, to=b'', value=value, data=code, startgas=startgas, gasprice=gasprice)
             return ABIContract(self, ct, addr)
-        
+
     def mine(self, number_of_blocks=1, coinbase=a0):
         self.cs.finalize(self.head_state, self.block)
         set_execution_results(self.head_state, self.block)
@@ -151,6 +151,7 @@ def mine(self, number_of_blocks=1, coinbase=a0):
         self.cs.initialize(self.head_state, self.block)
 
     def snapshot(self):
+        self.head_state.commit()
         return self.head_state.snapshot(), len(self.block.transactions), self.block.number
 
     def revert(self, snapshot):