Fixed some more block test bugs

Author: vbuterin

ethereum/common.py

@@ -81,8 +81,8 @@ def validate_header(state, header):
         if not check_gaslimit(parent, header.gas_limit, config=state.config):
             raise ValueError("Block's gaslimit is inconsistent with its parent's gaslimit")
         if header.difficulty != calc_difficulty(parent, header.timestamp, config=state.config):
-            raise ValueError("Block's difficulty is inconsistent with its parent's difficulty: parent %d expected %d actual %d" %
-                             (parent.difficulty, calc_difficulty(parent, header.timestamp, config=state.config), header.difficulty))
+            raise ValueError("Block's difficulty is inconsistent with its parent's difficulty: parent %d expected %d actual %d. Time diff %d" %
+                             (parent.difficulty, calc_difficulty(parent, header.timestamp, config=state.config), header.difficulty, header.timestamp - parent.timestamp))
         if header.gas_used > header.gas_limit:
             raise ValueError("Gas used exceeds gas limit")
         if len(header.extra_data) > 32 and not state.is_SERENITY():

ethereum/config.py

@@ -61,7 +61,7 @@
     METROPOLIS_DIFF_ADJUSTMENT_CUTOFF=9,
     # DAO fork
     DAO_FORK_BLKNUM = 1920000,
-    CHILD_DAO_LIST = map(utils.normalize_address, child_dao_list),
+    CHILD_DAO_LIST = list(map(utils.normalize_address, child_dao_list)),
     DAO_WITHDRAWER = utils.normalize_address('0xbf4ed7b27f1d666546e30d74d50d173d20bca754'),
     # Anti-DoS fork
     ANTI_DOS_FORK_BLKNUM = 2463000,

ethereum/messages.py

@@ -105,8 +105,8 @@ def bloom(self):
         return bloom.bloom_from_list(utils.flatten(bloomables))
 
 def mk_receipt(state, logs):
-    if state.is_METROPOLIS() or SKIP_RECEIPT_ROOT_VALIDATION:
-        return Receipt('\x00' * 32, state.gas_used, logs)
+    # if state.is_METROPOLIS() or SKIP_RECEIPT_ROOT_VALIDATION:
+    #     return MetropolisReceipt(state.gas_used, logs)
     return Receipt(state.trie.root_hash, state.gas_used, logs)
 
 def config_fork_specific_validation(config, blknum, tx):

ethereum/pow/consensus.py

@@ -86,6 +86,8 @@ def validate_uncles(state, block):
             raise VerificationFailed("Timestamp mismatch")
         if uncle.hash in ineligible:
             raise VerificationFailed("Duplicate uncle")
+        if uncle.gas_used > uncle.gas_limit:
+            raise VerificationFailed("Uncle used too much gas")
         if not check_pow(state, uncle):
             raise VerificationFailed('uncle pow mismatch')
         ineligible.append(uncle.hash)

ethereum/tests/test_blocks.py

@@ -102,17 +102,18 @@ def run_block_test(params, config_overrides=None):
 
 def get_config_overrides(filename, testname):
     o = {}
-    if 'Homestead' in testname:
-        o['HOMESTEAD_FORK_BLKNUM'] = 0
     if 'TestNetwork' in filename:
         o['HOMESTEAD_FORK_BLKNUM'] = 5
-        if 'EIP150' in filename:
-            o['DAO_FORK_BLKNUM'] = 8
-            o['ANTI_DOS_FORK_BLKNUM'] = 10
-    elif 'EIP150' in testname:
+        # o['DAO_FORK_BLKNUM'] = 8
+        o['ANTI_DOS_FORK_BLKNUM'] = 10
+        o['CLEARING_FORK_BLKNUM'] = 14
+        o['METROPOLIS_FORK_BLKNUM'] = 16
+    elif 'EIP150' in filename or 'EIP150' in testname:
         o['HOMESTEAD_FORK_BLKNUM'] = 0
         o['DAO_FORK_BLKNUM'] = 2**99
         o['ANTI_DOS_FORK_BLKNUM'] = 0
+    elif 'Homestead' in filename or 'Homestead' in testname:
+        o['HOMESTEAD_FORK_BLKNUM'] = 0
     elif 'EIP158' in testname:
         o['HOMESTEAD_FORK_BLKNUM'] = 0
         o['DAO_FORK_BLKNUM'] = 2**99