From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- ...static_callcodecallcodecall_110_OOGMAfter2.json | 257 +++++++++++++++------ 1 file changed, 189 insertions(+), 68 deletions(-) (limited to 'GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2.json') diff --git a/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2.json b/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2.json index 29dc288e5..3379e5a45 100644 --- a/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2.json +++ b/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2.json @@ -6,87 +6,208 @@ "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_OOGMAfter2Filler.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" : 0 + "post" : { + "EIP150" : [ + { + "hash" : "0xb148e0cdaa90341f1cbaf0a2459b7c28ae65349a5ad46369317a2a2c45b5ca6f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xbd561c70c58b9ad7c537e35048d55b5929024a177a9c394ccd0a1202d615d0f9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x00", - "0x01" : "0x014c7f" - } - } + { + "hash" : "0x428b51700c05d01812a0b0b49d002ca402fd3c5eceef51e65f24c06a27f69ebc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 2 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : [ - 1, - 2 + ], + "EIP158" : [ + { + "hash" : "0xb148e0cdaa90341f1cbaf0a2459b7c28ae65349a5ad46369317a2a2c45b5ca6f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xbd561c70c58b9ad7c537e35048d55b5929024a177a9c394ccd0a1202d615d0f9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "storage" : { - "0x00" : "0x00", - "0x01" : "0x012957" - } - } + { + "hash" : "0x428b51700c05d01812a0b0b49d002ca402fd3c5eceef51e65f24c06a27f69ebc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 2 + }, + "logs" : [ + ] } - } - ], + ], + "Frontier" : [ + { + "hash" : "0x8704738bfa5277536fef6409a73fe329ff03a9150ce6f51257b936c8f677ce64", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc97bc6e6f008d7c922338d28cc68b75ed0ec3528d5c7892750d22c469b4447ba", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x390487b8e191b002bd0077018dad6ef7c0dd8db478f1f8481880094385b7aa77", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 2 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0x8704738bfa5277536fef6409a73fe329ff03a9150ce6f51257b936c8f677ce64", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xc97bc6e6f008d7c922338d28cc68b75ed0ec3528d5c7892750d22c469b4447ba", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x390487b8e191b002bd0077018dad6ef7c0dd8db478f1f8481880094385b7aa77", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 2 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0xb148e0cdaa90341f1cbaf0a2459b7c28ae65349a5ad46369317a2a2c45b5ca6f", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xbd561c70c58b9ad7c537e35048d55b5929024a177a9c394ccd0a1202d615d0f9", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + }, + { + "hash" : "0x428b51700c05d01812a0b0b49d002ca402fd3c5eceef51e65f24c06a27f69ebc", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 2 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (CALLCODE 60150 0x1000000000000000000000000000000000000001 (CALLVALUE) 0 64 0 64 ) [[ 1 ]] (GAS) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x60406000604060003473100000000000000000000000000000000000000161eaf6f26000555a600155", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000001" : { - "balance" : "0", - "code" : "{ (CALLCODE 40080 0x1000000000000000000000000000000000000002 ( - (CALLVALUE) 1) 0 64 0 64 ) (def 'i 0x80) (for {} (< @i 50000) [i](+ @i 1) (EXTCODESIZE 1)) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000001" : { + "balance" : "0x00", + "code" : "0x604060006040600060013403731000000000000000000000000000000000000002619c90f2505b61c3506080511015603e576001608051016080526026565b", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000002" : { - "balance" : "0", - "code" : "{ (STATICCALL 20020 0x1000000000000000000000000000000000000003 0 64 0 64 ) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000002" : { + "balance" : "0x00", + "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34fa", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000003" : { - "balance" : "0", - "code" : "{ (MSTORE 3 1) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000003" : { + "balance" : "0x00", + "code" : "0x6001600352", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -96,16 +217,16 @@ "" ], "gasLimit" : [ - "172000" + "0x029fe0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "1000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x1000000000000000000000000000000000000000", "value" : [ - "0", - "1", - "2" + "0x00", + "0x01", + "0x02" ] } } -- cgit