aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json8
-rw-r--r--GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json48
-rw-r--r--src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json27
3 files changed, 43 insertions, 40 deletions
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
index 53fe0c7b4..8075d9a62 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createJS_ExampleContract.json
@@ -11,7 +11,7 @@
"post" : {
"EIP150" : [
{
- "hash" : "b2dfcdafc749ca42b433c9a2f0c9f1375867a776d6389631b83c56928fcc3adc",
+ "hash" : "40f6cbdb7ca65f2e117b8b4c1045e8fc56b2489aaba8782dc823287caa9e34b1",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -21,7 +21,7 @@
],
"EIP158" : [
{
- "hash" : "ef0112296215d4bc6e745b377ffbe6d5e50328545723756eacd3cff510a7de90",
+ "hash" : "42dc529367effa117b038f636726a90ef68de693a4ed0606b5e9a630437d3be7",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -31,7 +31,7 @@
],
"Frontier" : [
{
- "hash" : "5500215cdbf8165ca47720ad088ae49c2441560cdf267f1c946ae7b9807cb1d4",
+ "hash" : "5463198ffbf761ce22d9421e3d19177248189f91cbde328ba906986c2684e3f7",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -41,7 +41,7 @@
],
"Homestead" : [
{
- "hash" : "b2dfcdafc749ca42b433c9a2f0c9f1375867a776d6389631b83c56928fcc3adc",
+ "hash" : "40f6cbdb7ca65f2e117b8b4c1045e8fc56b2489aaba8782dc823287caa9e34b1",
"indexes" : {
"data" : 0,
"gas" : 0,
diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
index 637a0dc86..f761f7292 100644
--- a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
+++ b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
@@ -11,7 +11,7 @@
"post" : {
"EIP150" : [
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -19,7 +19,7 @@
}
},
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -27,7 +27,7 @@
}
},
{
- "hash" : "ad4387407d8395c2e2b8f07a63caec4930c10354f56531b8c619da2fcacf29af",
+ "hash" : "7560732379294ff6671be9416e3ef32c5bbea2785aee6eb590b4f0902565e9a1",
"indexes" : {
"data" : 0,
"gas" : 1,
@@ -35,7 +35,7 @@
}
},
{
- "hash" : "4efc2f249fc7c0f9597c3550b0689bd190f8e0b5d5f3d32c69e57693d7713261",
+ "hash" : "202e9b30c59094b99dee8afcea83947ff626ee7a910486e25920f4fa7b2ecfb9",
"indexes" : {
"data" : 0,
"gas" : 1,
@@ -43,7 +43,7 @@
}
},
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 1,
"gas" : 0,
@@ -51,7 +51,7 @@
}
},
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 1,
"gas" : 0,
@@ -59,7 +59,7 @@
}
},
{
- "hash" : "4e955662d40e58e3590068cc492ad4a286325846b5fd29640fb92c1fb08d2092",
+ "hash" : "701378c012644471c9b50e1b159f0be72ac1c3be066736a34c67789513582932",
"indexes" : {
"data" : 1,
"gas" : 1,
@@ -67,7 +67,7 @@
}
},
{
- "hash" : "d133d39ca6ad1147afe84c8155185fd6e18cfcaecc0282b2bc5678d5252b7412",
+ "hash" : "fde945ca2f6591c02da8330d29be4f0b460ba5a43d30de2fd304816c88d7510d",
"indexes" : {
"data" : 1,
"gas" : 1,
@@ -77,7 +77,7 @@
],
"EIP158" : [
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -85,7 +85,7 @@
}
},
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -93,7 +93,7 @@
}
},
{
- "hash" : "ad4387407d8395c2e2b8f07a63caec4930c10354f56531b8c619da2fcacf29af",
+ "hash" : "7560732379294ff6671be9416e3ef32c5bbea2785aee6eb590b4f0902565e9a1",
"indexes" : {
"data" : 0,
"gas" : 1,
@@ -101,7 +101,7 @@
}
},
{
- "hash" : "4efc2f249fc7c0f9597c3550b0689bd190f8e0b5d5f3d32c69e57693d7713261",
+ "hash" : "202e9b30c59094b99dee8afcea83947ff626ee7a910486e25920f4fa7b2ecfb9",
"indexes" : {
"data" : 0,
"gas" : 1,
@@ -109,7 +109,7 @@
}
},
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 1,
"gas" : 0,
@@ -117,7 +117,7 @@
}
},
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 1,
"gas" : 0,
@@ -125,7 +125,7 @@
}
},
{
- "hash" : "8e2330f0d5c3d0fc0e006941799b1a981863ae9f92d8834c846d2a825bb229cf",
+ "hash" : "502ef3640195e7041d9db8fd4c9ac921e3c23c591518c7d0f345ba8491be908b",
"indexes" : {
"data" : 1,
"gas" : 1,
@@ -133,7 +133,7 @@
}
},
{
- "hash" : "63fcfbdbbbaaf3bda1cb696b884c1d48a4ecaca7ce43483c0d15e280fb31e833",
+ "hash" : "1885eba0cd3e4648461a469a78f3dbeb835b5fb94f43dee4a74c9ad6bc495597",
"indexes" : {
"data" : 1,
"gas" : 1,
@@ -143,7 +143,7 @@
],
"Frontier" : [
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -151,7 +151,7 @@
}
},
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -159,7 +159,7 @@
}
},
{
- "hash" : "fb451a2bdac7aa56102a16c70c444789138679060e70760abbe30d154ccbe957",
+ "hash" : "a4c92564fafcbf444c74b858c7dc9b9204c7a5337901022830016b213475e3a6",
"indexes" : {
"data" : 0,
"gas" : 1,
@@ -167,7 +167,7 @@
}
},
{
- "hash" : "38dbe8cfc957c18f654e64f9dcf7820db9c11382d761618c375119efd451ab4b",
+ "hash" : "b6ee3d1d29671d2cd93222c0f2019e49dad12aee70f3a3591be6f27e04052a2c",
"indexes" : {
"data" : 0,
"gas" : 1,
@@ -209,7 +209,7 @@
],
"Homestead" : [
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -217,7 +217,7 @@
}
},
{
- "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
"indexes" : {
"data" : 0,
"gas" : 0,
@@ -225,7 +225,7 @@
}
},
{
- "hash" : "fb451a2bdac7aa56102a16c70c444789138679060e70760abbe30d154ccbe957",
+ "hash" : "a4c92564fafcbf444c74b858c7dc9b9204c7a5337901022830016b213475e3a6",
"indexes" : {
"data" : 0,
"gas" : 1,
@@ -233,7 +233,7 @@
}
},
{
- "hash" : "38dbe8cfc957c18f654e64f9dcf7820db9c11382d761618c375119efd451ab4b",
+ "hash" : "b6ee3d1d29671d2cd93222c0f2019e49dad12aee70f3a3591be6f27e04052a2c",
"indexes" : {
"data" : 0,
"gas" : 1,
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
index 64555a54a..a735b52ff 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
@@ -20,9 +20,10 @@
"result" : {
"3e180b1862f9d158abb5e519a6d8605540c23682" : {
"balance" : "0x06",
- "code" : "0x",
- "nonce" : "0x01",
+ "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+ "nonce" : "55",
"storage" : {
+ "0x00" : "0x01",
"0x01" : "0x01",
"0x04" : "0x0c"
}
@@ -46,9 +47,10 @@
"result" : {
"3e180b1862f9d158abb5e519a6d8605540c23682" : {
"balance" : "0x06",
- "code" : "0x",
- "nonce" : "0x00",
+ "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+ "nonce" : "54",
"storage" : {
+ "0x00" : "0x01",
"0x01" : "0x01",
"0x04" : "0x0c"
}
@@ -73,7 +75,7 @@
"3e180b1862f9d158abb5e519a6d8605540c23682" : {
"balance" : "0x05",
"code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
- "nonce" : "0x36",
+ "nonce" : "54",
"storage" : {
}
},
@@ -94,9 +96,10 @@
"result" : {
"3e180b1862f9d158abb5e519a6d8605540c23682" : {
"balance" : "0x06",
- "code" : "0x",
- "nonce" : "0x00",
+ "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+ "nonce" : "54",
"storage" : {
+ "0x00" : "0x01",
"0x04" : "0x0c"
}
},
@@ -117,8 +120,8 @@
"result" : {
"3e180b1862f9d158abb5e519a6d8605540c23682" : {
"balance" : "0x05",
- "code" : "0x",
- "nonce" : "0x00",
+ "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+ "nonce" : "54",
"storage" : {
}
},
@@ -140,7 +143,7 @@
"3e180b1862f9d158abb5e519a6d8605540c23682" : {
"balance" : "0x05",
"code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
- "nonce" : "0x36",
+ "nonce" : "54",
"storage" : {
}
},
@@ -161,8 +164,8 @@
"result" : {
"3e180b1862f9d158abb5e519a6d8605540c23682" : {
"balance" : "0x05",
- "code" : "0x",
- "nonce" : "0x00",
+ "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+ "nonce" : "54",
"storage" : {
}
},