diff options
Diffstat (limited to 'src')
3 files changed, 164 insertions, 4 deletions
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json index 3f04aaf7c..6c0e40ee8 100644 --- a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json +++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d0g0v0Filler.json @@ -1,5 +1,8 @@ { "create2collisionStorage_d0g0v0" : { + "_info" : { + "comment" : "create2 generates an account that already exists and has storage != 0" + }, "blocks" : [ { "blockHeaderPremine" : { @@ -59,7 +62,6 @@ "balance" : "0x00", "nonce" : "0x01", "storage" : { - "0x00" : "0x01" } } } @@ -90,6 +92,14 @@ "storage" : { } }, + "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, "0xe2b35478fdd26477cc576dd906e6277761246a3c" : { "balance" : "0x00", "code" : "", diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json new file mode 100644 index 000000000..f68f547ac --- /dev/null +++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/create2collisionStorage_d1g0v0Filler.json @@ -0,0 +1,115 @@ +{ + "create2collisionStorage_d1g0v0" : { + "_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" : "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" : "0x00", + "storage" : { + "0x00" : "0x01" + } + } + } + }, + { + "network" : "Constantinople", + "result" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x01", + "nonce" : "0x02", + "storage" : { + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01" + }, + "0xaf3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : { + "balance" : "0x00", + "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" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xe2b35478fdd26477cc576dd906e6277761246a3c" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + } + }, + "sealEngine" : "NoProof" + } +}
\ No newline at end of file diff --git a/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json b/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json index 5a063bd77..27b573a79 100644 --- a/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json +++ b/src/GeneralStateTestsFiller/stCreate2/create2collisionStorageFiller.json @@ -37,7 +37,7 @@ }, { "indexes" : { - "data" : -1, + "data" : 0, "gas" : -1, "value" : -1 }, @@ -47,7 +47,33 @@ "balance" : "0", "nonce" : "1", "storage" : { - "0x00" : "0x01" + } + }, + "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "1", + "nonce" : "2", + "storage" : { + "0x00" : "0x00" + } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + } + } + }, + { + "indexes" : { + "data" : 1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : { + "balance" : "0", + "nonce" : "1", + "storage" : { + "0x01" : "0x01" } }, "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { @@ -78,11 +104,20 @@ "storage" : { "0x00" : "0x01" } + }, + "af3ecba2fe09a4f6c19f16a9d119e44e08c2da01" : { + "balance" : "0", + "code" : "0x", + "nonce" : "0", + "storage" : { + "0x00" : "0x01" + } } }, "transaction" : { "data" : [ - "{ (CREATE2 0 0 0 0) }" + "{ (CREATE2 0 0 0 0) }", + "{ (MSTORE 0 0x6001600155) (CREATE2 0 27 5 0) }" ], "gasLimit" : [ "400000" |