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

Author: vub

ethereum/casper_utils.py

@@ -66,7 +66,7 @@ def get_casper_ct():
 class RandaoManager():
 
     def __init__(self, seed, rounds=10**4+1):
-        self.medstate = []        
+        self.medstate = []
         for i in range(rounds):
             if not i % RANDAO_SAVE_INTERVAL:
                 self.medstate.append(seed)

ethereum/config.py

@@ -63,7 +63,7 @@
     DAO_WITHDRAWER = utils.normalize_address('0xbf4ed7b27f1d666546e30d74d50d173d20bca754'),
     # Header validation: ethereum 1.0, contract
     HEADER_VALIDATION = 'ethereum1',
-    # Post-seal finalization: ethereum 1.0, contract
+    # Pre-seal finalization: ethereum 1.0, contract
     FINALIZATION = 'ethereum1',
     # Default consensus strategy: ethash, poa, casper, pbft
     CONSENSUS_STRATEGY = 'ethereum1',

ethereum/state_transition.py

@@ -78,6 +78,11 @@ def pre_seal_finalize(state, block):
             state.delta_balance(uncle.coinbase, r)
         if state.block_number - state.config['MAX_UNCLE_DEPTH'] in state.recent_uncles:
             del state.recent_uncles[state.block_number - state.config['MAX_UNCLE_DEPTH']]
+    elif state.config['FINALIZATION'] == 'contract':
+        pass
+    else:
+        raise Exception("Pre-seal finalization strategy %s not supported " % state.config['FINALIZATION'])
+
     state.commit()