fix genesis initialization

Author: Jan Xie

ethereum/chain.py

@@ -68,10 +68,14 @@ def __init__(self, genesis=None, env=None, coinbase=b'\x00' * 20, \
         if reset_genesis:
             self.genesis = Block(self.state.prev_headers[0], [], [])
             self.db.put('GENESIS_NUMBER', str(self.state.block_number))
-            self.db.put('GENESIS_HASH', str(self.state.prev_headers[0].hash))
-            self.db.put('score:' + self.state.prev_headers[0].hash, "0")
+            self.db.put('GENESIS_HASH', str(self.genesis.header.hash))
             self.db.put('GENESIS_STATE', json.dumps(self.state.to_snapshot()))
+            self.db.put('GENESIS_RLP', rlp.encode(self.genesis))
+            self.db.put('score:' + self.genesis.header.hash, "0")
+            self.db.put('state:' + self.genesis.header.hash, self.state.trie.root_hash)
+            self.db.put('block:0', self.genesis.header.hash)
             self.db.put(self.head_hash, 'GENESIS')
+            self.db.commit()
         else:
             self.genesis = self.get_block_by_number(0)
         self.min_gasprice = kwargs.get('min_gasprice', 5 * 10**9)
@@ -142,10 +146,13 @@ def get_block(self, blockhash):
         try:
             block_rlp = self.db.get(blockhash)
             if block_rlp == 'GENESIS':
+                if not hasattr(self, 'genesis'):
+                    self.genesis = rlp.decode(self.db.get('GENESIS_RLP'), sedes=Block)
                 return self.genesis
             else:
                 return rlp.decode(block_rlp, Block)
-        except:
+        except Exception as e:
+            log.debug("Failed to get block", hash=blockhash, error=e)
             return None
 
     # Add a record allowing you to later look up the provided block's
@@ -163,7 +170,7 @@ def add_child(self, child):
 
     def get_blockhash_by_number(self, number):
         try:
-            return self.db.get('blocknumber:' + str(number))
+            return self.db.get('block:' + str(number))
         except:
             return None
 

ethereum/snapshot.py

@@ -47,8 +47,7 @@ def create_snapshot(chain, recent=1024):
     assert recent > env.config['MAX_UNCLE_DEPTH']+2
 
     head_block = chain.head
-    base_block_hash = chain.index.get_block_by_number(max(head_block.number-recent, 0))
-    base_block = chain.get(base_block_hash)
+    base_block = chain.get_block_by_number(max(head_block.number-recent, 0))
 
     snapshot = create_env_snapshot(base_block)
     snapshot['base'] = create_base_snapshot(base_block)
@@ -60,7 +59,7 @@ def create_snapshot(chain, recent=1024):
 
 def create_env_snapshot(base):
     return {
-        'chainDifficulty': snapshot_form(base.chain_difficulty())
+        'chainDifficulty': snapshot_form(base.get_score())
     }