From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- .../callcodecallcallcode_101.json | 200 +++++++++------------ 1 file changed, 85 insertions(+), 115 deletions(-) (limited to 'GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json') diff --git a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json index 7d6411ad2..43ac60228 100644 --- a/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json +++ b/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101.json @@ -6,138 +6,108 @@ "source" : "/src/GeneralStateTestsFiller/stCallDelegateCodesHomestead/callcodecallcallcode_101Filler.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 - }, - "network" : "Frontier", - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x00", - "0x01" : "0x00", - "0x05" : "0x00" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x84e0417a096444285414996a7385278ecd74564c3e24043887a25c1e4371d9e8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1000000000000000000000000000000000000001" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00" - } - }, - "1000000000000000000000000000000000000002" : { - "storage" : { - "0x014a" : "0x00", - "0x014c" : "0x00", - "0x0150" : "0x00", - "0x0152" : "0x00", - "0x0154" : "0x00", - "0x02" : "0x00", - "0x03" : "0x00", - "0x04" : "0x00", - "0x06" : "0x00", - "0x07" : "0x00" - } + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x84e0417a096444285414996a7385278ecd74564c3e24043887a25c1e4371d9e8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x01" : "0x00", - "0x03" : "0x00" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Homestead", - "EIP158", - "EIP150" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x01", - "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" - } + ], + "Frontier" : [ + { + "hash" : "0xcbac6874f08a763e0b27e00000eb33fbc51796ed88b51d479251dac7dd3546f8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1000000000000000000000000000000000000001" : { - "storage" : { - "0x01" : "0x00", - "0x02" : "0x00" - } + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x0061db75543976053f51e37e6fa1b6b80bc2e4ad282986ed5831aa87cb731bac", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1000000000000000000000000000000000000002" : { - "storage" : { - "0x014a" : "0x1000000000000000000000000000000000000002", - "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", - "0x0150" : "0x40", - "0x0152" : "0x26", - "0x0154" : "0x01", - "0x02" : "0x01", - "0x03" : "0x01", - "0x04" : "0x1000000000000000000000000000000000000000", - "0x06" : "0x1000000000000000000000000000000000000000", - "0x07" : "0x01" - } + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x84e0417a096444285414996a7385278ecd74564c3e24043887a25c1e4371d9e8", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x01" : "0x00", - "0x03" : "0x00" - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (DELEGATECALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000001" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 1 ]] (CALL 300000 0x1000000000000000000000000000000000000002 1 0 64 0 64 ) (SSTORE 5 (CALLER)) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000001" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f160015533600555", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000002" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 2 ]] (DELEGATECALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SSTORE 6 (CALLER)) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000002" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f460025533600655", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000003" : { - "balance" : "0", - "code" : "{ (SSTORE 3 1) (SSTORE 4 (CALLER)) (SSTORE 7 (CALLVALUE)) (SSTORE 330 (ADDRESS)) (SSTORE 332 (ORIGIN)) (SSTORE 336 (CALLDATASIZE)) (SSTORE 338 (CODESIZE)) (SSTORE 340 (GASPRICE))}", - "nonce" : "0", + "0x1000000000000000000000000000000000000003" : { + "balance" : "0x00", + "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -147,14 +117,14 @@ "" ], "gasLimit" : [ - "3000000" + "0x2dc6c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "1000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x1000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } -- cgit v1.2.3