From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- ...tatic_callcodecallcodecall_110_SuicideEnd2.json | 187 ++++++++++++++++----- 1 file changed, 141 insertions(+), 46 deletions(-) (limited to 'GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_SuicideEnd2.json') diff --git a/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_SuicideEnd2.json b/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_SuicideEnd2.json index 58ba34346..35d35df3a 100644 --- a/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_SuicideEnd2.json +++ b/GeneralStateTests/stStaticCall/static_callcodecallcodecall_110_SuicideEnd2.json @@ -6,63 +6,158 @@ "source" : "/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_110_SuicideEnd2Filler.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 + "post" : { + "EIP150" : [ + { + "hash" : "0x3c05529efb0bdb7c995e3fb99f04cbb3f5a7a87de69d4c1e00ebb8785f34f86d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] }, - "network" : [ - "Metropolis" - ], - "result" : { - "1000000000000000000000000000000000000000" : { - "shouldnotexist" : "1" - } + { + "hash" : "0xa6c22628095e9e013c2b4290692b6550674e0704cdb4174e817e4e775f224c36", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] } - } - ], + ], + "EIP158" : [ + { + "hash" : "0x3c05529efb0bdb7c995e3fb99f04cbb3f5a7a87de69d4c1e00ebb8785f34f86d", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xa6c22628095e9e013c2b4290692b6550674e0704cdb4174e817e4e775f224c36", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + } + ], + "Frontier" : [ + { + "hash" : "0xa8f74c69852c591d7560057871ad5ed4c73cbadf6ffd2c1885ea63332587b5c1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x420987557b85268adb954329fc72ea11ad6333f5418959b6c5e953fa7c0fa44c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + } + ], + "Homestead" : [ + { + "hash" : "0xa8f74c69852c591d7560057871ad5ed4c73cbadf6ffd2c1885ea63332587b5c1", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0x420987557b85268adb954329fc72ea11ad6333f5418959b6c5e953fa7c0fa44c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + } + ], + "Metropolis" : [ + { + "hash" : "0x53650fed8f432df6260dcdc9e3ee394639b376047a2a2384600b39672ef7dd7c", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + }, + { + "hash" : "0xe21aaa19eea67e15d57f23f013f8c35592fd0d91d3ce32a4566fdeb78702e417", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 1 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "1000000000000000000000000000000000000000" : { - "balance" : "1000000000000000000", - "code" : "{ [[ 0 ]] (CALLCODE 150000 0x1000000000000000000000000000000000000001 (CALLVALUE) 0 64 0 64 ) [[ 1 ]] (GAS) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000000" : { + "balance" : "0x0de0b6b3a7640000", + "code" : "0x604060006040600034731000000000000000000000000000000000000001620249f0f26000555a600155", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000001" : { - "balance" : "10000000000", - "code" : "{ (CALLCODE 100000 0x1000000000000000000000000000000000000002 (CALLVALUE) 0 64 0 64 ) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000001" : { + "balance" : "0x02540be400", + "code" : "0x604060006040600034731000000000000000000000000000000000000002620186a0f2", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000002" : { - "balance" : "10000000000", - "code" : "{ (STATICCALL 50000 0x1000000000000000000000000000000000000003 0 64 0 64 ) (SELFDESTRUCT 0x1000000000000000000000000000000000000001) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000002" : { + "balance" : "0x02540be400", + "code" : "0x604060006040600073100000000000000000000000000000000000000361c350fa50731000000000000000000000000000000000000001ff", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000003" : { - "balance" : "10000000000", - "code" : "{ (MSTORE 3 1) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000003" : { + "balance" : "0x02540be400", + "code" : "0x6001600352", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x0de0b6b3a7640000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } } @@ -72,15 +167,15 @@ "" ], "gasLimit" : [ - "3000000" + "0x2dc6c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "1000000000000000000000000000000000000000", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0x1000000000000000000000000000000000000000", "value" : [ - "0", - "1" + "0x00", + "0x01" ] } } -- cgit