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_callcallcall_000.json | 278 +++++++++++---------- 1 file changed, 151 insertions(+), 127 deletions(-) (limited to 'GeneralStateTests/stStaticCall/static_callcallcall_000.json') diff --git a/GeneralStateTests/stStaticCall/static_callcallcall_000.json b/GeneralStateTests/stStaticCall/static_callcallcall_000.json index 540cffa1d..abe3b440b 100644 --- a/GeneralStateTests/stStaticCall/static_callcallcall_000.json +++ b/GeneralStateTests/stStaticCall/static_callcallcall_000.json @@ -6,169 +6,193 @@ "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callcallcall_000Filler.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" : 0, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Metropolis" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01" - } + "post" : { + "EIP150" : [ + { + "hash" : "0x2366cc1425f25a94027ba85103786087aada2ba103c56840dfd16238c88c9423", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1000000000000000000000000000000000000001" : { - "storage" : { - } + "logs" : [ + ] + }, + { + "hash" : "0x2366cc1425f25a94027ba85103786087aada2ba103c56840dfd16238c88c9423", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "1000000000000000000000000000000000000002" : { - "storage" : { - } + "logs" : [ + ] + } + ], + "EIP158" : [ + { + "hash" : "0x2366cc1425f25a94027ba85103786087aada2ba103c56840dfd16238c88c9423", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "1000000000000000000000000000000000000003" : { - "storage" : { - "0x014a" : "0x00", - "0x014c" : "0x00", - "0x0150" : "0x00", - "0x0152" : "0x00", - "0x0154" : "0x00", - "0x03" : "0x00", - "0x04" : "0x00", - "0x07" : "0x00" - } + "logs" : [ + ] + }, + { + "hash" : "0x2366cc1425f25a94027ba85103786087aada2ba103c56840dfd16238c88c9423", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x28fbaa" - } - } + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : 1, - "gas" : -1, - "value" : -1 + ], + "Frontier" : [ + { + "hash" : "0x29731d5bd892c9c659d856da2810960cecc7b37afacbe1700c43ed5ec0e786cf", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "2000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01" - } + { + "hash" : "0x29731d5bd892c9c659d856da2810960cecc7b37afacbe1700c43ed5ec0e786cf", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x29731d5bd892c9c659d856da2810960cecc7b37afacbe1700c43ed5ec0e786cf", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2000000000000000000000000000000000000001" : { - "storage" : { - } + "logs" : [ + ] + }, + { + "hash" : "0x29731d5bd892c9c659d856da2810960cecc7b37afacbe1700c43ed5ec0e786cf", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "2000000000000000000000000000000000000002" : { - "storage" : { - } + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x869d1e38e0df70852bb9b7d1bce10247bf70998a291c86fb0763e1e744c23e34", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 }, - "2000000000000000000000000000000000000003" : { - "storage" : { - "0x014a" : "0x00", - "0x014c" : "0x00", - "0x0150" : "0x00", - "0x0152" : "0x00", - "0x0154" : "0x00", - "0x03" : "0x00", - "0x04" : "0x00", - "0x07" : "0x00" - } + "logs" : [ + ] + }, + { + "hash" : "0x9c6e09a5bcec1aff2eae576af0a35a2955adc8fce906e914744fb14c07b5021d", + "indexes" : { + "data" : 1, + "gas" : 0, + "value" : 0 }, - "a000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x01", - "0x01" : "0x2ccc2b" - } - } + "logs" : [ + ] } - } - ], + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 350000 0x1000000000000000000000000000000000000001 0 64 0 64 ) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x604060006040600073100000000000000000000000000000000000000162055730fa600055", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000001" : { - "balance" : "1000000000000000000", - "code" : "{ (MSTORE 3 1) (STATICCALL 300000 0x1000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 32 1) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000001" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x60016003526040600060406000731000000000000000000000000000000000000002620493e0fa506001602052", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000002" : { - "balance" : "1000000000000000000", - "code" : "{ (MSTORE 3 1) (STATICCALL 250000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (MSTORE 32 1) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000002" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x600160035260406000604060007310000000000000000000000000000000000000036203d090fa506001602052", + "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" : { } }, - "2000000000000000000000000000000000000000" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (STATICCALL 350000 0x2000000000000000000000000000000000000001 0 64 0 64 ) }", - "nonce" : "0", + "0x2000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x604060006040600073200000000000000000000000000000000000000162055730fa600055", + "nonce" : "0x00", "storage" : { } }, - "2000000000000000000000000000000000000001" : { - "balance" : "1000000000000000000", - "code" : "{ (MSTORE 3 1) (STATICCALL 300000 0x2000000000000000000000000000000000000002 0 64 0 64 ) (MSTORE 32 1) }", - "nonce" : "0", + "0x2000000000000000000000000000000000000001" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x60016003526040600060406000732000000000000000000000000000000000000002620493e0fa506001602052", + "nonce" : "0x00", "storage" : { } }, - "2000000000000000000000000000000000000002" : { - "balance" : "1000000000000000000", - "code" : "{ (MSTORE 3 1) (STATICCALL 250000 0x2000000000000000000000000000000000000003 0 64 0 64 ) (MSTORE 32 1) }", - "nonce" : "0", + "0x2000000000000000000000000000000000000002" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x600160035260406000604060007320000000000000000000000000000000000000036203d090fa506001602052", + "nonce" : "0x00", "storage" : { } }, - "2000000000000000000000000000000000000003" : { - "balance" : "0", - "code" : "{ (MSTORE 3 1) }", - "nonce" : "0", + "0x2000000000000000000000000000000000000003" : { + "balance" : "0x00", + "code" : "0x6001600352", + "nonce" : "0x00", "storage" : { } }, - "a000000000000000000000000000000000000000" : { - "balance" : "0", - "code" : "{ [[ 0 ]] (CALL (GAS) (CALLDATALOAD 0) (CALLVALUE) 0 0 0 0) [[ 1 ]] (GAS) }", - "nonce" : "0", + "0xa000000000000000000000000000000000000000" : { + "balance" : "0x00", + "code" : "0x6000600060006000346000355af16000555a600155", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -179,14 +203,14 @@ "0x0000000000000000000000002000000000000000000000000000000000000000" ], "gasLimit" : [ - "3000000" + "0x2dc6c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "a000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xa000000000000000000000000000000000000000", "value" : [ - "0" + "0x00" ] } } -- cgit v1.2.3