From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- .../static_callcodecallcodecall_110_2.json | 270 ++++++++++++++------- 1 file changed, 188 insertions(+), 82 deletions(-) (limited to 'GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_2.json') diff --git a/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_2.json b/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_2.json index 639391a3f..e4bc17faa 100644 --- a/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_2.json +++ b/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_2.json @@ -6,102 +6,208 @@ "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_2Filler.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "30000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x01c9c380", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : 0 + "post" : { + "EIP150" : [ + { + "hash" : "0x5326815cdcdef4b1abdd14c29d16ae4aeeec663d59887c801d5b4fa36bcf3675", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x2d06a1" - } - } + { + "hash" : "0xfb0b902ebb76fa391208632f43303d92ca5188c75085e02fa84b0d0518eb2e9a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x909ff59a3fd650f3926cfba8fefc52ac1b5983dcc1436df30b3c1827e34de6d8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 2 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : 1 + ], + "EIP158" : [ + { + "hash" : "0x5326815cdcdef4b1abdd14c29d16ae4aeeec663d59887c801d5b4fa36bcf3675", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x2d03aa" - } - } + { + "hash" : "0xfb0b902ebb76fa391208632f43303d92ca5188c75085e02fa84b0d0518eb2e9a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x909ff59a3fd650f3926cfba8fefc52ac1b5983dcc1436df30b3c1827e34de6d8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 2 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : 2 + ], + "Frontier" : [ + { + "hash" : "0x5403204b06ff0eca5ccf43d109b61df4939c0593521b3352d76b30b77c0b174f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7fb514979212ee78728186db19e54a0f369282d3d4e93ab33e2e9c548e2976c1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x2ce97e" - } - } + { + "hash" : "0x4bc9fd46a70450fb1ecd0fe518a3cd7489f2ebdcd9f29501502f4fee9c133a76", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 2 + }, + "logs" : [ + ] } - } - ], + ], + "Homestead" : [ + { + "hash" : "0x5403204b06ff0eca5ccf43d109b61df4939c0593521b3352d76b30b77c0b174f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x7fb514979212ee78728186db19e54a0f369282d3d4e93ab33e2e9c548e2976c1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x4bc9fd46a70450fb1ecd0fe518a3cd7489f2ebdcd9f29501502f4fee9c133a76", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 2 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x5326815cdcdef4b1abdd14c29d16ae4aeeec663d59887c801d5b4fa36bcf3675", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x5dddfe506c6816272c589f08222ece4bfe063c3a04d87cfdda828423387f726b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0xa89a6d73a704a70aaa7d761ad976c768ce25243be0d4f5285d02585e55d49f09", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 2 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (CALLCODE 350000 0x1000000000000000000000000000000000000001 (CALLVALUE) 0 64 0 64 ) [[ 1 ]] (GAS) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x60406000604060003473100000000000000000000000000000000000000162055730f26000555a600155", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000001" : { - "balance" : "1000000000000000000", - "code" : "{ (MSTORE 1 1) (CALLCODE 300000 0x1000000000000000000000000000000000000002 ( - (CALLVALUE) 1) 0 64 0 64 ) (MSTORE 31 1) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000001" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6001600152604060006040600060013403731000000000000000000000000000000000000002620493e0f2506001601f52", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000002" : { - "balance" : "1000000000000000000", - "code" : "{ (MSTORE 1 1) (STATICCALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (MSTORE 31 1) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000002" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x600160015260406000604060007310000000000000000000000000000000000000036203d090fa506001601f52", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000003" : { - "balance" : "0", - "code" : "{ (MSTORE 1 1) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000003" : { + "balance" : "0x00", + "code" : "0x6001600152", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -111,16 +217,16 @@ "" ], "gasLimit" : [ - "3000000" + "0x2dc6c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "1000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x1000000000000000000000000000000000000000", "value" : [ - "0", - "1", - "2" + "0x00", + "0x01", + "0x02" ] } } -- cgit