From f71c2688e1a839f8429f7e94ec5e56bb182d82cf Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 09:11:00 +0300 Subject: regenerate hive tests --- .../stStaticCall/static_callcall_00_OOGE.json | 240 ++++++++++----------- 1 file changed, 111 insertions(+), 129 deletions(-) (limited to 'GeneralStateTests/stStaticCall/static_callcall_00_OOGE.json') diff --git a/GeneralStateTests/stStaticCall/static_callcall_00_OOGE.json b/GeneralStateTests/stStaticCall/static_callcall_00_OOGE.json index 18c043538..c71fa37f5 100644 --- a/GeneralStateTests/stStaticCall/static_callcall_00_OOGE.json +++ b/GeneralStateTests/stStaticCall/static_callcall_00_OOGE.json @@ -2,163 +2,145 @@ "static_callcall_00_OOGE" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callcall_00_OOGEFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x01c9c380", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "30000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xadf82e6d41108122b66a95932bb0897772c3e2674625830012fc3401a7d33a06", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xadf82e6d41108122b66a95932bb0897772c3e2674625830012fc3401a7d33a06", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "EIP158" : [ - { - "hash" : "0xadf82e6d41108122b66a95932bb0897772c3e2674625830012fc3401a7d33a06", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xadf82e6d41108122b66a95932bb0897772c3e2674625830012fc3401a7d33a06", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xadf82e6d41108122b66a95932bb0897772c3e2674625830012fc3401a7d33a06", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 }, - { - "hash" : "0xadf82e6d41108122b66a95932bb0897772c3e2674625830012fc3401a7d33a06", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 + "network" : [ + "Metropolis" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "1000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00" + } + }, + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x015a0e" + } } } - ], - "Homestead" : [ - { - "hash" : "0xadf82e6d41108122b66a95932bb0897772c3e2674625830012fc3401a7d33a06", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xadf82e6d41108122b66a95932bb0897772c3e2674625830012fc3401a7d33a06", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xf1a37027d9a02feb0d3656e3be65843a243640769eb15407306b5432373cb0de", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + }, + { + "indexes" : { + "data" : 1, + "gas" : -1, + "value" : -1 }, - { - "hash" : "0x64f889d7d71c70266fcfa9146f0a850556ca1e93b01d5ce6e3f2b24b8621128a", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 + "network" : [ + "Metropolis" + ], + "result" : { + "2000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2000000000000000000000000000000000000001" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } + }, + "2000000000000000000000000000000000000002" : { + "storage" : { + "0x02" : "0x00" + } + }, + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x015a0e" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0fa600055", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60016002526040600060406000731000000000000000000000000000000000000002614e34fa506001602052", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (MSTORE 2 1) (STATICCALL 20020 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 32 1) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x60016002556001600252", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (SSTORE 2 1) (MSTORE 2 1)}", + "nonce" : "0", "storage" : { } }, - "0x2000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x6040600060406000732000000000000000000000000000000000000001620249f0fa600055", - "nonce" : "0x00", + "2000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (STATICCALL 150000 0x2000000000000000000000000000000000000001 0 64 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x2000000000000000000000000000000000000001" : { - "balance" : "0x00", - "code" : "0x60016002526040600060406000732000000000000000000000000000000000000002614e34fa506001602052", - "nonce" : "0x00", + "2000000000000000000000000000000000000001" : { + "balance" : "0", + "code" : "{ (MSTORE 2 1) (STATICCALL 20020 0x2000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 32 1) }", + "nonce" : "0", "storage" : { } }, - "0x2000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x5b61c35060805110156018576001608051016080526000565b", - "nonce" : "0x00", + "2000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1) )}", + "nonce" : "0", "storage" : { } }, - "0xa000000000000000000000000000000000000000" : { - "balance" : "0x00", - "code" : "0x6000600060006000346000355af16000555a600155", - "nonce" : "0x00", + "a000000000000000000000000000000000000000" : { + "balance" : "0", + "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -169,14 +151,14 @@ "0x0000000000000000000000002000000000000000000000000000000000000000" ], "gasLimit" : [ - "0x029fe0" + "172000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xa000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "a000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } -- cgit v1.2.3