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_callcallcode_01_2.json | 204 ++++++++------------- 1 file changed, 75 insertions(+), 129 deletions(-) (limited to 'GeneralStateTests/stStaticCall/static_callcallcode_01_2.json') diff --git a/GeneralStateTests/stStaticCall/static_callcallcode_01_2.json b/GeneralStateTests/stStaticCall/static_callcallcode_01_2.json index 0fa957a82..e59fd8f10 100644 --- a/GeneralStateTests/stStaticCall/static_callcallcode_01_2.json +++ b/GeneralStateTests/stStaticCall/static_callcallcode_01_2.json @@ -2,163 +2,109 @@ "static_callcallcode_01_2" : { "_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_callcallcode_01_2Filler.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" : "0x594ebd435584f249cbd5b895c7760711ad029a6758eb785640f6160979b89737", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x594ebd435584f249cbd5b895c7760711ad029a6758eb785640f6160979b89737", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "EIP158" : [ - { - "hash" : "0x594ebd435584f249cbd5b895c7760711ad029a6758eb785640f6160979b89737", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x594ebd435584f249cbd5b895c7760711ad029a6758eb785640f6160979b89737", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x0cb8bc57ed5b190c0b9fe8b5562a351bdbb04064744b8757b7083d33b264c0bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : -1, + "value" : -1 }, - { - "hash" : "0x0cb8bc57ed5b190c0b9fe8b5562a351bdbb04064744b8757b7083d33b264c0bb", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 + "network" : [ + "Metropolis" + ], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x2d031d" + } } } - ], - "Homestead" : [ - { - "hash" : "0x0cb8bc57ed5b190c0b9fe8b5562a351bdbb04064744b8757b7083d33b264c0bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x0cb8bc57ed5b190c0b9fe8b5562a351bdbb04064744b8757b7083d33b264c0bb", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x0784a9e6d88b864d09e6f783f739742232c5c3998cfa5ef76744a58002e224a8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + }, + { + "indexes" : { + "data" : 1, + "gas" : -1, + "value" : -1 }, - { - "hash" : "0x66c43e7cfde8bd572acc81b2c58660a73051a7ad6f52e2cc0a7b93d3dc0f1a24", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 + "network" : [ + "Metropolis" + ], + "result" : { + "a000000000000000000000000000000000000000" : { + "storage" : { + "0x00" : "0x01", + "0x01" : "0x2d1d3d" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006020600073100000000000000000000000000000000000000162055730fa", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 32 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006020600060027310000000000000000000000000000000000000026203d090f2", - "nonce" : "0x00", + "1000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ (CALLCODE 250000 0x1000000000000000000000000000000000000002 2 0 32 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x1000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x6311223344600052", - "nonce" : "0x00", + "1000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (MSTORE 0 0x11223344) }", + "nonce" : "0", "storage" : { } }, - "0x2000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x604060006020600073200000000000000000000000000000000000000162055730fa", - "nonce" : "0x00", + "2000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ (STATICCALL 350000 0x2000000000000000000000000000000000000001 0 32 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x2000000000000000000000000000000000000001" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x600035600052604060006020600060007320000000000000000000000000000000000000026203d090f2", - "nonce" : "0x00", + "2000000000000000000000000000000000000001" : { + "balance" : "1000000000000000000", + "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (CALLCODE 250000 0x2000000000000000000000000000000000000002 0 0 32 0 64 ) }", + "nonce" : "0", "storage" : { } }, - "0x2000000000000000000000000000000000000002" : { - "balance" : "0x00", - "code" : "0x6311223344600052", - "nonce" : "0x00", + "2000000000000000000000000000000000000002" : { + "balance" : "0", + "code" : "{ (MSTORE 0 0x11223344) }", + "nonce" : "0", "storage" : { } }, - "0xa000000000000000000000000000000000000000" : { - "balance" : "0x0de0b6b3a7640000", - "code" : "0x600060006000600060006000355af26000555a600155", - "nonce" : "0x00", + "a000000000000000000000000000000000000000" : { + "balance" : "1000000000000000000", + "code" : "{ [[ 0 ]] (CALLCODE (GAS) (CALLDATALOAD 0) 0 0 0 0 0) [[ 1 ]] (GAS) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -169,14 +115,14 @@ "0x0000000000000000000000002000000000000000000000000000000000000000" ], "gasLimit" : [ - "0x2dc6c0" + "3000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0xa000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "a000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } -- cgit