aboutsummaryrefslogtreecommitdiffstats
path: root/GeneralStateTests/stCreate2
diff options
context:
space:
mode:
authorwinsvega <winsvega@mail.ru>2018-08-28 19:29:58 +0800
committerGitHub <noreply@github.com>2018-08-28 19:29:58 +0800
commite25d2306414373a82dbd561a7bfe84b794ba2aaa (patch)
treea6f68542511984af83bf57783a7fc99d9eff57d5 /GeneralStateTests/stCreate2
parentad2184adca367c0b68c65b44519dba16e1d0b9e2 (diff)
parent3be71ec3364a01fd4f2cb9b9fd086f3f69f0225c (diff)
downloadtangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar
tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar.gz
tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar.bz2
tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar.lz
tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar.xz
tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar.zst
tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.zip
Merge pull request #486 from ethereum/create2
create2 collision tests
Diffstat (limited to 'GeneralStateTests/stCreate2')
-rw-r--r--GeneralStateTests/stCreate2/create2collisionBalance.json74
-rw-r--r--GeneralStateTests/stCreate2/create2collisionCode.json74
-rw-r--r--GeneralStateTests/stCreate2/create2collisionCode2.json93
-rw-r--r--GeneralStateTests/stCreate2/create2collisionNonce.json74
-rw-r--r--GeneralStateTests/stCreate2/create2collisionSelfdestructed.json74
-rw-r--r--GeneralStateTests/stCreate2/create2collisionSelfdestructed2.json80
-rw-r--r--GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json74
-rw-r--r--GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json74
-rw-r--r--GeneralStateTests/stCreate2/create2collisionStorage.json75
9 files changed, 692 insertions, 0 deletions
diff --git a/GeneralStateTests/stCreate2/create2collisionBalance.json b/GeneralStateTests/stCreate2/create2collisionBalance.json
new file mode 100644
index 000000000..aa93e3d8d
--- /dev/null
+++ b/GeneralStateTests/stCreate2/create2collisionBalance.json
@@ -0,0 +1,74 @@
+{
+ "create2collisionBalance" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has balance != 0",
+ "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+ "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+ "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json",
+ "sourceHash" : "bd0821b3a8bde26a77b61300b4d2a6fb39c6fc13ddbd6f2ecfd9d23edbe943c7"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "0x0f4240",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Byzantium" : [
+ {
+ "hash" : "0x455afcc8ac854a58135d6b56c9b71446b6f13fd49bc75444572be50918a4a9e5",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ],
+ "Constantinople" : [
+ {
+ "hash" : "0xac2995edb932912509f3202ee433ed00712b9d0e6cf5578369da03ff73d50f01",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6000600060006000f5"
+ ],
+ "gasLimit" : [
+ "0x061a80"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0x01"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/create2collisionCode.json b/GeneralStateTests/stCreate2/create2collisionCode.json
new file mode 100644
index 000000000..36f6e2f55
--- /dev/null
+++ b/GeneralStateTests/stCreate2/create2collisionCode.json
@@ -0,0 +1,74 @@
+{
+ "create2collisionCode" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has not empty code",
+ "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+ "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+ "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json",
+ "sourceHash" : "4f997537a448d0024ea20a53d9673afa9324d9633ec7e8b97bd74073b40a25b9"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "0x0f4240",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Byzantium" : [
+ {
+ "hash" : "0x99f1f2d802c0e3d46619a143e236f1a8390f8b524553c8fd18b678317b377654",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ],
+ "Constantinople" : [
+ {
+ "hash" : "0x171ffc2b7bf5a9a8fcfb5d7a4b799c4069dc16f3b5b4d3837606b17b696b15f7",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6000600060006000f5"
+ ],
+ "gasLimit" : [
+ "0x061a80"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0x01"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/create2collisionCode2.json b/GeneralStateTests/stCreate2/create2collisionCode2.json
new file mode 100644
index 000000000..8780bc2ee
--- /dev/null
+++ b/GeneralStateTests/stCreate2/create2collisionCode2.json
@@ -0,0 +1,93 @@
+{
+ "create2collisionCode2" : {
+ "_info" : {
+ "comment" : "collision with the contract that already has the same init code that we are about to create",
+ "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+ "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+ "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionCode2Filler.json",
+ "sourceHash" : "1d371fe9a1edbd6e9f41bf52f6d7da73fafa240b8f75a564b125f32a3da7c672"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "0x0f4240",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Byzantium" : [
+ {
+ "hash" : "0x0031ba3237d38ea15dd82e9ba9940389da9b97e92f5485b8e118a24770e9704d",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0x0031ba3237d38ea15dd82e9ba9940389da9b97e92f5485b8e118a24770e9704d",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ],
+ "Constantinople" : [
+ {
+ "hash" : "0x29537ed68332a8b7e4c17f660f4c40b9a45c6deac425fdc80d170c5396900f48",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0xe2e94d628304f5e3871c5145cbbc0f3282ec8a1c990e25a8b95aaa02b44732cc",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6b620102036000526003601df36000526000600c60146000f5",
+ "0x6b620102036000526003601df36000526000600c60146001f5"
+ ],
+ "gasLimit" : [
+ "0x061a80"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0x01"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/create2collisionNonce.json b/GeneralStateTests/stCreate2/create2collisionNonce.json
new file mode 100644
index 000000000..f73d751b8
--- /dev/null
+++ b/GeneralStateTests/stCreate2/create2collisionNonce.json
@@ -0,0 +1,74 @@
+{
+ "create2collisionNonce" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has nonce != 0",
+ "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+ "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+ "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json",
+ "sourceHash" : "7431f28384a4f97499e69173aed899f15fe936a5ed4e955e86cd428285f1b914"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "0x0f4240",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Byzantium" : [
+ {
+ "hash" : "0x2f7b8ca16fa10a0164dedaac1c008f20ea5ea0cf67a74d173336a7b6baab71fd",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ],
+ "Constantinople" : [
+ {
+ "hash" : "0x1f471deaed5abf11e6b12d254b69d228ce820dad5a8e248c506d47a7d2e820f1",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6000600060006000f5"
+ ],
+ "gasLimit" : [
+ "0x061a80"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0x01"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructed.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructed.json
new file mode 100644
index 000000000..b572b20f0
--- /dev/null
+++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructed.json
@@ -0,0 +1,74 @@
+{
+ "create2collisionSelfdestructed" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction",
+ "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+ "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+ "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json",
+ "sourceHash" : "aa82221fe6312dc15add5fd8f69342605fa83c8c1b2a870139a9833dd2876eb6"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "0x0f4240",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Byzantium" : [
+ {
+ "hash" : "0xa0652ee361902645d869d84d6cfe814679e9a318e09205e6de48a9fbdcd33760",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ],
+ "Constantinople" : [
+ {
+ "hash" : "0x0ac1dfa111dfd2f876591a97b67faea1440596694e5a32e1092e28243757ce50",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f5"
+ ],
+ "gasLimit" : [
+ "0x061a80"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0x01"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructed2.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructed2.json
new file mode 100644
index 000000000..c61aed991
--- /dev/null
+++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructed2.json
@@ -0,0 +1,80 @@
+{
+ "create2collisionSelfdestructed2" : {
+ "_info" : {
+ "comment" : "A contract which performs SUICIDE, and is then attempted to be recreated (different code, same init-code) during the same transaction. This ought to fail, since the code is not cleaned out until after the transaction is ended.",
+ "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+ "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+ "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructed2Filler.json",
+ "sourceHash" : "c2dfd1897c3208ec6bb0d90f4c28366282433d67d37d571ba0af0fc0f7441ad4"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "0x0f4240",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Constantinople" : [
+ {
+ "hash" : "0x2aaeccadffb464b3942a98bcaa33d20002168de6b585c39514e45f2bfe8f68a8",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ {
+ "hash" : "0xccd5070f2c969fd80b3d6e01a5419fd7fd70359d4cbe9397da6838b338ceae50",
+ "indexes" : {
+ "data" : 1,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x626010ff6000526003601df3",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xcff64f4c5df8f436c4f2c1af4b2e3f9e3004c779" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6000600060006000600073fce41d047b4a1d4450382dcc29ec7e5fedc5f9a361c350f1506b620102036000526003601df36000526000600c60146000f5",
+ "0x6000600060006000600073cff64f4c5df8f436c4f2c1af4b2e3f9e3004c77961c350f1506b626010ff6000526003601df36000526000600c60146000f5"
+ ],
+ "gasLimit" : [
+ "0x061a80"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0x00"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json
new file mode 100644
index 000000000..804d05fff
--- /dev/null
+++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG.json
@@ -0,0 +1,74 @@
+{
+ "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",
+ "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+ "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json",
+ "sourceHash" : "6b3e76fd94ad0d4b63c4f0709b9a08e407681128ee046157ac29be87f61610ea"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "0x0f4240",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Byzantium" : [
+ {
+ "hash" : "0xa83baf40800c1629194bdaf2ebf00aec1366ddf24b457610eec75fe199d29720",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ],
+ "Constantinople" : [
+ {
+ "hash" : "0xa83baf40800c1629194bdaf2ebf00aec1366ddf24b457610eec75fe199d29720",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055"
+ ],
+ "gasLimit" : [
+ "0x030d40"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0x01"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json b/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json
new file mode 100644
index 000000000..57274403b
--- /dev/null
+++ b/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert.json
@@ -0,0 +1,74 @@
+{
+ "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",
+ "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+ "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json",
+ "sourceHash" : "5ee9f4ff1a2bbba51a007aab9a4fb4c771fe44b3cdf6c840d670a803c649f4a0"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "0x0f4240",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Byzantium" : [
+ {
+ "hash" : "0xa0652ee361902645d869d84d6cfe814679e9a318e09205e6de48a9fbdcd33760",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ],
+ "Constantinople" : [
+ {
+ "hash" : "0x4d7794f8ec48cb043fce08a7d9e53ead7016a4441408e05de50e0aefbaf33a08",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600052600a6000fd"
+ ],
+ "gasLimit" : [
+ "0x061a80"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0x01"
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/GeneralStateTests/stCreate2/create2collisionStorage.json b/GeneralStateTests/stCreate2/create2collisionStorage.json
new file mode 100644
index 000000000..a730a12ac
--- /dev/null
+++ b/GeneralStateTests/stCreate2/create2collisionStorage.json
@@ -0,0 +1,75 @@
+{
+ "create2collisionStorage" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has storage != 0",
+ "filledwith" : "testeth 1.5.0.dev2+commit.0397a837.dirty",
+ "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++",
+ "source" : "src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json",
+ "sourceHash" : "c46b7b85b0e53dabfe9c426e3985546f4d218dceaccb5a1fa1af921b6ea49136"
+ },
+ "env" : {
+ "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "0x0f4240",
+ "currentNumber" : "0x01",
+ "currentTimestamp" : "0x03e8",
+ "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "post" : {
+ "Byzantium" : [
+ {
+ "hash" : "0xd086ddbd06a36f9f5f78ea4cfd39f0930fec271fda68a786e0dac75b1c4f5e69",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ],
+ "Constantinople" : [
+ {
+ "hash" : "0xc5f9c36d995fd94ffad0bbcaf4ab01183bf7574152dcca0182d3c4e4720434e0",
+ "indexes" : {
+ "data" : 0,
+ "gas" : 0,
+ "value" : 0
+ },
+ "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ }
+ ]
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "0x6000600060006000f5"
+ ],
+ "gasLimit" : [
+ "0x061a80"
+ ],
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0x01"
+ ]
+ }
+ }
+} \ No newline at end of file