Merge pull request #1979 from carver/uncle-timestamp-check

Fix uncle timestamp check against its parent

Author: carver

eth/vm/base.py

@@ -634,10 +634,10 @@ def validate_uncle(cls,
                 f"Uncle number ({uncle.block_number}) is not one above "
                 f"ancestor's number ({uncle_parent.block_number})"
             )
-        if uncle.timestamp < uncle_parent.timestamp:
+        if uncle.timestamp <= uncle_parent.timestamp:
             raise ValidationError(
-                f"Uncle timestamp ({uncle.timestamp}) is before "
-                f"ancestor's timestamp ({uncle_parent.timestamp})"
+                f"Uncle timestamp ({uncle.timestamp}) is not newer than its "
+                f"parent's timestamp ({uncle_parent.timestamp})"
             )
         if uncle.gas_used > uncle.gas_limit:
             raise ValidationError(

newsfragments/1979.bugfix.rst

@@ -0,0 +1,2 @@
+Uncles with the same timestamp as their parents are invalid. Reject them, and add the test from
+ethereum/tests.

tests/json-fixtures/test_blockchain.py

@@ -196,12 +196,6 @@
     # but only in Istanbul, not in Constantinople.
     ('GeneralStateTests/stSStoreTest/InitCollision.json', 'InitCollision_d2g0v0_Istanbul'),
     ('GeneralStateTests/stSStoreTest/InitCollision.json', 'InitCollision_d3g0v0_Istanbul'),
-    # It's not clear how or why this test changed. It doesn't make sense that it only tests Istanbul
-    # either. See: https://github.com/ethereum/tests/issues/787
-    # The test seems to claim to test what happens if the uncle timestamp is the same as
-    # the block, but the RLP doesn't encode a matching timestamp.
-    ('InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp.json', 'incorrectUncleTimestamp_Istanbul'),  # noqa: E501
-    ('InvalidBlocks/bcUncleHeaderValidity/incorrectUncleTimestamp.json', 'incorrectUncleTimestamp_Berlin'),  # noqa: E501
 }