Don't check Shanghai when there is already EOF code in state

ethereum · Mar 31, 2023 · 1e08b48 · 1e08b48
1 parent b1514a3
commit 1e08b48
Show file tree

Hide file tree

Showing 12 changed files with 323 additions and 6,425 deletions.
diff --git a/EIPTests/BlockchainTests/StateTests/stEOF/stEIP3540/EOF1_Calls.json b/EIPTests/BlockchainTests/StateTests/stEOF/stEIP3540/EOF1_Calls.json
diff --git a/EIPTests/BlockchainTests/StateTests/stEOF/stEIP3540/EOF1_Execution.json b/EIPTests/BlockchainTests/StateTests/stEOF/stEIP3540/EOF1_Execution.json
diff --git a/EIPTests/StateTests/stEOF/stEIP3540/CREATE2_EOF1.json b/EIPTests/StateTests/stEOF/stEIP3540/CREATE2_EOF1.json
@@ -2,7 +2,7 @@
     "CREATE2_EOF1" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.11.0-unstable-c686236b-20230317",
+            "filling-rpc-server" : "evm version 1.11.0-unstable-dd96c2b0-20230329",
             "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.ffa35995.Linux.g++",
             "generatedTestHash" : "0fbcecf6b337960a784815ec59e37565c51a26bc1a912303901f39988071786b",
             "labels" : {

diff --git a/EIPTests/StateTests/stEOF/stEIP3540/CREATE2_EOF1_FromEOF.json b/EIPTests/StateTests/stEOF/stEIP3540/CREATE2_EOF1_FromEOF.json
@@ -2,7 +2,7 @@
     "CREATE2_EOF1_FromEOF" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.11.0-unstable-c686236b-20230317",
+            "filling-rpc-server" : "evm version 1.11.0-unstable-dd96c2b0-20230329",
             "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.ffa35995.Linux.g++",
             "generatedTestHash" : "ef400f5e125cdf9bf00099e06c17bd1bd209836f16b99780684f27a8057f5d53",
             "labels" : {

diff --git a/EIPTests/StateTests/stEOF/stEIP3540/CREATE_EOF1.json b/EIPTests/StateTests/stEOF/stEIP3540/CREATE_EOF1.json
@@ -2,7 +2,7 @@
     "CREATE_EOF1" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.11.0-unstable-c686236b-20230317",
+            "filling-rpc-server" : "evm version 1.11.0-unstable-dd96c2b0-20230329",
             "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.ffa35995.Linux.g++",
             "generatedTestHash" : "5b6a423e00769c55f89a799066a1048b0b91a5601a780a97ef34dcb8c9e2db97",
             "labels" : {

diff --git a/EIPTests/StateTests/stEOF/stEIP3540/CREATE_EOF1_FromEOF.json b/EIPTests/StateTests/stEOF/stEIP3540/CREATE_EOF1_FromEOF.json
@@ -2,7 +2,7 @@
     "CREATE_EOF1_FromEOF" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.11.0-unstable-c686236b-20230317",
+            "filling-rpc-server" : "evm version 1.11.0-unstable-dd96c2b0-20230329",
             "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.ffa35995.Linux.g++",
             "generatedTestHash" : "e7d9cf077fb7bf6c4f6100f9716fa4d8d2623fb6059d0ff4faaaa19111099dcb",
             "labels" : {

diff --git a/EIPTests/StateTests/stEOF/stEIP3540/CreateTransactionEOF1.json b/EIPTests/StateTests/stEOF/stEIP3540/CreateTransactionEOF1.json
@@ -2,7 +2,7 @@
     "CreateTransactionEOF1" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.11.0-unstable-c686236b-20230317",
+            "filling-rpc-server" : "evm version 1.11.0-unstable-dd96c2b0-20230329",
             "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.ffa35995.Linux.g++",
             "generatedTestHash" : "fd2ceeb793d2b41f1e1696604aabc270d64d155dc8b2e11b3c390d6dba8bdb8f",
             "labels" : {

diff --git a/EIPTests/StateTests/stEOF/stEIP3540/CreateTransactionInvalidEOF1.json b/EIPTests/StateTests/stEOF/stEIP3540/CreateTransactionInvalidEOF1.json
@@ -2,7 +2,7 @@
     "CreateTransactionInvalidEOF1" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.11.0-unstable-c686236b-20230317",
+            "filling-rpc-server" : "evm version 1.11.0-unstable-dd96c2b0-20230329",
             "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.ffa35995.Linux.g++",
             "generatedTestHash" : "fd586f4fcee0c439dca53033f0bb1b213e9fa06ecf975c2801a8e7d681f71357",
             "lllcversion" : "Version: 0.5.14-develop.2022.4.6+commit.401d5358.Linux.g++",

diff --git a/EIPTests/StateTests/stEOF/stEIP3540/EOF1_Calls.json b/EIPTests/StateTests/stEOF/stEIP3540/EOF1_Calls.json
@@ -2,9 +2,9 @@
     "EOF1_Calls" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.11.0-unstable-c686236b-20230317",
+            "filling-rpc-server" : "evm version 1.11.0-unstable-dd96c2b0-20230329",
             "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.ffa35995.Linux.g++",
-            "generatedTestHash" : "9108087bc5d8a0bc009fdc3e34e3df63359f674ebe9f59d6d81af08ef39cf45f",
+            "generatedTestHash" : "5a2b6aa6acb70636f6875bad469b27cb92b7c5a114fed513cb4f58d2d8c504a6",
             "labels" : {
                 "0" : "legacy_call_eof",
                 "1" : "legacy_delegatecall_eof",
@@ -22,7 +22,7 @@
             "lllcversion" : "Version: 0.5.14-develop.2022.4.6+commit.401d5358.Linux.g++",
             "solidity" : "Version: 0.8.18-develop.2023.1.16+commit.469d6d4d.Linux.g++",
             "source" : "src/EIPTestsFiller/StateTests/stEOF/stEIP3540/EOF1_CallsFiller.yml",
-            "sourceHash" : "d86aa2172627031a3ef097da79811ddd56f8c8448b1bc5d39c0eaea44e968c16"
+            "sourceHash" : "d5b369f884874ab4880de23816090eb731261c7f56d1077fab1bc96b3006886e"
         },
         "env" : {
             "currentBaseFee" : "0x0a",
@@ -156,48 +156,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
                     "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094344f5374fce5edbc8e2a8697c15331677e6ebf0b1ca0aa3f136330dfa79669933acde4f35a07c68d48b6c27b25ba9aacfb0b0858ea7fa02a34c634a0b24289cf8289f36e298abcb82f42fdf6870fe39eebf1af6c7ecfd2"
                 }
-            ],
-            "Shanghai" : [
-                {
-                    "hash" : "0xe37f3dc2d528d0c498a410496220e068901a61b5b3639e895fad6a346bfe0c5e",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094104f5374fce5edbc8e2a8697c15331677e6ebf0b1ca0ce2c66a62aa87b5e0c5abb6d9527ace59853df769ae181a264e9e0e9fc8e37b3a068c5c62e7d9de5d12d94a75c618cbc0f2cbbd0cdba96415d21203e72afa30eb2"
-                },
-                {
-                    "hash" : "0x9419b8701adaaae26b2184b581ad1c2288fcb497f3639e0f46dac752db65d045",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094124f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0ac577688cc8ec39c276b2ed149715e13ced201ab42dce4bd7c3b3c36cdd89753a01eae0d47f898845a0039e8f69cf4504f18b8ca5c8278c787d06df25588adba3f"
-                },
-                {
-                    "hash" : "0x0962da7c23d7bfdaf315ddea7fc99b131fcc78274800a761b6d82d6b77fb9b2b",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094134f5374fce5edbc8e2a8697c15331677e6ebf0b1ba07065a253ba1aea8997aa343a2af047abdca549fc009c6597282765b6994f349ea011f1d67ce5e9970ec4be5c53f39c5acae07522aa1dea6404c691323807993ded"
-                },
-                {
-                    "hash" : "0x07c8b4af7a6ce6588383b205156d3c49e43f51d183fc6b2c7b67db4957a0edec",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094144f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0d8f06ae1f1b349d8a869cdbd62d3769e87d020402b321139d0adcaf5b426f080a05faddd63ba05303f92a1c6c956527037ca56e2aa5cd2bfa77e461eb245572575"
-                }
             ]
         },
         "pre" : {

diff --git a/EIPTests/StateTests/stEOF/stEIP3540/EOF1_Execution.json b/EIPTests/StateTests/stEOF/stEIP3540/EOF1_Execution.json
@@ -2,9 +2,9 @@
     "EOF1_Execution" : {
         "_info" : {
             "comment" : "",
-            "filling-rpc-server" : "evm version 1.11.0-unstable-c686236b-20230317",
+            "filling-rpc-server" : "evm version 1.11.0-unstable-dd96c2b0-20230329",
             "filling-tool-version" : "retesteth-0.3.0-shanghai+commit.ffa35995.Linux.g++",
-            "generatedTestHash" : "07ca131520a12239d1e113eac82b822553fff45da173d4ed49c419a3512e412e",
+            "generatedTestHash" : "9029344f1fac8bb20b28e43ace9dee9b24e865bbd68a6fa8f0fc0a6617af3d9e",
             "labels" : {
                 "0" : "basic_valid_eof",
                 "1" : "basic_valid_eof_with_data",
@@ -24,7 +24,7 @@
             "lllcversion" : "Version: 0.5.14-develop.2022.4.6+commit.401d5358.Linux.g++",
             "solidity" : "Version: 0.8.18-develop.2023.1.16+commit.469d6d4d.Linux.g++",
             "source" : "src/EIPTestsFiller/StateTests/stEOF/stEIP3540/EOF1_ExecutionFiller.yml",
-            "sourceHash" : "561eb5a76bf11cc5b451da15567754c28dde0dbb58e2563e0055c722f629c38a"
+            "sourceHash" : "d6bda6037f81b05ed1ba9db5e94881aa6538630badc1bed55d292d915e876e1d"
         },
         "env" : {
             "currentBaseFee" : "0x0a",
@@ -178,148 +178,6 @@
                     "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
                     "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094674f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0e411a17a9c48a18ca17de3d65d0a123fc5507b5fe3a9155336c83d28e9a38895a026bdbcb958773c3158e3b848dce7b93957b5efcafa205eafb0dc231a18092914"
                 }
-            ],
-            "Shanghai" : [
-                {
-                    "hash" : "0x960914177920d6715543a9c94375f65612f74feab8013edca17964adb985fe49",
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094c94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba00f2fcdd4b12c82b225c6fa285c8bb5ec12173696d7e4dbca308a32dae03f2a8fa036144afe01bd2cba73e7afe4cefaeb5051f19c07cc4d81a508bdb50cfcd5451d"
-                },
-                {
-                    "hash" : "0x960914177920d6715543a9c94375f65612f74feab8013edca17964adb985fe49",
-                    "indexes" : {
-                        "data" : 1,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094d94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0bbdf9288646d44d3c72bb330001f8fee4d4f89981a89ab4890bf99efd34fe019a06738f208dc53a57ec8d4924be148cb3242f8b85bbb468a02227b708ae8c3d79a"
-                },
-                {
-                    "hash" : "0x960914177920d6715543a9c94375f65612f74feab8013edca17964adb985fe49",
-                    "indexes" : {
-                        "data" : 2,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094024f5374fce5edbc8e2a8697c15331677e6ebf0b1ca0ddda9fbf42a2c4959c273d72edf8ce7b5c232f136650b4b3525add61ea0801fba04425c0b7a23e0db9c78a6cf9eff0462423b24f82fac1b6ba97cd0a06dfec7612"
-                },
-                {
-                    "hash" : "0x960914177920d6715543a9c94375f65612f74feab8013edca17964adb985fe49",
-                    "indexes" : {
-                        "data" : 3,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094504f5374fce5edbc8e2a8697c15331677e6ebf0b1ca0529c826a2f39e5bd46c7244e8b4b14eb7b39e7a4c159857fc4bdcc0f0b59418ca01b5d2c1c1ff3633624d98c872ba37144441550a27bc61bea58a81dc22e17f6a3"
-                },
-                {
-                    "hash" : "0x960914177920d6715543a9c94375f65612f74feab8013edca17964adb985fe49",
-                    "indexes" : {
-                        "data" : 4,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094514f5374fce5edbc8e2a8697c15331677e6ebf0b1ba06c613003f07b4c58deecacc57c301179746a846e8b1287a992e5f676ef33fcf1a00ea490e8676098885825204bcb04cc035871738eb777cfa40ad1370aff8a1106"
-                },
-                {
-                    "hash" : "0x960914177920d6715543a9c94375f65612f74feab8013edca17964adb985fe49",
-                    "indexes" : {
-                        "data" : 5,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094524f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0f019a173f1ade159a89ce883a63b6d5a9f0485e26e9e520a5fded126810ba89ba07179096d67a415bd915faeb54c1bfe701ccd145b5bb32cb59dc33da1be48ef7b"
-                },
-                {
-                    "hash" : "0x8f03be16e0daa991ac8958670aad5832006f7f0eaf6cb95117fb123ed7936af1",
-                    "indexes" : {
-                        "data" : 6,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094604f5374fce5edbc8e2a8697c15331677e6ebf0b1ba05bed551950fdeb8a2e00c01b418e5437c91d2cafd65eb1ed8c56ad20a763a5eaa04318456a5b830203df765194dbeb83c58a396118efb61fa1db38ef10a03d326f"
-                },
-                {
-                    "hash" : "0x960914177920d6715543a9c94375f65612f74feab8013edca17964adb985fe49",
-                    "indexes" : {
-                        "data" : 7,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094614f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0481bd123f8e9c84f507324c9f5000acb635fa9025ddf1171acb16cce22243460a0118c991fe65e29cab0b39a251c8e5057b3b5c06550f40eb7152843336fadf527"
-                },
-                {
-                    "hash" : "0x9ed69ddad8131b3ad75e137a1346f0fb4f98565e9ff79a9e63c4b5c569b30b9f",
-                    "indexes" : {
-                        "data" : 8,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094624f5374fce5edbc8e2a8697c15331677e6ebf0b1ca05d3d57e2e62661735a1b51901f4ee7e6af4cb4a5b4f307fe7dae5b1082935c40a04e89f86c38132944ad4d92a4d7b383e976abd7c676a5981e0f13a6cbc7fdf07d"
-                },
-                {
-                    "hash" : "0x960914177920d6715543a9c94375f65612f74feab8013edca17964adb985fe49",
-                    "indexes" : {
-                        "data" : 9,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094634f5374fce5edbc8e2a8697c15331677e6ebf0b1ba06c182d4bd2987caa55a7e1c4c8652d15e125d0fc8bb28ed2c57cb8e500655462a03ec200e4f10ab33e4d3e414a88883d47faaa1eabbf58c26c01a90fd8444f5c36"
-                },
-                {
-                    "hash" : "0xedc64c7cfec55db003d763a79c4143f2272a2038b5e6a6a713016d90e8174129",
-                    "indexes" : {
-                        "data" : 10,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094644f5374fce5edbc8e2a8697c15331677e6ebf0b1ca056dd2833f1a7aac465f96308f049f18de8a0df6e18f9864664f41e5b553fc7c6a0455e0d8361e7839de2f16e4bf0ca9b196b75f32d9994524f67b4cc40a331c4de"
-                },
-                {
-                    "hash" : "0x960914177920d6715543a9c94375f65612f74feab8013edca17964adb985fe49",
-                    "indexes" : {
-                        "data" : 11,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094654f5374fce5edbc8e2a8697c15331677e6ebf0b1ba08b6504c574b41e0d661a61accc0f42ea8c5672fa6911bb76c5f4e42eecca553aa049a5c5fc75958c321ffec2733712582156027b649c3d3aeee5f6becdfa79eeca"
-                },
-                {
-                    "hash" : "0x3ad3b60a1540407a953251bab66d740e785c5b0baff57626adbc0830cfd1b6d3",
-                    "indexes" : {
-                        "data" : 12,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094664f5374fce5edbc8e2a8697c15331677e6ebf0b1ba07b25bb17aeaeabcfe5c302fbd30f06e4624badec74008348342a7aff10f0b203a00e0cef1ccb2a85facc935f973cfec336d28ea476c29a71b3053200580d7b58a9"
-                },
-                {
-                    "hash" : "0x960914177920d6715543a9c94375f65612f74feab8013edca17964adb985fe49",
-                    "indexes" : {
-                        "data" : 13,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-                    "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094674f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0e411a17a9c48a18ca17de3d65d0a123fc5507b5fe3a9155336c83d28e9a38895a026bdbcb958773c3158e3b848dce7b93957b5efcafa205eafb0dc231a18092914"
-                }
             ]
         },
         "pre" : {