aboutsummaryrefslogtreecommitdiffstats
path: root/src/BlockchainTestsFiller
diff options
context:
space:
mode:
Diffstat (limited to 'src/BlockchainTestsFiller')
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json17
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0Filler.json116
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0Filler.json115
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0Filler.json112
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json35
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0Filler.json131
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0Filler.json131
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json36
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0Filler.json129
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0Filler.json129
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json25
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0Filler.json121
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0Filler.json121
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json33
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0Filler.json121
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0Filler.json121
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json17
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0Filler.json116
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0Filler.json116
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json8
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json9
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0Filler.json123
22 files changed, 1876 insertions, 6 deletions
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json
index cb689d31f..f8dd2dd83 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d0g0v0Filler.json
@@ -1,5 +1,8 @@
{
"create2collisionBalance_d0g0v0" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has balance != 0"
+ },
"blocks" : [
{
"blockHeaderPremine" : {
@@ -82,12 +85,26 @@
"storage" : {
}
},
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
"0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0x01",
"code" : "",
"nonce" : "0x00",
"storage" : {
}
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
}
},
"sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0Filler.json
new file mode 100644
index 000000000..9d202fe0e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d1g0v0Filler.json
@@ -0,0 +1,116 @@
+{
+ "create2collisionBalance_d1g0v0" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has balance != 0"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x64600160015560005260006005601b6000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+ "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+ "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"
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ "0x01" : "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0Filler.json
new file mode 100644
index 000000000..c7aff5d38
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d2g0v0Filler.json
@@ -0,0 +1,115 @@
+{
+ "create2collisionBalance_d2g0v0" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has balance != 0"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+ "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+ "to" : "",
+ "v" : "0x1b",
+ "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"
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "0x6001600155",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0Filler.json
new file mode 100644
index 000000000..61af0c782
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionBalance_d3g0v0Filler.json
@@ -0,0 +1,112 @@
+{
+ "create2collisionBalance_d3g0v0" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has balance != 0"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006001f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xbcb8e3b988ef2600800744cbd56a589545f6835ba785bd1294cbfd4269475e5f",
+ "s" : "0x364cd8be570ac583145288da8593dce1f18b3886f33ef75133779d02babaec14",
+ "to" : "",
+ "v" : "0x1c",
+ "value" : "0x01"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "nonce" : "0x00"
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+ "balance" : "0x00",
+ "nonce" : "0x02"
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "nonce" : "0x01"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x02",
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "",
+ "nonce" : "0x00",
+ "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
index 3558d29b1..2fcacb95e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d0g0v0Filler.json
@@ -1,5 +1,8 @@
{
"create2collisionCode_d0g0v0" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has not empty code"
+ },
"blocks" : [
{
"blockHeaderPremine" : {
@@ -52,10 +55,26 @@
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "0x01"
},
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
"0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0x00",
"code" : "0x010203",
- "nonce" : "0x00"
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
}
}
}
@@ -85,12 +104,26 @@
"storage" : {
}
},
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
"0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0x00",
"code" : "0x010203",
"nonce" : "0x00",
"storage" : {
}
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
}
},
"sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0Filler.json
new file mode 100644
index 000000000..7c1a66320
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d1g0v0Filler.json
@@ -0,0 +1,131 @@
+{
+ "create2collisionCode_d1g0v0" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has not empty code"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x64600160015560005260006005601b6000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+ "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+ "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"
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0Filler.json
new file mode 100644
index 000000000..50d065610
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionCode_d2g0v0Filler.json
@@ -0,0 +1,131 @@
+{
+ "create2collisionCode_d2g0v0" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has not empty code"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+ "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+ "to" : "",
+ "v" : "0x1b",
+ "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"
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "0x010203",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "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
index 87435970d..df9e1e008 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d0g0v0Filler.json
@@ -1,5 +1,8 @@
{
"create2collisionNonce_d0g0v0" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has nonce != 0"
+ },
"blocks" : [
{
"blockHeaderPremine" : {
@@ -50,9 +53,26 @@
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "0x01"
},
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
"0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0x00",
- "nonce" : "0x01"
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
}
}
@@ -82,12 +102,26 @@
"storage" : {
}
},
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
"0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0x00",
"code" : "",
"nonce" : "0x01",
"storage" : {
}
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
}
},
"sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0Filler.json
new file mode 100644
index 000000000..20ce675e0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d1g0v0Filler.json
@@ -0,0 +1,129 @@
+{
+ "create2collisionNonce_d1g0v0" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has nonce != 0"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x64600160015560005260006005601b6000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x7da48f10e29eb5a6814cda354150bde7f47de04fa62ed4cdb9ff4a81a5794b84",
+ "s" : "0x7bbabfcc8e405f15aa225178990ca95a390f0ff8dfa392545ed8ae9c4b61377c",
+ "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"
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0Filler.json
new file mode 100644
index 000000000..f20fe5c4e
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionNonce_d2g0v0Filler.json
@@ -0,0 +1,129 @@
+{
+ "create2collisionNonce_d2g0v0" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has nonce != 0"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+ "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+ "to" : "",
+ "v" : "0x1b",
+ "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"
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x01",
+ "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
index 0955437ef..beb3ead2e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d0g0v0Filler.json
@@ -1,5 +1,8 @@
{
"create2collisionSelfdestructedOOG_d0g0v0" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG"
+ },
"blocks" : [
{
"blockHeaderPremine" : {
@@ -51,9 +54,17 @@
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "0x01"
},
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ },
"0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0x01",
"code" : "0x6010ff"
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
}
}
}
@@ -83,12 +94,26 @@
"storage" : {
}
},
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
"0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0x01",
"code" : "0x6010ff",
"nonce" : "0x00",
"storage" : {
}
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
}
},
"sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0Filler.json
new file mode 100644
index 000000000..65521d9dc
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d1g0v0Filler.json
@@ -0,0 +1,121 @@
+{
+ "create2collisionSelfdestructedOOG_d1g0v0" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f55062112233600055",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xc0f0aee182bd978f7c158b0cd8d4e302186af634691f09f2f6ded35435b3a67c",
+ "s" : "0x2f6dc01df80d1f8d4281bb3db9090054b64085ae9756ed75e4165167d654c2c5",
+ "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"
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0Filler.json
new file mode 100644
index 000000000..2fe52c93d
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedOOG_d2g0v0Filler.json
@@ -0,0 +1,121 @@
+{
+ "create2collisionSelfdestructedOOG_d2g0v0" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction but then OOG"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f55062112233600055",
+ "gasLimit" : "0x030d40",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x400d01fbee4cd6f282e37d30701a8b9def8b9ab9525a9b39de005c00f80290fc",
+ "s" : "0x3ec2ac7110338a288c5404555d5edc6af34dc1ce8bbfa0a030bb6409bec498b8",
+ "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"
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "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
index f77608e49..049474e58 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d0g0v0Filler.json
@@ -1,5 +1,8 @@
{
"create2collisionSelfdestructedRevert_d0g0v0" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called"
+ },
"blocks" : [
{
"blockHeaderPremine" : {
@@ -10,14 +13,14 @@
},
"transactions" : [
{
- "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f55062112233600052600a6000fd",
+ "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506000600060006000f550621122336000526003601dfd",
"gasLimit" : "0x061a80",
"gasPrice" : "0x01",
"nonce" : "0x00",
- "r" : "0x960e876c974e4bd11f01c43b1b78db3d407c453bcfd608b692da2fd0a1af3e70",
- "s" : "0x3414c7e97f382be2d3458d3e60b5c67b932f2672e790b082c7059154eb0ef025",
+ "r" : "0xabaa7765012a257e7afb2c1e9dab591037ef9b215d0d7b5a3d82027f1965cb2f",
+ "s" : "0x2a22b608fb9b72ba335f91ca34e960d9f353840ab956049f3a7a6a7097d3dd74",
"to" : "",
- "v" : "0x1b",
+ "v" : "0x1c",
"value" : "0x01"
}
],
@@ -51,9 +54,17 @@
"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
"nonce" : "0x01"
},
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ },
"0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0x01",
"code" : "0x6010ff"
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
}
}
}
@@ -83,12 +94,26 @@
"storage" : {
}
},
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
"0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0x01",
"code" : "0x6010ff",
"nonce" : "0x00",
"storage" : {
}
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
}
},
"sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0Filler.json
new file mode 100644
index 000000000..8d5d02e9b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d1g0v0Filler.json
@@ -0,0 +1,121 @@
+{
+ "create2collisionSelfdestructedRevert_d1g0v0" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f15064600160015560005260006005601b6000f550621122336000526003601dfd",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x06c72773d9ec0a8d9a4a393422c5b62a7e4d482b187eca4839fc31d4a49d92fd",
+ "s" : "0x1821cc26908d7c4f0b4fe954cf8ba91d3c648e0deb24c1dbe2e733cdc59e4a7d",
+ "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"
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0Filler.json
new file mode 100644
index 000000000..38c889ea4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructedRevert_d2g0v0Filler.json
@@ -0,0 +1,121 @@
+{
+ "create2collisionSelfdestructedRevert_d2g0v0" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction but then REVERT is called"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073e2b35478fdd26477cc576dd906e6277761246a3c61c350f1506d6460016001556000526005601bf36000526000600e60126000f550621122336000526003601dfd",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x24c1a4a1f47eb30f0d674c8ecd87cecd868652abfaa828e9bd9201cdd01f62c6",
+ "s" : "0x667d69fde64034e7a20ac0da13137c43e5baf6ce477f1527e954ff374fbf26cd",
+ "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"
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff"
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "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
index ec0aac8be..c57385216 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d0g0v0Filler.json
@@ -1,5 +1,8 @@
{
"create2collisionSelfdestructed_d0g0v0" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction"
+ },
"blocks" : [
{
"blockHeaderPremine" : {
@@ -86,12 +89,26 @@
"storage" : {
}
},
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
"0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
"balance" : "0x01",
"code" : "0x6010ff",
"nonce" : "0x00",
"storage" : {
}
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
}
},
"sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0Filler.json
new file mode 100644
index 000000000..84d2fad12
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d1g0v0Filler.json
@@ -0,0 +1,116 @@
+{
+ "create2collisionSelfdestructed_d1g0v0" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073af3ecba2fe09a4f6c19f16a9d119e44e08c2da0161c350f15064600160015560005260006005601b6000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x8ed34060c3b876c8807ad84619a57d33c0a1f2159be991a3c0c1650659ee76ae",
+ "s" : "0x3f4cb699c2fa9e9cd49f8dbba7e28ea2b5736919939d196eb353d2821a55d97a",
+ "to" : "",
+ "v" : "0x1b",
+ "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"
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ }
+ }
+ }
+ ],
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0Filler.json
new file mode 100644
index 000000000..d1e9d1140
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionSelfdestructed_d2g0v0Filler.json
@@ -0,0 +1,116 @@
+{
+ "create2collisionSelfdestructed_d2g0v0" : {
+ "_info" : {
+ "comment" : "collision with address that has been selfdestructed in the same transaction"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6000600060006000600073ec2c6832d00680ece8ff9254f81fdab0a5a2ac5061c350f1506d6460016001556000526005601bf36000526000600e60126000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe273305d3f7274b4240a41448355f706a1a49a006a68367590f80753163238be",
+ "s" : "0x48999c9f182c1de512a97a387f0e09cbde89cfd668319658a1a3c8ec76872ba6",
+ "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"
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ }
+ }
+ }
+ ],
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x01",
+ "code" : "0x6010ff",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "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
index 6c0e40ee8..014a6ac21 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json
@@ -107,6 +107,14 @@
"storage" : {
"0x00" : "0x01"
}
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01"
+ }
}
},
"sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json
index f68f547ac..553d7ec14 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json
@@ -60,6 +60,7 @@
},
"0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
"balance" : "0x00",
+ "code" : "",
"nonce" : "0x01",
"storage" : {
"0x01" : "0x01"
@@ -108,6 +109,14 @@
"storage" : {
"0x00" : "0x01"
}
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01"
+ }
}
},
"sealEngine" : "NoProof"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0Filler.json
new file mode 100644
index 000000000..80e83b017
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d2g0v0Filler.json
@@ -0,0 +1,123 @@
+{
+ "create2collisionStorage_d2g0v0" : {
+ "_info" : {
+ "comment" : "create2 generates an account that already exists and has storage != 0"
+ },
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x6d6460016001556000526005601bf36000526000600e60126000f5",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0x6e3d7fc770c6f8dd5bdd4012f7979ff80f3dd90b9d2d5ff70caf5016723f5935",
+ "s" : "0x672067c23773c51da516c12d39692bd00dea60cee7c7de58f0456b01d4ce0322",
+ "to" : "",
+ "v" : "0x1b",
+ "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"
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "0x6001600155",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "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" : {
+ }
+ },
+ "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "0xe2b35478fdd26477cc576dd906e6277761246a3c" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "0xec2c6832d00680ece8ff9254f81fdab0a5a2ac50" : {
+ "balance" : "0x00",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ }
+ },
+ "sealEngine" : "NoProof"
+ }
+} \ No newline at end of file