revert: uncles must not be siblings

Author: heikoheiko

ethereum/blocks.py

@@ -697,7 +697,8 @@ def validate_uncles(self, db=None):
         for uncle in self.uncles:
             assert db is None or uncle.prevhash in self.db
             if uncle.number == self.number:
-                log.warn("uncle at same block height", block=self)
+                log.error("uncle at same block height", block=self)
+                return False
 
         # Check uncle validity
         ancestor_chain = [a for a in self.get_ancestor_list(MAX_UNCLE_DEPTH + 1) if a]
@@ -707,7 +708,7 @@ def validate_uncles(self, db=None):
         for ancestor in ancestor_chain[1:]:
             ineligible.extend(ancestor.uncles)
         ineligible.extend([b.header for b in ancestor_chain])
-        eligible_ancestor_hashes = [x.hash for x in ancestor_chain[1:]]
+        eligible_ancestor_hashes = [x.hash for x in ancestor_chain[2:]]
         for uncle in self.uncles:
             if not uncle.check_pow(db=db):
                 return False