From 78c52764c6c26f0a3c2dca25fcd2e1b932ee2c43 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 1 Aug 2017 11:04:30 +0300 Subject: update general tests --- .../stEIP150Specific/NewGasPriceForCodes.json | 206 +++++++++------------ 1 file changed, 83 insertions(+), 123 deletions(-) (limited to 'GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json') diff --git a/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json index d99d7e947..318db129d 100644 --- a/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json +++ b/GeneralStateTests/stEIP150Specific/NewGasPriceForCodes.json @@ -6,141 +6,101 @@ "source" : "/src/GeneralStateTestsFiller/stEIP150Specific/NewGasPriceForCodesFiller.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" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x12", - "0x01" : "0x20", - "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000", - "0x03" : "0xe8d49be840", - "0x04" : "0x12", - "0x07" : "0x01", - "0x08" : "0x01", - "0x0a" : "0x05e276", - "0x64" : "0x11" - } - } + "post" : { + "EIP150" : [ + { + "hash" : "0x58530241bc470bb693bf79333ecdb9561a65cad9a5e2717df5e9d2e252ed111e", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "EIP158" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x12", - "0x01" : "0x20", - "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000", - "0x03" : "0xe8d49be840", - "0x04" : "0x12", - "0x07" : "0x01", - "0x08" : "0x01", - "0x0a" : "0x06441e", - "0x64" : "0x11" - } - } + ], + "EIP158" : [ + { + "hash" : "0x717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Frontier" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x12", - "0x01" : "0", - "0x02" : "0", - "0x03" : "0", - "0x04" : "0", - "0x07" : "0", - "0x08" : "0", - "0x0a" : "0", - "0x64" : "0" - } - } + ], + "Frontier" : [ + { + "hash" : "0xd6bfa0493ca6ab0b2dcf421757ba5c36fe8f4ee93b09f447c735404a063c77a6", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - }, - { - "indexes" : { - "data" : -1, - "gas" : -1, - "value" : -1 - }, - "network" : [ - "Homestead" - ], - "result" : { - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "storage" : { - "0x00" : "0x12", - "0x01" : "0x20", - "0x02" : "0x1122334455667788991011121314151617181920000000000000000000000000", - "0x03" : "0xe8d49be840", - "0x04" : "0x12", - "0x07" : "0x01", - "0x08" : "0x01", - "0x0a" : "0x05f428", - "0x64" : "0x11" - } - } + ], + "Homestead" : [ + { + "hash" : "0xeaa47f6fe617ab6ca6fea56adfda649114ec8d4997aa586e5ee23517697db10b", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] } - } - ], + ], + "Metropolis" : [ + { + "hash" : "0x717eb439457deec8adb3980be18a1e4a5950a316b9612e18f487180b123cf1a5", + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "logs" : [ + ] + } + ] + }, "pre" : { - "1000000000000000000000000000000000000010" : { - "balance" : "111", + "0x1000000000000000000000000000000000000010" : { + "balance" : "0x6f", "code" : "0x1122334455667788991011121314151617181920212223242526272829303132", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "1000000000000000000000000000000000000011" : { - "balance" : "0", - "code" : "{ (SSTORE 100 0x11) }", - "nonce" : "0", + "0x1000000000000000000000000000000000000011" : { + "balance" : "0x00", + "code" : "0x6011606455", + "nonce" : "0x00", "storage" : { } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000", + "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0xe8d4a51000", "code" : "", - "nonce" : "0", + "nonce" : "0x00", "storage" : { } }, - "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0", - "code" : "{ (SSTORE 1 (EXTCODESIZE 0x1000000000000000000000000000000000000010)) (EXTCODECOPY 0x1000000000000000000000000000000000000010 0 0 20) (SSTORE 2 (MLOAD 0)) (SSTORE 4 (SLOAD 0)) (SSTORE 5 (CALL 30000 0x1000000000000000000000000000000000000011 1 0 0 0 0)) (SSTORE 6 (CALLCODE 30000 0x1000000000000000000000000000000000000011 1 0 0 0 0)) (SSTORE 7 (DELEGATECALL 30000 0x1000000000000000000000000000000000000011 0 0 0 0)) (SSTORE 8 (CALL 30000 0x1000000000000000000000000000000000000013 0 0 0 0 0)) (SSTORE 3 (BALANCE 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)) (SSTORE 10 (GAS)) }", - "nonce" : "0", + "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "0x00", + "code" : "0x7310000000000000000000000000000000000000103b6001556014600060007310000000000000000000000000000000000000103c60005160025560005460045560006000600060006001731000000000000000000000000000000000000011617530f160055560006000600060006001731000000000000000000000000000000000000011617530f26006556000600060006000731000000000000000000000000000000000000011617530f460075560006000600060006000731000000000000000000000000000000000000013617530f160085573a94f5374fce5edbc8e2a8697c15331677e6ebf0b316003555a600a55", + "nonce" : "0x00", "storage" : { "0x00" : "0x12" } @@ -151,14 +111,14 @@ "" ], "gasLimit" : [ - "600000" + "0x0927c0" ], - "gasPrice" : "1", - "nonce" : "0", - "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "gasPrice" : "0x01", + "nonce" : "0x00", + "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b", "value" : [ - "0" + "0x00" ] } } -- cgit