From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- .../callcallcodecall_010_OOGMAfter_1.json | 194 +++++++++------------ 1 file changed, 85 insertions(+), 109 deletions(-) (limited to 'GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json') diff --git a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json index ecb557fdf..d4ff0c878 100644 --- a/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json +++ b/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json @@ -6,132 +6,108 @@ "source" : "/src/GeneralStateTestsFiller/stChangedEIP150/callcallcodecall_010_OOGMAfter_1Filler.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" : -1, - "value" : -1 - }, - "network" : [ - "EIP150", - "EIP158" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } + "post" : { + "EIP150" : [ + { + "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1000000000000000000000000000000000000001" : { - "storage" : { - "0x01" : "0x00" - } - }, - "1000000000000000000000000000000000000002" : { - "storage" : { - "0x02" : "0x00" - } - }, - "1000000000000000000000000000000000000003" : { - "storage" : { - "0x03" : "0x00" - } - }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier", - "Homestead" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x00", - "0x01" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00" - } + ], + "EIP158" : [ + { + "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1000000000000000000000000000000000000001" : { - "storage" : { - "0x01" : "0x00" - } + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1000000000000000000000000000000000000002" : { - "storage" : { - "0x02" : "0x00" - } + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xdd76ee8ba39a7071c313c6482b98e2db641023bf18a796e77cf2eb4758a18549", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1000000000000000000000000000000000000003" : { - "storage" : { - "0x03" : "0x00" - } + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xde101ef70f3ec3b41bfbc894ed9af86d9f1e28b95d30fba017aeb5f5fbda601b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00" - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (CALLCODE 60151 0x1000000000000000000000000000000000000001 0 0 64 0 64 ) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000001" : { - "balance" : "0", - "code" : "{ [[ 1 ]] (DELEGATECALL 40077 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 3 1) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000001" : { + "balance" : "0x00", + "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000002" : { - "balance" : "0", - "code" : "{ [[ 2 ]] (CALLCODE 20020 0x1000000000000000000000000000000000000003 0 0 64 0 64 ) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000002" : { + "balance" : "0x00", + "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000003" : { - "balance" : "0", - "code" : "{ (SSTORE 3 1) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000003" : { + "balance" : "0x00", + "code" : "0x6001600355", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -141,14 +117,14 @@ "" ], "gasLimit" : [ - "172000" + "0x029fe0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "1000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x1000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } -- cgit v1.2.3