diff options
Diffstat (limited to 'GeneralStateTests/stCreate2')
7 files changed, 420 insertions, 35 deletions
diff --git a/GeneralStateTests/stCreate2/create2collisionBalance.json b/GeneralStateTests/stCreate2/create2collisionBalance.json index aa93e3d8d..2c6c08862 100644 --- a/GeneralStateTests/stCreate2/create2collisionBalance.json +++ b/GeneralStateTests/stCreate2/create2collisionBalance.json @@ -2,10 +2,10 @@ "create2collisionBalance" : { "_info" : { "comment" : "create2 generates an account that already exists and has balance != 0", - "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty", + "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty", "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json", - "sourceHash" : "bd0821b3a8bde26a77b61300b4d2a6fb39c6fc13ddbd6f2ecfd9d23edbe943c7" + "sourceHash" : "1245420c316e622ebba93f732e8500dd971bd2de495d552a67868a66223484ed" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -18,24 +18,78 @@ "post" : { "Byzantium" : [ { - "hash" : "0x455afcc8ac854a58135d6b56c9b71446b6f13fd49bc75444572be50918a4a9e5", + "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x782e2bfd6acde8f3fa357bf1029dfc522a31f2379a1befdfde927158c77fb590", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], "Constantinople" : [ { - "hash" : "0xac2995edb932912509f3202ee433ed00712b9d0e6cf5578369da03ff73d50f01", + "hash" : "0x69b97ecb350ab7c49e0ffbea5dd5ee872dc2dab90e8fca9d6ecae2b16f61c3cf", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x8d299acd82371ffd6826b9cdcfc0be4c45be08342871fae38bd934e536c4416f", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x126134d4e196a778bb0a5a4dc8740f837fad149dfd5a76741e7b7b82eb583319", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xa616341f188981f5b84d7e67e3e8c9f460c77255b725bf6a79a4b024d6169f54", + "indexes" : { + "data" : 3, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ] }, @@ -47,17 +101,34 @@ "storage" : { } }, + "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : { + "balance" : "0x01", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, "0xe2b35478fdd26477cc576dd906e6277761246a3c" : { "balance" : "0x01", "code" : "", "nonce" : "0x00", "storage" : { } + }, + "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : { + "balance" : "0x01", + "code" : "", + "nonce" : "0x00", + "storage" : { + } } }, "transaction" : { "data" : [ - "0x6000600060006000f5" + "0x6000600060006000f5", + "0x64600160015560005260006005601b6000f5", + "0x6d6460016001556000526005601bf36000526000600e60126000f5", + "0x6000600060006001f5" ], "gasLimit" : [ "0x061a80" diff --git a/GeneralStateTests/stCreate2/create2collisionCode.json b/GeneralStateTests/stCreate2/create2collisionCode.json index 36f6e2f55..aac485240 100644 --- a/GeneralStateTests/stCreate2/create2collisionCode.json +++ b/GeneralStateTests/stCreate2/create2collisionCode.json @@ -2,10 +2,10 @@ "create2collisionCode" : { "_info" : { "comment" : "create2 generates an account that already exists and has not empty code", - "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty", + "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty", "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json", - "sourceHash" : "4f997537a448d0024ea20a53d9673afa9324d9633ec7e8b97bd74073b40a25b9" + "sourceHash" : "a29d584a2e2c0ef915616ed1fbc5696ccbceca975f22d3089733f6e01cb72ccb" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -18,24 +18,60 @@ "post" : { "Byzantium" : [ { - "hash" : "0x99f1f2d802c0e3d46619a143e236f1a8390f8b524553c8fd18b678317b377654", + "hash" : "0x0fd160ce4d4b77a18350c3de0121cee9a6b1c1ac25e9789840f12fc723159054", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x0fd160ce4d4b77a18350c3de0121cee9a6b1c1ac25e9789840f12fc723159054", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x0fd160ce4d4b77a18350c3de0121cee9a6b1c1ac25e9789840f12fc723159054", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], "Constantinople" : [ { - "hash" : "0x171ffc2b7bf5a9a8fcfb5d7a4b799c4069dc16f3b5b4d3837606b17b696b15f7", + "hash" : "0x72761ce2124ae982e88a5df41c464119c592355ad9c41c9c5b8435d69ab52103", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x9feab867ac14d2dd0d61befa8486adf4c9b70c13d47453d66f382f0a20202da6", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xee7e793da89342c335e3c6dba89d64ea1068cb9ee6d56276a0f351e079beba83", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ] }, @@ -47,17 +83,33 @@ "storage" : { } }, + "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : { + "balance" : "0x00", + "code" : "0x010203", + "nonce" : "0x00", + "storage" : { + } + }, "0xe2b35478fdd26477cc576dd906e6277761246a3c" : { "balance" : "0x00", "code" : "0x010203", "nonce" : "0x00", "storage" : { } + }, + "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : { + "balance" : "0x00", + "code" : "0x010203", + "nonce" : "0x00", + "storage" : { + } } }, "transaction" : { "data" : [ - "0x6000600060006000f5" + "0x6000600060006000f5", + "0x64600160015560005260006005601b6000f5", + "0x6d6460016001556000526005601bf36000526000600e60126000f5" ], "gasLimit" : [ "0x061a80" diff --git a/GeneralStateTests/stCreate2/create2collisionNonce.json b/GeneralStateTests/stCreate2/create2collisionNonce.json index f73d751b8..895059761 100644 --- a/GeneralStateTests/stCreate2/create2collisionNonce.json +++ b/GeneralStateTests/stCreate2/create2collisionNonce.json @@ -2,10 +2,10 @@ "create2collisionNonce" : { "_info" : { "comment" : "create2 generates an account that already exists and has nonce != 0", - "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty", + "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty", "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json", - "sourceHash" : "7431f28384a4f97499e69173aed899f15fe936a5ed4e955e86cd428285f1b914" + "sourceHash" : "d04a1fa39a8582d4ec0e9297d0f2139cc88bbe13ce063007bc850c5bc5d88c32" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -18,24 +18,60 @@ "post" : { "Byzantium" : [ { - "hash" : "0x2f7b8ca16fa10a0164dedaac1c008f20ea5ea0cf67a74d173336a7b6baab71fd", + "hash" : "0xb6890061c3e91f8e7527116dce2943fc8dee81a228783b1919c09fa123cbc901", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xb6890061c3e91f8e7527116dce2943fc8dee81a228783b1919c09fa123cbc901", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xb6890061c3e91f8e7527116dce2943fc8dee81a228783b1919c09fa123cbc901", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], "Constantinople" : [ { - "hash" : "0x1f471deaed5abf11e6b12d254b69d228ce820dad5a8e248c506d47a7d2e820f1", + "hash" : "0x8b8cabd2a732dc61eeb2994112158afd4fe7efd40ffd32ed5a706e879a660898", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x4d42c80258f15c835e22e74dc8db15f00365406b23371074199b6fa0ad093626", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x8b248f79f0627f2400a0a72d9cf6d3b078828072f7e7e205ee644396c4a747d1", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ] }, @@ -47,17 +83,33 @@ "storage" : { } }, + "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + }, "0xe2b35478fdd26477cc576dd906e6277761246a3c" : { "balance" : "0x00", "code" : "", "nonce" : "0x01", "storage" : { } + }, + "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x01", + "storage" : { + } } }, "transaction" : { "data" : [ - "0x6000600060006000f5" + "0x6000600060006000f5", + "0x64600160015560005260006005601b6000f5", + "0x6d6460016001556000526005601bf36000526000600e60126000f5" ], "gasLimit" : [ "0x061a80" diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructed.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructed.json index b572b20f0..b64d21a66 100644 --- a/GeneralStateTests/stCreate2/create2collisionSelfdestructed.json +++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructed.json @@ -2,10 +2,10 @@ "create2collisionSelfdestructed" : { "_info" : { "comment" : "collision with address that has been selfdestructed in the same transaction", - "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty", + "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty", "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json", - "sourceHash" : "aa82221fe6312dc15add5fd8f69342605fa83c8c1b2a870139a9833dd2876eb6" + "sourceHash" : "3fb1c7dddc5371db434a9e68024f28d515d099048a2c5064522d00063ba5dfeb" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -18,24 +18,60 @@ "post" : { "Byzantium" : [ { - "hash" : "0xa0652ee361902645d869d84d6cfe814679e9a318e09205e6de48a9fbdcd33760", + "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], "Constantinople" : [ { - "hash" : "0x0ac1dfa111dfd2f876591a97b67faea1440596694e5a32e1092e28243757ce50", + "hash" : "0xf5d89299a22e4cdce4895c65d7cd610286308f5676ec92de4778f15be8cd284a", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x6b114efa7d4ce347a9687858e822520cdfc255d618d5f1b2f73448db0a2c252c", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x3a67e2d3c0824ce01741983ea15167291c4f140d65449366828df0df537f7726", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ] }, @@ -47,17 +83,33 @@ "storage" : { } }, + "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : { + "balance" : "0x01", + "code" : "0x6010ff", + "nonce" : "0x00", + "storage" : { + } + }, "0xe2b35478fdd26477cc576dd906e6277761246a3c" : { "balance" : "0x01", "code" : "0x6010ff", "nonce" : "0x00", "storage" : { } + }, + "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : { + "balance" : "0x01", + "code" : "0x6010ff", + "nonce" : "0x00", + "storage" : { + } } }, "transaction" : { "data" : [ - "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f5" + "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f5", + "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f5", + "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f5" ], "gasLimit" : [ "0x061a80" diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json index 804d05fff..f33a0725f 100644 --- a/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json +++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json @@ -2,10 +2,10 @@ "create2collisionSelfdestructedOOG" : { "_info" : { "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG", - "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty", + "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty", "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json", - "sourceHash" : "6b3e76fd94ad0d4b63c4f0709b9a08e407681128ee046157ac29be87f61610ea" + "sourceHash" : "77cbd98bf19a333fb67d41d07874d0d68b9087ffdcbadcb79f0e88dd9ea5eec0" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -18,24 +18,60 @@ "post" : { "Byzantium" : [ { - "hash" : "0xa83baf40800c1629194bdaf2ebf00aec1366ddf24b457610eec75fe199d29720", + "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], "Constantinople" : [ { - "hash" : "0xa83baf40800c1629194bdaf2ebf00aec1366ddf24b457610eec75fe199d29720", + "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x4067a6a896c4ee412fe11e0ed5f425b80e324e15c2c4f7becab171a71bfa41a4", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ] }, @@ -47,17 +83,33 @@ "storage" : { } }, + "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : { + "balance" : "0x01", + "code" : "0x6010ff", + "nonce" : "0x00", + "storage" : { + } + }, "0xe2b35478fdd26477cc576dd906e6277761246a3c" : { "balance" : "0x01", "code" : "0x6010ff", "nonce" : "0x00", "storage" : { } + }, + "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : { + "balance" : "0x01", + "code" : "0x6010ff", + "nonce" : "0x00", + "storage" : { + } } }, "transaction" : { "data" : [ - "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055" + "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055", + "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f55062112233600055", + "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f55062112233600055" ], "gasLimit" : [ "0x030d40" diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json index 57274403b..2841f7cc1 100644 --- a/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json +++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json @@ -2,10 +2,10 @@ "create2collisionSelfdestructedRevert" : { "_info" : { "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called", - "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty", + "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty", "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json", - "sourceHash" : "5ee9f4ff1a2bbba51a007aab9a4fb4c771fe44b3cdf6c840d670a803c649f4a0" + "sourceHash" : "3cf7bd53e01efb8c6e4cc18108d35e3af6db95b868cccf728383ba65e30665c6" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -18,24 +18,60 @@ "post" : { "Byzantium" : [ { - "hash" : "0xa0652ee361902645d869d84d6cfe814679e9a318e09205e6de48a9fbdcd33760", + "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xa798c3f8bc9d5440f061a906e1a29cc5e5c9e36edfa2f2846f40b870adbe378b", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], "Constantinople" : [ { - "hash" : "0x4d7794f8ec48cb043fce08a7d9e53ead7016a4441408e05de50e0aefbaf33a08", + "hash" : "0x67ee8792884cb74ca16898a91dad472752d48af97b491a004e0b04b6ff11fd1a", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xc340c1ded39af2c0921a1ff70f07e73b761a05e1872bcda26d82074aacdac7a0", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xfe7f548b1a6d01545688f701ee883f6411b6dc6e79e0b281889cff2fcc5e8cb7", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ] }, @@ -47,17 +83,33 @@ "storage" : { } }, + "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : { + "balance" : "0x01", + "code" : "0x6010ff", + "nonce" : "0x00", + "storage" : { + } + }, "0xe2b35478fdd26477cc576dd906e6277761246a3c" : { "balance" : "0x01", "code" : "0x6010ff", "nonce" : "0x00", "storage" : { } + }, + "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : { + "balance" : "0x01", + "code" : "0x6010ff", + "nonce" : "0x00", + "storage" : { + } } }, "transaction" : { "data" : [ - "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600052600a6000fd" + "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000526003601dfd", + "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f15064600160015560005260006005601b6000f550621122336000526003601dfd", + "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000526003601dfd" ], "gasLimit" : [ "0x061a80" diff --git a/GeneralStateTests/stCreate2/create2collisionStorage.json b/GeneralStateTests/stCreate2/create2collisionStorage.json index a730a12ac..f6ca45913 100644 --- a/GeneralStateTests/stCreate2/create2collisionStorage.json +++ b/GeneralStateTests/stCreate2/create2collisionStorage.json @@ -2,10 +2,10 @@ "create2collisionStorage" : { "_info" : { "comment" : "create2 generates an account that already exists and has storage != 0", - "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty", + "filledwith" : "testeth 1.5.0.dev2+commit.88f7415e.dirty", "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++", "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json", - "sourceHash" : "c46b7b85b0e53dabfe9c426e3985546f4d218dceaccb5a1fa1af921b6ea49136" + "sourceHash" : "c9586bfff17277724cafec14ccde2e03743d9d2ceb7379eb7c0a87c2b5ef5319" }, "env" : { "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", @@ -18,24 +18,60 @@ "post" : { "Byzantium" : [ { - "hash" : "0xd086ddbd06a36f9f5f78ea4cfd39f0930fec271fda68a786e0dac75b1c4f5e69", + "hash" : "0x18e3ce957cf4cc8951cb61e12b06d58eafce93595d5df2bb9d9899bcd96aa1a3", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x18e3ce957cf4cc8951cb61e12b06d58eafce93595d5df2bb9d9899bcd96aa1a3", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x18e3ce957cf4cc8951cb61e12b06d58eafce93595d5df2bb9d9899bcd96aa1a3", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ], "Constantinople" : [ { - "hash" : "0xc5f9c36d995fd94ffad0bbcaf4ab01183bf7574152dcca0182d3c4e4720434e0", + "hash" : "0x711de9a6053077c237823f2c0db69668e1a68662953ed74f69793f3754644d93", "indexes" : { "data" : 0, "gas" : 0, "value" : 0 }, "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xecfcb034a3f39a5591b1aa0534f24e5a3849d2c22df0de1b7ebe486c86c57e60", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0xd339d4828e0e9e7118e32dcf585eaf7dd4f2d8f1e9a1a9e1c9496039fc0bb529", + "indexes" : { + "data" : 2, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" } ] }, @@ -47,6 +83,14 @@ "storage" : { } }, + "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, "0xe2b35478fdd26477cc576dd906e6277761246a3c" : { "balance" : "0x00", "code" : "", @@ -54,11 +98,21 @@ "storage" : { "0x00" : "0x01" } + }, + "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } } }, "transaction" : { "data" : [ - "0x6000600060006000f5" + "0x6000600060006000f5", + "0x64600160015560005260006005601b6000f5", + "0x6d6460016001556000526005601bf36000526000600e60126000f5" ], "gasLimit" : [ "0x061a80" |