enable timestamp rules on Merge

ethereum · Jul 9, 2022 · 95a8490 · 95a8490
1 parent 27721a7
commit 95a8490
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 220 deletions.
diff --git a/BlockchainTests/InvalidBlocks/bcInvalidHeaderTest/badTimestamp.json b/BlockchainTests/InvalidBlocks/bcInvalidHeaderTest/badTimestamp.json
@@ -2,13 +2,13 @@
     "badTimestamp_London" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.10.20-unstable-e620fa39-20220624",
-            "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.7e597e14.Linux.g++",
+            "filling-rpc-server" : "evm version 1.10.21-unstable-692bfd1b-20220630",
+            "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.6c4094ab.Linux.g++",
             "generatedTestHash" : "d526cbb921b8c2e829931cbfb1966ef7b62f8807da3124ade216c3ecc4e51027",
             "lllcversion" : "Version: 0.5.14-develop.2022.6.6+commit.245805fe.Linux.g++",
             "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++",
             "source" : "src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/badTimestampFiller.yml",
-            "sourceHash" : "9dde9e3b4ecdc851aa454a29f393687b478c732b338cc9b5922628bdf7bf73c2"
+            "sourceHash" : "dae0e3f015489b418090e79e049cd77a047323395be465cd4996878af7394492"
         },
         "blocks" : [
             {
@@ -292,13 +292,13 @@
     "badTimestamp_Merge" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.10.20-unstable-e620fa39-20220624",
-            "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.7e597e14.Linux.g++",
-            "generatedTestHash" : "61885a3ec85a6e215e1815f59d3dc2c98fbfaf878d6fc01d162bf0259eb7a5da",
+            "filling-rpc-server" : "evm version 1.10.21-unstable-692bfd1b-20220630",
+            "filling-tool-version" : "retesteth-0.2.2-testinfo+commit.6c4094ab.Linux.g++",
+            "generatedTestHash" : "10e2afcd440ea016ea48f6b09d51a188d23ea7db474e5ad6c8c0b70b13d55e82",
             "lllcversion" : "Version: 0.5.14-develop.2022.6.6+commit.245805fe.Linux.g++",
             "solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++",
             "source" : "src/BlockchainTestsFiller/InvalidBlocks/bcInvalidHeaderTest/badTimestampFiller.yml",
-            "sourceHash" : "9dde9e3b4ecdc851aa454a29f393687b478c732b338cc9b5922628bdf7bf73c2"
+            "sourceHash" : "dae0e3f015489b418090e79e049cd77a047323395be465cd4996878af7394492"
         },
         "blocks" : [
             {
@@ -386,32 +386,10 @@
                 ]
             },
             {
-                "blockHeader" : {
-                    "baseFeePerGas" : "0x024c",
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x00",
-                    "extraData" : "0x42",
-                    "gasLimit" : "0x40000000",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x0e50c4ca4fa3a020a8992bea51d6cb213db3048c1c9728eb49bad88e9de28f5c",
-                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
-                    "nonce" : "0x0000000000000000",
-                    "number" : "0x04",
-                    "parentHash" : "0x7e259a4696b8d89d1fa892321e66221bfc4687d5c9369cc31c62fcc1a398d681",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa747ce876588c69e0ce10ce41ee889a0c1bec73edb598f389070381c77c8ccb9",
-                    "timestamp" : "0x608f3d3c",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
                 "blocknumber" : "4",
                 "chainname" : "default",
-                "rlp" : "0xf901fdf901f8a07e259a4696b8d89d1fa892321e66221bfc4687d5c9369cc31c62fcc1a398d681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a747ce876588c69e0ce10ce41ee889a0c1bec73edb598f389070381c77c8ccb9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800484400000008084608f3d3c42a0000000000000000000000000000000000000000000000000000000000002000088000000000000000082024cc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
+                "expectException" : "InvalidTimestampOlderParent",
+                "rlp" : "0xf901fdf901f8a07e259a4696b8d89d1fa892321e66221bfc4687d5c9369cc31c62fcc1a398d681a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a747ce876588c69e0ce10ce41ee889a0c1bec73edb598f389070381c77c8ccb9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800484400000008084608f3d3c42a0000000000000000000000000000000000000000000000000000000000002000088000000000000000082024cc0c0"
             },
             {
                 "blockHeader" : {
@@ -442,60 +420,16 @@
                 ]
             },
             {
-                "blockHeader" : {
-                    "baseFeePerGas" : "0x0203",
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x00",
-                    "extraData" : "0x42",
-                    "gasLimit" : "0x40000000",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x333ee7de9b113817677c8debbd04ef2d89b0d1cca882ad49d02e08a4598e67c9",
-                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
-                    "nonce" : "0x0000000000000000",
-                    "number" : "0x05",
-                    "parentHash" : "0xd68502ca2ed911692125eecafa37fc2d401aa335f110b038f2f5ec2805c55133",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa747ce876588c69e0ce10ce41ee889a0c1bec73edb598f389070381c77c8ccb9",
-                    "timestamp" : "0x608f4b0f",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
                 "blocknumber" : "5",
                 "chainname" : "default",
-                "rlp" : "0xf901fdf901f8a0d68502ca2ed911692125eecafa37fc2d401aa335f110b038f2f5ec2805c55133a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a747ce876588c69e0ce10ce41ee889a0c1bec73edb598f389070381c77c8ccb9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800584400000008084608f4b0f42a00000000000000000000000000000000000000000000000000000000000020000880000000000000000820203c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
+                "expectException" : "InvalidTimestampOlderParent",
+                "rlp" : "0xf901fdf901f8a0d68502ca2ed911692125eecafa37fc2d401aa335f110b038f2f5ec2805c55133a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a747ce876588c69e0ce10ce41ee889a0c1bec73edb598f389070381c77c8ccb9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800584400000008084608f4b0f42a00000000000000000000000000000000000000000000000000000000000020000880000000000000000820203c0c0"
             },
             {
-                "blockHeader" : {
-                    "baseFeePerGas" : "0x0203",
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x00",
-                    "extraData" : "0x42",
-                    "gasLimit" : "0x40000000",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x0633abf87497611c4ab4da7051ce08dce0a754a3b23510d961d19b2a315a6f4b",
-                    "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
-                    "nonce" : "0x0000000000000000",
-                    "number" : "0x05",
-                    "parentHash" : "0xd68502ca2ed911692125eecafa37fc2d401aa335f110b038f2f5ec2805c55133",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa747ce876588c69e0ce10ce41ee889a0c1bec73edb598f389070381c77c8ccb9",
-                    "timestamp" : "0x608f4b10",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
                 "blocknumber" : "5",
                 "chainname" : "default",
-                "rlp" : "0xf901fdf901f8a0d68502ca2ed911692125eecafa37fc2d401aa335f110b038f2f5ec2805c55133a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a747ce876588c69e0ce10ce41ee889a0c1bec73edb598f389070381c77c8ccb9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800584400000008084608f4b1042a00000000000000000000000000000000000000000000000000000000000020000880000000000000000820203c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
+                "expectException" : "InvalidTimestampOlderParent",
+                "rlp" : "0xf901fdf901f8a0d68502ca2ed911692125eecafa37fc2d401aa335f110b038f2f5ec2805c55133a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a747ce876588c69e0ce10ce41ee889a0c1bec73edb598f389070381c77c8ccb9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800584400000008084608f4b1042a00000000000000000000000000000000000000000000000000000000000020000880000000000000000820203c0c0"
             },
             {
                 "blockHeader" : {