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_callcallcodecall_010_OOGE_2.json | 196 +++++++++++++++------ 1 file changed, 144 insertions(+), 52 deletions(-) (limited to 'GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGE_2.json') diff --git a/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGE_2.json b/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGE_2.json index c99822278..ded05429c 100644 --- a/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGE_2.json +++ b/GeneralStateTests/stStaticCall/static_callcallcodecall_010_OOGE_2.json @@ -6,73 +6,165 @@ "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecall_010_OOGE_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" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0xf135c91e03115f15fb71a6d8adc4509119fe4d7be0697dee1e38878f5715e462", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x01a7e5" - } - } + { + "hash" : "0xf135c91e03115f15fb71a6d8adc4509119fe4d7be0697dee1e38878f5715e462", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xf135c91e03115f15fb71a6d8adc4509119fe4d7be0697dee1e38878f5715e462", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf135c91e03115f15fb71a6d8adc4509119fe4d7be0697dee1e38878f5715e462", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xf135c91e03115f15fb71a6d8adc4509119fe4d7be0697dee1e38878f5715e462", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf135c91e03115f15fb71a6d8adc4509119fe4d7be0697dee1e38878f5715e462", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xf135c91e03115f15fb71a6d8adc4509119fe4d7be0697dee1e38878f5715e462", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xf135c91e03115f15fb71a6d8adc4509119fe4d7be0697dee1e38878f5715e462", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x8c283b491cfb0dbd6a11a53e55b6c27501f8c12f02bcb2d5d3c42dcad358bec7", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x8c283b491cfb0dbd6a11a53e55b6c27501f8c12f02bcb2d5d3c42dcad358bec7", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "1000000000000000000", - "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) [[ 0 ]] (STATICCALL 150000 0x1000000000000000000000000000000000000001 0 32 0 64 ) [[ 1 ]] (GAS) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6000356000526040600060206000731000000000000000000000000000000000000001620249f0fa6000555a600155", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000001" : { - "balance" : "0", - "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (CALLCODE 100000 0x1000000000000000000000000000000000000002 0 0 32 0 64 ) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000001" : { + "balance" : "0x00", + "code" : "0x60003560005260406000602060006000731000000000000000000000000000000000000002620186a0f2", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000002" : { - "balance" : "0", - "code" : "{ (STATICCALL 20020 (CALLDATALOAD 0) 0 64 0 64 ) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000002" : { + "balance" : "0x00", + "code" : "0x6040600060406000600035614e34fa", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000003" : { - "balance" : "0", - "code" : "{ (SSTORE 3 1) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000003" : { + "balance" : "0x00", + "code" : "0x6001600355", + "nonce" : "0x00", "storage" : { } }, - "2000000000000000000000000000000000000003" : { - "balance" : "0", - "code" : "{ (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }", - "nonce" : "0", + "0x2000000000000000000000000000000000000003" : { + "balance" : "0x00", + "code" : "0x5b61c35060805110156018576001608051016080526000565b", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -83,14 +175,14 @@ "0x0000000000000000000000002000000000000000000000000000000000000003" ], "gasLimit" : [ - "172000" + "0x029fe0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "1000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x1000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } -- cgit