From e0d92e449b7673084b431f3aa4dc9ac3d6168298 Mon Sep 17 00:00:00 2001 From: pdobacz <5735525+pdobacz@users.noreply.github.com> Date: Tue, 13 Feb 2024 15:57:41 +0100 Subject: [PATCH] Update EXTCODE* tests (cherry picked from commit b1c41726c235ae722847293a4f17b060824c7817) --- .../stEOF/stEIP3540/EOF1_Execution.json | 52 +++++++++---------- .../stEOF/stEIP3540/EOF1_ExecutionFiller.yml | 22 ++++---- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/EIPTests/StateTests/stEOF/stEIP3540/EOF1_Execution.json b/EIPTests/StateTests/stEOF/stEIP3540/EOF1_Execution.json index cca0d3464f8..aafdf2bc7f9 100644 --- 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" : "evmone-t8n 0.12.0-dev+commit.14ba7529", - "filling-tool-version" : "retesteth-0.3.2-cancun+commit.9d793abd.Linux.g++", - "generatedTestHash" : "77040ebc814c48c868d431e0dd6063300d4e3221c66c6104d046fd6c05505238", + "filling-rpc-server" : "evmone-t8n 0.12.0-dev+commit.b67c8bbe", + "filling-tool-version" : "retesteth-0.3.2-cancun+commit.0abe77bb.Linux.g++", + "generatedTestHash" : "e2127d512c1bdc14c5eded6a42a76adaa2c048fe05f4e76412606fce498486e6", "labels" : { "0" : "basic_valid_eof", "1" : "basic_valid_eof_with_data", @@ -21,10 +21,10 @@ "8" : "extcodehash", "9" : "extcodehash_inside_eof" }, - "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++", + "lllcversion" : "Error getting LLLC Version", + "solidity" : "Version: 0.8.24+commit.e11b9ed9.Linux.g++", "source" : "src/EIPTestsFiller/StateTests/stEOF/stEIP3540/EOF1_ExecutionFiller.yml", - "sourceHash" : "ed251f445299a8eda15627292a273d29388de5713c12bc3d665526feb5b95684" + "sourceHash" : "dcef88e062f3a36ae9bdeb004699c9b87a543bb47768806c233976d02e6ed6b4" }, "env" : { "currentBaseFee" : "0x0a", @@ -39,7 +39,7 @@ "post" : { "Prague" : [ { - "hash" : "0x83ebfcc46beaf6b70a392c91e284a3f399444d1b9ddd8612922bc3dade7e5ada", + "hash" : "0x4a7748dfc634ce2b2828d8a2f58aece6f5c96d77180b2a182b39e7d80c19950f", "indexes" : { "data" : 0, "gas" : 0, @@ -49,7 +49,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094c94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba00f2fcdd4b12c82b225c6fa285c8bb5ec12173696d7e4dbca308a32dae03f2a8fa036144afe01bd2cba73e7afe4cefaeb5051f19c07cc4d81a508bdb50cfcd5451d" }, { - "hash" : "0xd4c674dace07f7966a667289fd24a8b41155d4e799a392f6567d65b7b5a7a899", + "hash" : "0x03296ec7e5c2fcf63e2ec01d2e8478804dab9b4d12f51976ce062a30e3f80f98", "indexes" : { "data" : 1, "gas" : 0, @@ -59,7 +59,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094d94f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0bbdf9288646d44d3c72bb330001f8fee4d4f89981a89ab4890bf99efd34fe019a06738f208dc53a57ec8d4924be148cb3242f8b85bbb468a02227b708ae8c3d79a" }, { - "hash" : "0x503dbb034d4d387cd3513cb9c8083247e404874197141a2c821c8acc2751e267", + "hash" : "0x4efb749bf493a474b0c1c7548d96c5f0e1b9f82539bbcb48ca9b0562c2878c4d", "indexes" : { "data" : 2, "gas" : 0, @@ -69,7 +69,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094024f5374fce5edbc8e2a8697c15331677e6ebf0b1ca0ddda9fbf42a2c4959c273d72edf8ce7b5c232f136650b4b3525add61ea0801fba04425c0b7a23e0db9c78a6cf9eff0462423b24f82fac1b6ba97cd0a06dfec7612" }, { - "hash" : "0xc766def8a8aa8b69e984257a60cb58da9a4cd34396cfe06e1cb0aeadcf4fa59f", + "hash" : "0xd4003516d792d8a94a4f0d824e512e0a8452b8e5c68e8dc53b15004ed3f4db2f", "indexes" : { "data" : 3, "gas" : 0, @@ -79,7 +79,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094504f5374fce5edbc8e2a8697c15331677e6ebf0b1ca0529c826a2f39e5bd46c7244e8b4b14eb7b39e7a4c159857fc4bdcc0f0b59418ca01b5d2c1c1ff3633624d98c872ba37144441550a27bc61bea58a81dc22e17f6a3" }, { - "hash" : "0x9ba4f19852b8dc6c2e479a6191ccf7636a9a0d599ef700a023cf24d7497b3f8e", + "hash" : "0xa8813a3b41aff94a67b1257ed3a3301ded3f7e39e883c46d058c2172b1d9062f", "indexes" : { "data" : 4, "gas" : 0, @@ -89,7 +89,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094514f5374fce5edbc8e2a8697c15331677e6ebf0b1ba06c613003f07b4c58deecacc57c301179746a846e8b1287a992e5f676ef33fcf1a00ea490e8676098885825204bcb04cc035871738eb777cfa40ad1370aff8a1106" }, { - "hash" : "0x0aea26594926750e547bbf797d52a9d6649cd04b4dbf829239ff026e249c7ad4", + "hash" : "0xd34cc793817164bcdd5bd0547c8b17079def5224e41780de3e36928a7d3b3bc1", "indexes" : { "data" : 5, "gas" : 0, @@ -99,7 +99,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094524f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0f019a173f1ade159a89ce883a63b6d5a9f0485e26e9e520a5fded126810ba89ba07179096d67a415bd915faeb54c1bfe701ccd145b5bb32cb59dc33da1be48ef7b" }, { - "hash" : "0xdbda4c082353a2afedc7af68f29783b107d29b90e79560ac8cacac60a5b9eb8f", + "hash" : "0x49fa54579528b5942d4f3d885d65ce002c025ef94674e3115ee19f30943d8f3c", "indexes" : { "data" : 6, "gas" : 0, @@ -109,7 +109,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094604f5374fce5edbc8e2a8697c15331677e6ebf0b1ba05bed551950fdeb8a2e00c01b418e5437c91d2cafd65eb1ed8c56ad20a763a5eaa04318456a5b830203df765194dbeb83c58a396118efb61fa1db38ef10a03d326f" }, { - "hash" : "0xa21c97c7c7a3519b8a1c6abec3dacce94e5c29f93e4078a35f5bacba52503eb2", + "hash" : "0x8f1c45b163833d0a00df62d0f47cb1e8142cf40c6a547b7b37d3e1f5979364fb", "indexes" : { "data" : 7, "gas" : 0, @@ -119,7 +119,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094614f5374fce5edbc8e2a8697c15331677e6ebf0b1ba0481bd123f8e9c84f507324c9f5000acb635fa9025ddf1171acb16cce22243460a0118c991fe65e29cab0b39a251c8e5057b3b5c06550f40eb7152843336fadf527" }, { - "hash" : "0x3da2c5eff6dff07e2132ce52198d7e0a0f3bdca3959673f96d47f077b4d0205d", + "hash" : "0x1424a81f5e8ad54b26f90c7dff7f278bbd0a2c9f09e21af8841f56f7d0d4a3b7", "indexes" : { "data" : 8, "gas" : 0, @@ -129,7 +129,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094624f5374fce5edbc8e2a8697c15331677e6ebf0b1ca05d3d57e2e62661735a1b51901f4ee7e6af4cb4a5b4f307fe7dae5b1082935c40a04e89f86c38132944ad4d92a4d7b383e976abd7c676a5981e0f13a6cbc7fdf07d" }, { - "hash" : "0x3636d11a9f82aeb200ffed0170fdeb9089fbff36aee8dfa163f17ea76e2156b8", + "hash" : "0xc8cf805a46838f2a0544e5cd484859903c5d90cb80862813629e16d77ffe4462", "indexes" : { "data" : 9, "gas" : 0, @@ -139,7 +139,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094634f5374fce5edbc8e2a8697c15331677e6ebf0b1ba06c182d4bd2987caa55a7e1c4c8652d15e125d0fc8bb28ed2c57cb8e500655462a03ec200e4f10ab33e4d3e414a88883d47faaa1eabbf58c26c01a90fd8444f5c36" }, { - "hash" : "0x80082c1fa499c25436c4aa4c96f7a630ac3a37a014449692dc9a242daf92bb5d", + "hash" : "0x56a37fd04b2cb280f44b72182272a74b6fcf49df95d14e8311eba9a8acf83f1e", "indexes" : { "data" : 10, "gas" : 0, @@ -149,7 +149,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094644f5374fce5edbc8e2a8697c15331677e6ebf0b1ca056dd2833f1a7aac465f96308f049f18de8a0df6e18f9864664f41e5b553fc7c6a0455e0d8361e7839de2f16e4bf0ca9b196b75f32d9994524f67b4cc40a331c4de" }, { - "hash" : "0xea0169f9da9692d18204868c53b099cc21bfd227e135d822cd399fe88811f255", + "hash" : "0x3c0166164d1ef5a854a0dab0431e756f6297001df5f189e5fca65f33d2d47b3f", "indexes" : { "data" : 11, "gas" : 0, @@ -159,7 +159,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094654f5374fce5edbc8e2a8697c15331677e6ebf0b1ba08b6504c574b41e0d661a61accc0f42ea8c5672fa6911bb76c5f4e42eecca553aa049a5c5fc75958c321ffec2733712582156027b649c3d3aeee5f6becdfa79eeca" }, { - "hash" : "0x90f84b7f24e085d63270057e49a85b6aab5075f9067b15599e91058d7fbad3da", + "hash" : "0x1093306d74847d3d836ce3f0c7b1329b8d8285d788fc2894a9ea14ebd93265a7", "indexes" : { "data" : 12, "gas" : 0, @@ -169,7 +169,7 @@ "txbytes" : "0xf874800a830aae6094b94f5374fce5edbc8e2a8697c15331677e6ebf0b8094664f5374fce5edbc8e2a8697c15331677e6ebf0b1ba07b25bb17aeaeabcfe5c302fbd30f06e4624badec74008348342a7aff10f0b203a00e0cef1ccb2a85facc935f973cfec336d28ea476c29a71b3053200580d7b58a9" }, { - "hash" : "0x73c46074fccad6503ea3a12028f3712e18a0d049687b24cc79768acdf2f14660", + "hash" : "0xa22718bd8aa32dbb2505b2a10210a41f137e4f83f0266c7c7ea005610dd808d2", "indexes" : { "data" : 13, "gas" : 0, @@ -211,7 +211,7 @@ }, "0x604f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x00", - "code" : "0x73d94f5374fce5edbc8e2a8697c15331677e6ebf0b3b600055", + "code" : "0x73d94f5374fce5edbc8e2a8697c15331677e6ebf0b3b5f5500", "nonce" : "0x00", "storage" : { } @@ -225,7 +225,7 @@ }, "0x624f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x00", - "code" : "0x73d94f5374fce5edbc8e2a8697c15331677e6ebf0b3f600055", + "code" : "0x73d94f5374fce5edbc8e2a8697c15331677e6ebf0b3f5f5500", "nonce" : "0x00", "storage" : { } @@ -239,21 +239,21 @@ }, "0x644f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x00", - "code" : "0x60286001600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b3c600051600055", + "code" : "0x60285f8073d94f5374fce5edbc8e2a8697c15331677e6ebf0b3c5f515f5500", "nonce" : "0x00", "storage" : { } }, "0x654f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x00", - "code" : "0xef00010100040200010023040000000080000460286001600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b3c60005160005500", + "code" : "0xef00010100040200010023040000000080000460286000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b3c60005160005500", "nonce" : "0x00", "storage" : { } }, "0x664f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260086019600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b3c600051600055", + "code" : "0x5f195f52600860195f73d94f5374fce5edbc8e2a8697c15331677e6ebf0b3c5f515f5500", "nonce" : "0x00", "storage" : { } @@ -274,7 +274,7 @@ }, "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x00", - "code" : "0x6000806000806000803560601c620186a0f160005560018055", + "code" : "0x5f80808080803560601c620186a0f15f556001805500", "nonce" : "0x00", "storage" : { } diff --git a/src/EIPTestsFiller/StateTests/stEOF/stEIP3540/EOF1_ExecutionFiller.yml b/src/EIPTestsFiller/StateTests/stEOF/stEIP3540/EOF1_ExecutionFiller.yml index 75cc9ee28e9..74d3f381da3 100644 --- a/src/EIPTestsFiller/StateTests/stEOF/stEIP3540/EOF1_ExecutionFiller.yml +++ b/src/EIPTestsFiller/StateTests/stEOF/stEIP3540/EOF1_ExecutionFiller.yml @@ -106,15 +106,15 @@ EOF1_Execution: 644f5374fce5edbc8e2a8697c15331677e6ebf0b: balance: 0 # EXTCODECOPY copying part of header + code section + part of data section - code: ':yul { extcodecopy(0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b, 0, 1, 40) sstore(0, mload(0)) }' + code: ':yul { extcodecopy(0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b, 0, 0, 40) sstore(0, mload(0)) }' nonce: 0 storage: {} 654f5374fce5edbc8e2a8697c15331677e6ebf0b: balance: 0 # EXTCODECOPY copying part of header + code section + part of data section inside EOF contract - # code: PUSH1(40) PUSH1(1) PUSH1(0) PUSH20(0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) EXTCODECOPY PUSH1(0) MLOAD PUSH1(0) SSTORE STOP - code: ':raw 0xef00010100040200010023040000000080000460286001600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b3c60005160005500' + # code: PUSH1(40) PUSH1(0) PUSH1(0) PUSH20(0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b) EXTCODECOPY PUSH1(0) MLOAD PUSH1(0) SSTORE STOP + code: ':raw 0xef00010100040200010023040000000080000460286000600073d94f5374fce5edbc8e2a8697c15331677e6ebf0b3c60005160005500' nonce: 0 storage: {} @@ -257,7 +257,7 @@ EOF1_Execution: '1': '1' 604f5374fce5edbc8e2a8697c15331677e6ebf0b: storage: - '0': '29' + '0': '2' - indexes: data: ':label extcodesize_inside_eof' network: @@ -271,7 +271,7 @@ EOF1_Execution: '1': '1' 614f5374fce5edbc8e2a8697c15331677e6ebf0b: storage: - '0': '29' + '0': '2' - indexes: data: ':label extcodehash' network: @@ -285,7 +285,7 @@ EOF1_Execution: '1': '1' 624f5374fce5edbc8e2a8697c15331677e6ebf0b: storage: - '0': '0x6942154f630e629ebe2b5ea584b50bf04b87a0e83112d4c53893a0d79135ca28' + '0': '0x9dbf3648db8210552e9c4f75c6a1c3057c0ca432043bd648be15fe7be05646f5' - indexes: data: ':label extcodehash_inside_eof' network: @@ -299,7 +299,7 @@ EOF1_Execution: '1': '1' 634f5374fce5edbc8e2a8697c15331677e6ebf0b: storage: - '0': '0x6942154f630e629ebe2b5ea584b50bf04b87a0e83112d4c53893a0d79135ca28' + '0': '0x9dbf3648db8210552e9c4f75c6a1c3057c0ca432043bd648be15fe7be05646f5' - indexes: data: ':label extcodecopy' network: @@ -313,7 +313,7 @@ EOF1_Execution: '1': '1' 644f5374fce5edbc8e2a8697c15331677e6ebf0b: storage: - '0': '0x0101000402000100060400040000800002600160005500aabbccdd00000000' + '0': '0xef00000000000000000000000000000000000000000000000000000000000000' - indexes: data: ':label extcodecopy_inside_eof' network: @@ -327,7 +327,7 @@ EOF1_Execution: '1': '1' 654f5374fce5edbc8e2a8697c15331677e6ebf0b: storage: - '0': '0x0101000402000100060400040000800002600160005500aabbccdd00000000' + '0': '0xef00000000000000000000000000000000000000000000000000000000000000' - indexes: data: ':label extcodecopy_out_of_bounds' network: @@ -341,7 +341,7 @@ EOF1_Execution: '1': '1' 664f5374fce5edbc8e2a8697c15331677e6ebf0b: storage: - '0': 'aabbccdd00000000ffffffffffffffffffffffffffffffffffffffffffffffff' + '0': '0xffffffffffffffffffffffffffffffffffffffffffffffff' - indexes: data: ':label extcodecopy_out_of_bounds_eof' network: @@ -355,4 +355,4 @@ EOF1_Execution: '1': '1' 674f5374fce5edbc8e2a8697c15331677e6ebf0b: storage: - '0': 'aabbccdd00000000ffffffffffffffffffffffffffffffffffffffffffffffff' + '0': '0xffffffffffffffffffffffffffffffffffffffffffffffff'