diff options
author | Yoichi Hirai <i@yoichihirai.com> | 2018-03-01 22:24:57 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-01 22:24:57 +0800 |
commit | 61185fe4b8762118fe9ee318539683b47cb04ed6 (patch) | |
tree | 3286811a8c0bdb53ef41d730b948e5ffa1ba1991 | |
parent | 8cade06ed831731d11d3329ae94b1dc65c9deed0 (diff) | |
parent | 298749a4b2d0d9e932057dabb1ebb38ddb84f116 (diff) | |
download | tangerine-tests-61185fe4b8762118fe9ee318539683b47cb04ed6.tar tangerine-tests-61185fe4b8762118fe9ee318539683b47cb04ed6.tar.gz tangerine-tests-61185fe4b8762118fe9ee318539683b47cb04ed6.tar.bz2 tangerine-tests-61185fe4b8762118fe9ee318539683b47cb04ed6.tar.lz tangerine-tests-61185fe4b8762118fe9ee318539683b47cb04ed6.tar.xz tangerine-tests-61185fe4b8762118fe9ee318539683b47cb04ed6.tar.zst tangerine-tests-61185fe4b8762118fe9ee318539683b47cb04ed6.zip |
Merge pull request #419 from ethereum/init-create-revert
revert in CREATE in init code, followed by returndatasize/copy
5 files changed, 867 insertions, 4 deletions
diff --git a/BlockchainTests/GeneralStateTests/stRevertTest/RevertInCreateInInit_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRevertTest/RevertInCreateInInit_d0g0v0.json new file mode 100644 index 000000000..4e1ebba92 --- /dev/null +++ b/BlockchainTests/GeneralStateTests/stRevertTest/RevertInCreateInInit_d0g0v0.json @@ -0,0 +1,548 @@ +{ + "RevertInCreateInInit_d0g0v0_Byzantium" : { + "_info" : { + "comment" : "", + "filledwith" : "cpp-1.3.0+commit.d9483255.Linux.g++", + "lllcversion" : "Version: 0.4.20-develop.2017.12.6+commit.c2109436.Linux.g++", + "source" : "src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInCreateInInit_d0g0v0Filler.json", + "sourceHash" : "5d8264b60c1bce6673ebdfd39d842726112e95ce5bae51e914d8a9da668edb1b" + }, + "blocks" : [ + { + "blockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "", + "gasLimit" : "0x0a00000000", + "gasUsed" : "0x01f250", + "hash" : "0x24b9c2e7d5ffd6d45ae4aa55056a1fdb6768b4795aa9c54721a0d29ceda8d08f", + "mixHash" : "0x7557765386d1dabf084eb3460035b0498dcd05cd3b9c43b358af89e973154195", + "nonce" : "0xa3700b0c65d83b35", + "number" : "0x01", + "parentHash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145", + "receiptTrie" : "0x1317725ef8cc40837ca3fc80e7234b5dfb4ae71b35fc1b9fdca1ad979bcee2d1", + "stateRoot" : "0xeedc4123d2e64028e099654aefcb7bf54f036efa9e27079e031b5ab815d4f4c2", + "timestamp" : "0x03e8", + "transactionsTrie" : "0x343afd4795c7f7b757d9826ebb61ed759dde2ea604c1ecf34ea4a27a1d28bf72", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "rlp" : "0xf9027ef901faa06a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eedc4123d2e64028e099654aefcb7bf54f036efa9e27079e031b5ab815d4f4c2a0343afd4795c7f7b757d9826ebb61ed759dde2ea604c1ecf34ea4a27a1d28bf72a01317725ef8cc40837ca3fc80e7234b5dfb4ae71b35fc1b9fdca1ad979bcee2d1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a000000008301f2508203e880a07557765386d1dabf084eb3460035b0498dcd05cd3b9c43b358af89e97315419588a3700b0c65d83b35f87ef87c8001850a000000008080ae3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd1ba042c939717e6caa4699346a155bbf45c72a346a985ec26c2362a76b0a7df10897a05024f8caa7d700b41788e2405161386ab3354f01bdab7b0a65175007bd39f9f9c0", + "transactions" : [ + { + "data" : "0x3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd", + "gasLimit" : "0x0a00000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "r" : "0x42c939717e6caa4699346a155bbf45c72a346a985ec26c2362a76b0a7df10897", + "s" : "0x5024f8caa7d700b41788e2405161386ab3354f01bdab7b0a65175007bd39f9f9", + "to" : "", + "v" : "0x1b", + "value" : "0x00" + } + ], + "uncleHeaders" : [ + ] + } + ], + "genesisBlockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "0x42", + "gasLimit" : "0x0a00000000", + "gasUsed" : "0x00", + "hash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145", + "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "nonce" : "0x0102030405060708", + "number" : "0x00", + "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "stateRoot" : "0xbb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9", + "timestamp" : "0x03b6", + "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0", + "lastblockhash" : "0x24b9c2e7d5ffd6d45ae4aa55056a1fdb6768b4795aa9c54721a0d29ceda8d08f", + "network" : "Byzantium", + "postState" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x29a2241af62df250", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x02", + "storage" : { + "0x00" : "0x20", + "0x01" : "0x112233" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x63fffe0db0", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + } + }, + "pre" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x6400000000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + } + }, + "RevertInCreateInInit_d0g0v0_EIP150" : { + "_info" : { + "comment" : "", + "filledwith" : "cpp-1.3.0+commit.d9483255.Linux.g++", + "lllcversion" : "Version: 0.4.20-develop.2017.12.6+commit.c2109436.Linux.g++", + "source" : "src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInCreateInInit_d0g0v0Filler.json", + "sourceHash" : "5d8264b60c1bce6673ebdfd39d842726112e95ce5bae51e914d8a9da668edb1b" + }, + "blocks" : [ + { + "blockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "", + "gasLimit" : "0x0a00000000", + "gasUsed" : "0x0a00000000", + "hash" : "0x7f01c89cd7070e893fd7463f73842f2a6be290ef23062a134480bd65d67b4a7e", + "mixHash" : "0xddeac7f79d0f979c75244521ac227f7923d9556257a5f77b1774ffeb1594d3d2", + "nonce" : "0x148fb44e87b7d678", + "number" : "0x01", + "parentHash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145", + "receiptTrie" : "0x565c3581a0a4c366c4bea265aedb1c15dcda0592346befe8ada2a89fb7dc4d5c", + "stateRoot" : "0xf9257ecde85506c81ca7b0ca992ca7a58d189d0048efa197d0d1a134ee6c0639", + "timestamp" : "0x03e8", + "transactionsTrie" : "0x343afd4795c7f7b757d9826ebb61ed759dde2ea604c1ecf34ea4a27a1d28bf72", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "rlp" : "0xf90280f901fca06a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9257ecde85506c81ca7b0ca992ca7a58d189d0048efa197d0d1a134ee6c0639a0343afd4795c7f7b757d9826ebb61ed759dde2ea604c1ecf34ea4a27a1d28bf72a0565c3581a0a4c366c4bea265aedb1c15dcda0592346befe8ada2a89fb7dc4d5cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0ddeac7f79d0f979c75244521ac227f7923d9556257a5f77b1774ffeb1594d3d288148fb44e87b7d678f87ef87c8001850a000000008080ae3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd1ba042c939717e6caa4699346a155bbf45c72a346a985ec26c2362a76b0a7df10897a05024f8caa7d700b41788e2405161386ab3354f01bdab7b0a65175007bd39f9f9c0", + "transactions" : [ + { + "data" : "0x3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd", + "gasLimit" : "0x0a00000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "r" : "0x42c939717e6caa4699346a155bbf45c72a346a985ec26c2362a76b0a7df10897", + "s" : "0x5024f8caa7d700b41788e2405161386ab3354f01bdab7b0a65175007bd39f9f9", + "to" : "", + "v" : "0x1b", + "value" : "0x00" + } + ], + "uncleHeaders" : [ + ] + } + ], + "genesisBlockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "0x42", + "gasLimit" : "0x0a00000000", + "gasUsed" : "0x00", + "hash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145", + "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "nonce" : "0x0102030405060708", + "number" : "0x00", + "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "stateRoot" : "0xbb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9", + "timestamp" : "0x03b6", + "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0", + "lastblockhash" : "0x7f01c89cd7070e893fd7463f73842f2a6be290ef23062a134480bd65d67b4a7e", + "network" : "EIP150", + "postState" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x4563918c44f40000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x5a00000000", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + } + }, + "pre" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x6400000000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + } + }, + "RevertInCreateInInit_d0g0v0_EIP158" : { + "_info" : { + "comment" : "", + "filledwith" : "cpp-1.3.0+commit.d9483255.Linux.g++", + "lllcversion" : "Version: 0.4.20-develop.2017.12.6+commit.c2109436.Linux.g++", + "source" : "src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInCreateInInit_d0g0v0Filler.json", + "sourceHash" : "5d8264b60c1bce6673ebdfd39d842726112e95ce5bae51e914d8a9da668edb1b" + }, + "blocks" : [ + { + "blockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "", + "gasLimit" : "0x0a00000000", + "gasUsed" : "0x0a00000000", + "hash" : "0x0fab4090a593039343e3ed12dbb86d53aa641a23d41ce3ab44346d77ec11abe8", + "mixHash" : "0xde2c31971efad6899c31aa790252a09ca16d3a54829966a0d0fcddb8762326d1", + "nonce" : "0x85bf5c668ed15909", + "number" : "0x01", + "parentHash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145", + "receiptTrie" : "0x565c3581a0a4c366c4bea265aedb1c15dcda0592346befe8ada2a89fb7dc4d5c", + "stateRoot" : "0xf9257ecde85506c81ca7b0ca992ca7a58d189d0048efa197d0d1a134ee6c0639", + "timestamp" : "0x03e8", + "transactionsTrie" : "0x343afd4795c7f7b757d9826ebb61ed759dde2ea604c1ecf34ea4a27a1d28bf72", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "rlp" : "0xf90280f901fca06a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9257ecde85506c81ca7b0ca992ca7a58d189d0048efa197d0d1a134ee6c0639a0343afd4795c7f7b757d9826ebb61ed759dde2ea604c1ecf34ea4a27a1d28bf72a0565c3581a0a4c366c4bea265aedb1c15dcda0592346befe8ada2a89fb7dc4d5cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0de2c31971efad6899c31aa790252a09ca16d3a54829966a0d0fcddb8762326d18885bf5c668ed15909f87ef87c8001850a000000008080ae3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd1ba042c939717e6caa4699346a155bbf45c72a346a985ec26c2362a76b0a7df10897a05024f8caa7d700b41788e2405161386ab3354f01bdab7b0a65175007bd39f9f9c0", + "transactions" : [ + { + "data" : "0x3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd", + "gasLimit" : "0x0a00000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "r" : "0x42c939717e6caa4699346a155bbf45c72a346a985ec26c2362a76b0a7df10897", + "s" : "0x5024f8caa7d700b41788e2405161386ab3354f01bdab7b0a65175007bd39f9f9", + "to" : "", + "v" : "0x1b", + "value" : "0x00" + } + ], + "uncleHeaders" : [ + ] + } + ], + "genesisBlockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "0x42", + "gasLimit" : "0x0a00000000", + "gasUsed" : "0x00", + "hash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145", + "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "nonce" : "0x0102030405060708", + "number" : "0x00", + "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "stateRoot" : "0xbb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9", + "timestamp" : "0x03b6", + "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0", + "lastblockhash" : "0x0fab4090a593039343e3ed12dbb86d53aa641a23d41ce3ab44346d77ec11abe8", + "network" : "EIP158", + "postState" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x4563918c44f40000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x5a00000000", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + } + }, + "pre" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x6400000000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + } + }, + "RevertInCreateInInit_d0g0v0_Frontier" : { + "_info" : { + "comment" : "", + "filledwith" : "cpp-1.3.0+commit.d9483255.Linux.g++", + "lllcversion" : "Version: 0.4.20-develop.2017.12.6+commit.c2109436.Linux.g++", + "source" : "src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInCreateInInit_d0g0v0Filler.json", + "sourceHash" : "5d8264b60c1bce6673ebdfd39d842726112e95ce5bae51e914d8a9da668edb1b" + }, + "blocks" : [ + { + "blockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "", + "gasLimit" : "0x0a00000000", + "gasUsed" : "0x0a00000000", + "hash" : "0xbb0479d9afa3d2a20839ef2b8d6fd7b700d197add9c06c951de2d86379b48d68", + "mixHash" : "0x9d24e794152b019c85bdedde1a41de65a9928de9a666d79d9b953af938988da0", + "nonce" : "0x9f6427080634a7d4", + "number" : "0x01", + "parentHash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145", + "receiptTrie" : "0x565c3581a0a4c366c4bea265aedb1c15dcda0592346befe8ada2a89fb7dc4d5c", + "stateRoot" : "0xf9257ecde85506c81ca7b0ca992ca7a58d189d0048efa197d0d1a134ee6c0639", + "timestamp" : "0x03e8", + "transactionsTrie" : "0x343afd4795c7f7b757d9826ebb61ed759dde2ea604c1ecf34ea4a27a1d28bf72", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "rlp" : "0xf90280f901fca06a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9257ecde85506c81ca7b0ca992ca7a58d189d0048efa197d0d1a134ee6c0639a0343afd4795c7f7b757d9826ebb61ed759dde2ea604c1ecf34ea4a27a1d28bf72a0565c3581a0a4c366c4bea265aedb1c15dcda0592346befe8ada2a89fb7dc4d5cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a09d24e794152b019c85bdedde1a41de65a9928de9a666d79d9b953af938988da0889f6427080634a7d4f87ef87c8001850a000000008080ae3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd1ba042c939717e6caa4699346a155bbf45c72a346a985ec26c2362a76b0a7df10897a05024f8caa7d700b41788e2405161386ab3354f01bdab7b0a65175007bd39f9f9c0", + "transactions" : [ + { + "data" : "0x3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd", + "gasLimit" : "0x0a00000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "r" : "0x42c939717e6caa4699346a155bbf45c72a346a985ec26c2362a76b0a7df10897", + "s" : "0x5024f8caa7d700b41788e2405161386ab3354f01bdab7b0a65175007bd39f9f9", + "to" : "", + "v" : "0x1b", + "value" : "0x00" + } + ], + "uncleHeaders" : [ + ] + } + ], + "genesisBlockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "0x42", + "gasLimit" : "0x0a00000000", + "gasUsed" : "0x00", + "hash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145", + "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "nonce" : "0x0102030405060708", + "number" : "0x00", + "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "stateRoot" : "0xbb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9", + "timestamp" : "0x03b6", + "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0", + "lastblockhash" : "0xbb0479d9afa3d2a20839ef2b8d6fd7b700d197add9c06c951de2d86379b48d68", + "network" : "Frontier", + "postState" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x4563918c44f40000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x5a00000000", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + } + }, + "pre" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x6400000000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + } + }, + "RevertInCreateInInit_d0g0v0_Homestead" : { + "_info" : { + "comment" : "", + "filledwith" : "cpp-1.3.0+commit.d9483255.Linux.g++", + "lllcversion" : "Version: 0.4.20-develop.2017.12.6+commit.c2109436.Linux.g++", + "source" : "src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInCreateInInit_d0g0v0Filler.json", + "sourceHash" : "5d8264b60c1bce6673ebdfd39d842726112e95ce5bae51e914d8a9da668edb1b" + }, + "blocks" : [ + { + "blockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "", + "gasLimit" : "0x0a00000000", + "gasUsed" : "0x0a00000000", + "hash" : "0x8386a9980e41d1c99251441b7460b0e744eebbe262645f1ee855f31aedeafae5", + "mixHash" : "0xf5195b0adbf710cf472b94dd23a3bad361a1d8f016d7c1465abab12a20a40f99", + "nonce" : "0xcb4a1f5f99a2ca23", + "number" : "0x01", + "parentHash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145", + "receiptTrie" : "0x565c3581a0a4c366c4bea265aedb1c15dcda0592346befe8ada2a89fb7dc4d5c", + "stateRoot" : "0xf9257ecde85506c81ca7b0ca992ca7a58d189d0048efa197d0d1a134ee6c0639", + "timestamp" : "0x03e8", + "transactionsTrie" : "0x343afd4795c7f7b757d9826ebb61ed759dde2ea604c1ecf34ea4a27a1d28bf72", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "rlp" : "0xf90280f901fca06a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9257ecde85506c81ca7b0ca992ca7a58d189d0048efa197d0d1a134ee6c0639a0343afd4795c7f7b757d9826ebb61ed759dde2ea604c1ecf34ea4a27a1d28bf72a0565c3581a0a4c366c4bea265aedb1c15dcda0592346befe8ada2a89fb7dc4d5cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001850a00000000850a000000008203e880a0f5195b0adbf710cf472b94dd23a3bad361a1d8f016d7c1465abab12a20a40f9988cb4a1f5f99a2ca23f87ef87c8001850a000000008080ae3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd1ba042c939717e6caa4699346a155bbf45c72a346a985ec26c2362a76b0a7df10897a05024f8caa7d700b41788e2405161386ab3354f01bdab7b0a65175007bd39f9f9c0", + "transactions" : [ + { + "data" : "0x3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd", + "gasLimit" : "0x0a00000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "r" : "0x42c939717e6caa4699346a155bbf45c72a346a985ec26c2362a76b0a7df10897", + "s" : "0x5024f8caa7d700b41788e2405161386ab3354f01bdab7b0a65175007bd39f9f9", + "to" : "", + "v" : "0x1b", + "value" : "0x00" + } + ], + "uncleHeaders" : [ + ] + } + ], + "genesisBlockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "0x42", + "gasLimit" : "0x0a00000000", + "gasUsed" : "0x00", + "hash" : "0x6a6e0fafd7a591526d8910e0271827c9d33fdc4670f5b64be5f7e8608103a145", + "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "nonce" : "0x0102030405060708", + "number" : "0x00", + "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "stateRoot" : "0xbb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9", + "timestamp" : "0x03b6", + "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb66f5a3f61c86eba37c5ea6c3464988e4a07b794414d7791770c44c065cfae9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080850a00000000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0", + "lastblockhash" : "0x8386a9980e41d1c99251441b7460b0e744eebbe262645f1ee855f31aedeafae5", + "network" : "Homestead", + "postState" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x4563918c44f40000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x5a00000000", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + } + }, + "pre" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x6400000000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + } + } +}
\ No newline at end of file diff --git a/GeneralStateTests/stRevertTest/RevertInCreateInInit.json b/GeneralStateTests/stRevertTest/RevertInCreateInInit.json new file mode 100644 index 000000000..4546681f4 --- /dev/null +++ b/GeneralStateTests/stRevertTest/RevertInCreateInInit.json @@ -0,0 +1,108 @@ +{ + "RevertInCreateInInit" : { + "_info" : { + "comment" : "", + "filledwith" : "cpp-1.3.0+commit.d9483255.Linux.g++", + "lllcversion" : "Version: 0.4.20-develop.2017.12.6+commit.c2109436.Linux.g++", + "source" : "src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json", + "sourceHash" : "638f281f2df36ecb8d1999481f66aa41c40ce8ed1b4f6cf6cb2e6d5e3d283a85" + }, + "env" : { + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x20000", + "currentGasLimit" : "0x0a00000000", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "post" : { + "Byzantium" : [ + { + "hash" : "0x0b8b0a2fe051563f41d33f16bcf7c8d3caf7974f6d94ac049d04c2d9b8104c42", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], + "EIP150" : [ + { + "hash" : "0x4198bc14346b78f666445049893f68de17d21f892a1e2c2848b576ff0d80cb4a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], + "EIP158" : [ + { + "hash" : "0x4198bc14346b78f666445049893f68de17d21f892a1e2c2848b576ff0d80cb4a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], + "Frontier" : [ + { + "hash" : "0x4198bc14346b78f666445049893f68de17d21f892a1e2c2848b576ff0d80cb4a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ], + "Homestead" : [ + { + "hash" : "0x4198bc14346b78f666445049893f68de17d21f892a1e2c2848b576ff0d80cb4a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ] + }, + "pre" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x6400000000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "0x3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd" + ], + "gasLimit" : [ + "0x0a00000000" + ], + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "", + "value" : [ + "0x00" + ] + } + } +}
\ No newline at end of file diff --git a/JSONSchema/st-filler-schema.json b/JSONSchema/st-filler-schema.json index a9e2831e2..d110e0493 100644 --- a/JSONSchema/st-filler-schema.json +++ b/JSONSchema/st-filler-schema.json @@ -20,12 +20,17 @@ { "$ref": "#/definitions/HexQuantity" } ] }, - "HexDataOrEmpty": { + "TxData": { "oneOf": [ { "$ref": "#/definitions/HexData" }, - { "$ref": "#/definitions/EmptyString" } + { "$ref": "#/definitions/EmptyString" }, + { "$ref": "#/definitions/LLLCode" } ] }, + "LLLCode" : { + "type" : "string", + "pattern" : "^{.*}$" + }, "HexNoPrefix" : { "pattern": "^([0-9a-fA-F][0-9a-fA-F])+$", "type": "string" @@ -165,7 +170,7 @@ }, "properties": { "data": { - "items": { "$ref": "#/definitions/HexDataOrEmpty" }, + "items": { "$ref": "#/definitions/TxData" }, "type": "array" }, "gasLimit": { @@ -199,7 +204,7 @@ }, "properties": { "data": { - "items": { "$ref": "#/definitions/HexMaybePrefixOrEmpty" }, + "items": { "$ref": "#/definitions/TxData" }, "type": "array" }, "gasLimit": { diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInCreateInInit_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInCreateInInit_d0g0v0Filler.json new file mode 100644 index 000000000..638d6340d --- /dev/null +++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertInCreateInInit_d0g0v0Filler.json @@ -0,0 +1,127 @@ +{ + "RevertInCreateInInit_d0g0v0" : { + "blocks" : [ + { + "blockHeaderPremine" : { + "difficulty" : "0x020000", + "gasLimit" : "0x0a00000000", + "timestamp" : "0x03e8", + "updatePoW" : "1" + }, + "transactions" : [ + { + "data" : "0x3050600c80602260003960006000f0503d6000556020600060003e600051600155006211223360005260206000fd", + "gasLimit" : "0x0a00000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "r" : "0x42c939717e6caa4699346a155bbf45c72a346a985ec26c2362a76b0a7df10897", + "s" : "0x5024f8caa7d700b41788e2405161386ab3354f01bdab7b0a65175007bd39f9f9", + "to" : "", + "v" : "0x1b", + "value" : "0x00" + } + ], + "uncleHeaders" : [ + ] + } + ], + "expect" : [ + { + "network" : "Frontier", + "result" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + "0x00" : "0x01" + } + } + } + }, + { + "network" : "Homestead", + "result" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + "0x00" : "0x01" + } + } + } + }, + { + "network" : "EIP150", + "result" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + "0x00" : "0x01" + } + } + } + }, + { + "network" : "EIP158", + "result" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + "0x00" : "0x01" + } + } + } + }, + { + "network" : "Byzantium", + "result" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + "0x00" : "0x20", + "0x01" : "0x112233" + } + } + } + }, + { + "network" : "Constantinople", + "result" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + "0x00" : "0x20", + "0x01" : "0x112233" + } + } + } + } + ], + "genesisBlockHeader" : { + "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "131072", + "extraData" : "0x42", + "gasLimit" : "0x0a00000000", + "gasUsed" : "0", + "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "nonce" : "0x0102030405060708", + "number" : "0", + "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a", + "timestamp" : "0x03b6", + "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "pre" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x6400000000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + } + } +}
\ No newline at end of file diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json new file mode 100644 index 000000000..10eab9334 --- /dev/null +++ b/src/GeneralStateTestsFiller/stRevertTest/RevertInCreateInInitFiller.json @@ -0,0 +1,75 @@ +{ + "RevertInCreateInInit" : { + "env" : { + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x20000", + "currentGasLimit" : "0x0a00000000", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : ["Frontier", "Homestead", "EIP150", "EIP158"], + "result" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + "0x00" : "0x01" + } + } + } + }, + { "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [">=Byzantium"], + "result" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "storage" : { + "0x00" : "0x20", + "0x01" : "0x112233" + } + } + } + } + ], + "pre" : { + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0", + "code" : "", + "nonce" : "0x00", + "storage" : { + "0x00" : "0x01" + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x6400000000", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "{ (seq (address) (CREATE 0 0 (lll (seq (mstore 0 0x112233) (revert 0 32)) 0)) (SSTORE 0 (RETURNDATASIZE)) (returndatacopy 0 0 32) (sstore 1 (mload 0)) ) }" + ], + "gasLimit" : [ + "0x0a00000000" + ], + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "", + "value" : [ + "0x00" + ] + } + } +} |