aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry <winsvega@mail.ru>2017-01-17 08:48:22 +0800
committerDimitry <winsvega@mail.ru>2017-01-17 08:48:22 +0800
commit616d2c8e53aa45ede68eb09a5fa27446a82cd15a (patch)
tree4bd0392adfa11cbd03e665f5d290482cf3d53b29
parent3770ef5f234ec7837015e6717715bfa82131bc5b (diff)
downloaddexon-tests-616d2c8e53aa45ede68eb09a5fa27446a82cd15a.tar
dexon-tests-616d2c8e53aa45ede68eb09a5fa27446a82cd15a.tar.gz
dexon-tests-616d2c8e53aa45ede68eb09a5fa27446a82cd15a.tar.bz2
dexon-tests-616d2c8e53aa45ede68eb09a5fa27446a82cd15a.tar.lz
dexon-tests-616d2c8e53aa45ede68eb09a5fa27446a82cd15a.tar.xz
dexon-tests-616d2c8e53aa45ede68eb09a5fa27446a82cd15a.tar.zst
dexon-tests-616d2c8e53aa45ede68eb09a5fa27446a82cd15a.zip
Revert Tests
Create in subcall with OOG (in and after subcall) Create is a collision with address Create is not a collision with address
-rw-r--r--GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json319
-rw-r--r--GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json319
-rw-r--r--src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json219
-rw-r--r--src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json178
4 files changed, 1035 insertions, 0 deletions
diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
new file mode 100644
index 000000000..637a0dc86
--- /dev/null
+++ b/GeneralStateTests/stRevertTest/RevertDepthCreateAddressCollision.json
@@ -0,0 +1,319 @@
+{
+ "RevertDepthCreateAddressCollision" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x02b8feb0",
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x28d138",
+ "currentTimestamp" : "0x01",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "ad4387407d8395c2e2b8f07a63caec4930c10354f56531b8c619da2fcacf29af",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "4efc2f249fc7c0f9597c3550b0689bd190f8e0b5d5f3d32c69e57693d7713261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "4e955662d40e58e3590068cc492ad4a286325846b5fd29640fb92c1fb08d2092",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "d133d39ca6ad1147afe84c8155185fd6e18cfcaecc0282b2bc5678d5252b7412",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 1
+ }
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "ad4387407d8395c2e2b8f07a63caec4930c10354f56531b8c619da2fcacf29af",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "4efc2f249fc7c0f9597c3550b0689bd190f8e0b5d5f3d32c69e57693d7713261",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "8e2330f0d5c3d0fc0e006941799b1a981863ae9f92d8834c846d2a825bb229cf",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "63fcfbdbbbaaf3bda1cb696b884c1d48a4ecaca7ce43483c0d15e280fb31e833",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 1
+ }
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "fb451a2bdac7aa56102a16c70c444789138679060e70760abbe30d154ccbe957",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "38dbe8cfc957c18f654e64f9dcf7820db9c11382d761618c375119efd451ab4b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "c0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "c0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 1
+ }
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "5b1b71fdd1f2fbcd573cc0d930fd07496485fde947b14226cc956907b67443a4",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "fb451a2bdac7aa56102a16c70c444789138679060e70760abbe30d154ccbe957",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "38dbe8cfc957c18f654e64f9dcf7820db9c11382d761618c375119efd451ab4b",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "222799d2ad41990338860221d0d59567fcb0ac058b7b72d962708a84cbace1ad",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "c0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "c0df71b65b1cca2a28025c9c81d3b3775f44d7378e192e51a9b15c3467a54d9a",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 1
+ }
+ }
+ ]
+ },
+ "pre" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "balance" : "0x05",
+ "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+ "nonce" : "0x36",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6008600255600060006000f050600c600355",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "000000000000000000000000000000000000000000000000000000000000ea60",
+ "000000000000000000000000000000000000000000000000000000000001ea60"
+ ],
+ "gasLimit" : [
+ "110000",
+ "160000"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "3e180b1862f9d158abb5e519a6d8605540c23682",
+ "value" : [
+ "1",
+ "0"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json b/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json
new file mode 100644
index 000000000..f8c3834f2
--- /dev/null
+++ b/GeneralStateTests/stRevertTest/RevertDepthCreateOOG.json
@@ -0,0 +1,319 @@
+{
+ "RevertDepthCreateOOG" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x02b8feb0",
+ "currentGasLimit" : "0x989680",
+ "currentNumber" : "0x28d138",
+ "currentTimestamp" : "0x01",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "EIP150" : [
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "2792964862a467219a4d5e497f798176b09d8177f290c39eca662befff5f3a60",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "42ca5d93f92acb6a80eb20a11fa0528865c1ac9a9bf67c39a6191d060ca7ce4f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "1e0fae46b35d00d90eb311a335fffbfb18b5bb6fb97d2e8fd81b20179745ce4e",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "24a0106e5d29661bd6c5adcac678ffe1715cbc1ef0a5b5db39a084695cc737be",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 1
+ }
+ }
+ ],
+ "EIP158" : [
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "2792964862a467219a4d5e497f798176b09d8177f290c39eca662befff5f3a60",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "42ca5d93f92acb6a80eb20a11fa0528865c1ac9a9bf67c39a6191d060ca7ce4f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "327f51edf987241a0a59405a62804d1a574cc7f285a875e3fbd7cd01863b1e4b",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "1a18a2344a9244b257d4d16e2e9abb6dcb53d17d5a4c5fbb240f1c6011f14b50",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 1
+ }
+ }
+ ],
+ "Frontier" : [
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "d8e4aee5a220887aa9a11f33979816e6dfd43d8566f2ae977b49afa17042ac17",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "46c459fa446969520040529dc429163a5c4304c9c0b774fd1e178dbf1d27eb86",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 1
+ }
+ }
+ ],
+ "Homestead" : [
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "d8e4aee5a220887aa9a11f33979816e6dfd43d8566f2ae977b49afa17042ac17",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "46c459fa446969520040529dc429163a5c4304c9c0b774fd1e178dbf1d27eb86",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "e4e1694e86eef3ff5604aa78e8b6130f63e430ef199a9a218b8ef3e0f11d315f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 1
+ }
+ },
+ {
+ "hash" : "5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ }
+ },
+ {
+ "hash" : "5e0dd98b60aa899f5c210103e4fdd587b00b461c36dedb372646b0fd0d2e023f",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 1
+ }
+ }
+ ]
+ },
+ "pre" : {
+ "a000000000000000000000000000000000000000" : {
+ "balance" : "0x05",
+ "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+ "nonce" : "0x36",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0xe8d4a51000",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "balance" : "0x00",
+ "code" : "0x6008600255600060006000f050600c600355",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "000000000000000000000000000000000000000000000000000000000000ea60",
+ "000000000000000000000000000000000000000000000000000000000001ea60"
+ ],
+ "gasLimit" : [
+ "110000",
+ "160000"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "a000000000000000000000000000000000000000",
+ "value" : [
+ "1",
+ "0"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
new file mode 100644
index 000000000..64555a54a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
@@ -0,0 +1,219 @@
+{
+ "RevertDepthCreateAddressCollision" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "comment" : "NO OOG",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "balance" : "0x06",
+ "code" : "0x",
+ "nonce" : "0x01",
+ "storage" : {
+ "0x01" : "0x01",
+ "0x04" : "0x0c"
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x02" : "0x08",
+ "0x03" : "0x0c"
+ }
+ }
+ }
+ },
+ {
+ "comment" : "NO OOG",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "balance" : "0x06",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x01" : "0x01",
+ "0x04" : "0x0c"
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x02" : "0x08",
+ "0x03" : "0x0c"
+ }
+ }
+ }
+ },
+ {
+ "comment" : "NO OOG",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "balance" : "0x05",
+ "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+ "nonce" : "0x36",
+ "storage" : {
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "comment" : "OOG in subcall",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "balance" : "0x06",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x04" : "0x0c"
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "comment" : "OOG after subcall",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ },
+ "network" : ["EIP158", "EIP150"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "balance" : "0x05",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "comment" : "OOG after subcall",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ },
+ "network" : ["Homestead", "Frontier"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "balance" : "0x05",
+ "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
+ "nonce" : "0x36",
+ "storage" : {
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "comment" : "double OOG",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "balance" : "0x05",
+ "code" : "0x",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "balance" : "5",
+ "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }",
+ "nonce" : "54",
+ "storage" : {
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "{ [[2]] 8 (CREATE 0 0 0) [[3]] 12}",
+ "nonce" : "",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "Call with value to address A, then another call X, in the call X CREATE of account A, OOG -> revert call X.",
+ "data" : "d0g0 - double OOG, d0g1 - OOG inside subcall, d1g0 - OOG after subcall, d1g1 - no OOG",
+ "data" : [
+ "000000000000000000000000000000000000000000000000000000000000ea60",
+ "000000000000000000000000000000000000000000000000000000000001ea60"
+ ],
+ "gasLimit" : [
+ "110000", "160000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "3e180b1862f9d158abb5e519a6d8605540c23682",
+ "value" : [
+ "1", "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json
new file mode 100644
index 000000000..79f7d3ce0
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json
@@ -0,0 +1,178 @@
+{
+ "RevertDepthCreateOOG" : {
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "45678256",
+ "currentGasLimit" : "10000000",
+ "currentNumber" : "2675000",
+ "currentTimestamp" : "1",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "comment" : "NO OOG",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ },
+ "network" : ["EIP158"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "nonce" : "1"
+ },
+ "a000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01",
+ "0x04" : "0x0c"
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x02" : "0x08",
+ "0x03" : "0x0c"
+ }
+ }
+ }
+ },
+ {
+ "comment" : "NO OOG",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ },
+ "network" : ["EIP150"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "nonce" : "0"
+ },
+ "a000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x01" : "0x01",
+ "0x04" : "0x0c"
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x02" : "0x08",
+ "0x03" : "0x0c"
+ }
+ }
+ }
+ },
+ {
+ "comment" : "NO OOG",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 1,
+ "value" : 0
+ },
+ "network" : ["Frontier", "Homestead"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "shouldnotexist" : "1"
+ },
+ "a000000000000000000000000000000000000000" : {
+ "storage" : {
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "comment" : "OOG in subcall",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 1,
+ "value" : 0
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "shouldnotexist" : "1"
+ },
+ "a000000000000000000000000000000000000000" : {
+ "storage" : {
+ "0x00" : "0x01",
+ "0x04" : "0x0c"
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "comment" : "OOG after subcall / double OOG",
+ "indexes" : {
+ "data" : [1, 0],
+ "gas" : 0,
+ "value" : 0
+ },
+ "network" : ["ALL"],
+ "result" : {
+ "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+ "shouldnotexist" : "1"
+ },
+ "a000000000000000000000000000000000000000" : {
+ "storage" : {
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" :
+ {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000",
+ "code" : "",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a000000000000000000000000000000000000000" : {
+ "balance" : "5",
+ "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }",
+ "nonce" : "54",
+ "storage" : {
+ }
+ },
+ "b000000000000000000000000000000000000000" : {
+ "balance" : "",
+ "code" : "{ [[2]] 8 (CREATE 0 0 0) [[3]] 12}",
+ "nonce" : "",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : "Call with value to address A, then another call X, in the call X CREATE of account A, OOG -> revert call X.",
+ "data" : "d0g0 - double OOG, d0g1 - OOG inside subcall, d1g0 - OOG after subcall, d1g1 - no OOG",
+ "data" : [
+ "000000000000000000000000000000000000000000000000000000000000ea60",
+ "000000000000000000000000000000000000000000000000000000000001ea60"
+ ],
+ "gasLimit" : [
+ "110000", "160000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "a000000000000000000000000000000000000000",
+ "value" : [
+ "1", "0"
+ ]
+ }
+ }
+}