From e2d84e1c00289bc259ad631efb6b42390e6a291a Mon Sep 17 00:00:00 2001 From: Dimitry Date: Wed, 12 Sep 2018 16:56:58 +0300 Subject: create2 oog in init --- .../CreateMessageRevertedOOGInInit_d0g0v0.json | 117 +++++++++++++++++++ .../CreateMessageRevertedOOGInInit_d0g1v0.json | 126 +++++++++++++++++++++ .../stCreate2/CreateMessageRevertedOOGInInit.json | 73 ++++++++++++ ...reateMessageRevertedOOGInInit_d0g0v0Filler.json | 78 +++++++++++++ ...reateMessageRevertedOOGInInit_d0g1v0Filler.json | 84 ++++++++++++++ .../CreateMessageRevertedOOGInInitFiller.json | 85 ++++++++++++++ 6 files changed, 563 insertions(+) create mode 100644 BlockchainTests/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g0v0.json create mode 100644 BlockchainTests/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g1v0.json create mode 100644 GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit.json create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g0v0Filler.json create mode 100644 src/BlockchainTestsFiller/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g1v0Filler.json create mode 100644 src/GeneralStateTestsFiller/stCreate2/CreateMessageRevertedOOGInInitFiller.json diff --git a/BlockchainTests/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g0v0.json new file mode 100644 index 000000000..eca6c1a8c --- /dev/null +++ b/BlockchainTests/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g0v0.json @@ -0,0 +1,117 @@ +{ + "CreateMessageRevertedOOGInInit_d0g0v0_Constantinople" : { + "_info" : { + "comment" : "create2 oog during the init code, + when create2 is from transaction init code. but oog still in create2 init code", + "filledwith" : "testeth 1.5.0.dev2-45+commit.0189490f.dirty", + "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++", + "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g0v0Filler.json", + "sourceHash" : "7c2b29178eeb0efb963cf9e1408fe445d6a5c963cc8b2f37252efb2960e7d4e1" + }, + "blocks" : [ + { + "blockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "", + "gasLimit" : "0xe8d4a51000", + "gasUsed" : "0x01ac3f", + "hash" : "0xc88aa71750ce14d0af6fa8586acdc0e6cadefddfb2a19322a5a3abfb48e376d8", + "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "nonce" : "0x0000000000000000", + "number" : "0x01", + "parentHash" : "0x18e67f719d8aba6574b31b737f85969e1633b3873449b2f504e6a573705aada2", + "receiptTrie" : "0x6ea0b0c89bb2c679585063fc30115e1ec2ec6f5994faeb485329a069d9b2f2fb", + "stateRoot" : "0xb94227f870d9b3568d7cfa89ef8d4e0f36f8cb633166af089d39347b69dd67ca", + "timestamp" : "0x03e8", + "transactionsTrie" : "0x931220524950cffb8ca8fde421e81b1d33afc1c56af4441c2d03d0a25c821789", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "rlp" : "0xf90265f901faa018e67f719d8aba6574b31b737f85969e1633b3873449b2f504e6a573705aada2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b94227f870d9b3568d7cfa89ef8d4e0f36f8cb633166af089d39347b69dd67caa0931220524950cffb8ca8fde421e81b1d33afc1c56af4441c2d03d0a25c821789a06ea0b0c89bb2c679585063fc30115e1ec2ec6f5994faeb485329a069d9b2f2fbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000185e8d4a510008301ac3f8203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f865f86380018301adb080649769600c600055600d6001556000526000600a60166000f51ca0aa9c4941265c6dd813e98e983602b21472acba7fd8c22c1bd272955a8be32207a0017729207d1163e6069052305fd2b92a0a356f2965158e4a1b168a4fee128527c0", + "transactions" : [ + { + "data" : "0x69600c600055600d6001556000526000600a60166000f5", + "gasLimit" : "0x01adb0", + "gasPrice" : "0x01", + "nonce" : "0x00", + "r" : "0xaa9c4941265c6dd813e98e983602b21472acba7fd8c22c1bd272955a8be32207", + "s" : "0x017729207d1163e6069052305fd2b92a0a356f2965158e4a1b168a4fee128527", + "to" : "", + "v" : "0x1c", + "value" : "0x64" + } + ], + "uncleHeaders" : [ + ] + } + ], + "genesisBlockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "0x42", + "gasLimit" : "0xe8d4a51000", + "gasUsed" : "0x00", + "hash" : "0x18e67f719d8aba6574b31b737f85969e1633b3873449b2f504e6a573705aada2", + "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "nonce" : "0x0102030405060708", + "number" : "0x00", + "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "stateRoot" : "0xd1e15f0f31fa2d018559abdd82ee755c615ac2a76b835a329b5e278879a2b1a0", + "timestamp" : "0x03b6", + "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1e15f0f31fa2d018559abdd82ee755c615ac2a76b835a329b5e278879a2b1a0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008085e8d4a51000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0", + "lastblockhash" : "0xc88aa71750ce14d0af6fa8586acdc0e6cadefddfb2a19322a5a3abfb48e376d8", + "network" : "Constantinople", + "postState" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x1bc16d674ec9ac3f", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x64", + "code" : "", + "nonce" : "0x02", + "storage" : { + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x02e73d", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + }, + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + }, + "pre" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0493e0", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + }, + "sealEngine" : "NoProof" + } +} \ No newline at end of file diff --git a/BlockchainTests/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g1v0.json b/BlockchainTests/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g1v0.json new file mode 100644 index 000000000..82aac0e76 --- /dev/null +++ b/BlockchainTests/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g1v0.json @@ -0,0 +1,126 @@ +{ + "CreateMessageRevertedOOGInInit_d0g1v0_Constantinople" : { + "_info" : { + "comment" : "create2 oog during the init code, + when create2 is from transaction init code. but oog still in create2 init code", + "filledwith" : "testeth 1.5.0.dev2-45+commit.0189490f.dirty", + "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++", + "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g1v0Filler.json", + "sourceHash" : "b23d67e1f53108437c5ed9a3006b5759d4ac4ef8753e543b5a0aaa2e7c00fc75" + }, + "blocks" : [ + { + "blockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "", + "gasLimit" : "0xe8d4a51000", + "gasUsed" : "0x01ed88", + "hash" : "0x9d5e8fa5b0057157241e21fae7a39788ced4bf256151b5d105b1d9b038ec50e4", + "mixHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "nonce" : "0x0000000000000000", + "number" : "0x01", + "parentHash" : "0x18e67f719d8aba6574b31b737f85969e1633b3873449b2f504e6a573705aada2", + "receiptTrie" : "0x8006710d64b8280b653402206cdbe254b190c8a1ca6cca75ea32fb82b25b8f00", + "stateRoot" : "0x6ffedbe6f9af64e3375f61cecb0f2cf7097b3b0593f585610544df44d05e122a", + "timestamp" : "0x03e8", + "transactionsTrie" : "0x74ad0400e69c13412eca85692b4362be042c76bd91becb83b3610d2595028b31", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "rlp" : "0xf90265f901faa018e67f719d8aba6574b31b737f85969e1633b3873449b2f504e6a573705aada2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ffedbe6f9af64e3375f61cecb0f2cf7097b3b0593f585610544df44d05e122aa074ad0400e69c13412eca85692b4362be042c76bd91becb83b3610d2595028b31a08006710d64b8280b653402206cdbe254b190c8a1ca6cca75ea32fb82b25b8f00b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000185e8d4a510008301ed888203e880a00000000000000000000000000000000000000000000000000000000000000000880000000000000000f865f8638001830249f080649769600c600055600d6001556000526000600a60166000f51ba050547e9246a9a4fd017b785e38726a5019ebdf4e3260dfaaa3f2a18f77784e10a05a3813b5fdb075d0bf25787c7ade8e394a5e07370bc495d4c1af2a75746af5f3c0", + "transactions" : [ + { + "data" : "0x69600c600055600d6001556000526000600a60166000f5", + "gasLimit" : "0x0249f0", + "gasPrice" : "0x01", + "nonce" : "0x00", + "r" : "0x50547e9246a9a4fd017b785e38726a5019ebdf4e3260dfaaa3f2a18f77784e10", + "s" : "0x5a3813b5fdb075d0bf25787c7ade8e394a5e07370bc495d4c1af2a75746af5f3", + "to" : "", + "v" : "0x1b", + "value" : "0x64" + } + ], + "uncleHeaders" : [ + ] + } + ], + "genesisBlockHeader" : { + "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "0x020000", + "extraData" : "0x42", + "gasLimit" : "0xe8d4a51000", + "gasUsed" : "0x00", + "hash" : "0x18e67f719d8aba6574b31b737f85969e1633b3873449b2f504e6a573705aada2", + "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "nonce" : "0x0102030405060708", + "number" : "0x00", + "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "stateRoot" : "0xd1e15f0f31fa2d018559abdd82ee755c615ac2a76b835a329b5e278879a2b1a0", + "timestamp" : "0x03b6", + "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "genesisRLP" : "0xf901fcf901f7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1e15f0f31fa2d018559abdd82ee755c615ac2a76b835a329b5e278879a2b1a0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008085e8d4a51000808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0", + "lastblockhash" : "0x9d5e8fa5b0057157241e21fae7a39788ced4bf256151b5d105b1d9b038ec50e4", + "network" : "Constantinople", + "postState" : { + "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "0x1bc16d674ec9ed88", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { + "balance" : "0x64", + "code" : "", + "nonce" : "0x02", + "storage" : { + } + }, + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x02a5f4", + "code" : "", + "nonce" : "0x01", + "storage" : { + } + }, + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xf3059e18a327c662766f6ba11808c400635847ef" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x01", + "storage" : { + "0x00" : "0x0c", + "0x01" : "0x0d" + } + } + }, + "pre" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0493e0", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + }, + "sealEngine" : "NoProof" + } +} \ No newline at end of file diff --git a/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit.json b/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit.json new file mode 100644 index 000000000..5ac15874c --- /dev/null +++ b/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit.json @@ -0,0 +1,73 @@ +{ + "CreateMessageRevertedOOGInInit" : { + "_info" : { + "comment" : "create2 oog during the init code, + when create2 is from transaction init code. but oog still in create2 init code", + "filledwith" : "testeth 1.5.0.dev2-45+commit.0189490f.dirty", + "lllcversion" : "Version: 0.4.25-develop.2018.8.9+commit.63d071d6.mod.Linux.g++", + "source" : "src/GeneralStateTestsFiller/stCreate2/CreateMessageRevertedOOGInInitFiller.json", + "sourceHash" : "7243cf543edf7131ca5ccb0a91a135c7d20a14b3d19558f2c05dbda78b2d31a3" + }, + "env" : { + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "0xe8d4a51000", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "post" : { + "Constantinople" : [ + { + "hash" : "0xe90d055bebfbb9d11fde3f2b17c08ffab8e1e4d31b9ab48ccfb162fdea7413cc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + { + "hash" : "0x075015589242bcfa9875b7ac8a9fe622d151ef62ca2d2833859cc8d8c2ded74a", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + } + ] + }, + "pre" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0493e0", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "0x69600c600055600d6001556000526000600a60166000f5" + ], + "gasLimit" : [ + "0x01adb0", + "0x0249f0" + ], + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "", + "value" : [ + "0x64" + ] + } + } +} \ No newline at end of file diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g0v0Filler.json new file mode 100644 index 000000000..93d453c9c --- /dev/null +++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g0v0Filler.json @@ -0,0 +1,78 @@ +{ + "CreateMessageRevertedOOGInInit_d0g0v0" : { + "_info" : { + "comment" : "create2 oog during the init code, + when create2 is from transaction init code. but oog still in create2 init code" + }, + "blocks" : [ + { + "blockHeaderPremine" : { + "difficulty" : "0x020000", + "gasLimit" : "0xe8d4a51000", + "timestamp" : "0x03e8", + "updatePoW" : "1" + }, + "transactions" : [ + { + "data" : "0x69600c600055600d6001556000526000600a60166000f5", + "gasLimit" : "0x01adb0", + "gasPrice" : "0x01", + "nonce" : "0x00", + "r" : "0xaa9c4941265c6dd813e98e983602b21472acba7fd8c22c1bd272955a8be32207", + "s" : "0x017729207d1163e6069052305fd2b92a0a356f2965158e4a1b168a4fee128527", + "to" : "", + "v" : "0x1c", + "value" : "0x64" + } + ], + "uncleHeaders" : [ + ] + } + ], + "expect" : [ + { + "network" : "Constantinople", + "result" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01" + }, + "0xf3059e18a327c662766f6ba11808c400635847ef" : { + } + } + } + ], + "genesisBlockHeader" : { + "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "131072", + "extraData" : "0x42", + "gasLimit" : "0xe8d4a51000", + "gasUsed" : "0", + "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "nonce" : "0x0102030405060708", + "number" : "0", + "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a", + "timestamp" : "0x03b6", + "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "pre" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0493e0", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + }, + "sealEngine" : "NoProof" + } +} \ No newline at end of file diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g1v0Filler.json new file mode 100644 index 000000000..1c19a6cda --- /dev/null +++ b/src/BlockchainTestsFiller/GeneralStateTests/stCreate2/CreateMessageRevertedOOGInInit_d0g1v0Filler.json @@ -0,0 +1,84 @@ +{ + "CreateMessageRevertedOOGInInit_d0g1v0" : { + "_info" : { + "comment" : "create2 oog during the init code, + when create2 is from transaction init code. but oog still in create2 init code" + }, + "blocks" : [ + { + "blockHeaderPremine" : { + "difficulty" : "0x020000", + "gasLimit" : "0xe8d4a51000", + "timestamp" : "0x03e8", + "updatePoW" : "1" + }, + "transactions" : [ + { + "data" : "0x69600c600055600d6001556000526000600a60166000f5", + "gasLimit" : "0x0249f0", + "gasPrice" : "0x01", + "nonce" : "0x00", + "r" : "0x50547e9246a9a4fd017b785e38726a5019ebdf4e3260dfaaa3f2a18f77784e10", + "s" : "0x5a3813b5fdb075d0bf25787c7ade8e394a5e07370bc495d4c1af2a75746af5f3", + "to" : "", + "v" : "0x1b", + "value" : "0x64" + } + ], + "uncleHeaders" : [ + ] + } + ], + "expect" : [ + { + "network" : "Constantinople", + "result" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "0x01" + }, + "0xf3059e18a327c662766f6ba11808c400635847ef" : { + "balance" : "0x00", + "nonce" : "0x01", + "storage" : { + "0x00" : "0x0c", + "0x01" : "0x0d" + } + } + } + } + ], + "genesisBlockHeader" : { + "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "difficulty" : "131072", + "extraData" : "0x42", + "gasLimit" : "0xe8d4a51000", + "gasUsed" : "0", + "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "nonce" : "0x0102030405060708", + "number" : "0", + "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", + "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a", + "timestamp" : "0x03b6", + "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", + "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347" + }, + "pre" : { + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0493e0", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + }, + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "", + "nonce" : "0x00", + "storage" : { + } + } + }, + "sealEngine" : "NoProof" + } +} \ No newline at end of file diff --git a/src/GeneralStateTestsFiller/stCreate2/CreateMessageRevertedOOGInInitFiller.json b/src/GeneralStateTestsFiller/stCreate2/CreateMessageRevertedOOGInInitFiller.json new file mode 100644 index 000000000..6a76cf674 --- /dev/null +++ b/src/GeneralStateTestsFiller/stCreate2/CreateMessageRevertedOOGInInitFiller.json @@ -0,0 +1,85 @@ +{ + "CreateMessageRevertedOOGInInit" : { + "_info" : { + "comment" : "create2 oog during the init code, + when create2 is from transaction init code. but oog still in create2 init code" + }, + "env" : { + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentDifficulty" : "0x020000", + "currentGasLimit" : "1000000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + }, + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : 0, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + }, + "f3059e18a327c662766f6ba11808c400635847ef" : { + "shouldnotexist" : "1" + } + } + }, + { + "indexes" : { + "data" : -1, + "gas" : 1, + "value" : -1 + }, + "network" : [">=Constantinople"], + "result" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "nonce" : "1" + }, + "f3059e18a327c662766f6ba11808c400635847ef" : { + "balance" : "0", + "nonce" : "1", + "storage" : { + "0x00" : "0x0c", + "0x01" : "0x0d" + } + } + } + } + ], + "pre" : { + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "300000", + "code" : "", + "nonce" : "0", + "storage" : { + } + }, + "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + } + }, + "transaction" : { + "data" : [ + "{(MSTORE 0 0x600c600055600d600155) (CREATE2 0 22 10 0)}" + ], + "gasLimit" : [ + "110000", "150000" + ], + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "", + "value" : [ + "100" + ] + } + } +} -- cgit v1.2.3