Skip to content

Commit

Permalink
fix EIPTest with double fields
Browse files Browse the repository at this point in the history
  • Loading branch information
@winsvega
winsvega committed Mar 31, 2023
1 parent 1c3832e commit d25a79a
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 52 deletions.
56 changes: 29 additions & 27 deletions EIPTests/BlockchainTests/bcEIP1153-transientStorage/tloadDoesNotPersistAcrossBlocks.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"tloadDoesNotPersistAcrossBlocks_Merge+1153" : {
"_info" : {
"comment" : "",
"filling-rpc-server" : "evm version 1.11.0-unstable-1b8a3921-20221128",
"filling-tool-version" : "retesteth-0.2.3-postmerge+commit.17808a69.Linux.g++",
"generatedTestHash" : "4a56662876726adc8218de3851df03af0c765563d2fc312c9f258b420dba8400",
"lllcversion" : "Version: 0.5.14-develop.2022.11.29+commit.a096d7a9.Linux.g++",
"solidity" : "Version: 0.8.5+commit.a4f2e591.Linux.g++",
"source" : "src/BlockchainTestsFiller/ValidBlocks/bcEIP1153/tloadDoesNotPersistAcrossBlocksFiller.yml",
"sourceHash" : "cdfe8ed8cee91d14260685e992ea0333515a7e477777c14b564fe6d0a24e13e9"
"filling-rpc-server" : "evm version 1.11.5-unstable-5d23d21f-20230320",
"filling-tool-version" : "retesteth-0.3.1-shanghai+commit.785df81b.Linux.g++",
"generatedTestHash" : "4c7ce932091e8fb289133c61f98ee2cdad491021cf3873db6b4664734a9db5da",
"lllcversion" : "Version: 0.5.14-develop.2022.7.30+commit.a096d7a9.Linux.g++",
"solidity" : "Version: 0.8.17+commit.8df45f5f.Linux.g++",
"source" : "src/EIPTestsFiller/BlockchainTests/bcEIP1153-transientStorage/tloadDoesNotPersistAcrossBlocksFiller.yml",
"sourceHash" : "43940f2ba0e2d07ae45f49cb258ae1afc1b78446a407eb4c6d2d95e0e1fb3202"
},
"blocks" : [
{
Expand All @@ -19,21 +19,21 @@
"difficulty" : "0x00",
"extraData" : "0x42",
"gasLimit" : "0x016345785d8a0000",
"gasUsed" : "0xa9f4",
"hash" : "0xe1ec57db4bf082ed8f2928ad4b4c609b7851f07cbbcee18316b424db78af01dd",
"gasUsed" : "0xa9f2",
"hash" : "0x08eb87dcf38810f6fa933ac0097e8365200d1599c0c16ac25e493b9d7a51997f",
"mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
"nonce" : "0x0000000000000000",
"number" : "0x01",
"parentHash" : "0x0831bbf8ec7060f53ecd9c2d72c5830eff33c4c46d5216c25f2d0233141be528",
"receiptTrie" : "0x99c74ece9c6784b58036e18bf771ddf994fd0da2d620d7c5efbeddadbf2c96bc",
"stateRoot" : "0x9832168efe1501e5fab8a7bba1790204635794453ac310e3973050239db7ead5",
"parentHash" : "0x49e1fd0c3b757e40d0c9ae826e07fd4d7d1d584786410c12881cc3b17657a9ba",
"receiptTrie" : "0x4828ae313068cf2f3c881fcabe33f0835e9b0bcad328c62e2f75a9a4eafe9152",
"stateRoot" : "0x4c0ce6d60b39de7fefb01eebe256b38f1c0dfec68608007418bcf7ca59565cb8",
"timestamp" : "0x079e",
"transactionsTrie" : "0xaa7e8383c944c425e964822d7d780e758a7c380d3791bcade2b499257c292bcd",
"uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
"blocknumber" : "1",
"chainname" : "default",
"rlp" : "0xf90272f901fca00831bbf8ec7060f53ecd9c2d72c5830eff33c4c46d5216c25f2d0233141be528a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794ba5e000000000000000000000000000000000000a09832168efe1501e5fab8a7bba1790204635794453ac310e3973050239db7ead5a0aa7e8383c944c425e964822d7d780e758a7c380d3791bcade2b499257c292bcda099c74ece9c6784b58036e18bf771ddf994fd0da2d620d7c5efbeddadbf2c96bcb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800188016345785d8a000082a9f482079e42a0000000000000000000000000000000000000000000000000000000000002000088000000000000000082036bf870b86e02f86b0180018203e885e8d4a5100094000000000000000000000000000000000000000a80840accf739c001a012d2b2fdd72b664f1cb63fd9e6b137f4695e2d7fa1c2ac517e0561b57bac39f0a0051de0849dfa8564def63103c582eaf728794fb0e92a4d691fa1adfc0e6c8603c0",
"rlp" : "0xf90272f901fca049e1fd0c3b757e40d0c9ae826e07fd4d7d1d584786410c12881cc3b17657a9baa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794ba5e000000000000000000000000000000000000a04c0ce6d60b39de7fefb01eebe256b38f1c0dfec68608007418bcf7ca59565cb8a0aa7e8383c944c425e964822d7d780e758a7c380d3791bcade2b499257c292bcda04828ae313068cf2f3c881fcabe33f0835e9b0bcad328c62e2f75a9a4eafe9152b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800188016345785d8a000082a9f282079e42a0000000000000000000000000000000000000000000000000000000000002000088000000000000000082036bf870b86e02f86b0180018203e885e8d4a5100094000000000000000000000000000000000000000a80840accf739c001a012d2b2fdd72b664f1cb63fd9e6b137f4695e2d7fa1c2ac517e0561b57bac39f0a0051de0849dfa8564def63103c582eaf728794fb0e92a4d691fa1adfc0e6c8603c0",
"transactions" : [
{
"accessList" : [
Expand All @@ -46,6 +46,7 @@
"nonce" : "0x00",
"r" : "0x12d2b2fdd72b664f1cb63fd9e6b137f4695e2d7fa1c2ac517e0561b57bac39f0",
"s" : "0x051de0849dfa8564def63103c582eaf728794fb0e92a4d691fa1adfc0e6c8603",
"sender" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"to" : "0x000000000000000000000000000000000000000a",
"type" : "0x02",
"v" : "0x01",
Expand All @@ -63,21 +64,21 @@
"difficulty" : "0x00",
"extraData" : "0x42",
"gasLimit" : "0x016345785d8a0000",
"gasUsed" : "0x5409",
"hash" : "0x1ca490a47ff406c3c130434be802155e6da246cc6de9c3e9aabcce7522e233c8",
"gasUsed" : "0x5407",
"hash" : "0x2b7a7a879018542e89493a4bb3f6fc966db8845755cb8921ee5b26df7fde6890",
"mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
"nonce" : "0x0000000000000000",
"number" : "0x02",
"parentHash" : "0xe1ec57db4bf082ed8f2928ad4b4c609b7851f07cbbcee18316b424db78af01dd",
"receiptTrie" : "0x9cf15d51ff40d0a75594b79920a56010c279e3b8166d3ac3c91dd82808d82bd3",
"stateRoot" : "0x79e3463c25ba0f35137a6324043e8066bca80a951013441f0cba0a396502679e",
"parentHash" : "0x08eb87dcf38810f6fa933ac0097e8365200d1599c0c16ac25e493b9d7a51997f",
"receiptTrie" : "0x7f1d8fe68c7b76c4645a69ee5b5de87e43c5c1f4e9eeb9e49aa052dc62a57848",
"stateRoot" : "0x2d845df0e0f3969153821dffb3a2c72fbd0389e37d72ee2599cbfe5c3120e668",
"timestamp" : "0x0b86",
"transactionsTrie" : "0xda0f4a390f88121c99ca5bc764bd01522d25ab1bbd6a71670072744eed1e8904",
"uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
"blocknumber" : "2",
"chainname" : "default",
"rlp" : "0xf90272f901fca0e1ec57db4bf082ed8f2928ad4b4c609b7851f07cbbcee18316b424db78af01dda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794ba5e000000000000000000000000000000000000a079e3463c25ba0f35137a6324043e8066bca80a951013441f0cba0a396502679ea0da0f4a390f88121c99ca5bc764bd01522d25ab1bbd6a71670072744eed1e8904a09cf15d51ff40d0a75594b79920a56010c279e3b8166d3ac3c91dd82808d82bd3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800288016345785d8a0000825409820b8642a000000000000000000000000000000000000000000000000000000000000200008800000000000000008202fef870b86e02f86b0101018203e885e8d4a5100094000000000000000000000000000000000000000a808443ac1c39c080a019a564e377bfb32e1c5125a15b2708f63b883720eddcfe7c4b4b07a22a1c1051a011303d2f45b5e07e7ecab491fce55b10ecb9b338f44fc15bce7ba9ef63ce8ca5c0",
"rlp" : "0xf90272f901fca008eb87dcf38810f6fa933ac0097e8365200d1599c0c16ac25e493b9d7a51997fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794ba5e000000000000000000000000000000000000a02d845df0e0f3969153821dffb3a2c72fbd0389e37d72ee2599cbfe5c3120e668a0da0f4a390f88121c99ca5bc764bd01522d25ab1bbd6a71670072744eed1e8904a07f1d8fe68c7b76c4645a69ee5b5de87e43c5c1f4e9eeb9e49aa052dc62a57848b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800288016345785d8a0000825407820b8642a000000000000000000000000000000000000000000000000000000000000200008800000000000000008202fef870b86e02f86b0101018203e885e8d4a5100094000000000000000000000000000000000000000a808443ac1c39c080a019a564e377bfb32e1c5125a15b2708f63b883720eddcfe7c4b4b07a22a1c1051a011303d2f45b5e07e7ecab491fce55b10ecb9b338f44fc15bce7ba9ef63ce8ca5c0",
"transactions" : [
{
"accessList" : [
Expand All @@ -90,6 +91,7 @@
"nonce" : "0x01",
"r" : "0x19a564e377bfb32e1c5125a15b2708f63b883720eddcfe7c4b4b07a22a1c1051",
"s" : "0x11303d2f45b5e07e7ecab491fce55b10ecb9b338f44fc15bce7ba9ef63ce8ca5",
"sender" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"to" : "0x000000000000000000000000000000000000000a",
"type" : "0x02",
"v" : "0x00",
Expand All @@ -108,38 +110,38 @@
"extraData" : "0x42",
"gasLimit" : "0x016345785d8a0000",
"gasUsed" : "0x00",
"hash" : "0x0831bbf8ec7060f53ecd9c2d72c5830eff33c4c46d5216c25f2d0233141be528",
"hash" : "0x49e1fd0c3b757e40d0c9ae826e07fd4d7d1d584786410c12881cc3b17657a9ba",
"mixHash" : "0x0000000000000000000000000000000000000000000000000000000000020000",
"nonce" : "0x0000000000000000",
"number" : "0x00",
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"stateRoot" : "0x354ba2d34b468f72dce1533103a27a7cba0e6bce9563446475fa74ffb83353d0",
"stateRoot" : "0x6b23861b393a8b05b6482c8b15d3c397e87f0976be0bf5521282b4bd1f17a097",
"timestamp" : "0x03b6",
"transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
"uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
"genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794ba5e000000000000000000000000000000000000a0354ba2d34b468f72dce1533103a27a7cba0e6bce9563446475fa74ffb83353d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000808088016345785d8a0000808203b642a000000000000000000000000000000000000000000000000000000000000200008800000000000000008203e8c0c0",
"lastblockhash" : "0x1ca490a47ff406c3c130434be802155e6da246cc6de9c3e9aabcce7522e233c8",
"genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794ba5e000000000000000000000000000000000000a06b23861b393a8b05b6482c8b15d3c397e87f0976be0bf5521282b4bd1f17a097a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000808088016345785d8a0000808203b642a000000000000000000000000000000000000000000000000000000000000200008800000000000000008203e8c0c0",
"lastblockhash" : "0x2b7a7a879018542e89493a4bb3f6fc966db8845755cb8921ee5b26df7fde6890",
"network" : "Merge+1153",
"postState" : {
"0x000000000000000000000000000000000000000a" : {
"balance" : "0x01000000000000000000",
"code" : "0x6005604e565b630accf7398114601d576343ac1c398114602757602e565b60236033565b602e565b602d6043565b5b50605e565b605a6000b46000b380600055505b565b6000b380600155505b565b60006000358060e01c9150505b90565b",
"code" : "0x6005604c565b630accf7398114601d576343ac1c398114602757602e565b60236033565b602e565b602d6042565b5b50605a565b605a6000b46000b38060005550565b6000b38060015550565b600080358060e01c91505090565b",
"nonce" : "0x00",
"storage" : {
"0x00" : "0x5a"
}
},
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"balance" : "0xfffffffffffcbeaa19",
"balance" : "0xfffffffffffcbeb6ef",
"code" : "0x",
"nonce" : "0x02",
"storage" : {
}
},
"0xba5e000000000000000000000000000000000000" : {
"balance" : "0xfdfd",
"balance" : "0xfdf9",
"code" : "0x",
"nonce" : "0x00",
"storage" : {
Expand All @@ -149,7 +151,7 @@
"pre" : {
"0x000000000000000000000000000000000000000a" : {
"balance" : "0x01000000000000000000",
"code" : "0x6005604e565b630accf7398114601d576343ac1c398114602757602e565b60236033565b602e565b602d6043565b5b50605e565b605a6000b46000b380600055505b565b6000b380600155505b565b60006000358060e01c9150505b90565b",
"code" : "0x6005604c565b630accf7398114601d576343ac1c398114602757602e565b60236033565b602e565b602d6042565b5b50605a565b605a6000b46000b38060005550565b6000b38060015550565b600080358060e01c91505090565b",
"nonce" : "0x00",
"storage" : {
"0x01" : "0xffff"
Expand Down

0 comments on commit d25a79a

Please sign in to comment.