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_LoopCallsThenRevert.json | 183 ++++++++++++++++----- 1 file changed, 138 insertions(+), 45 deletions(-) (limited to 'GeneralStateTests/stStaticCall/static_LoopCallsThenRevert.json') diff --git a/GeneralStateTests/stStaticCall/static_LoopCallsThenRevert.json b/GeneralStateTests/stStaticCall/static_LoopCallsThenRevert.json index 3e1e79a00..d5955090d 100644 --- a/GeneralStateTests/stStaticCall/static_LoopCallsThenRevert.json +++ b/GeneralStateTests/stStaticCall/static_LoopCallsThenRevert.json @@ -6,59 +6,152 @@ "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_LoopCallsThenRevertFiller.json" }, "env" : { - "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x020000", - "currentGasLimit" : "10000000", - "currentNumber" : "1", - "currentTimestamp" : "1000", - "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "0x989680", + "currentNumber" : "0x01", + "currentTimestamp" : "0x03e8", + "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "expect" : [ - { - "indexes" : { - "data" : -1, - "gas" : 0, - "value" : -1 + "post" : { + "EIP150" : [ + { + "hash" : "0xb0ad60c2c3c7495515e5e3469f4e4445e56734256a6e5a4f165c23c1b83a71e9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x01" : "0x024d79" - } - } + { + "hash" : "0x4b7b5b5964f57c178c00608be3d6ae8456df2c719c46b64d1fe6febb57b20d3a", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0xb0ad60c2c3c7495515e5e3469f4e4445e56734256a6e5a4f165c23c1b83a71e9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x4b7b5b5964f57c178c00608be3d6ae8456df2c719c46b64d1fe6febb57b20d3a", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0x0732b1e42c0e34d12d683d8f10159a69e96dda70cbc0254bb070565ca8944f4a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x25efea7c074db57384542cb5eb05389e21d11bca7a23f070d3e289fa348b5c98", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x0732b1e42c0e34d12d683d8f10159a69e96dda70cbc0254bb070565ca8944f4a", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x25efea7c074db57384542cb5eb05389e21d11bca7a23f070d3e289fa348b5c98", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb0ad60c2c3c7495515e5e3469f4e4445e56734256a6e5a4f165c23c1b83a71e9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x4b7b5b5964f57c178c00608be3d6ae8456df2c719c46b64d1fe6febb57b20d3a", + "indexes" : { + "data" : 0, + "gas" : 1, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ (MSTORE 0 850) [[ 0 ]] (CALL (- (GAS) 10000) 0xa000000000000000000000000000000000000000 0 0 32 0 0) [[ 1 ]] (GAS) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6103526000526000600060206000600073a0000000000000000000000000000000000000006127105a03f16000555a600155", + "nonce" : "0x00", "storage" : { } }, - "a000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ (JUMPDEST) (MSTORE 0 (- (CALLDATALOAD 0) 1)) (STATICCALL 50000 0xb000000000000000000000000000000000000000 0 0 0 0) (JUMPI 0 (MLOAD 0))}", - "nonce" : "0", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x5b600160003503600052600060006000600073b00000000000000000000000000000000000000061c350fa50600051600057", + "nonce" : "0x00", "storage" : { - "0x00" : "850" + "0x00" : "0x0352" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b000000000000000000000000000000000000000" : { - "balance" : "", - "code" : "{ (MSTORE 0 (ADD 1 (MLOAD 0))) }", - "nonce" : "", + "0xb000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x600051600101600052", + "nonce" : "0x00", "storage" : { } } @@ -68,15 +161,15 @@ "" ], "gasLimit" : [ - "10000000", - "9000000" + "0x989680", + "0x895440" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "1000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x1000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } -- cgit v1.2.3