From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- .../stStaticCall/static_Call1024PreCalls.json | 208 +++++++++++++-------- 1 file changed, 133 insertions(+), 75 deletions(-) (limited to 'GeneralStateTests/stStaticCall/static_Call1024PreCalls.json') diff --git a/GeneralStateTests/stStaticCall/static_Call1024PreCalls.json b/GeneralStateTests/stStaticCall/static_Call1024PreCalls.json index c9a1eef15..2e5b0d727 100644 --- a/GeneralStateTests/stStaticCall/static_Call1024PreCalls.json +++ b/GeneralStateTests/stStaticCall/static_Call1024PreCalls.json @@ -6,100 +6,158 @@ "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_Call1024PreCallsFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", "currentGasLimit" : "0x7fffffffffffffff", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : 0, - "gas" : -1, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0x72c9194816bf3bdeea30964d4ce764517bd08e0e1b6a6850dfe32af1b6a07845", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x7fffeffffffe3617" - } + { + "hash" : "0x72c9194816bf3bdeea30964d4ce764517bd08e0e1b6a6850dfe32af1b6a07845", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x00", - "0x02" : "0x01", - "0x03" : "0x01" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 1, - "gas" : -1, - "value" : -1 + ], + "EIP158" : [ + { + "hash" : "0x72c9194816bf3bdeea30964d4ce764517bd08e0e1b6a6850dfe32af1b6a07845", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x7fffffffffdd3145" - } + { + "hash" : "0x72c9194816bf3bdeea30964d4ce764517bd08e0e1b6a6850dfe32af1b6a07845", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "cbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x00", - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } - } + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0xd8c1ef716b4972c223a88f5f00f7fbca98f82256a8179f0d008e4386c6a36a5d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd8c1ef716b4972c223a88f5f00f7fbca98f82256a8179f0d008e4386c6a36a5d", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xd8c1ef716b4972c223a88f5f00f7fbca98f82256a8179f0d008e4386c6a36a5d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xd8c1ef716b4972c223a88f5f00f7fbca98f82256a8179f0d008e4386c6a36a5d", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x47545485af2352f55deacfb37d334fae960a6569be0376e9aeaac56c43109d65", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc9d51252543c9fa0eb320b0a9589663000ab8135737c659d8d096f6fd5d2a9ae", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] (GAS) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6000600060006000346000355af16000555a600155", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xfffffffffffffffffffffffffffffffff", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0fffffffffffffffffffffffffffffffff", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "7000", + "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x1b58", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "2024", - "code" : "{ [[ 2 ]] (STATICCALL 0xffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[ 3 ]] (STATICCALL 0xffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) [[ 0 ]] (ADD @@0 1) [[ 1 ]] (STATICCALL 0xfffffffffff 0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) }", - "nonce" : "0", + "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x07e8", + "code" : "0x600060006000600073aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffffa600255600060006000600073aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffffa600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffffa600155", + "nonce" : "0x00", "storage" : { } }, - "cbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "2024", - "code" : "{ (STATICCALL 0xffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (STATICCALL 0xffff 0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) (MSTORE 0 (ADD (MLOAD 0) 1)) (STATICCALL 0xfffffffffff 0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0) }", - "nonce" : "0", + "0xcbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x07e8", + "code" : "0x600060006000600073aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffffa50600060006000600073aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffffa50600160005101600052600060006000600073cbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffffa", + "nonce" : "0x00", "storage" : { } } @@ -112,12 +170,12 @@ "gasLimit" : [ "0x7ffffffffffffff0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "1000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x1000000000000000000000000000000000000000", "value" : [ - "10" + "0x0a" ] } } -- cgit v1.2.3