aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitry <dimitry@ethereum.org>2018-08-16 01:05:39 +0800
committerDimitry <dimitry@ethereum.org>2018-08-27 20:18:05 +0800
commit6ebd4f17753ad633a7aeec98dc3f8fb2d629571a (patch)
tree32a2419c7b556b0d070f222435383f7c8fed4e70 /src
parentad2184adca367c0b68c65b44519dba16e1d0b9e2 (diff)
downloadtangerine-tests-6ebd4f17753ad633a7aeec98dc3f8fb2d629571a.tar
tangerine-tests-6ebd4f17753ad633a7aeec98dc3f8fb2d629571a.tar.gz
tangerine-tests-6ebd4f17753ad633a7aeec98dc3f8fb2d629571a.tar.bz2
tangerine-tests-6ebd4f17753ad633a7aeec98dc3f8fb2d629571a.tar.lz
tangerine-tests-6ebd4f17753ad633a7aeec98dc3f8fb2d629571a.tar.xz
tangerine-tests-6ebd4f17753ad633a7aeec98dc3f8fb2d629571a.tar.zst
tangerine-tests-6ebd4f17753ad633a7aeec98dc3f8fb2d629571a.zip
create2 test
Diffstat (limited to 'src')
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json95
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode2_d0g0v0Filler.json100
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode2_d1g0v0Filler.json100
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json98
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json95
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed2_d0g0v0Filler.json85
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed2_d1g0v0Filler.json85
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json96
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json96
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json99
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json104
-rw-r--r--src/BlockchainTestsFiller/bcStateTests/create2collisionwithSelfdestructSameBlockFiller.json89
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json89
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionCode2Filler.json119
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json92
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json89
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructed2Filler.json95
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json96
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json93
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json93
-rw-r--r--src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json99
21 files changed, 2007 insertions, 0 deletions
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json
new file mode 100644
index 000000000..cb689d31f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json
@@ -0,0 +1,95 @@
+{
+ "create2collisionBalance_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41",
+ "s" : "0x72568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x01"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "nonce" : "0x00"
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x01",
+ "nonce" : "0x02"
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "nonce" : "0x01"
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode2_d0g0v0Filler.json
new file mode 100644
index 000000000..8639f280c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode2_d0g0v0Filler.json
@@ -0,0 +1,100 @@
+{
+ "create2collisionCode2_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6b620102036000526003601df36000526000600c60146000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x47afa1a0b9f587287cae5fa351528b3db0cf99dd091a83f83e05dfa8c748acb1",
+ "s" : "0x75915d25ff48ff3254b63b7a153c796224b13cc706523a80bc410f173ee521ad",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x01"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "nonce" : "0x01"
+ },
+ "0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x01"
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x02"
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75df8a1",
+ "nonce" : "0x01"
+ },
+ "0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x01"
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode2_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode2_d1g0v0Filler.json
new file mode 100644
index 000000000..601a857c3
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode2_d1g0v0Filler.json
@@ -0,0 +1,100 @@
+{
+ "create2collisionCode2_d1g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6b620102036000526003601df36000526000600c60146001f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xff4a17353d8dbbe240808499854a7103dac228938ea31693436958ae60b70171",
+ "s" : "0xec5f2d9b551654607eeacb9079aa374c6a17b0ef96a1e0d1ad34aae1e4d1f5",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x01"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "nonce" : "0x01"
+ },
+ "0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x01"
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x02"
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75df8a0",
+ "nonce" : "0x01"
+ },
+ "0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x01"
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json
new file mode 100644
index 000000000..3558d29b1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json
@@ -0,0 +1,98 @@
+{
+ "create2collisionCode_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41",
+ "s" : "0x72568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x01"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00"
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x02"
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00"
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json
new file mode 100644
index 000000000..87435970d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json
@@ -0,0 +1,95 @@
+{
+ "create2collisionNonce_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41",
+ "s" : "0x72568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x01"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "nonce" : "0x01"
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x01",
+ "nonce" : "0x02"
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "nonce" : "0x01"
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed2_d0g0v0Filler.json
new file mode 100644
index 000000000..68a8aecdf
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed2_d0g0v0Filler.json
@@ -0,0 +1,85 @@
+{
+ "create2collisionSelfdestructed2_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073fce41d047b4a1d4450382dcc29ec7e5fedc5f9a361c350f1506b620102036000526003601df36000526000600c60146000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xf91da15bc3b0d0f3536f3b0513af6f2e9e46eef521a918898c2e44608e2c3e48",
+ "s" : "0x30fe012f350305e639d18a77467fa8634327d0e15ffd8a011bf5947cfb51be50",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x0000000000000000000000000000000000000010" : {
+ "balance" : "0x01"
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "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" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed2_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed2_d1g0v0Filler.json
new file mode 100644
index 000000000..b29811620
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed2_d1g0v0Filler.json
@@ -0,0 +1,85 @@
+{
+ "create2collisionSelfdestructed2_d1g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073cff64f4c5df8f436c4f2c1af4b2e3f9e3004c77961c350f1506b626010ff6000526003601df36000526000600c60146000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x2f5cc10fe04d67301b8f039cdebb279b51578ce54c711c0eb7170852f4893d9e",
+ "s" : "0x0b5dcf40e42ea7afb5ac8282eef23eead4eb197e939169786b2ede913d3476bd",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x00"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x0000000000000000000000000000000000000010" : {
+ "balance" : "0x01"
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xcff64f4c5df8f436c4f2c1af4b2e3f9e3004c779" : {
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "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" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json
new file mode 100644
index 000000000..0955437ef
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json
@@ -0,0 +1,96 @@
+{
+ "create2collisionSelfdestructedOOG_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600055",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x5f755a2b2d21277a0cef4eac4bf04bc32fc316081fd37f58fde6f9a2fe6bb64a",
+ "s" : "0x4a6a209a5688318f9691eff080b3aabf49b7638bac6bb755c40643f1341c8b03",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x01"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x0000000000000000000000000000000000000010" : {
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01"
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x0000000000000000000000000000000000000010" : {
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json
new file mode 100644
index 000000000..f77608e49
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json
@@ -0,0 +1,96 @@
+{
+ "create2collisionSelfdestructedRevert_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600052600a6000fd",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x960e876c974e4bd11f01c43b1b78db3d407c453bcfd608b692da2fd0a1af3e70",
+ "s" : "0x3414c7e97f382be2d3458d3e60b5c67b932f2672e790b082c7059154eb0ef025",
+ "to" : "",
+ "v" : "0x1b",
+ "value" : "0x01"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x0000000000000000000000000000000000000010" : {
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01"
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x0000000000000000000000000000000000000010" : {
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json
new file mode 100644
index 000000000..ec0aac8be
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json
@@ -0,0 +1,99 @@
+{
+ "create2collisionSelfdestructed_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe2d75d08fb681b15b09a794468c0f20f87807fdf00989e528ac753792fe7ab96",
+ "s" : "0x32326b6cc043975a6e4a8a02c1a5477fbf3f26e49c3a6287913d155979284368",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x01"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x0000000000000000000000000000000000000010" : {
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01"
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x0000000000000000000000000000000000000010" : {
+ "balance" : "0x01"
+ },
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x01",
+ "nonce" : "0x02",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json
new file mode 100644
index 000000000..3f04aaf7c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json
@@ -0,0 +1,104 @@
+{
+ "create2collisionStorage_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xec06b6a5de4da3d4c1dd660df4a47ec361b883301c7e51de9e9a9d9ccc2a1e41",
+ "s" : "0x72568521c5df26ee1166c2a92581c1dd2e89ed9832fc1ba0d33f74807be56c48",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x01"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x01",
+ "nonce" : "0x02",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "nonce" : "0x01",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/bcStateTests/create2collisionwithSelfdestructSameBlockFiller.json b/src/BlockchainTestsFiller/bcStateTests/create2collisionwithSelfdestructSameBlockFiller.json
new file mode 100644
index 000000000..b75a30c2c
--- /dev/null
+++ b/src/BlockchainTestsFiller/bcStateTests/create2collisionwithSelfdestructSameBlockFiller.json
@@ -0,0 +1,89 @@
+{
+ "create2collisionwithSelfdestructSameBlock" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdesturcted by another transaction in the same block"
+ },
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
+ "difficulty" : "0x020000",
+ "extraData" : "0x42",
+ "gasLimit" : "3141592",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x54c98c81",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "expect" : [
+ {
+ "network" : ["Constantinople"],
+ "result" : {
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x02"
+ },
+ "0x0000000000000000000000000000000000000010" : {
+ "balance" : "1"
+ },
+ "0x22a4ec9c035f66874f234c3a5bc7e18073e89057" : {
+ "nonce" : "1"
+ },
+ "0xec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+ "balance" : "10",
+ "code" : "",
+ "nonce" : "0x02",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "ec0e71ad0a90ffe1909d27dac207f7680abba42d" : {
+ "balance" : "1",
+ "nonce" : "3",
+ "code" : "{ (SELFDESTRUCT 0x10) }",
+ "storage": {}
+ }
+ },
+ "sealEngine" : "NoProof",
+ "blocks" : [
+ {
+ "transactions" : [
+ {
+ "data" : "",
+ "gasLimit" : "150000",
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "ec0e71ad0a90ffe1909d27dac207f7680abba42d",
+ "value" : "0"
+ },
+ {
+ "data" : "{ (CREATE2 0 0 0 0) }",
+ "gasLimit" : "150000",
+ "gasPrice" : "1",
+ "nonce" : "1",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : "10"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ]
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json
new file mode 100644
index 000000000..ca9d7caeb
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionBalanceFiller.json
@@ -0,0 +1,89 @@
+{
+ "create2collisionBalance" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has balance != 0"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Byzantium"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "1",
+ "nonce" : "0"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "1",
+ "nonce" : "1"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "1",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "{ (CREATE2 0 0 0 0) }"
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionCode2Filler.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionCode2Filler.json
new file mode 100644
index 000000000..90b6b8c9a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionCode2Filler.json
@@ -0,0 +1,119 @@
+{
+ "create2collisionCode2" : {
+ "_info" : {
+ "comment" : "collision with the contract that already has the same init code that we are about to create"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Byzantium"],
+ "result" : {
+ "fce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0",
+ "nonce" : "1",
+ "code" : "0x010203"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1",
+ "balance" : "999999999999600000"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "fce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0",
+ "nonce" : "1",
+ "code" : "0x010203"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2",
+ "code" : ""
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1",
+ "balance" : "999999999999604897"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "fce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0",
+ "nonce" : "1",
+ "code" : "0x010203"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2",
+ "code" : ""
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1",
+ "balance" : "999999999999604896"
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "{ (MSTORE 0 0x620102036000526003601df3) (CREATE2 0 20 12 0) }",
+ "{ (MSTORE 0 0x620102036000526003601df3) (CREATE2 1 20 12 0) }"
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json
new file mode 100644
index 000000000..3788046be
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionCodeFiller.json
@@ -0,0 +1,92 @@
+{
+ "create2collisionCode" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has not empty code"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Byzantium"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "0x010203"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "code" : "0x010203"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2",
+ "code" : ""
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0",
+ "code" : "0x010203",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "{ (CREATE2 0 0 0 0) }"
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json
new file mode 100644
index 000000000..a1d553c97
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionNonceFiller.json
@@ -0,0 +1,89 @@
+{
+ "create2collisionNonce" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has nonce != 0"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Byzantium"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0",
+ "nonce" : "1"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0",
+ "nonce" : "1"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "{ (CREATE2 0 0 0 0) }"
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructed2Filler.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructed2Filler.json
new file mode 100644
index 000000000..7721af90f
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructed2Filler.json
@@ -0,0 +1,95 @@
+{
+ "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."
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : 0,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "fce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "shouldnotexist" : "1"
+ },
+ "0000000000000000000000000000000000000010" : {
+ "balance" : "0x01"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : 1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "cff64f4c5df8f436c4f2c1af4b2e3f9e3004c779" : {
+ "shouldnotexist" : "1"
+ },
+ "0000000000000000000000000000000000000010" : {
+ "balance" : "0x01"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "{ (MSTORE 0 0x6010ff) (RETURN 29 3) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "fce41d047b4a1d4450382dcc29ec7e5fedc5f9a3" : {
+ "balance" : "1",
+ "code" : "{ (SELFDESTRUCT 0x10) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "0xcff64f4c5df8f436c4f2c1af4b2e3f9e3004c779" : {
+ "balance" : "1",
+ "code" : "0x6010ff",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "//data" : "0 - different code, 1 - same code",
+ "data" : [
+ "{ (CALL 50000 0xfce41d047b4a1d4450382dcc29ec7e5fedc5f9a3 0 0 0 0 0) (MSTORE 0 0x620102036000526003601df3) (CREATE2 0 20 12 0) }",
+ "{ (CALL 50000 0xcff64f4c5df8f436c4f2c1af4b2e3f9e3004c779 0 0 0 0 0) (MSTORE 0 0x626010ff6000526003601df3) (CREATE2 0 20 12 0) }"
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "0"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json
new file mode 100644
index 000000000..1fb17c1ea
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedFiller.json
@@ -0,0 +1,96 @@
+{
+ "create2collisionSelfdestructed" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Byzantium"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "1"
+ },
+ "0000000000000000000000000000000000000010" : {
+ "shouldnotexist" : "1"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "shouldnotexist" : "1"
+ },
+ "0000000000000000000000000000000000000010" : {
+ "balance" : "0x01"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2",
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "1",
+ "code" : "{ (SELFDESTRUCT 0x10) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) }"
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json
new file mode 100644
index 000000000..9e6282453
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedOOGFiller.json
@@ -0,0 +1,93 @@
+{
+ "create2collisionSelfdestructedOOG" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Byzantium"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "1"
+ },
+ "0000000000000000000000000000000000000010" : {
+ "shouldnotexist" : "1"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "1",
+ "code" : "0x6010ff"
+ },
+ "0000000000000000000000000000000000000010" : {
+ "shouldnotexist" : "1"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "1",
+ "code" : "{ (SELFDESTRUCT 0x10) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) (SSTORE 0 0x112233)}"
+ ],
+ "gasLimit" : [
+ "200000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json
new file mode 100644
index 000000000..817623aae
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionSelfdestructedRevertFiller.json
@@ -0,0 +1,93 @@
+{
+ "create2collisionSelfdestructedRevert" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Byzantium"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "1"
+ },
+ "0000000000000000000000000000000000000010" : {
+ "shouldnotexist" : "1"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "1",
+ "code" : "0x6010ff"
+ },
+ "0000000000000000000000000000000000000010" : {
+ "shouldnotexist" : "1"
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "1",
+ "code" : "{ (SELFDESTRUCT 0x10) }",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "{ (CALL 50000 0xe2b35478fdd26477cc576dd906e6277761246a3c 0 0 0 0 0) (CREATE2 0 0 0 0) (MSTORE 0 0x112233) (REVERT 0 10) }"
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "1"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json
new file mode 100644
index 000000000..5a063bd77
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json
@@ -0,0 +1,99 @@
+{
+ "create2collisionStorage" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has storage != 0"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["Byzantium"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "shouldnotexist" : "1"
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0",
+ "nonce" : "1",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "1",
+ "nonce" : "2",
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "1"
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "e2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ "{ (CREATE2 0 0 0 0) }"
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "",
+ "value" : [
+ "1"
+ ]
+ }
+ }
+}