diff options
| author | Dimitry <winsvega@mail.ru> | 2017-08-01 14:11:00 +0800 |
|---|---|---|
| committer | Dimitry <winsvega@mail.ru> | 2017-08-01 14:11:00 +0800 |
| commit | f71c2688e1a839f8429f7e94ec5e56bb182d82cf (patch) | |
| tree | e9ad8d0e49e5717880a5bef10c332711d047f5b3 /GeneralStateTests/stPreCompiledContracts | |
| parent | 092c0560e8084a05516430b8ed3a735290c969e1 (diff) | |
| download | dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.tar.gz dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.tar.zst dexon-tests-f71c2688e1a839f8429f7e94ec5e56bb182d82cf.zip | |
regenerate hive tests
Diffstat (limited to 'GeneralStateTests/stPreCompiledContracts')
187 files changed, 16591 insertions, 16737 deletions
diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json index 41a90d597..e3946a4b5 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0.json @@ -2,81 +2,50 @@ "CALLCODEEcrecover0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x9eac1b6a89d6b05265e9b04176c468a87c03d1ea45cf55b06efd0c9ab48d2301", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x01", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json index 13a80b423..a76020170 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input.json @@ -2,81 +2,48 @@ "CALLCODEEcrecover0_0input" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_0inputFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x0c8f940ac7ccc785ea3269c54e2163015371fe33503a1f8132b978038cd575e1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x57d85a776f0ed60eb9f8addc94d51c6a4291bd377076fa0f472c3c3e36cf0faa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x94aa48e4c65f925e0720999909ae372c2a8d0a323188c7836c9acd9de8084d01", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x94aa48e4c65f925e0720999909ae372c2a8d0a323188c7836c9acd9de8084d01", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x57d85a776f0ed60eb9f8addc94d51c6a4291bd377076fa0f472c3c3e36cf0faa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x602060806080600060006001620493e0f260025560a060020a60805106600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json index 70aa424ed..5280db599 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999.json @@ -2,81 +2,48 @@ "CALLCODEEcrecover0_Gas2999" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xb883081d90f494799d270110223dadef0a39d8876bc0c14f4826c5d3e3ae0ebb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x897f996d27f67f93cf68f7a3dc8aaec646b713234c34a2c162a43841ac55dc90", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xc6d9353338911dcd8ade0686ffb48152ef6d6c3f5f352d954e66f10dfec29840", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xc6d9353338911dcd8ade0686ffb48152ef6d6c3f5f352d954e66f10dfec29840", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x897f996d27f67f93cf68f7a3dc8aaec646b713234c34a2c162a43841ac55dc90", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 2999 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json index 707f4ff3e..225885a16 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas.json @@ -2,81 +2,89 @@ "CALLCODEEcrecover0_NoGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_NoGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x2be771c1f218681ff8b8a2c2af94605601c815cd7034c69891a7dd17c5c26313", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "45216" } } - ], - "EIP158" : [ - { - "hash" : "0x6ffab1a138206bf9486ae55c422414ef4a7d287370035c89b1b58f0eb3facc26", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x9bfb9c885eac441898a31454c65c65ff2ec84238221af48da2ac32500bb20f5e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x9bfb9c885eac441898a31454c65c65ff2ec84238221af48da2ac32500bb20f5e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "46026" } } - ], - "Metropolis" : [ - { - "hash" : "0x6ffab1a138206bf9486ae55c422414ef4a7d287370035c89b1b58f0eb3facc26", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + } + }, + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "46066" } } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 0 1 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +94,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json index d6696e8cd..d64fb03df 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue.json @@ -2,81 +2,49 @@ "CALLCODEEcrecover0_completeReturnValue" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValueFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x584bd8635ffc1fbba4dadff92094fec0a28de4ced2191b1b68d17eb2efe11bab", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x584bd8635ffc1fbba4dadff92094fec0a28de4ced2191b1b68d17eb2efe11bab", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xbb908853ebf24a2f1892e21ab87edfcdae6c242b9167b4c234de7aa9cb97b524", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xbb908853ebf24a2f1892e21ab87edfcdae6c242b9167b4c234de7aa9cb97b524", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x584bd8635ffc1fbba4dadff92094fec0a28de4ced2191b1b68d17eb2efe11bab", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f2600255608051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 3000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json index db5f24882..2bc3d66c5 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000.json @@ -2,81 +2,50 @@ "CALLCODEEcrecover0_gas3000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_gas3000Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x22f37948a081bbb85a340254a983ca835503113cfb6418143021fb89021e5bf5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x01", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xfa8f83131d8d5f9322d2893e12342a8980948d1e734cfdbfa99aabefb9942b03", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x30162640b2bf57fa99f543a25f45882c8e41d1d3e1ceffded3b72daa6884c1e1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x30162640b2bf57fa99f543a25f45882c8e41d1d3e1ceffded3b72daa6884c1e1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xfa8f83131d8d5f9322d2893e12342a8980948d1e734cfdbfa99aabefb9942b03", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 3000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json index e6578ea2d..29dc6d2c6 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput.json @@ -2,81 +2,50 @@ "CALLCODEEcrecover0_overlappingInputOutput" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutputFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xe575a3b7d926bc4c6de7be26d68a1d094b0ec0841d2130493d23ab102051596a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x01", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x91656c11a9845fd85d0bd83befcd344906d4aa16edfd5fa4273d01b634476b3d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xca1717450cce44ba42c7d5d190ba1b05105af965e211fba73460f390e8fd1be3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xca1717450cce44ba42c7d5d190ba1b05105af965e211fba73460f390e8fd1be3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x91656c11a9845fd85d0bd83befcd344906d4aa16edfd5fa4273d01b634476b3d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f260025560a060020a604051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 64 32) [[ 0 ]] (MOD (MLOAD 64) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json index 88631181e..f98bfecac 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1.json @@ -2,81 +2,48 @@ "CALLCODEEcrecover1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf262fe6a03bbc8679c4a82514702934627d13d6c7e76085eae0ef31de1cfbc73", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x12c413ef17691f161eeb212121bbad4804d14a8ffc8ecf0bb740ab1229beebcc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5adfb4e75598f76d070edb5056d4360ae6eaac1e0c6776d82ef688bec4ca38ab", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5adfb4e75598f76d070edb5056d4360ae6eaac1e0c6776d82ef688bec4ca38ab", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x12c413ef17691f161eeb212121bbad4804d14a8ffc8ecf0bb740ab1229beebcc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 1) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json index 9a6da4bab..9d69dd193 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2.json @@ -2,81 +2,48 @@ "CALLCODEEcrecover2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x8be0de871f149dd9036ffea13ad9076a19b0a87f6d7828103907724e28f83b5d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9b3d7d6eac73bb9f96ea5f8157c4993f0459a65ea5918cc5c2196238be22a0cd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2b063782ff9c42c18b0c440e41a1b2097c8f75389f698c7b69af9484e87b1394", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2b063782ff9c42c18b0c440e41a1b2097c8f75389f698c7b69af9484e87b1394", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9b3d7d6eac73bb9f96ea5f8157c4993f0459a65ea5918cc5c2196238be22a0cd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f260025560a060020a606151066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 33 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 65 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 100000 1 0 0 97 97 32) [[ 0 ]] (MOD (MLOAD 97) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json index e6ccc88fc..0b42a1ef7 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3.json @@ -2,81 +2,49 @@ "CALLCODEEcrecover3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover3Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xfed1e9a3da583046162af6ed6171e7683d3a89100c474e7617931cbb23c9171e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xe4319f4b631c6d0fcfc84045dbcb676865fe5e13", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x66a61576f892dd293458323d70df471ca61771c959203d1e174d64d557e53aca", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xeb94655adec71a88e2615ac24a4fa697b7ac3a2d745873069ccf0232c494313c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xeb94655adec71a88e2615ac24a4fa697b7ac3a2d745873069ccf0232c494313c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x66a61576f892dd293458323d70df471ca61771c959203d1e174d64d557e53aca", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9) (MSTORE 32 27) (MSTORE 64 0x6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a) (MSTORE 96 0x37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4) [[ 2 ]] (CALLCODE 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json index fd4a9c5f8..72c004c1f 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80.json @@ -2,81 +2,50 @@ "CALLCODEEcrecover80" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover80Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xe216badd7d303a75a5ba7269f21c9e25353a4e0276757e55459ce0da5e2f5fc8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x00", + "0x01" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x40b646526608d59b43f550e238f50a3bcfaf065b83fa186e877015fc93b6f738", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x7a06a9b9029ed27905c979757d738d9172a2bdd83c14db8ed22582cb4852ab80", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x7a06a9b9029ed27905c979757d738d9172a2bdd83c14db8ed22582cb4852ab80", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x40b646526608d59b43f550e238f50a3bcfaf065b83fa186e877015fc93b6f738", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x00c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x00b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0x00b940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json index bfa7fe5ed..da939976f 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0.json @@ -2,81 +2,50 @@ "CALLCODEEcrecoverH_prefixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xc7710f6a93d1f58657ea85ded47657ba849f076d133087388e6cb2bd5f674ba1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa0b29af6a56d6cfef6415cb195ccbe540e006d0a", + "0x01" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x7897ca4676634b39cb65d8f06d58720262c5a17cebf696dbadd378550ff0cd1f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xfd40abde077f5ddc8e6f9e0077117fc2c5f0a12039525ba83ad79d2519a2f1bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xfd40abde077f5ddc8e6f9e0077117fc2c5f0a12039525ba83ad79d2519a2f1bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x7897ca4676634b39cb65d8f06d58720262c5a17cebf696dbadd378550ff0cd1f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x00c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json index c93d77725..12acd67b3 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0.json @@ -2,81 +2,50 @@ "CALLCODEEcrecoverR_prefixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xef146e382f63cd5e0c0b19a2b982fa24d65b5e5816fd99b4852942bca11c1994", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x00", + "0x01" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xe0fb6df8294c30d22dd68bb80917de61e7ca3fb5bd9e29cb29dab6432176be7d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf6e3d4a6aa057bdd8a5a8b8648fdc1b2efd1146db5d6e003cf0c0d344d5901fd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf6e3d4a6aa057bdd8a5a8b8648fdc1b2efd1146db5d6e003cf0c0d344d5901fd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe0fb6df8294c30d22dd68bb80917de61e7ca3fb5bd9e29cb29dab6432176be7d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x00b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json index 1c985eb95..f30d41327 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0.json @@ -2,81 +2,50 @@ "CALLCODEEcrecoverS_prefixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xea5900accbdb7ac4d5e3838d594a0a6be6996889c5926e781734788b4ef8350d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xb4950a7fad428434b11c357fa6d4b4bcd3096a5d", + "0x01" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9fc4b5d1e199ad0d51733ecc120706356d81ee5f0c49a2ae6494e8f23a86dde9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x7a263a0b4ce8299dff23b911080cadab60bfec7ed41b171647e27074de3741af", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x7a263a0b4ce8299dff23b911080cadab60bfec7ed41b171647e27074de3741af", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9fc4b5d1e199ad0d51733ecc120706356d81ee5f0c49a2ae6494e8f23a86dde9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0x00b940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json index 4e96b0311..768bff110 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0.json @@ -2,81 +2,50 @@ "CALLCODEEcrecoverV_prefixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x9eac1b6a89d6b05265e9b04176c468a87c03d1ea45cf55b06efd0c9ab48d2301", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x01", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf799a1ce0f751eb1229b63c7f8f88e8cee0b5aa0bb4533131706b570c4bddcca", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 0x001c) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0.json index a59e8641f..f2c03730c 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0.json @@ -2,121 +2,50 @@ "CALLCODEEcrecoverV_prefixedf0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x9eba53e9f11d7b45ebcff8d960ca6ee701d572b1533c0f7acbf6210373d1e34f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x9eba53e9f11d7b45ebcff8d960ca6ee701d572b1533c0f7acbf6210373d1e34f", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "EIP158" : [ - { - "hash" : "0xb2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xb2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x15e6392b8f1990a2f59f6f0d8af5b00239dcdafe68bd4cab13f1e00ce783c533", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 }, - { - "hash" : "0xb2ee88dee876096e747b6879e06a263d98e4c3cb8d24ed173382259112e69226", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x00", + "0x01" : "0x00", + "0x02" : "0x01" + } } } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6000526000356020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f260025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 (CALLDATALOAD 0)) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALLCODE 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -127,14 +56,14 @@ "0x00000000000000000000000000000000f000000000000000000000000000001c" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json index 05185a4ff..51753a387 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0.json @@ -2,81 +2,48 @@ "CALLCODEIdentitiy_0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentitiy_0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xe03f1d6e66a44f43647704defdbe06e5535f1fecc57350344fdce2d6c500f0ff", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0000000000000000000000000000000000000000000000000000000000000001" + } } } - ], - "EIP158" : [ - { - "hash" : "0xe03f1d6e66a44f43647704defdbe06e5535f1fecc57350344fdce2d6c500f0ff", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5d8b1ba285d79d0fbdc0f7ebe2276b1a61196f40252f31306ddb0da74dc67a08", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5d8b1ba285d79d0fbdc0f7ebe2276b1a61196f40252f31306ddb0da74dc67a08", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe03f1d6e66a44f43647704defdbe06e5535f1fecc57350344fdce2d6c500f0ff", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", "code" : "0x600160005260206000602060006000600460fff2600051600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json index 21f57b019..d42c45519 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1.json @@ -2,81 +2,49 @@ "CALLCODEIdentitiy_1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentitiy_1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x4e4c71d51978ca6ee442b08705a89c415ea71e5bf00b0963e923465b4bc2062f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x4e4c71d51978ca6ee442b08705a89c415ea71e5bf00b0963e923465b4bc2062f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x1ef50261df0bf5ee5a0d9abc28d8695bbd0bb6bb5ff4b1775419942a2cb5dd38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x1ef50261df0bf5ee5a0d9abc28d8695bbd0bb6bb5ff4b1775419942a2cb5dd38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x4e4c71d51978ca6ee442b08705a89c415ea71e5bf00b0963e923465b4bc2062f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x6020600060006000600060046101f4f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ [[ 2 ]] (CALLCODE 500 4 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json index 829c13d12..30fac5e77 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue.json @@ -2,81 +2,49 @@ "CALLCODEIdentity_1_nonzeroValue" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValueFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x0a425ed069c15a06c4c043803e98ed613c7fda0c01c911816f581ad75695712b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x0a425ed069c15a06c4c043803e98ed613c7fda0c01c911816f581ad75695712b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x52afe51d1eee169b025f53bcba971e6ebd51c0b60a8b201caa6c4a2f3e1d29bf", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x52afe51d1eee169b025f53bcba971e6ebd51c0b60a8b201caa6c4a2f3e1d29bf", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x0a425ed069c15a06c4c043803e98ed613c7fda0c01c911816f581ad75695712b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0bebc200", - "code" : "0x60206000600060006013600462030d40f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "200000000", + "code" : "{ [[ 2 ]] (CALLCODE 200000 4 0x13 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json index c5656d81c..19403ea45 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2.json @@ -2,81 +2,49 @@ "CALLCODEIdentity_2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x000000000000000000000000000000000000000000000000000000f34578907f", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f) [[ 2 ]] (CALLCODE 500 4 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json index 6414fe01f..7f0a02245 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3.json @@ -2,81 +2,49 @@ "CALLCODEIdentity_3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_3Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x000000000000000000000000000000000000000000000000000000f34578907f", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe6918c4262f559d6a44c6c555da8635ff01f9fbf2f4ce808c310d37052a8705d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x339317f131bd9e9ae6d70e13aa53267646fe98231c7694a8666041110eb17eed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f6000526020600060256000600060046101f4f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f) [[ 2 ]] (CALLCODE 500 4 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json index c58da1000..196bed844 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4.json @@ -2,81 +2,49 @@ "CALLCODEIdentity_4" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x4640953e96ae83c81900b74f3f2f666b24ecded241aa3c6e17c1925a78646229", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x4640953e96ae83c81900b74f3f2f666b24ecded241aa3c6e17c1925a78646229", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf7f1cfffee70125d101b1097c15f86ddbd67f9efc1a790f7f5a7c081cc82475f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf7f1cfffee70125d101b1097c15f86ddbd67f9efc1a790f7f5a7c081cc82475f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x4640953e96ae83c81900b74f3f2f666b24ecded241aa3c6e17c1925a78646229", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046064f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 100 4 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json index 6618d546f..976eef929 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17.json @@ -2,81 +2,49 @@ "CALLCODEIdentity_4_gas17" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4_gas17Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x6b6d3209c5ee4053386231d2c7fd643ceaddeea8648258673607e13ef4f337c3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6b6d3209c5ee4053386231d2c7fd643ceaddeea8648258673607e13ef4f337c3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x75b157a2a3ed65dc4b929e3bae97d19a3d5698f2d343e9627f3e3fc99d5fa312", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x75b157a2a3ed65dc4b929e3bae97d19a3d5698f2d343e9627f3e3fc99d5fa312", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6b6d3209c5ee4053386231d2c7fd643ceaddeea8648258673607e13ef4f337c3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 17 4 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json index 68692e672..c90ad30d9 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18.json @@ -2,81 +2,49 @@ "CALLCODEIdentity_4_gas18" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4_gas18Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xe998a0359b9b6ee50bcd2e8cddca4c429768b9f7fff2531a761cfc7999a77cc9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xe998a0359b9b6ee50bcd2e8cddca4c429768b9f7fff2531a761cfc7999a77cc9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8affab955d17a66d86c006b3eec16173434624792581690f5e86ca070dc63eec", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8affab955d17a66d86c006b3eec16173434624792581690f5e86ca070dc63eec", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe998a0359b9b6ee50bcd2e8cddca4c429768b9f7fff2531a761cfc7999a77cc9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 18 4 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json index 93bd75533..fd9f84ddf 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5.json @@ -2,81 +2,48 @@ "CALLCODEIdentity_5" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_5Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xe1b1bf135aa55e24a591e8f8a3e092e2263868c6bbc6ef8a01e5ecab5a5d894a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + } } } - ], - "EIP158" : [ - { - "hash" : "0xe1b1bf135aa55e24a591e8f8a3e092e2263868c6bbc6ef8a01e5ecab5a5d894a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x9b33939f10d802dd786623ed008ff320701d5dbef5001560d376ef88164cfbec", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x9b33939f10d802dd786623ed008ff320701d5dbef5001560d376ef88164cfbec", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe1b1bf135aa55e24a591e8f8a3e092e2263868c6bbc6ef8a01e5ecab5a5d894a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 600 4 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x989680" + "10000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json index 86383ad09..44a5d57ba 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0.json @@ -2,81 +2,48 @@ "CALLCODERipemd160_0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xc26e661d6843db12e0d0d896e1838ecd63b9a347756da99a0f19b3f62d54e24b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc26e661d6843db12e0d0d896e1838ecd63b9a347756da99a0f19b3f62d54e24b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x30b40f8fc4c5d4e9fb62f24ab4d2f158c406fb8a5e9f6443bbc30ad5a07bb651", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x30b40f8fc4c5d4e9fb62f24ab4d2f158c406fb8a5e9f6443bbc30ad5a07bb651", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xc26e661d6843db12e0d0d896e1838ecd63b9a347756da99a0f19b3f62d54e24b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", "code" : "0x600160005260206000602060006000600360fff2600051600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json index c3c9e8900..ccb3d9a67 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1.json @@ -2,81 +2,49 @@ "CALLCODERipemd160_1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xfa285a579fce99e3bf712a8538dc24ad17d9dedebc78623af4050a7cd31e5347", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x9c1185a5c5e9fc54612808977ee8f548b2258d31", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xfa285a579fce99e3bf712a8538dc24ad17d9dedebc78623af4050a7cd31e5347", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x132251be75567abbc7ef39c5832f8ace12d118ecaa1c8db9e1c8a75a3d166cbb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x132251be75567abbc7ef39c5832f8ace12d118ecaa1c8db9e1c8a75a3d166cbb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xfa285a579fce99e3bf712a8538dc24ad17d9dedebc78623af4050a7cd31e5347", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x602060006000600060006003610258f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ [[ 2 ]] (CALLCODE 600 3 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json index c045cf23c..d4a96812f 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2.json @@ -2,81 +2,49 @@ "CALLCODERipemd160_2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x536140a0df4cf715599a2b8a377e48323cad0e3d3f5eb1e61893f5111a8c94b2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0xdbc100f916bfbc53535573d98cf0cbb3a5b36124", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x536140a0df4cf715599a2b8a377e48323cad0e3d3f5eb1e61893f5111a8c94b2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8fadc16e1e04e9d81960894ff8851904cf517e9bbe9c5689688b18a34d03478d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8fadc16e1e04e9d81960894ff8851904cf517e9bbe9c5689688b18a34d03478d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x536140a0df4cf715599a2b8a377e48323cad0e3d3f5eb1e61893f5111a8c94b2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f600552602060006025600060006003611770f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 5 0xf34578907f) [[ 2 ]] (CALLCODE 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json index e62f8b7a4..b2d9ed868 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3.json @@ -2,81 +2,49 @@ "CALLCODERipemd160_3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x316750573f9be26bc17727b47cacedbd0ab3e6ca", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f) [[ 2 ]] (CALLCODE 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json index ee1bf6bc2..ece983c2d 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0.json @@ -2,81 +2,49 @@ "CALLCODERipemd160_3_postfixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x72a652921c45cdc85a3d0172a4643ebc320b8ba58745ac667ccbddfb432b4e77", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x7730b4642169b0f16752696da8da830a4b429c9d", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x72a652921c45cdc85a3d0172a4643ebc320b8ba58745ac667ccbddfb432b4e77", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x58130be64bb95d387e167974a2c2831a1c51c6013e7450f522d9167f9057446e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x58130be64bb95d387e167974a2c2831a1c51c6013e7450f522d9167f9057446e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x72a652921c45cdc85a3d0172a4643ebc320b8ba58745ac667ccbddfb432b4e77", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x65f34578907f00600052602060006025600060006003611770f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f00) [[ 2 ]] (CALLCODE 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json index f4e1f72ed..73653dd44 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0.json @@ -2,81 +2,49 @@ "CALLCODERipemd160_3_prefixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x316750573f9be26bc17727b47cacedbd0ab3e6ca", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8b6c209afa88718c1e50103fa97c18ef27c5279e113257df57eea141b8a83f24", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x78faadcd29814e3d689e510cd49c457985be48aa12500d08281b894275ff38c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f600052602060006025600060006003611770f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x00f34578907f) [[ 2 ]] (CALLCODE 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json index 232a7ad07..16a3c2336 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4.json @@ -2,81 +2,49 @@ "CALLCODERipemd160_4" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_4Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xd7a415ec40003a2e8e485cedc1929fd9f9d5c4f7eb050a5038d4ffeca96d5a5d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x1cf4e77f5966e13e109703cd8a0df7ceda7f3dc3", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xd7a415ec40003a2e8e485cedc1929fd9f9d5c4f7eb050a5038d4ffeca96d5a5d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x90161da4f4947bbe433f2ad3954b8a205f58c3800c2fe87ef4f7ee20f45cd5be", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x90161da4f4947bbe433f2ad3954b8a205f58c3800c2fe87ef4f7ee20f45cd5be", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd7a415ec40003a2e8e485cedc1929fd9f9d5c4f7eb050a5038d4ffeca96d5a5d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102d0f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 720 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json index 793b64f12..5ee3ad25b 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719.json @@ -2,81 +2,48 @@ "CALLCODERipemd160_4_gas719" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_4_gas719Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x3858948e61be1d2756e10a9ab2b447a4c7581608ad4b00a35da8bd19fd130cf0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + } } } - ], - "EIP158" : [ - { - "hash" : "0x3858948e61be1d2756e10a9ab2b447a4c7581608ad4b00a35da8bd19fd130cf0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe47a0f907843569aa87c33888216418a431f0f32dd72fd58685263a387819d68", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe47a0f907843569aa87c33888216418a431f0f32dd72fd58685263a387819d68", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x3858948e61be1d2756e10a9ab2b447a4c7581608ad4b00a35da8bd19fd130cf0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 719 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json index 0356d5865..7ba54982b 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5.json @@ -2,81 +2,48 @@ "CALLCODERipemd160_5" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_5Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x92f03b4d3e050ab726a2791fe0a178e79664d1bed0b08675cc728fc16554595c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + } } } - ], - "EIP158" : [ - { - "hash" : "0x92f03b4d3e050ab726a2791fe0a178e79664d1bed0b08675cc728fc16554595c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xbc4678907c6b5edf23b8168d033e41eff624ca154c9bba9d50a40d7501f4b7ec", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xbc4678907c6b5edf23b8168d033e41eff624ca154c9bba9d50a40d7501f4b7ec", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x92f03b4d3e050ab726a2791fe0a178e79664d1bed0b08675cc728fc16554595c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 6000 3 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x989680" + "10000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json index 083655f91..049aecb03 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0.json @@ -2,81 +2,48 @@ "CALLCODESha256_0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x670a98631f06ae54db67f0cd501879d06ed88c14f5452a8ea1f9134c899c80d3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xec4916dd28fc4c10d78e287ca5d9cc51ee1ae73cbfde08c6b37324cbfaac8bc5" + } } } - ], - "EIP158" : [ - { - "hash" : "0x670a98631f06ae54db67f0cd501879d06ed88c14f5452a8ea1f9134c899c80d3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x1529c257c369c7802b4a9814d6fa4006f0be11238fe35cd9c8d8c1b8391c12be", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x1529c257c369c7802b4a9814d6fa4006f0be11238fe35cd9c8d8c1b8391c12be", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x670a98631f06ae54db67f0cd501879d06ed88c14f5452a8ea1f9134c899c80d3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", "code" : "0x600160005260206000602060006000600260fff2600051600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json index 2344d7687..caa3bdaa3 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1.json @@ -2,81 +2,49 @@ "CALLCODESha256_1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x7d542c7d4109350d7cd0d349c12ce05e8681403b1bd186b56cdeb09e729bb19c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x7d542c7d4109350d7cd0d349c12ce05e8681403b1bd186b56cdeb09e729bb19c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4833302bd51ace328a4e36d14916842f10f430b1e7a4a91ae17ade32eac8909c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4833302bd51ace328a4e36d14916842f10f430b1e7a4a91ae17ade32eac8909c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x7d542c7d4109350d7cd0d349c12ce05e8681403b1bd186b56cdeb09e729bb19c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x6020600060006000600060026101f4f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ [[ 2 ]] (CALLCODE 500 2 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json index 2c3092afc..4325e11e6 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue.json @@ -2,81 +2,49 @@ "CALLCODESha256_1_nonzeroValue" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_1_nonzeroValueFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x48798a6d4c74a787608c14bf589ac6306ef5af3d4cb793a68e36c9880c209b15", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x48798a6d4c74a787608c14bf589ac6306ef5af3d4cb793a68e36c9880c209b15", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb4ca0a701ef2f893c70b499b66afc2e02e2f1224d2237ff908a4ce1c90133408", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb4ca0a701ef2f893c70b499b66afc2e02e2f1224d2237ff908a4ce1c90133408", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x48798a6d4c74a787608c14bf589ac6306ef5af3d4cb793a68e36c9880c209b15", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0bebc200", - "code" : "0x60206000600060006013600262030d40f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "200000000", + "code" : "{ [[ 2 ]] (CALLCODE 200000 2 0x13 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json index 359b0cab2..f1eeaeb6a 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2.json @@ -2,81 +2,49 @@ "CALLCODESha256_2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xaf396401acd11bb73faec4d3c830639b29026198dc0ca537eb200e65b0143dbe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xcb39b3bde22925b2f931111130c774761d8895e0e08437c9b396c1e97d10f34d", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xaf396401acd11bb73faec4d3c830639b29026198dc0ca537eb200e65b0143dbe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x96abcf46fdb7e2d89de59fa41cffb7cb7e99234232b67fa672a87065fb1ce4b5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x96abcf46fdb7e2d89de59fa41cffb7cb7e99234232b67fa672a87065fb1ce4b5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xaf396401acd11bb73faec4d3c830639b29026198dc0ca537eb200e65b0143dbe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f6005526020600060256000600060026101f4f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 5 0xf34578907f) [[ 2 ]] (CALLCODE 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json index aedeb73cc..b803ecaef 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3.json @@ -2,81 +2,49 @@ "CALLCODESha256_3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f) [[ 2 ]] (CALLCODE 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json index 243cedf96..81fffaae5 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0.json @@ -2,81 +2,49 @@ "CALLCODESha256_3_postfix0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3_postfix0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x3fa7da42d456cdfe4dbd5fd254c7135cec918e0737d540fc8561454d16f9ebb8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x3b745a1c00d035c334f358d007a430e4cf0ae63aa0556fb05529706de546464d", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x3fa7da42d456cdfe4dbd5fd254c7135cec918e0737d540fc8561454d16f9ebb8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xfbe78e64e11b2f5801bfc346bdc25aaf600a8cceeb1ee62e9512e9768eb0e610", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xfbe78e64e11b2f5801bfc346bdc25aaf600a8cceeb1ee62e9512e9768eb0e610", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x3fa7da42d456cdfe4dbd5fd254c7135cec918e0737d540fc8561454d16f9ebb8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x65f34578907f006000526020600060256000600060026101f4f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f00) [[ 2 ]] (CALLCODE 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json index ef2c6afaa..b3e08dcdd 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0.json @@ -2,81 +2,49 @@ "CALLCODESha256_3_prefix0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3_prefix0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4b62d72a804ebb03621302972172df1f34ac8224be07cf3168484eab1ceb46f5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa79606bbb30cf8de0ab7b06067977d7bbad98b7c548553d218900cac28848e0b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f6000526020600060256000600060026101f4f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x00f34578907f) [[ 2 ]] (CALLCODE 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json index f08f5db76..6e92e82b0 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4.json @@ -2,81 +2,49 @@ "CALLCODESha256_4" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_4Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x843bc24a3eda2be4ed12e2e67c84e40dc21e2eb00a3fb5b9ff1fa06342f8ffb5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x843bc24a3eda2be4ed12e2e67c84e40dc21e2eb00a3fb5b9ff1fa06342f8ffb5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x812fe546750edec69755b9f7b672bed74dd7d641953da0660e0e877a372ff523", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x812fe546750edec69755b9f7b672bed74dd7d641953da0660e0e877a372ff523", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x843bc24a3eda2be4ed12e2e67c84e40dc21e2eb00a3fb5b9ff1fa06342f8ffb5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026064f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 100 2 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json index 4f6663797..966c33151 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99.json @@ -2,81 +2,49 @@ "CALLCODESha256_4_gas99" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_4_gas99Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x419cd054c0d12261f5bdf4ca1ae5bb0254e9d15ea57b39d7bdc91ccab11588c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x419cd054c0d12261f5bdf4ca1ae5bb0254e9d15ea57b39d7bdc91ccab11588c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf74c8ae615146b95b9889857962c998575a3985ff7ce541f3c952e6233cfdde5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf74c8ae615146b95b9889857962c998575a3985ff7ce541f3c952e6233cfdde5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x419cd054c0d12261f5bdf4ca1ae5bb0254e9d15ea57b39d7bdc91ccab11588c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026063f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 99 2 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json index 425255475..bc2694731 100644 --- a/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json +++ b/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5.json @@ -2,81 +2,48 @@ "CALLCODESha256_5" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_5Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x80e50e6029b1eedab60c117faca3a26bd41006eaedf35ec7542b4a4f8430c143", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + } } } - ], - "EIP158" : [ - { - "hash" : "0x80e50e6029b1eedab60c117faca3a26bd41006eaedf35ec7542b4a4f8430c143", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x18774dbef5f50715a33f58ee46efc8067ee81c7ab9511246c8e8a709cdd9596a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x18774dbef5f50715a33f58ee46efc8067ee81c7ab9511246c8e8a709cdd9596a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x80e50e6029b1eedab60c117faca3a26bd41006eaedf35ec7542b4a4f8430c143", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f2600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALLCODE 600 2 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x989680" + "10000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json index 162b47fed..e00b397d5 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0.json @@ -2,81 +2,50 @@ "CallEcrecover0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x8505dbcf94b936e26c353b02f74fb7a63c8944a99e3ecb290d57e4eff2fabdab", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x01", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json index e3d5b009d..7d4d631dc 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input.json @@ -2,81 +2,48 @@ "CallEcrecover0_0input" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_0inputFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x58840eda5f0456e479cbc88fb36a3d726aa00cc749f7f9d6781b3040fbfde0e2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xceda0216a6e3075a9d97660ac8cd73ebe8a404de2e4c598fa1e7bbe4a3ac39a2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x90dbbb8ef30716e81ed29f7dd1134fc8c2cc63030859dada095bd6e6d5fab570", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x90dbbb8ef30716e81ed29f7dd1134fc8c2cc63030859dada095bd6e6d5fab570", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xceda0216a6e3075a9d97660ac8cd73ebe8a404de2e4c598fa1e7bbe4a3ac39a2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x602060806080600060006001620493e0f160025560a060020a60805106600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json index dacdf0edc..44711ac46 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999.json @@ -2,81 +2,48 @@ "CallEcrecover0_Gas2999" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_Gas2999Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x866186ae9d33b5b2a581f5df2565e64e8c61c662c4005766735edb716201da8c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0x911822f4a79d685d5f3a342b18c8236d9bd5dcc1c95df59097976be55c8425b1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x93529a5670f3deec10566bdd9b9d0c64d507104276cb45bb89ff9e58a2fb8bdf", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x93529a5670f3deec10566bdd9b9d0c64d507104276cb45bb89ff9e58a2fb8bdf", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x911822f4a79d685d5f3a342b18c8236d9bd5dcc1c95df59097976be55c8425b1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb7f160025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 2999 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json index 81efa96cf..1e466f892 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas.json @@ -2,81 +2,77 @@ "CallEcrecover0_NoGas" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_NoGasFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x588ae61bf355d95355831237f9c194249fea4ee07ba336e50df603abfd97d88a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Frontier", + "Homestead" + ], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "70216" } } - ], - "EIP158" : [ - { - "hash" : "0xb6bf32d8dd390c9d512edd4cc09e4ecfafecec80a1268865255a18b20c6ecf27", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x032a12ab38d985948b46af030fb1bf3f91639309061fc5c5f987ae7514c8f210", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x032a12ab38d985948b46af030fb1bf3f91639309061fc5c5f987ae7514c8f210", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150" + ], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "71026" } } - ], - "Metropolis" : [ - { - "hash" : "0xb6bf32d8dd390c9d512edd4cc09e4ecfafecec80a1268865255a18b20c6ecf27", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP158" + ], + "result" : { + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "71066" } } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c45496060526020608060806000600160016000f160025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 0 1 1 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +82,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json index f25acf04e..7155ae361 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue.json @@ -2,81 +2,49 @@ "CallEcrecover0_completeReturnValue" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_completeReturnValueFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x13906f096f838797d95679a558b847bf344c320d1f8317cfdafd620a73c4c66b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x10f2c5ac2871f3e34193847a66433d23c7d4e64b359f8a006cf25b51f5f9e7ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xcf3a03c8130bc0c6e37631c6dcc902da0b3dbfd543daa109c643629699aaf3e2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xcf3a03c8130bc0c6e37631c6dcc902da0b3dbfd543daa109c643629699aaf3e2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x10f2c5ac2871f3e34193847a66433d23c7d4e64b359f8a006cf25b51f5f9e7ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f1600255608051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 3000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json index 39f902be3..61246e22f 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000.json @@ -2,81 +2,50 @@ "CallEcrecover0_gas3000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_gas3000Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x3d5b0141e864305619c2ab5a2e0d234aed6500593e67d4670d9274d37125b046", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x01", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xb190f9b2ca19fc3608cdc6a8996f7922f43802a11d2c9ef4f8096bea4bd87283", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf88554801a796b492c18990052e6c5c2d59f2d64d451cbb679e23f6d5f0ca116", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf88554801a796b492c18990052e6c5c2d59f2d64d451cbb679e23f6d5f0ca116", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb190f9b2ca19fc3608cdc6a8996f7922f43802a11d2c9ef4f8096bea4bd87283", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001610bb8f160025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 3000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json index d0c4d4cf2..bea89cb7a 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput.json @@ -2,81 +2,50 @@ "CallEcrecover0_overlappingInputOutput" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_overlappingInputOutputFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x124609657b6e6c9d599efde65a05ab2c46a92e775fbe862f7e7a28754531d87d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x01", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xd7836cf325c2b6d378a0b2494d37ab333137634eb8dd98cddf6f99bc61ed1040", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xdc2e15ae32e22ada58a279d127eb0f3f09436b81b258599e54e087de4427a7b7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xdc2e15ae32e22ada58a279d127eb0f3f09436b81b258599e54e087de4427a7b7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xd7836cf325c2b6d378a0b2494d37ab333137634eb8dd98cddf6f99bc61ed1040", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060406080600060006001620493e0f160025560a060020a604051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 64 32) [[ 0 ]] (MOD (MLOAD 64) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json index ff1238802..cfa43f09a 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover1.json @@ -2,81 +2,48 @@ "CallEcrecover1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x598525c77ae0e6c1f9521c791a79dd72adb2028c78be1e6851b6b445106e7e90", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x49b38376404c99af28367fbeb75af86fa492b58060f85f38104e04fa709444e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x76ff072677ae740627ca68045f5a48976592e806ca44291895c83e3d7baa7f77", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x76ff072677ae740627ca68045f5a48976592e806ca44291895c83e3d7baa7f77", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x49b38376404c99af28367fbeb75af86fa492b58060f85f38104e04fa709444e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c60005260016020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 1) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json index 0378e82f0..3744f9dcb 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover2.json @@ -2,81 +2,48 @@ "CallEcrecover2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x14a386a5c799c6bf2171ead5376c4d167810e8faf64085d8f1d683bcc880c5df", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x2d79c0271766fdbd306ec02697e7f12efab038a4e1423b128a8c0977df1670e2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa2c6e104fd37a7a1fbd6244d98a9019669f65509f1e1775a00b3982d7ae9bf95", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa2c6e104fd37a7a1fbd6244d98a9019669f65509f1e1775a00b3982d7ae9bf95", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x2d79c0271766fdbd306ec02697e7f12efab038a4e1423b128a8c0977df1670e2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6021527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549604152602060616061600060006001620186a0f160025560a060020a606151066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 33 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 65 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 100000 1 0 0 97 97 32) [[ 0 ]] (MOD (MLOAD 97) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json index d93a18fa7..a9c878d57 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover3.json @@ -2,81 +2,49 @@ "CallEcrecover3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover3Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x4b068eda7ef6d2485f037a5da86d987352aedf658e043556fab5eb53ff12d32b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xe4319f4b631c6d0fcfc84045dbcb676865fe5e13", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x251bb0ce027876b20cde52e1df43ee1c89b359ea531fd61ec13a6e255a924a8f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x98a5fc6cc3755b02eb073d723f0248f2ed541b216c718ffdb7ce45fe4d279afe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x98a5fc6cc3755b02eb073d723f0248f2ed541b216c718ffdb7ce45fe4d279afe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x251bb0ce027876b20cde52e1df43ee1c89b359ea531fd61ec13a6e255a924a8f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9600052601b6020527f6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a6040527f37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4606052602060806080600060006001620186a0f160025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x2f380a2dea7e778d81affc2443403b8fe4644db442ae4862ff5bb3732829cdb9) (MSTORE 32 27) (MSTORE 64 0x6b65ccb0558806e9b097f27a396d08f964e37b8b7af6ceeb516ff86739fbea0a) (MSTORE 96 0x37cbc8d883e129a4b1ef9d5f1df53c4f21a3ef147cf2a50a4ede0eb06ce092d4) [[ 2 ]] (CALL 100000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json index 1a4a89280..125783399 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecover80.json @@ -2,81 +2,50 @@ "CallEcrecover80" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover80Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x8294f78f70d24b3c5229b7f74a48164b06c2017cf8d6d5d0e6b80d4c11622e45", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x00", + "0x01" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa03c4faaf1c664028b3fb54c9438eb4b087af266d9e096ca21262085ae26a61b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xffb96a92a31182d6315ce1be5e6ecf0edb08439beeee76f00754ebef78184de2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xffb96a92a31182d6315ce1be5e6ecf0edb08439beeee76f00754ebef78184de2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa03c4faaf1c664028b3fb54c9438eb4b087af266d9e096ca21262085ae26a61b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x00c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x00b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0x00b940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json index 4fd8679b8..760d6ca03 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength.json @@ -2,81 +2,50 @@ "CallEcrecoverCheckLength" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x638e4110cba967f52d8f95485362b38bb194d4391e05d0aef00e5dfd6a5a82a6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0xa0", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x64c2d838b0cacb5932e2f2a7f7b5d08db2ef73491dbbc607dcbaef412d057da5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x39a3e642f9dae481af1cf868fdf45c9e7a969198ce5e28992ba13f2245414753", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x39a3e642f9dae481af1cf868fdf45c9e7a969198ce5e28992ba13f2245414753", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x64c2d838b0cacb5932e2f2a7f7b5d08db2ef73491dbbc607dcbaef412d057da5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f11223344556677889900112233445566778899001122334455667788990011226080527f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560805160005559600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 128 0x1122334455667788990011223344556677889900112233445566778899001122) (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) [[ 1 ]] (MSIZE) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json index 06f14684e..819393e8d 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV.json @@ -2,81 +2,50 @@ "CallEcrecoverCheckLengthWrongV" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthWrongVFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x04d25dda2e050f8dd39e03aab9e6b2d2ce018d5e1df87f6b2f19ed982baace27", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x1122334455667788990011223344556677889900112233445566778899001122", + "0x01" : "0xa0", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x8f8558ab35c3f053d7e065850a39becadadd83f84b4a9286e2026e5fc6a8f51c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x65a33fe0392e3358f07118cbeb290cc4ff26b0b8521a16279fdbd01172fe532c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x65a33fe0392e3358f07118cbeb290cc4ff26b0b8521a16279fdbd01172fe532c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x8f8558ab35c3f053d7e065850a39becadadd83f84b4a9286e2026e5fc6a8f51c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f11223344556677889900112233445566778899001122334455667788990011226080527f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601d6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560805160005559600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 128 0x1122334455667788990011223344556677889900112233445566778899001122) (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 29) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MLOAD 128) [[ 1 ]] (MSIZE) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json index 916314e87..fb77d7eb9 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0.json @@ -2,81 +2,50 @@ "CallEcrecoverH_prefixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverH_prefixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xa6c5db01005f66672af63de8f23bb41c1d94adee8d6808698eba96989d762a80", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa0b29af6a56d6cfef6415cb195ccbe540e006d0a", + "0x01" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xde3ccf17a0d898e0f32dbeb683d931a001ed51095fddbf6718a3189811519199", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xdf4759b5abd497561010bbb5e32ce3a05ae566914b439aafe1974d34c79505dd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xdf4759b5abd497561010bbb5e32ce3a05ae566914b439aafe1974d34c79505dd", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xde3ccf17a0d898e0f32dbeb683d931a001ed51095fddbf6718a3189811519199", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7ec547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x00c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json index b8689428c..2dcc4392c 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0.json @@ -2,81 +2,50 @@ "CallEcrecoverR_prefixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverR_prefixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x6b66f574dedab09f4ec85ad6f09a73784b475eb2b5c1c19497d8c4de66b4f6a2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x00", + "0x01" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6442eb30120caf880ddf9d8e449b3b94043a1b1cd518df156504d7f700b86dc7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe1849dd8b142d9789bbb0ae5cfeb43bae4e89a356ef4067593aeee62e5a7512a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe1849dd8b142d9789bbb0ae5cfeb43bae4e89a356ef4067593aeee62e5a7512a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6442eb30120caf880ddf9d8e449b3b94043a1b1cd518df156504d7f700b86dc7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527eb1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x00b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json index c9cee0000..c3a6e80b3 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0.json @@ -2,81 +2,50 @@ "CallEcrecoverS_prefixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverS_prefixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xfb856755b7081da6b2524530d15a140672838a64b1502a12664dd31f6feb2450", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xb4950a7fad428434b11c357fa6d4b4bcd3096a5d", + "0x01" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9ec7d7d82d95eb381826e68acded80fc3e53465e8b8b355f0157659771168df5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x173de6b545ca3ba8844c40322b8820013df8e35de86aeeb7f41c7cfb3b718c7e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x173de6b545ca3ba8844c40322b8820013df8e35de86aeeb7f41c7cfb3b718c7e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9ec7d7d82d95eb381826e68acded80fc3e53465e8b8b355f0157659771168df5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527eb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 28) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0x00b940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json index 3033d56ff..afd548b53 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0.json @@ -2,81 +2,50 @@ "CallEcrecoverV_prefixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverV_prefixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x8505dbcf94b936e26c353b02f74fb7a63c8944a99e3ecb290d57e4eff2fabdab", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b", + "0x01" : "0x01", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe59ad00cf0b8f137057e235e8923da16bece8e3813402cabebbcecd21b2989f2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x370f1d0efbf7a605382c003a69c11ff6594f71c08e5d2786a261935c2d226813", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c600052601c6020527f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f6040527feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549606052602060806080600060006001620493e0f160025560a060020a608051066000556000543214600155", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c) (MSTORE 32 0x001c) (MSTORE 64 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f) (MSTORE 96 0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) [[ 2 ]] (CALL 300000 1 0 0 128 128 32) [[ 0 ]] (MOD (MLOAD 128) (EXP 2 160)) [[ 1 ]] (EQ (ORIGIN) (SLOAD 0)) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +55,14 @@ "" ], "gasLimit" : [ - "0x37ba90" + "3652240" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json index 8e1e27498..c44b56901 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0.json @@ -2,81 +2,48 @@ "CallIdentitiy_0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentitiy_0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x2a2fe3cbecb8a0a5dcb6b1eec781f2c5bd4afbea81f5b77f97519c7218a7322b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0000000000000000000000000000000000000000000000000000000000000001" + } } } - ], - "EIP158" : [ - { - "hash" : "0x15b122e1f8eff78043fb6fb23c5d011026cea7741586cb2bd0e9a2af074ce180", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xc0597a2a5a4719ac83e0ef87fe6ecc2cff6542f240815b94178d66501319befc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xc0597a2a5a4719ac83e0ef87fe6ecc2cff6542f240815b94178d66501319befc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x15b122e1f8eff78043fb6fb23c5d011026cea7741586cb2bd0e9a2af074ce180", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", "code" : "0x600160005260206000602060006000600460fff1600051600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json index 2cc9dc924..b72ad6df7 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json +++ b/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1.json @@ -2,81 +2,49 @@ "CallIdentitiy_1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentitiy_1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x12941dbdbb5e71f565c3edb1abb5202ee31054a23497085e8331ee9d73df94f0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xab6b59df16a6036de5cbe6a121af7c01a6851d91ec2f04ecc227c33218af6171", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xc3421551fe70fd96f23787dccbad42678560a10d563eed5798a4a4072ef0a84d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xc3421551fe70fd96f23787dccbad42678560a10d563eed5798a4a4072ef0a84d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xab6b59df16a6036de5cbe6a121af7c01a6851d91ec2f04ecc227c33218af6171", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x6020600060006000600060046101f4f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ [[ 2 ]] (CALL 500 4 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json index 53c8fc883..54abe3518 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json +++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue.json @@ -2,81 +2,52 @@ "CallIdentity_1_nonzeroValue" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_1_nonzeroValueFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xbaa02d57dbced7b424a3e924caf5b973cc5bc8b8196de9c5d1fd08e1d4f88c84", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "0000000000000000000000000000000000000004" : { + "balance" : "19" + }, + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x00", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xbaa02d57dbced7b424a3e924caf5b973cc5bc8b8196de9c5d1fd08e1d4f88c84", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa03eaa07a46ad382fe5827f9ea3d97b367e0fc5f05e4bf3101b4749966a506da", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa03eaa07a46ad382fe5827f9ea3d97b367e0fc5f05e4bf3101b4749966a506da", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xbaa02d57dbced7b424a3e924caf5b973cc5bc8b8196de9c5d1fd08e1d4f88c84", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0bebc200", - "code" : "0x60206000600060006013600462030d40f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "200000000", + "code" : "{ [[ 2 ]] (CALL 200000 4 0x13 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +57,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json index 6d6dc87a6..f6ca3cb3e 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json +++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_2.json @@ -2,81 +2,49 @@ "CallIdentity_2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x31fcdb740b5116808148c57d8fa50b88e3b74346ec747dd93f32da7f70e5443b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x000000000000000000000000000000000000000000000000000000f34578907f", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f6000526020600060256000600060046101f4f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f) [[ 2 ]] (CALL 500 4 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json index 107a50861..9139ecac6 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json +++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_3.json @@ -2,81 +2,49 @@ "CallIdentity_3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_3Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x31fcdb740b5116808148c57d8fa50b88e3b74346ec747dd93f32da7f70e5443b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x000000000000000000000000000000000000000000000000000000f34578907f", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x38ea48c5d3c1e38baf62235a6052525a4183f6c496af843b82ac99d505b99b54", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa86c7bc16888d22117df157633b66a0661573856c7b8390a148dcbeaededdb08", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f6000526020600060256000600060046101f4f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f) [[ 2 ]] (CALL 500 4 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json index 0efc4d650..d9891087b 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json +++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4.json @@ -2,81 +2,49 @@ "CallIdentity_4" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x0291a60c427c75552a5becdc9679e24592d87e319334b629d40f4d48b56da233", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xb96c0a52a392b5c70e3f1f5745a652aabae535641283bad2eb7cf56e13023e54", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xdc83ec4cbf38f314848a1eb20262fa8d78fa9708cc99058e1205112a4f7534f8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xdc83ec4cbf38f314848a1eb20262fa8d78fa9708cc99058e1205112a4f7534f8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb96c0a52a392b5c70e3f1f5745a652aabae535641283bad2eb7cf56e13023e54", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046064f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 100 4 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json index 7141cbed9..3d4efc29e 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json +++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17.json @@ -2,81 +2,49 @@ "CallIdentity_4_gas17" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4_gas17Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xe2dcb5cc0942d7be3d0ecb21e173c5abd86b755aa3b1cf7bfe6bf7f4296754b3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xbf192444e0d0b5076efbf4fa8bd7e8141f2749fc273537ccd20c68b5acaf0f76", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3492519d71098ebaa3d5838c55708698215b8e711ed71359dc8d62be949b76e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3492519d71098ebaa3d5838c55708698215b8e711ed71359dc8d62be949b76e6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xbf192444e0d0b5076efbf4fa8bd7e8141f2749fc273537ccd20c68b5acaf0f76", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046011f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 17 4 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json index 3027274f5..3a883f97b 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json +++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18.json @@ -2,81 +2,49 @@ "CallIdentity_4_gas18" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4_gas18Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xd75ad45243788aa28b8d3d7b801d9825414bce24a629d07cd6f966c5f89f243b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9775eb229187458c166832ace1cd972a410d903029be855c6ccf880aee39738f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe96de5a841c51dd3eafc83e2e48b62895f47af3c23ca3d13f954b8ded4d84dab", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe96de5a841c51dd3eafc83e2e48b62895f47af3c23ca3d13f954b8ded4d84dab", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9775eb229187458c166832ace1cd972a410d903029be855c6ccf880aee39738f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060046012f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 18 4 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json b/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json index 5eb60c10c..f60e60b41 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json +++ b/GeneralStateTests/stPreCompiledContracts/CallIdentity_5.json @@ -2,81 +2,48 @@ "CallIdentity_5" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_5Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x4f0f966de47b3c5f33eed5309cb538d3c9b027fc1deca750d34600854ed258d5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + } } } - ], - "EIP158" : [ - { - "hash" : "0x1f91d1b116ec8c728da65c0fd5b12d9a081092cdf6f454161fad580f16ef2e89", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x0edafad0e4913deab8b13bcde66c69f1aed4372f3245c0772eca7452e74791b5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x0edafad0e4913deab8b13bcde66c69f1aed4372f3245c0772eca7452e74791b5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x1f91d1b116ec8c728da65c0fd5b12d9a081092cdf6f454161fad580f16ef2e89", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006004610258f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 600 4 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x989680" + "10000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json index 37e7ef35e..2880b87e7 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0.json @@ -2,81 +2,48 @@ "CallRipemd160_0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x686c6f0235678010e68839c7ba72cd39ed5b7de6475ebf2f1a42ed3056c445d6", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x435aedb8d3ae05243d181c5eb50880e30ac527b87163a86ee7cfd255ce79b94c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb418cef120df01a9cef80804c2f883527c0b550df6664166857a7c998a869b65", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb418cef120df01a9cef80804c2f883527c0b550df6664166857a7c998a869b65", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x435aedb8d3ae05243d181c5eb50880e30ac527b87163a86ee7cfd255ce79b94c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", "code" : "0x600160005260206000602060006000600360fff1600051600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json index dc28f3696..206747b1a 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json +++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1.json @@ -2,81 +2,49 @@ "CallRipemd160_1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x34f4f4a52d69fed606412853b95650be8dc1a3f35ef8da8b3a81a6da1c8b7135", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x9c1185a5c5e9fc54612808977ee8f548b2258d31", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x37bf4936518d1bdbd00c4d6085a1dda0c8c17d80fea19ac7c7a7212e40ca41db", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x1d22c83f58f74145b7afad4f5a57244540f901969d5d2a7ec4aa519ed0787930", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x1d22c83f58f74145b7afad4f5a57244540f901969d5d2a7ec4aa519ed0787930", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x37bf4936518d1bdbd00c4d6085a1dda0c8c17d80fea19ac7c7a7212e40ca41db", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x602060006000600060006003610258f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ [[ 2 ]] (CALL 600 3 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json index a3f07f043..e8bbf6de8 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json +++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2.json @@ -2,81 +2,49 @@ "CallRipemd160_2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xefa421c033dd0a7ff037166340c068e5560b9da80cbe4626e5ea3860e7c5f82f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0xdbc100f916bfbc53535573d98cf0cbb3a5b36124", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdb19dd8002a75f71875397e59eee22a2e7a0165cc2a928373d09855dccc6bbd0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xbc4584ac2f7c4700e762bfd62eb415fac4f9613a8d8c40b9f9fa69746f3c647c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xbc4584ac2f7c4700e762bfd62eb415fac4f9613a8d8c40b9f9fa69746f3c647c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdb19dd8002a75f71875397e59eee22a2e7a0165cc2a928373d09855dccc6bbd0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f600552602060006025600060006003611770f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 5 0xf34578907f) [[ 2 ]] (CALL 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json index 7cfc2a620..bf085471f 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json +++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3.json @@ -2,81 +2,49 @@ "CallRipemd160_3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x1c9d805e8510689af75f8235017a930f3128f4ebc7beb07be48c709696efcf26", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x316750573f9be26bc17727b47cacedbd0ab3e6ca", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f600052602060006025600060006003611770f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f) [[ 2 ]] (CALL 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json index 589238d01..a0fdab05c 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0.json @@ -2,81 +2,49 @@ "CallRipemd160_3_postfixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3_postfixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xe6a95c717a096d670ab2a1ddd4288430982baabaa52e89936c0a8da192219ad4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x7730b4642169b0f16752696da8da830a4b429c9d", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x39a6d621e41ca9d266a684313899a078c43219a657377abebf38b2a988c5b782", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa2af8618f7758923dd3dab7ef54cb26f42ab11c316172aba26f1b84483f7a166", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa2af8618f7758923dd3dab7ef54cb26f42ab11c316172aba26f1b84483f7a166", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x39a6d621e41ca9d266a684313899a078c43219a657377abebf38b2a988c5b782", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x65f34578907f00600052602060006025600060006003611770f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f00) [[ 2 ]] (CALL 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json index 97c8e798d..9e3993353 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0.json @@ -2,81 +2,49 @@ "CallRipemd160_3_prefixed0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3_prefixed0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x1c9d805e8510689af75f8235017a930f3128f4ebc7beb07be48c709696efcf26", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x316750573f9be26bc17727b47cacedbd0ab3e6ca", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4190628cd7645611fdd0bfecc72dbe756897fb08f92ff8a24ece746c656240b9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x61d43f9c89fb798e915650738d94660050b92e8f3c5b01047b17d68a04d43a32", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f600052602060006025600060006003611770f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x00f34578907f) [[ 2 ]] (CALL 6000 3 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json index d122a26f6..c2fec7579 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json +++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4.json @@ -2,81 +2,49 @@ "CallRipemd160_4" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_4Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x4689dc4aaa314cd049ea40e2b2d064393875e67e8dc0cd9dee8dadad2bd3ce6a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0x1cf4e77f5966e13e109703cd8a0df7ceda7f3dc3", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xead04023e5b0f010c226767bcc44c1f9140c0b2499dcc93a64d977b578304556", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5f262f6a170033a4882dd89eb94ebfe8a8046a0f6442c62a852ca916ee210d53", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5f262f6a170033a4882dd89eb94ebfe8a8046a0f6442c62a852ca916ee210d53", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xead04023e5b0f010c226767bcc44c1f9140c0b2499dcc93a64d977b578304556", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102d0f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 720 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json index f17472207..c1d7f6276 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json +++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719.json @@ -2,81 +2,48 @@ "CallRipemd160_4_gas719" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_4_gas719Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x231af4ae84d086a74ccea9af42af14de47f48fe18ec565de095f5987b85ce933", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + } } } - ], - "EIP158" : [ - { - "hash" : "0x0ce883cdc8e7b4acf14d7d28d7446b4dfe132b5c5239be9c8bf23a2c3a37765a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x1e83dde333b6e3f50223781c584bdc334145e3e58b0cea77c76e6247f2b58fa0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x1e83dde333b6e3f50223781c584bdc334145e3e58b0cea77c76e6247f2b58fa0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x0ce883cdc8e7b4acf14d7d28d7446b4dfe132b5c5239be9c8bf23a2c3a37765a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060036102cff1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 719 3 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json index 48b7b3f50..855ca85f7 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json +++ b/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5.json @@ -2,81 +2,48 @@ "CallRipemd160_5" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_5Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xb9f2484fa66f67ec3abb57c35024cb90c67237c7a800a083d6dedba49d4393aa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc004a3a22e5ed22297ab6555c85391446361245e7f4811b7dc91ccc7b8db916e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xd2973c4abfcc5775a79c48621f1bcd0ebd72471853ba1d1c5116a423301db265", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xd2973c4abfcc5775a79c48621f1bcd0ebd72471853ba1d1c5116a423301db265", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xc004a3a22e5ed22297ab6555c85391446361245e7f4811b7dc91ccc7b8db916e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006003611770f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 6000 3 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x989680" + "10000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json index fe522dff9..0758bfffd 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_0.json @@ -2,81 +2,48 @@ "CallSha256_0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xe5d6c470d46618ad3d1298c9575d622ff01035ab4e2717df0cb37ebb18b53b86", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xec4916dd28fc4c10d78e287ca5d9cc51ee1ae73cbfde08c6b37324cbfaac8bc5" + } } } - ], - "EIP158" : [ - { - "hash" : "0xaf78af682890ed52f547478bf1a105a5c8e2627f5eff5f951f38140fd8745152", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x86b9a816d69dc08083a5266bcf788491fabc3986bfb4cbcef78bd9e9d5f30e50", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x86b9a816d69dc08083a5266bcf788491fabc3986bfb4cbcef78bd9e9d5f30e50", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xaf78af682890ed52f547478bf1a105a5c8e2627f5eff5f951f38140fd8745152", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", "code" : "0x600160005260206000602060006000600260fff1600051600055", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json index 24f716b01..231c73aed 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json +++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_1.json @@ -2,81 +2,49 @@ "CallSha256_1" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_1Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x6de5c8f3f170953bc212092db9030852c7b36ea9c4a804b9cd5e967b5fdfb484", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x1bab374f8e446a5ba07b8e46f51211c46ef9688e93b5970c28eb971511ff5de9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x308d9368ff3343b3dfe257199d9ff3ae8fbec5810c63e74e669a343fa658f4a8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x308d9368ff3343b3dfe257199d9ff3ae8fbec5810c63e74e669a343fa658f4a8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x1bab374f8e446a5ba07b8e46f51211c46ef9688e93b5970c28eb971511ff5de9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x6020600060006000600060026101f4f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ [[ 2 ]] (CALL 500 2 0 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json index 5a5fd6b44..362ea491a 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json +++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue.json @@ -2,81 +2,52 @@ "CallSha256_1_nonzeroValue" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_1_nonzeroValueFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x05f5e100", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "100000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xa2b35883e68dc45cfb7eaf35c36fdda84a1aea77c416693388725973d44f0a58", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "0000000000000000000000000000000000000002" : { + "balance" : "19" + }, + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa2b35883e68dc45cfb7eaf35c36fdda84a1aea77c416693388725973d44f0a58", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5f16000ab7b60629613874726ca6b564fa81c5242f2e304d41fd08de087085f8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5f16000ab7b60629613874726ca6b564fa81c5242f2e304d41fd08de087085f8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa2b35883e68dc45cfb7eaf35c36fdda84a1aea77c416693388725973d44f0a58", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x0bebc200", - "code" : "0x60206000600060006013600262030d40f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "200000000", + "code" : "{ [[ 2 ]] (CALL 200000 2 0x13 0 0 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +57,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json index 5a3c81141..75b716cf9 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json +++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_2.json @@ -2,81 +2,49 @@ "CallSha256_2" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_2Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x5f16214512791aa2ff58ed1dfb91dd03abf992eaa2459bd93eede7475dccfbe0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xcb39b3bde22925b2f931111130c774761d8895e0e08437c9b396c1e97d10f34d", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa8cca12173a969472c8e27402ac36b2089680e8d4926a2f8cce4a4a2769e60b8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4486c2ed72e7eb999134286eb0cdd193cd5a25fcf74b2f0ec41743fc2b0a993a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4486c2ed72e7eb999134286eb0cdd193cd5a25fcf74b2f0ec41743fc2b0a993a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa8cca12173a969472c8e27402ac36b2089680e8d4926a2f8cce4a4a2769e60b8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f6005526020600060256000600060026101f4f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 5 0xf34578907f) [[ 2 ]] (CALL 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json index b28dae0c6..3c20fc8c4 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json +++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_3.json @@ -2,81 +2,49 @@ "CallSha256_3" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x629bd433840e4cf0ff15d9f156c89b64b7db3d834ea2583694195997978fbe41", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f6000526020600060256000600060026101f4f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f) [[ 2 ]] (CALL 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json index a7416f5e3..0a55fbad9 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0.json @@ -2,81 +2,49 @@ "CallSha256_3_postfix0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3_postfix0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x90791e9d5dccb0c20fba4b193e275d4f83e4c9d57f6b4930511df4793146600e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x3b745a1c00d035c334f358d007a430e4cf0ae63aa0556fb05529706de546464d", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x81e879df5e979305af1f79c7740bd1754ff11e6d8d129795e586b735c92187f3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x13cc9b72cee9a44291cc26fda71bf8cdeca31a454786e0e70dc6aae7ab507cba", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x13cc9b72cee9a44291cc26fda71bf8cdeca31a454786e0e70dc6aae7ab507cba", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x81e879df5e979305af1f79c7740bd1754ff11e6d8d129795e586b735c92187f3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x65f34578907f006000526020600060256000600060026101f4f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xf34578907f00) [[ 2 ]] (CALL 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json index 3f2d97a0b..c901c3629 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json +++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0.json @@ -2,81 +2,49 @@ "CallSha256_3_prefix0" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3_prefix0Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x629bd433840e4cf0ff15d9f156c89b64b7db3d834ea2583694195997978fbe41", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0x52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2b4bd681b739a73b8c2c150718789783ed83a01bc9e6aece404755418b5c18a7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x52e69963b10d07e1181b4666ee8eb8c8a674b04a2d181ef63980711afe2fb451", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x64f34578907f6000526020600060256000600060026101f4f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0x00f34578907f) [[ 2 ]] (CALL 500 2 0 0 37 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json index fea92fd53..5ab083a4c 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json +++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_4.json @@ -2,81 +2,49 @@ "CallSha256_4" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_4Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x20270d37d265f700ba4860f612411a4092621a329b0a2a378228764e2d23ac7f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xe7591befc32140f54eb732d50574f89bec399b0b3b402af4ef4d9272d21fc0aa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xebf6e4a83fcafea74db774fa81650afcf661cb5d1eb6fb04158a3369bc0a0c81", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xebf6e4a83fcafea74db774fa81650afcf661cb5d1eb6fb04158a3369bc0a0c81", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe7591befc32140f54eb732d50574f89bec399b0b3b402af4ef4d9272d21fc0aa", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026064f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 100 2 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json index e1879e5c9..5a4cefdde 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json +++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99.json @@ -2,81 +2,49 @@ "CallSha256_4_gas99" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_4_gas99Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x95d63944bcbeb03fa4afc9d935a8fbdd3bc76a37b30207e40f9de7ae7a0331cb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051", + "0x02" : "0x01" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc9b775e18b516ae69d8d106d2754056629a68ec3be4d967804e4e2e768e9f316", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8efab944f5c2525aff1db05bf947281046ed8737b7d81bf3b58ff01e367263d4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8efab944f5c2525aff1db05bf947281046ed8737b7d81bf3b58ff01e367263d4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xc9b775e18b516ae69d8d106d2754056629a68ec3be4d967804e4e2e768e9f316", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000526020600060206000600060026063f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 99 2 0 0 32 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +54,14 @@ "" ], "gasLimit" : [ - "0x0592a8" + "365224" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json b/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json index 07e7f7edd..47441fb54 100644 --- a/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json +++ b/GeneralStateTests/stPreCompiledContracts/CallSha256_5.json @@ -2,81 +2,48 @@ "CallSha256_5" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_5Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xffb1bb4f635f0ea33d5b41632626ba9922d0ed84badfcc2c99256cb7563532b3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" + } } } - ], - "EIP158" : [ - { - "hash" : "0x9ddd87380d77cdab2089800cd67e53c56f3e989a05ec9f78d9b1f03ae3ba2c06", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x158ae4f43576851b9ebba515ba108fded9df16956b249d9bfe9169be5f837402", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x158ae4f43576851b9ebba515ba108fded9df16956b249d9bfe9169be5f837402", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9ddd87380d77cdab2089800cd67e53c56f3e989a05ec9f78d9b1f03ae3ba2c06", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", - "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60005260206000620f4240600060006002610258f1600255600051600055", - "nonce" : "0x00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", + "code" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 2 ]] (CALL 600 2 0 0 1000000 0 32) [[ 0 ]] (MLOAD 0)}", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x989680" + "10000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp.json b/GeneralStateTests/stPreCompiledContracts/modexp.json index 34d2b9411..9c930d23f 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp.json @@ -2,1281 +2,233 @@ "modexp" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.b08c7b41.Linux.clang", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x02540be400", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0xf344f27b4bbe9ff93695b2217359d4a244b866c108907dc9d62e70b8c24b3fab", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xedadefce96b8e5bc0b47ab27f15d0d4485b48bd2310d025297f1e8a81d218f8a", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x30ea2865862628ecdfb1b8e05a93924e0724fd3cb2ddb58a81f12115aa35d8e6", - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x0750d2c5ea18000c751a7cd6c2d80181e2b3b652697080d0630318d1133c5d80", - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x7ab9c5c6fa99244ac4be6eb1616a07cae2a86f1bc3edf1806d7e571c3d1fddec", - "indexes" : { - "data" : 4, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x1b6eb5326be2812301439769d4c1ee96cd1f7caada80dfa4cedfe8631c28770f", - "indexes" : { - "data" : 5, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xf94ed059b9cf9c906e19620368914a7896fc500d5142ddaedef0289368b15857", - "indexes" : { - "data" : 6, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x01c03446197c1b6ae586f3e36da100c6b8db81a71c8e789fc3e8d4591a400e3d", - "indexes" : { - "data" : 7, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x4d121d2b73e06febfd827e5fbe96f0f07053de8a67db87de342a8fae79f2439d", - "indexes" : { - "data" : 8, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x548b75e6b85f994ec0f6dc3e7c5f5b96981c5d9d5559f9528ce55aa27fa59488", - "indexes" : { - "data" : 9, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2ca8c0c717997cb343a2c40361aee089948bf81f5b54b6a70c0142ce47dbdd3b", - "indexes" : { - "data" : 10, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2ca8c0c717997cb343a2c40361aee089948bf81f5b54b6a70c0142ce47dbdd3b", - "indexes" : { - "data" : 11, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2ca8c0c717997cb343a2c40361aee089948bf81f5b54b6a70c0142ce47dbdd3b", - "indexes" : { - "data" : 12, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x548b75e6b85f994ec0f6dc3e7c5f5b96981c5d9d5559f9528ce55aa27fa59488", - "indexes" : { - "data" : 13, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x548b75e6b85f994ec0f6dc3e7c5f5b96981c5d9d5559f9528ce55aa27fa59488", - "indexes" : { - "data" : 14, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x548b75e6b85f994ec0f6dc3e7c5f5b96981c5d9d5559f9528ce55aa27fa59488", - "indexes" : { - "data" : 15, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x15c59e0509961d406f6938d9f81755c3ce716f7b29b0222f705704eb72e5d0a4", - "indexes" : { - "data" : 16, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2645e04375986d954b5a519729a0185493e8c742ade1a47c209518f39bf7b34a", - "indexes" : { - "data" : 17, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2ca8c0c717997cb343a2c40361aee089948bf81f5b54b6a70c0142ce47dbdd3b", - "indexes" : { - "data" : 18, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x983bc042119afb8ab9ca087eab378e8f7ac7fe0010c1e8f4b17907141ce67c22", - "indexes" : { - "data" : 19, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xdc9371c778ad15b02e9575e305fde0645b15642d0dd8878bc41da9fb88252722", - "indexes" : { - "data" : 20, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2645e04375986d954b5a519729a0185493e8c742ade1a47c209518f39bf7b34a", - "indexes" : { - "data" : 21, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xdc9371c778ad15b02e9575e305fde0645b15642d0dd8878bc41da9fb88252722", - "indexes" : { - "data" : 22, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x1b6eb5326be2812301439769d4c1ee96cd1f7caada80dfa4cedfe8631c28770f", - "indexes" : { - "data" : 23, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbeb3a72a05bec1ad4c3c7f0d5c761676093c5859aa2052b30d5f89a09c56c418", - "indexes" : { - "data" : 24, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x5dfae05cec5a88a6786f37288d099e08764ab1d8989caa7215bd44cdc19964ec", - "indexes" : { - "data" : 25, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x01c03446197c1b6ae586f3e36da100c6b8db81a71c8e789fc3e8d4591a400e3d", - "indexes" : { - "data" : 26, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x6105198fe46b16679fce14df3ac906734c6c371f0f4b2876aba7303b30868a75", - "indexes" : { - "data" : 27, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x04c1a9eddf133cae0729735fa6251863e2ea8e0760d4205a75bc87803555a1f3", - "indexes" : { - "data" : 28, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x04c1a9eddf133cae0729735fa6251863e2ea8e0760d4205a75bc87803555a1f3", - "indexes" : { - "data" : 29, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xd841e6f32bacdeef36dc820063af8b30b3ecf37ab6a3b76e60ac1449faa8ed5d", - "indexes" : { - "data" : 30, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "EIP150", + "EIP158" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } } } - ], - "EIP158" : [ - { - "hash" : "0xf344f27b4bbe9ff93695b2217359d4a244b866c108907dc9d62e70b8c24b3fab", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xedadefce96b8e5bc0b47ab27f15d0d4485b48bd2310d025297f1e8a81d218f8a", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x30ea2865862628ecdfb1b8e05a93924e0724fd3cb2ddb58a81f12115aa35d8e6", - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x0750d2c5ea18000c751a7cd6c2d80181e2b3b652697080d0630318d1133c5d80", - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x7ab9c5c6fa99244ac4be6eb1616a07cae2a86f1bc3edf1806d7e571c3d1fddec", - "indexes" : { - "data" : 4, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x1b6eb5326be2812301439769d4c1ee96cd1f7caada80dfa4cedfe8631c28770f", - "indexes" : { - "data" : 5, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xf94ed059b9cf9c906e19620368914a7896fc500d5142ddaedef0289368b15857", - "indexes" : { - "data" : 6, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x01c03446197c1b6ae586f3e36da100c6b8db81a71c8e789fc3e8d4591a400e3d", - "indexes" : { - "data" : 7, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x4d121d2b73e06febfd827e5fbe96f0f07053de8a67db87de342a8fae79f2439d", - "indexes" : { - "data" : 8, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x548b75e6b85f994ec0f6dc3e7c5f5b96981c5d9d5559f9528ce55aa27fa59488", - "indexes" : { - "data" : 9, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2ca8c0c717997cb343a2c40361aee089948bf81f5b54b6a70c0142ce47dbdd3b", - "indexes" : { - "data" : 10, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2ca8c0c717997cb343a2c40361aee089948bf81f5b54b6a70c0142ce47dbdd3b", - "indexes" : { - "data" : 11, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2ca8c0c717997cb343a2c40361aee089948bf81f5b54b6a70c0142ce47dbdd3b", - "indexes" : { - "data" : 12, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x548b75e6b85f994ec0f6dc3e7c5f5b96981c5d9d5559f9528ce55aa27fa59488", - "indexes" : { - "data" : 13, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x548b75e6b85f994ec0f6dc3e7c5f5b96981c5d9d5559f9528ce55aa27fa59488", - "indexes" : { - "data" : 14, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x548b75e6b85f994ec0f6dc3e7c5f5b96981c5d9d5559f9528ce55aa27fa59488", - "indexes" : { - "data" : 15, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x15c59e0509961d406f6938d9f81755c3ce716f7b29b0222f705704eb72e5d0a4", - "indexes" : { - "data" : 16, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2645e04375986d954b5a519729a0185493e8c742ade1a47c209518f39bf7b34a", - "indexes" : { - "data" : 17, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2ca8c0c717997cb343a2c40361aee089948bf81f5b54b6a70c0142ce47dbdd3b", - "indexes" : { - "data" : 18, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x983bc042119afb8ab9ca087eab378e8f7ac7fe0010c1e8f4b17907141ce67c22", - "indexes" : { - "data" : 19, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xdc9371c778ad15b02e9575e305fde0645b15642d0dd8878bc41da9fb88252722", - "indexes" : { - "data" : 20, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2645e04375986d954b5a519729a0185493e8c742ade1a47c209518f39bf7b34a", - "indexes" : { - "data" : 21, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xdc9371c778ad15b02e9575e305fde0645b15642d0dd8878bc41da9fb88252722", - "indexes" : { - "data" : 22, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x1b6eb5326be2812301439769d4c1ee96cd1f7caada80dfa4cedfe8631c28770f", - "indexes" : { - "data" : 23, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbeb3a72a05bec1ad4c3c7f0d5c761676093c5859aa2052b30d5f89a09c56c418", - "indexes" : { - "data" : 24, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x5dfae05cec5a88a6786f37288d099e08764ab1d8989caa7215bd44cdc19964ec", - "indexes" : { - "data" : 25, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x01c03446197c1b6ae586f3e36da100c6b8db81a71c8e789fc3e8d4591a400e3d", - "indexes" : { - "data" : 26, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x6105198fe46b16679fce14df3ac906734c6c371f0f4b2876aba7303b30868a75", - "indexes" : { - "data" : 27, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x04c1a9eddf133cae0729735fa6251863e2ea8e0760d4205a75bc87803555a1f3", - "indexes" : { - "data" : 28, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x04c1a9eddf133cae0729735fa6251863e2ea8e0760d4205a75bc87803555a1f3", - "indexes" : { - "data" : 29, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xd841e6f32bacdeef36dc820063af8b30b3ecf37ab6a3b76e60ac1449faa8ed5d", - "indexes" : { - "data" : 30, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : [ + 0, + 6, + 7 + ], + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x01" + } } } - ], - "Frontier" : [ - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 4, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 5, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 6, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 7, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 8, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 9, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 10, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 11, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 12, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 13, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 14, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 15, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 16, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 17, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 18, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 19, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 20, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 21, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 22, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 23, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 24, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 25, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 26, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 27, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 28, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 29, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 30, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : [ + 29 + ], + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } } } - ], - "Homestead" : [ - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 4, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 5, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 6, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 7, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 8, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 9, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 10, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 11, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 12, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 13, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 14, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 15, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 16, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 17, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 18, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 19, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 20, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 21, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 22, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 23, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 24, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 25, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 26, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 27, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 28, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 29, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbbe41bbf20a3f2663091f141148c584776955f1ddfe40a9c56eeb43c63cf961f", - "indexes" : { - "data" : 30, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : [ + 1, + 5, + 8, + 9, + 10, + 12, + 13, + 15, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 30 + ], + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x00" + } } } - ], - "Metropolis" : [ - { - "hash" : "0x8ab635aeb122bb5038eaa8ffb4f81d6bbf4913eb6f91600dab45f6a8e6d4f19d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x055ce8a173a7a583a3884e7dc80d649ac44c55bf660864c7bc59e4b3ed122b04", - "indexes" : { - "data" : 1, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xe3a7ddada48220c8592f6bd514430285b58b3383623a93710feab1c651651a18", - "indexes" : { - "data" : 2, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xc5016c244e1875b3336ffcdf3431128575deca48f7002ab782ce76b6f59c6828", - "indexes" : { - "data" : 3, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x12e68b7e133d09e64222d8f6aa38d96cbced82273da06ddfb90bd1d9d7a3936b", - "indexes" : { - "data" : 4, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xf1a18f9f7c7b169d33c416a7924c246bc43f6fddcca6cf829fa10c7968d0c7ef", - "indexes" : { - "data" : 5, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xfb0524c49998353f408b775428128ded71bf81c790a5382aedc956fb1fa310a8", - "indexes" : { - "data" : 6, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x3701b34d1b21837e9bd5c63f2655408a153c70264abbbba7e87ed0963f21cc02", - "indexes" : { - "data" : 7, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x8ab2f4a84d94d2824e035ab697083d9f5f5145632956d2445d9372443a0ad0d7", - "indexes" : { - "data" : 8, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x548b75e6b85f994ec0f6dc3e7c5f5b96981c5d9d5559f9528ce55aa27fa59488", - "indexes" : { - "data" : 9, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2ca8c0c717997cb343a2c40361aee089948bf81f5b54b6a70c0142ce47dbdd3b", - "indexes" : { - "data" : 10, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xad6357cbdf0bec96c717c466205b4e4d1701b8e509ea7a4c309e6d19767e3d2c", - "indexes" : { - "data" : 11, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2ca8c0c717997cb343a2c40361aee089948bf81f5b54b6a70c0142ce47dbdd3b", - "indexes" : { - "data" : 12, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x548b75e6b85f994ec0f6dc3e7c5f5b96981c5d9d5559f9528ce55aa27fa59488", - "indexes" : { - "data" : 13, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xe931892583db8a3be87fdc79c961f0ac3c8e3dcce8ac423dd7c5f1b8198d2f29", - "indexes" : { - "data" : 14, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x548b75e6b85f994ec0f6dc3e7c5f5b96981c5d9d5559f9528ce55aa27fa59488", - "indexes" : { - "data" : 15, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xb38b07f4f1d4401d64e4796e79aebaa339faba8ff438ee1fd37e7058e3079a0e", - "indexes" : { - "data" : 16, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x700712ea25c4d123021b690c8b5457404ff1c7263663a523dc83b6c523c348a3", - "indexes" : { - "data" : 17, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2ca8c0c717997cb343a2c40361aee089948bf81f5b54b6a70c0142ce47dbdd3b", - "indexes" : { - "data" : 18, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x983bc042119afb8ab9ca087eab378e8f7ac7fe0010c1e8f4b17907141ce67c22", - "indexes" : { - "data" : 19, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xdc9371c778ad15b02e9575e305fde0645b15642d0dd8878bc41da9fb88252722", - "indexes" : { - "data" : 20, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x2645e04375986d954b5a519729a0185493e8c742ade1a47c209518f39bf7b34a", - "indexes" : { - "data" : 21, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xdc9371c778ad15b02e9575e305fde0645b15642d0dd8878bc41da9fb88252722", - "indexes" : { - "data" : 22, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x1b6eb5326be2812301439769d4c1ee96cd1f7caada80dfa4cedfe8631c28770f", - "indexes" : { - "data" : 23, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xbeb3a72a05bec1ad4c3c7f0d5c761676093c5859aa2052b30d5f89a09c56c418", - "indexes" : { - "data" : 24, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0x1493609bc7a1f2d93fce7b6686dc9924ce992a3d628ff2f611b1b3d9dcb98c04", - "indexes" : { - "data" : 25, - "gas" : 0, - "value" : 0 - } - }, - { - "hash" : "0xf86c34793b0787f853d6dc878eac0db3289d2fae018951da94930d1f688ff811", - "indexes" : { - "data" : 26, - "gas" : 0, - "value" : 0 + }, + { + "indexes" : { + "data" : [ + 2, + 28 + ], + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x00", + "0x02" : "0x00" + } } - }, - { - "hash" : "0x54f7ac3ec3555bd7fbf119a986b26aa0ace72058b8126ac5479f22adef152c50", - "indexes" : { - "data" : 27, - "gas" : 0, - "value" : 0 + } + }, + { + "indexes" : { + "data" : [ + 3, + 4 + ], + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x3b01b01ac41f2d6e917c6d6a221ce793802469026d9ab7578fa2e79e4da6aaab" + } } - }, - { - "hash" : "0x8b0936c7732c47d392f0985635df5cbf80b287c306abb56f667a932933921275", - "indexes" : { - "data" : 28, - "gas" : 0, - "value" : 0 + } + }, + { + "indexes" : { + "data" : [ + 11, + 14, + 25, + 26 + ], + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x0100000000000000000000000000000000000000000000000000000000000000" + } } - }, - { - "hash" : "0x04c1a9eddf133cae0729735fa6251863e2ea8e0760d4205a75bc87803555a1f3", - "indexes" : { - "data" : 29, - "gas" : 0, - "value" : 0 + } + }, + { + "indexes" : { + "data" : [ + 16, + 27 + ], + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x02000000000000000000000000000000000000000000000000000000000000" + } } - }, - { - "hash" : "0xd841e6f32bacdeef36dc820063af8b30b3ecf37ab6a3b76e60ac1449faa8ed5d", - "indexes" : { - "data" : 30, - "gas" : 0, - "value" : 0 + } + }, + { + "indexes" : { + "data" : [ + 17 + ], + "gas" : -1, + "value" : -1 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "1000000000000000000000000000000000000000" : { + "storage" : { + "0x01" : "0x01", + "0x02" : "0x0200000000000000000000000000000000000000000000000000000000000000" + } } } - ] - }, + } + ], "pre" : { - "0x1000000000000000000000000000000000000000" : { - "balance" : "0x00", - "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255", - "nonce" : "0x00", + "1000000000000000000000000000000000000000" : { + "balance" : "", + "code" : "{ (CALLDATACOPY 0 0 (CALLDATASIZE)) [[1]] (CALLCODE (GAS) 5 0 0 (CALLDATASIZE) 1000 32) [[2]](MLOAD 1000) }", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x3635c9adc5dea00000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -1316,14 +268,14 @@ "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" ], "gasLimit" : [ - "0x05f5e100" + "100000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x1000000000000000000000000000000000000000", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "1000000000000000000000000000000000000000", "value" : [ - "0x00" + "0" ] } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000.json index b3026680a..2527c129b 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_1000000.json @@ -2,7 +2,7 @@ "modexp_0_0_0_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_1000000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175484", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824516", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4c3825454feab2d6b0da8514726edc73460ba022716f8aadf7610988def5449b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4c3825454feab2d6b0da8514726edc73460ba022716f8aadf7610988def5449b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000.json index 9469dd47d..587d3aff4 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_155000.json @@ -2,7 +2,7 @@ "modexp_0_0_0_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_155000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175484", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824516", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xc45f45ae070efb966cb524c03d20097525377219b3ba24c1d73a1905491d4c66", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xc45f45ae070efb966cb524c03d20097525377219b3ba24c1d73a1905491d4c66", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500.json index e0c205652..61740c777 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500.json @@ -2,7 +2,7 @@ "modexp_0_0_0_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4cb81bc296b7700b2ea0e4cd94a5f4e2f4c67df0e6232d66254e6370ce055be3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "174106", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999825894", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x4cb81bc296b7700b2ea0e4cd94a5f4e2f4c67df0e6232d66254e6370ce055be3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4cb81bc296b7700b2ea0e4cd94a5f4e2f4c67df0e6232d66254e6370ce055be3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4cb81bc296b7700b2ea0e4cd94a5f4e2f4c67df0e6232d66254e6370ce055be3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x4cb81bc296b7700b2ea0e4cd94a5f4e2f4c67df0e6232d66254e6370ce055be3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000.json index 511199b05..ea1a2d7ff 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000.json @@ -2,7 +2,7 @@ "modexp_0_0_0_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_22000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175484", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824516", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3eb47ef1222fdf484852d249cf453602253b8ec77ae3324c0b93a096bf5ce5d7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3eb47ef1222fdf484852d249cf453602253b8ec77ae3324c0b93a096bf5ce5d7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000.json index 7bb6e5630..f009db4cb 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000.json @@ -2,7 +2,7 @@ "modexp_0_0_0_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_25000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175484", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824516", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x93afda1fc15e0a061dcf1fb996f09107a2489a06164f2f00c2e7711ea8b9a7a1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x93afda1fc15e0a061dcf1fb996f09107a2489a06164f2f00c2e7711ea8b9a7a1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000.json index d92b562ae..c734ef8a9 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000.json @@ -2,7 +2,7 @@ "modexp_0_0_0_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_35000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175484", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824516", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x93f18729e40efc9a67066b12285e686204e77169a4584a09cd7e8dc74c98a098", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x93f18729e40efc9a67066b12285e686204e77169a4584a09cd7e8dc74c98a098", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa23fba7b3b1924e71de309a0b1ff583fd6f6911c003ae17e9653df5bbd5a2694", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760846004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000.json index 8ac2b6452..14ddce373 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_1000000.json @@ -2,7 +2,7 @@ "modexp_0_1_0_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_1000000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175743", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824257", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa0e93870cf059bad4fe1b0db6fd0914a4dc294b27474a26e4581d8c697fd835f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa0e93870cf059bad4fe1b0db6fd0914a4dc294b27474a26e4581d8c697fd835f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000.json index c0d020459..2f6ec483b 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_155000.json @@ -2,7 +2,7 @@ "modexp_0_1_0_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_155000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175743", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824257", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x7b22739b6ffd93e673aee9a517a03ebb9d6a68e7d69ca98abda84a08c36fbec7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x7b22739b6ffd93e673aee9a517a03ebb9d6a68e7d69ca98abda84a08c36fbec7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500.json index 4d820bc79..63519f8b8 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_20500.json @@ -2,7 +2,7 @@ "modexp_0_1_0_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xbb43e24b4c20d1136460e54a8acde649023744c1f692fd8b9315d7a042c89f44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "174362", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999825638", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xbb43e24b4c20d1136460e54a8acde649023744c1f692fd8b9315d7a042c89f44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xbb43e24b4c20d1136460e54a8acde649023744c1f692fd8b9315d7a042c89f44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xbb43e24b4c20d1136460e54a8acde649023744c1f692fd8b9315d7a042c89f44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xbb43e24b4c20d1136460e54a8acde649023744c1f692fd8b9315d7a042c89f44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000.json index fc4fce47f..a66ab5fcb 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_22000.json @@ -2,7 +2,7 @@ "modexp_0_1_0_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_22000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175743", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824257", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x9eb7c45f7fb8889481a1c18e21575bb4a035cd588eabd57553d147dae0d8f9c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x9eb7c45f7fb8889481a1c18e21575bb4a035cd588eabd57553d147dae0d8f9c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000.json index d0749cab8..ba9bbe78c 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_25000.json @@ -2,7 +2,7 @@ "modexp_0_1_0_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_25000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175743", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824257", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa07951092cdeecec2857342282f5e461fce73670808cf9b2db90c023247362ba", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa07951092cdeecec2857342282f5e461fce73670808cf9b2db90c023247362ba", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000.json index 6bbb2715a..312a334b3 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_1_0_35000.json @@ -2,7 +2,7 @@ "modexp_0_1_0_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_35000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175743", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824257", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x1c18fc303b0ca8c35dc2e026d4cff5555afeed33d68509fc816df18be5a94423", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x1c18fc303b0ca8c35dc2e026d4cff5555afeed33d68509fc816df18be5a94423", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 1 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000.json index b9c8d9486..d96df8f7a 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_1000000.json @@ -2,7 +2,7 @@ "modexp_0_3_100_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_1000000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175871", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824129", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x007e3a7b8f2352e0de39679b9c52d5c2b0f7b91e80a5425cd350e7556759b156", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x007e3a7b8f2352e0de39679b9c52d5c2b0f7b91e80a5425cd350e7556759b156", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000.json index 65bbdd634..8df4ab220 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_155000.json @@ -2,7 +2,7 @@ "modexp_0_3_100_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_155000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175871", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824129", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x9661fd692d26c7f8762d4416e577c60dba838799e4a0d51584f1370f3d5c6076", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x9661fd692d26c7f8762d4416e577c60dba838799e4a0d51584f1370f3d5c6076", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500.json index 16baf9a0d..95cd9d14d 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_20500.json @@ -2,7 +2,7 @@ "modexp_0_3_100_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x2b8da6677e55d94476680c71022ea73c269c9a47550b6f3ea1a227e8b73b84ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "174490", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999825510", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x2b8da6677e55d94476680c71022ea73c269c9a47550b6f3ea1a227e8b73b84ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2b8da6677e55d94476680c71022ea73c269c9a47550b6f3ea1a227e8b73b84ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2b8da6677e55d94476680c71022ea73c269c9a47550b6f3ea1a227e8b73b84ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x2b8da6677e55d94476680c71022ea73c269c9a47550b6f3ea1a227e8b73b84ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000.json index e957ca5a6..e05a9b091 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_22000.json @@ -2,7 +2,7 @@ "modexp_0_3_100_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_22000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175871", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824129", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3a86b9de7d6c7156712983497ba939a75bbd2dce10e9a82b2227066b4ceac0bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3a86b9de7d6c7156712983497ba939a75bbd2dce10e9a82b2227066b4ceac0bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000.json index d58b9c603..8b9f514da 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_25000.json @@ -2,7 +2,7 @@ "modexp_0_3_100_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_25000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175871", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824129", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xdb6070a37265043480daad1f3820a9c1d6086c12809f61c3a1c7b45f7b72dcc3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xdb6070a37265043480daad1f3820a9c1d6086c12809f61c3a1c7b45f7b72dcc3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000.json index 2e2526067..0c7b64099 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_0_3_100_35000.json @@ -2,7 +2,7 @@ "modexp_0_3_100_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_35000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175871", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824129", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb1b6ffcf4816d38c2477f1e4d334ed56aa20f1c4a95d93b33e1a75bfdbb48404", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb1b6ffcf4816d38c2477f1e4d334ed56aa20f1c4a95d93b33e1a75bfdbb48404", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 0, exponent 3 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000.json index 09ffd6df9..e5c7064af 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_1000000.json @@ -2,7 +2,7 @@ "modexp_1_0_0_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_1000000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175743", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824257", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa0e93870cf059bad4fe1b0db6fd0914a4dc294b27474a26e4581d8c697fd835f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa0e93870cf059bad4fe1b0db6fd0914a4dc294b27474a26e4581d8c697fd835f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000.json index 8fb41cae2..e347bbc6b 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_155000.json @@ -2,7 +2,7 @@ "modexp_1_0_0_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_155000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175743", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824257", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x7b22739b6ffd93e673aee9a517a03ebb9d6a68e7d69ca98abda84a08c36fbec7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x7b22739b6ffd93e673aee9a517a03ebb9d6a68e7d69ca98abda84a08c36fbec7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500.json index 8f9521fab..2b1e3cab7 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_20500.json @@ -2,7 +2,7 @@ "modexp_1_0_0_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xbb43e24b4c20d1136460e54a8acde649023744c1f692fd8b9315d7a042c89f44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "174362", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999825638", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xbb43e24b4c20d1136460e54a8acde649023744c1f692fd8b9315d7a042c89f44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xbb43e24b4c20d1136460e54a8acde649023744c1f692fd8b9315d7a042c89f44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xbb43e24b4c20d1136460e54a8acde649023744c1f692fd8b9315d7a042c89f44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xbb43e24b4c20d1136460e54a8acde649023744c1f692fd8b9315d7a042c89f44", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000.json index 5ea447cc8..b0a966fc0 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_22000.json @@ -2,7 +2,7 @@ "modexp_1_0_0_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_22000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175743", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824257", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x9eb7c45f7fb8889481a1c18e21575bb4a035cd588eabd57553d147dae0d8f9c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x9eb7c45f7fb8889481a1c18e21575bb4a035cd588eabd57553d147dae0d8f9c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000.json index c60e25984..d630af5b3 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_25000.json @@ -2,7 +2,7 @@ "modexp_1_0_0_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_25000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175743", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824257", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa07951092cdeecec2857342282f5e461fce73670808cf9b2db90c023247362ba", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa07951092cdeecec2857342282f5e461fce73670808cf9b2db90c023247362ba", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000.json index b6a225731..72a2a96aa 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_0_35000.json @@ -2,7 +2,7 @@ "modexp_1_0_0_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_35000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175743", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824257", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x1c18fc303b0ca8c35dc2e026d4cff5555afeed33d68509fc816df18be5a94423", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x1c18fc303b0ca8c35dc2e026d4cff5555afeed33d68509fc816df18be5a94423", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6c2b9fcad463cde231b39b79bf1da3c33d3ff5ab903c4da9b2c5773dd5787ffe", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760856004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000.json index 255bacaee..3c42b63a1 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_1000000.json @@ -2,7 +2,7 @@ "modexp_1_0_1_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_1000000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175871", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824129", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x007e3a7b8f2352e0de39679b9c52d5c2b0f7b91e80a5425cd350e7556759b156", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x007e3a7b8f2352e0de39679b9c52d5c2b0f7b91e80a5425cd350e7556759b156", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000.json index 3e15ed79f..ead1c7206 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_155000.json @@ -2,7 +2,7 @@ "modexp_1_0_1_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_155000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175871", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824129", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x9661fd692d26c7f8762d4416e577c60dba838799e4a0d51584f1370f3d5c6076", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x9661fd692d26c7f8762d4416e577c60dba838799e4a0d51584f1370f3d5c6076", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500.json index 5a4a3297d..cb6f8b5c4 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_20500.json @@ -2,7 +2,7 @@ "modexp_1_0_1_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x2b8da6677e55d94476680c71022ea73c269c9a47550b6f3ea1a227e8b73b84ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "174490", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999825510", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x2b8da6677e55d94476680c71022ea73c269c9a47550b6f3ea1a227e8b73b84ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2b8da6677e55d94476680c71022ea73c269c9a47550b6f3ea1a227e8b73b84ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2b8da6677e55d94476680c71022ea73c269c9a47550b6f3ea1a227e8b73b84ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x2b8da6677e55d94476680c71022ea73c269c9a47550b6f3ea1a227e8b73b84ef", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000.json index a2dae52ce..e85e6bbc7 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_22000.json @@ -2,7 +2,7 @@ "modexp_1_0_1_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_22000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175871", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824129", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3a86b9de7d6c7156712983497ba939a75bbd2dce10e9a82b2227066b4ceac0bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3a86b9de7d6c7156712983497ba939a75bbd2dce10e9a82b2227066b4ceac0bb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000.json index 73d4c4a7f..c7bd3a0c3 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_25000.json @@ -2,7 +2,7 @@ "modexp_1_0_1_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_25000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175871", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824129", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xdb6070a37265043480daad1f3820a9c1d6086c12809f61c3a1c7b45f7b72dcc3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xdb6070a37265043480daad1f3820a9c1d6086c12809f61c3a1c7b45f7b72dcc3", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000.json index c3ce88e91..8a9681970 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_0_1_35000.json @@ -2,7 +2,7 @@ "modexp_1_0_1_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_35000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175871", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824129", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb1b6ffcf4816d38c2477f1e4d334ed56aa20f1c4a95d93b33e1a75bfdbb48404", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb1b6ffcf4816d38c2477f1e4d334ed56aa20f1c4a95d93b33e1a75bfdbb48404", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xdacade500da9d396a3311376858dac04e8c9c820a3ee9d8b87a18a7acabb66c9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 0 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760866004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000.json index fe2dd06a9..078714ccd 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_1000000.json @@ -2,7 +2,7 @@ "modexp_1_1_1_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_1000000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175999", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824001", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3664e864e10a81a12bd2793b83ab71cb27832742a848c467c129f49a3bfeb21c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3664e864e10a81a12bd2793b83ab71cb27832742a848c467c129f49a3bfeb21c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000.json index 4df8c27cd..bb209ae1e 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_155000.json @@ -2,7 +2,7 @@ "modexp_1_1_1_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_155000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175999", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824001", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2a433c99d44882387ed86d759e02a260171828d4425b19c3f0b57392dfe65156", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2a433c99d44882387ed86d759e02a260171828d4425b19c3f0b57392dfe65156", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500.json index a60b7f0b9..eeddc2f02 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_20500.json @@ -2,7 +2,7 @@ "modexp_1_1_1_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xe8153407b3136310cdc0eec08c213622c7092f5cef1bdd7fb100ed4ecd096652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "174618", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999825382", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xe8153407b3136310cdc0eec08c213622c7092f5cef1bdd7fb100ed4ecd096652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe8153407b3136310cdc0eec08c213622c7092f5cef1bdd7fb100ed4ecd096652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe8153407b3136310cdc0eec08c213622c7092f5cef1bdd7fb100ed4ecd096652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe8153407b3136310cdc0eec08c213622c7092f5cef1bdd7fb100ed4ecd096652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000.json index ae1839cbf..930205cb8 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_22000.json @@ -2,7 +2,7 @@ "modexp_1_1_1_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_22000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175999", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824001", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x384ac2b53fbe640f387287a2003a692315bcc82bb52834e63ad41306d38b3a6d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x384ac2b53fbe640f387287a2003a692315bcc82bb52834e63ad41306d38b3a6d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000.json index 79304b1f7..30454ea01 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_25000.json @@ -2,7 +2,7 @@ "modexp_1_1_1_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_25000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175999", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824001", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x25bfcccff0916b282b8d6892c0b9829b45a41e06144720a2066ed542cc3b778a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x25bfcccff0916b282b8d6892c0b9829b45a41e06144720a2066ed542cc3b778a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000.json index b44b4365a..0b51d4e33 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_1_1_1_35000.json @@ -2,7 +2,7 @@ "modexp_1_1_1_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_35000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175999", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824001", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } } } - ], - "EIP158" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa711cfe2614927965c0f7e84e11cf6c96978548d692ae2cab096161efe009fc7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa711cfe2614927965c0f7e84e11cf6c96978548d692ae2cab096161efe009fc7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 1, exponent 1 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000.json index 6631d855f..2390e35e9 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_22411_22000.json @@ -2,7 +2,7 @@ "modexp_37120_22411_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_22411_22000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "193730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999806270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe7a86c639ff5f1a861600ce354cf278a5416ff529726dff5c36e72b9c34b557e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe7a86c639ff5f1a861600ce354cf278a5416ff529726dff5c36e72b9c34b557e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe7a86c639ff5f1a861600ce354cf278a5416ff529726dff5c36e72b9c34b557e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000.json index c1f56cfe2..0438dc125 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_1000000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_0_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.b352d835.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_1000000Filler.json" }, "env" : { @@ -10,147 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4a9f3c02264be23434edf1f0346e525828b0e575617d6fcc32bd5a8882c64b38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "EIP158" : [ - { - "hash" : "0x4a9f3c02264be23434edf1f0346e525828b0e575617d6fcc32bd5a8882c64b38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Frontier" : [ - { - "hash" : "0x4d440e0a27495c893e3b9063d75ad8eb62b345898fefec7b1d1427604d904ced", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Homestead" : [ - { - "hash" : "0x4d440e0a27495c893e3b9063d75ad8eb62b345898fefec7b1d1427604d904ced", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Metropolis" : [ - { - "hash" : "0xb987a09a9cfe708d69a1c2a41d76d123a9e77a79d81e4b97c4c12d0ad5ae4aa0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "329582", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999670418", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } + } } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000.json index 85ae8aafd..93da86eed 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_155000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_0_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_155000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4a9f3c02264be23434edf1f0346e525828b0e575617d6fcc32bd5a8882c64b38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "326474", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999673526", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x4a9f3c02264be23434edf1f0346e525828b0e575617d6fcc32bd5a8882c64b38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x47e7100b12093da81a343618941605c265ae15b4df6f13bb7fe0c6fce59a38b8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x47e7100b12093da81a343618941605c265ae15b4df6f13bb7fe0c6fce59a38b8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x47e7100b12093da81a343618941605c265ae15b4df6f13bb7fe0c6fce59a38b8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500.json index 6577d7ac7..75347571d 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_20500.json @@ -2,7 +2,7 @@ "modexp_37120_37111_0_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x93b73788b166855152cda77a36402c0c28961149e5b1ae3594ec663150c29d12", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "191974", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999808026", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x93b73788b166855152cda77a36402c0c28961149e5b1ae3594ec663150c29d12", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x93b73788b166855152cda77a36402c0c28961149e5b1ae3594ec663150c29d12", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x93b73788b166855152cda77a36402c0c28961149e5b1ae3594ec663150c29d12", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x93b73788b166855152cda77a36402c0c28961149e5b1ae3594ec663150c29d12", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000.json index c8c40e740..8690a53ce 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_22000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_0_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_22000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4a9f3c02264be23434edf1f0346e525828b0e575617d6fcc32bd5a8882c64b38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "193474", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999806526", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x4a9f3c02264be23434edf1f0346e525828b0e575617d6fcc32bd5a8882c64b38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xecf14d481f871dd6b0234af0eff89cd3cc6eca52e910770e3d409c733a225288", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xecf14d481f871dd6b0234af0eff89cd3cc6eca52e910770e3d409c733a225288", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xecf14d481f871dd6b0234af0eff89cd3cc6eca52e910770e3d409c733a225288", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000.json index b7d2fd846..b32289c54 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_25000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_0_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_25000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4a9f3c02264be23434edf1f0346e525828b0e575617d6fcc32bd5a8882c64b38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "196474", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999803526", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x4a9f3c02264be23434edf1f0346e525828b0e575617d6fcc32bd5a8882c64b38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xc1fce9909fb92c01134cb00e80f0cb502b9dacd836d955c3398012db3e16d2c4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xc1fce9909fb92c01134cb00e80f0cb502b9dacd836d955c3398012db3e16d2c4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xc1fce9909fb92c01134cb00e80f0cb502b9dacd836d955c3398012db3e16d2c4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000.json index 4d8cdaf1a..9905be91b 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_0_35000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_0_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_35000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4a9f3c02264be23434edf1f0346e525828b0e575617d6fcc32bd5a8882c64b38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "206474", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999793526", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x4a9f3c02264be23434edf1f0346e525828b0e575617d6fcc32bd5a8882c64b38", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x9813e1a8a0e547953cc40ac606b5dbea795bbadda164585cf6c6db5648ca4bc2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x9813e1a8a0e547953cc40ac606b5dbea795bbadda164585cf6c6db5648ca4bc2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x9813e1a8a0e547953cc40ac606b5dbea795bbadda164585cf6c6db5648ca4bc2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 0 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101846004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000.json index 478143f96..b2524f046 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_1000000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_1_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.b352d835.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_1000000Filler.json" }, "env" : { @@ -10,147 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "EIP158" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Frontier" : [ - { - "hash" : "0x7989f47b9a8495b8bebf3810a035b1e8e803862cb80930831979f6194e6b8970", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Homestead" : [ - { - "hash" : "0x7989f47b9a8495b8bebf3810a035b1e8e803862cb80930831979f6194e6b8970", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Metropolis" : [ - { - "hash" : "0xf0ae90f0c97de213edf08a1ccd0e8d818bd9881765c2c12647f3a38e145d329d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "329841", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999670159", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a" + } + } } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000.json index 6f0056b9b..6cbc241d6 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_155000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_1_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_155000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "326730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999673270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x92bbae2524afad51b019969112dc2f4170636e77a483abde9243152b65f69f0c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x92bbae2524afad51b019969112dc2f4170636e77a483abde9243152b65f69f0c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x92bbae2524afad51b019969112dc2f4170636e77a483abde9243152b65f69f0c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500.json index 40f2639d4..d2ae034d2 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_20500.json @@ -2,7 +2,7 @@ "modexp_37120_37111_1_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x52671cca402f6ea20c1f17b4854d7bc9deb29b7f38a2ae3528685f903eabc35d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "192230", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999807770", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x52671cca402f6ea20c1f17b4854d7bc9deb29b7f38a2ae3528685f903eabc35d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x52671cca402f6ea20c1f17b4854d7bc9deb29b7f38a2ae3528685f903eabc35d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x52671cca402f6ea20c1f17b4854d7bc9deb29b7f38a2ae3528685f903eabc35d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x52671cca402f6ea20c1f17b4854d7bc9deb29b7f38a2ae3528685f903eabc35d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000.json index 5452434b1..6b2c0f1bb 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_25000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_1_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_25000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "196730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999803270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe6ebd711890fa34f87072875706e43ce304f9fca9e27756112c4897e71b0ff43", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe6ebd711890fa34f87072875706e43ce304f9fca9e27756112c4897e71b0ff43", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe6ebd711890fa34f87072875706e43ce304f9fca9e27756112c4897e71b0ff43", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000.json index 6b66f2ac8..079557d05 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_1_35000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_1_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_35000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "206730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999793270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x388b9d76c6f6045ae01c93741d9fb41dbb486d2e69ff800d6901e5a409fd6ae2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x388b9d76c6f6045ae01c93741d9fb41dbb486d2e69ff800d6901e5a409fd6ae2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x388b9d76c6f6045ae01c93741d9fb41dbb486d2e69ff800d6901e5a409fd6ae2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 1 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000.json index fa0217768..7f73e98fa 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_1000000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_37111_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.b352d835.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_1000000Filler.json" }, "env" : { @@ -10,147 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4ab705fcfab9c598afe5604b45e73efc33f001154a4490670a7fa90038706cc4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "EIP158" : [ - { - "hash" : "0x4ab705fcfab9c598afe5604b45e73efc33f001154a4490670a7fa90038706cc4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Frontier" : [ - { - "hash" : "0xe1ad81867242795a4e40ff6a8baa644a48fdddedf627b5cb6fee2d6ebf8b5fe7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Homestead" : [ - { - "hash" : "0xe1ad81867242795a4e40ff6a8baa644a48fdddedf627b5cb6fee2d6ebf8b5fe7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Metropolis" : [ - { - "hash" : "0x8ee3006700d539a3dcc5e109b825866ab8f707dd764d33c0d461e7da1a70b68b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "338421", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999661579", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x3961ec903a448e057fbc76e10170d02f15b9b65c2f7fc8215f611ec6dc74cf91" + } + } } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000.json index 6e1ed62c3..f922dc279 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_155000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_37111_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_155000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4ab705fcfab9c598afe5604b45e73efc33f001154a4490670a7fa90038706cc4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "335242", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999664758", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x4ab705fcfab9c598afe5604b45e73efc33f001154a4490670a7fa90038706cc4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x26452b5230b198654a03c73c6a8589a6d6e5907becde6845f679b9131f41f951", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x26452b5230b198654a03c73c6a8589a6d6e5907becde6845f679b9131f41f951", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x26452b5230b198654a03c73c6a8589a6d6e5907becde6845f679b9131f41f951", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500.json index 16a9d967d..ebc3b1dc8 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_20500.json @@ -2,7 +2,7 @@ "modexp_37120_37111_37111_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x0a955fccb8b4f105308acbe4e06db82a4625b26d15c5e463d17d1f3e667504e9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "200742", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999799258", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x0a955fccb8b4f105308acbe4e06db82a4625b26d15c5e463d17d1f3e667504e9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x0a955fccb8b4f105308acbe4e06db82a4625b26d15c5e463d17d1f3e667504e9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x0a955fccb8b4f105308acbe4e06db82a4625b26d15c5e463d17d1f3e667504e9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x0a955fccb8b4f105308acbe4e06db82a4625b26d15c5e463d17d1f3e667504e9", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000.json index 18a98b866..1bbe19086 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_22000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_37111_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_22000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4ab705fcfab9c598afe5604b45e73efc33f001154a4490670a7fa90038706cc4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "202242", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999797758", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x4ab705fcfab9c598afe5604b45e73efc33f001154a4490670a7fa90038706cc4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2459bf359ac33292153bca5caeb9fef4465db441b5365fc2419f7499718aa732", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2459bf359ac33292153bca5caeb9fef4465db441b5365fc2419f7499718aa732", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x2459bf359ac33292153bca5caeb9fef4465db441b5365fc2419f7499718aa732", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000.json index bfb89e706..eef691341 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_25000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_37111_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_25000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4ab705fcfab9c598afe5604b45e73efc33f001154a4490670a7fa90038706cc4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "205242", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999794758", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x4ab705fcfab9c598afe5604b45e73efc33f001154a4490670a7fa90038706cc4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3589ad89e447ab9a7f1197873b0883b9d1bd25f21d35390a20829fc609ea1331", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3589ad89e447ab9a7f1197873b0883b9d1bd25f21d35390a20829fc609ea1331", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x3589ad89e447ab9a7f1197873b0883b9d1bd25f21d35390a20829fc609ea1331", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000.json index 234ace9a2..47646bedf 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_37111_35000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_37111_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_35000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4ab705fcfab9c598afe5604b45e73efc33f001154a4490670a7fa90038706cc4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "215242", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999784758", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x4ab705fcfab9c598afe5604b45e73efc33f001154a4490670a7fa90038706cc4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x653685e1f6de537a689bb13fe33b04b58444b65a12064ad6fec1e3ed488aa05d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x653685e1f6de537a689bb13fe33b04b58444b65a12064ad6fec1e3ed488aa05d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x653685e1f6de537a689bb13fe33b04b58444b65a12064ad6fec1e3ed488aa05d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c57610204600435600401351115155857600435600401356020016004356004016101403760806103c061014051610160600060056305f5e0fff115585760806103a0526103a060a0806104608284600060046022f150505061046080516020820120905060005561046060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000.json index dbf5bdca2..8d22de5c5 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_1000000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_97_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.b352d835.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_1000000Filler.json" }, "env" : { @@ -10,147 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "EIP158" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Frontier" : [ - { - "hash" : "0x7989f47b9a8495b8bebf3810a035b1e8e803862cb80930831979f6194e6b8970", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Homestead" : [ - { - "hash" : "0x7989f47b9a8495b8bebf3810a035b1e8e803862cb80930831979f6194e6b8970", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Metropolis" : [ - { - "hash" : "0x84b61f38f2e4b69c8f06e3f913aa3767089b7e3e5d0f077f304061c1f59c827b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "329841", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999670159", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xeff31f7855752a3582db9a0d965d5063f23d94003e66f8c5a8f8e8fe2ab24753" + } + } } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000.json index 126eeb8cf..6a732dcbe 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_155000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_97_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_155000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "326730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999673270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x92bbae2524afad51b019969112dc2f4170636e77a483abde9243152b65f69f0c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x92bbae2524afad51b019969112dc2f4170636e77a483abde9243152b65f69f0c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x92bbae2524afad51b019969112dc2f4170636e77a483abde9243152b65f69f0c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500.json index c3c0c8da9..59a90465d 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_20500.json @@ -2,7 +2,7 @@ "modexp_37120_37111_97_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x52671cca402f6ea20c1f17b4854d7bc9deb29b7f38a2ae3528685f903eabc35d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "192230", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999807770", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x52671cca402f6ea20c1f17b4854d7bc9deb29b7f38a2ae3528685f903eabc35d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x52671cca402f6ea20c1f17b4854d7bc9deb29b7f38a2ae3528685f903eabc35d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x52671cca402f6ea20c1f17b4854d7bc9deb29b7f38a2ae3528685f903eabc35d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x52671cca402f6ea20c1f17b4854d7bc9deb29b7f38a2ae3528685f903eabc35d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000.json index 6bad49bfa..51b793091 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_22000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_97_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_22000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "193730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999806270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe7a86c639ff5f1a861600ce354cf278a5416ff529726dff5c36e72b9c34b557e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe7a86c639ff5f1a861600ce354cf278a5416ff529726dff5c36e72b9c34b557e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe7a86c639ff5f1a861600ce354cf278a5416ff529726dff5c36e72b9c34b557e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000.json index 923d27c7a..190a5df4f 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_25000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_97_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_25000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "196730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999803270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe6ebd711890fa34f87072875706e43ce304f9fca9e27756112c4897e71b0ff43", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe6ebd711890fa34f87072875706e43ce304f9fca9e27756112c4897e71b0ff43", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe6ebd711890fa34f87072875706e43ce304f9fca9e27756112c4897e71b0ff43", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000.json index 7a5589895..057bb447b 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_37120_37111_97_35000.json @@ -2,7 +2,7 @@ "modexp_37120_37111_97_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_35000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "206730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999793270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xc8fc3bad240d964fda1961988805ca4c903b1399b7d2eb4abbe9b9640b7d3956", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x388b9d76c6f6045ae01c93741d9fb41dbb486d2e69ff800d6901e5a409fd6ae2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x388b9d76c6f6045ae01c93741d9fb41dbb486d2e69ff800d6901e5a409fd6ae2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x388b9d76c6f6045ae01c93741d9fb41dbb486d2e69ff800d6901e5a409fd6ae2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137120, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 97 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037600161034061014051610160600060056305f5e0fff11558576001610320526103206021806103808284600060046015f150505061038080516020820120905060005561038060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000.json index 89b605836..35697df38 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_1000000.json @@ -2,7 +2,7 @@ "modexp_39936_1_55201_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_1000000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x84a1eda4b3b6051597f6098cd9cf7995469edf286f5602c41849511718aa533f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "178262", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999821738", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe" + } } } - ], - "EIP158" : [ - { - "hash" : "0x84a1eda4b3b6051597f6098cd9cf7995469edf286f5602c41849511718aa533f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x51dd1fbe2130a40b7026d0e779fd4a6209f2433872899ea1a7bb3ff86a9f25c5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x51dd1fbe2130a40b7026d0e779fd4a6209f2433872899ea1a7bb3ff86a9f25c5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x717fe2475b80f8ee48136c3e7051158fdb400525450890bd2a00fe937657567d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000.json index 4fd364587..8893830c2 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_155000.json @@ -2,7 +2,7 @@ "modexp_39936_1_55201_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_155000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x84a1eda4b3b6051597f6098cd9cf7995469edf286f5602c41849511718aa533f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "178262", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999821738", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe" + } } } - ], - "EIP158" : [ - { - "hash" : "0x84a1eda4b3b6051597f6098cd9cf7995469edf286f5602c41849511718aa533f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xf19522362da9bf03874defd6d035a7a3a9b2f91ee0fb11d9334f83ebc0380330", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xf19522362da9bf03874defd6d035a7a3a9b2f91ee0fb11d9334f83ebc0380330", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x717fe2475b80f8ee48136c3e7051158fdb400525450890bd2a00fe937657567d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500.json index 1d8dbe1c2..868ed070a 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_20500.json @@ -2,7 +2,7 @@ "modexp_39936_1_55201_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x71ce57bd3cb60f3f13680781c7332eebe1cd567dfbb8da6eb8d64fc04a155bf0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "176858", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999823142", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x71ce57bd3cb60f3f13680781c7332eebe1cd567dfbb8da6eb8d64fc04a155bf0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x71ce57bd3cb60f3f13680781c7332eebe1cd567dfbb8da6eb8d64fc04a155bf0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x71ce57bd3cb60f3f13680781c7332eebe1cd567dfbb8da6eb8d64fc04a155bf0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x71ce57bd3cb60f3f13680781c7332eebe1cd567dfbb8da6eb8d64fc04a155bf0", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000.json index 696eece6c..57448fe95 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_22000.json @@ -2,7 +2,7 @@ "modexp_39936_1_55201_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_22000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x84a1eda4b3b6051597f6098cd9cf7995469edf286f5602c41849511718aa533f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "178262", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999821738", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe" + } } } - ], - "EIP158" : [ - { - "hash" : "0x84a1eda4b3b6051597f6098cd9cf7995469edf286f5602c41849511718aa533f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3511d77d8bc66c502aeb153df540a7b86c4357dead7eabc876c515c6d793e674", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3511d77d8bc66c502aeb153df540a7b86c4357dead7eabc876c515c6d793e674", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x717fe2475b80f8ee48136c3e7051158fdb400525450890bd2a00fe937657567d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000.json index 5886a1047..df52fe91a 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_25000.json @@ -2,7 +2,7 @@ "modexp_39936_1_55201_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_25000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x84a1eda4b3b6051597f6098cd9cf7995469edf286f5602c41849511718aa533f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "178262", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999821738", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe" + } } } - ], - "EIP158" : [ - { - "hash" : "0x84a1eda4b3b6051597f6098cd9cf7995469edf286f5602c41849511718aa533f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x6e78c3a7a71aeb7edf950d3e61c3177497fe888a7bf0d1e123b0278c84ba5689", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x6e78c3a7a71aeb7edf950d3e61c3177497fe888a7bf0d1e123b0278c84ba5689", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x717fe2475b80f8ee48136c3e7051158fdb400525450890bd2a00fe937657567d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000.json index 198d879aa..e20e4dc96 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_39936_1_55201_35000.json @@ -2,7 +2,7 @@ "modexp_39936_1_55201_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_35000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x84a1eda4b3b6051597f6098cd9cf7995469edf286f5602c41849511718aa533f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "178262", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999821738", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x038ce2d0d81afd6f9db7e4b21a65a2763091c1068647b921ca1e6ff8f640acfe" + } } } - ], - "EIP158" : [ - { - "hash" : "0x84a1eda4b3b6051597f6098cd9cf7995469edf286f5602c41849511718aa533f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa6b7805c00480fcde648e22e0d0418f1078d65634251f99fc202c531fa4dfc4b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa6b7805c00480fcde648e22e0d0418f1078d65634251f99fc202c531fa4dfc4b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x717fe2475b80f8ee48136c3e7051158fdb400525450890bd2a00fe937657567d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 115792089237316195423570985008687907853269984665640564039457584007913129639936, exponent 1 and modulus 21847450052839212624230656502990235142567050104912751880812823948662932355201 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602061028061014051610160600060056305f5e0fff11558576020610260526102606040806102c08284600060046018f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000.json index e9fd9a95b..c9f37fbc7 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_1000000.json @@ -2,7 +2,7 @@ "modexp_3_09984_39936_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_1000000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc5d18908d269b9b508c9471220b127ef55d6cd4fa98543c1ae6b4547e0bf45ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "179049", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999820951", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc5d18908d269b9b508c9471220b127ef55d6cd4fa98543c1ae6b4547e0bf45ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xbaefd266cb2fdbc435196c47e6c66d608fc6b8ca94be2662ce956be6c07fc638", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xbaefd266cb2fdbc435196c47e6c66d608fc6b8ca94be2662ce956be6c07fc638", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb1d2c591ff29720cf615412d9227e03072aa06af4814680f85e607714643a16e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000.json index d97305c28..534f04e92 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_155000.json @@ -2,7 +2,7 @@ "modexp_3_09984_39936_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_155000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc5d18908d269b9b508c9471220b127ef55d6cd4fa98543c1ae6b4547e0bf45ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "179049", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999820951", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc5d18908d269b9b508c9471220b127ef55d6cd4fa98543c1ae6b4547e0bf45ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x88b83735835f9d1efcf3bfb9861f5b153d981da6b0108ee882fd771b7ac7f618", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x88b83735835f9d1efcf3bfb9861f5b153d981da6b0108ee882fd771b7ac7f618", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb1d2c591ff29720cf615412d9227e03072aa06af4814680f85e607714643a16e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000.json index 01d2f09e2..5804b9fd2 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_22000.json @@ -2,7 +2,7 @@ "modexp_3_09984_39936_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_22000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc5d18908d269b9b508c9471220b127ef55d6cd4fa98543c1ae6b4547e0bf45ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "176374", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999823626", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xc5d18908d269b9b508c9471220b127ef55d6cd4fa98543c1ae6b4547e0bf45ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x70240d70b3a3bc6b69e9e0442519e5233506203cb341d794af639d2d1508417d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x70240d70b3a3bc6b69e9e0442519e5233506203cb341d794af639d2d1508417d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x70240d70b3a3bc6b69e9e0442519e5233506203cb341d794af639d2d1508417d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000.json index 6d11a21c4..988d46506 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_25000.json @@ -2,7 +2,7 @@ "modexp_3_09984_39936_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_25000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc5d18908d269b9b508c9471220b127ef55d6cd4fa98543c1ae6b4547e0bf45ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "179049", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999820951", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc5d18908d269b9b508c9471220b127ef55d6cd4fa98543c1ae6b4547e0bf45ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x5906361a887d190ba04ed942970e835f9dd1532c2128ba0ffbb3c28fc7d952ca", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x5906361a887d190ba04ed942970e835f9dd1532c2128ba0ffbb3c28fc7d952ca", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb1d2c591ff29720cf615412d9227e03072aa06af4814680f85e607714643a16e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000.json index 3c3da73ea..3f2ee4de1 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_09984_39936_35000.json @@ -2,7 +2,7 @@ "modexp_3_09984_39936_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_35000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xc5d18908d269b9b508c9471220b127ef55d6cd4fa98543c1ae6b4547e0bf45ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "179049", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999820951", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0" + } } } - ], - "EIP158" : [ - { - "hash" : "0xc5d18908d269b9b508c9471220b127ef55d6cd4fa98543c1ae6b4547e0bf45ed", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x72fea5b5f49d22a532afe8d7044076bb3d18a6ec5eda34f426f0192369baf593", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x72fea5b5f49d22a532afe8d7044076bb3d18a6ec5eda34f426f0192369baf593", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb1d2c591ff29720cf615412d9227e03072aa06af4814680f85e607714643a16e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500.json index a6c3f38c0..40f3c2952 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_28948_11579_20500.json @@ -2,7 +2,7 @@ "modexp_3_28948_11579_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_28948_11579_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x4d64a4cdca827144c4cda65b7049697ffecc07fb165ba3c188cfea288d2cfe8e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "174874", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999825126", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x4d64a4cdca827144c4cda65b7049697ffecc07fb165ba3c188cfea288d2cfe8e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x4d64a4cdca827144c4cda65b7049697ffecc07fb165ba3c188cfea288d2cfe8e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x4d64a4cdca827144c4cda65b7049697ffecc07fb165ba3c188cfea288d2cfe8e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x4d64a4cdca827144c4cda65b7049697ffecc07fb165ba3c188cfea288d2cfe8e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 28948022309329048855892746252171976963317496166410141009864396001978282409984 and modulus 115792089237316195423570985008687907853269984665640564039457584007913129639936 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000.json index f9621bbfd..cc8c9e6ae 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_1000000.json @@ -2,7 +2,7 @@ "modexp_3_5_100_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_1000000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175999", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824001", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8" + } } } - ], - "EIP158" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x3664e864e10a81a12bd2793b83ab71cb27832742a848c467c129f49a3bfeb21c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x3664e864e10a81a12bd2793b83ab71cb27832742a848c467c129f49a3bfeb21c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6e4ac1910b666f49a10026acad50b424b233b7851fc851c6d9b125ad3eafcbb4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000.json index 719701846..5220bcb04 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_155000.json @@ -2,7 +2,7 @@ "modexp_3_5_100_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_155000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175999", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824001", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8" + } } } - ], - "EIP158" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2a433c99d44882387ed86d759e02a260171828d4425b19c3f0b57392dfe65156", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2a433c99d44882387ed86d759e02a260171828d4425b19c3f0b57392dfe65156", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6e4ac1910b666f49a10026acad50b424b233b7851fc851c6d9b125ad3eafcbb4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500.json index 41903731a..cd04d6432 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_20500.json @@ -2,7 +2,7 @@ "modexp_3_5_100_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xe8153407b3136310cdc0eec08c213622c7092f5cef1bdd7fb100ed4ecd096652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "174618", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999825382", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xe8153407b3136310cdc0eec08c213622c7092f5cef1bdd7fb100ed4ecd096652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe8153407b3136310cdc0eec08c213622c7092f5cef1bdd7fb100ed4ecd096652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe8153407b3136310cdc0eec08c213622c7092f5cef1bdd7fb100ed4ecd096652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe8153407b3136310cdc0eec08c213622c7092f5cef1bdd7fb100ed4ecd096652", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000.json index e2f4cbc3f..c30a1497c 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_22000.json @@ -2,7 +2,7 @@ "modexp_3_5_100_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_22000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175999", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824001", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8" + } } } - ], - "EIP158" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x384ac2b53fbe640f387287a2003a692315bcc82bb52834e63ad41306d38b3a6d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x384ac2b53fbe640f387287a2003a692315bcc82bb52834e63ad41306d38b3a6d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6e4ac1910b666f49a10026acad50b424b233b7851fc851c6d9b125ad3eafcbb4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000.json index 045804f5f..06c723289 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_25000.json @@ -2,7 +2,7 @@ "modexp_3_5_100_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_25000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175999", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824001", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8" + } } } - ], - "EIP158" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x25bfcccff0916b282b8d6892c0b9829b45a41e06144720a2066ed542cc3b778a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x25bfcccff0916b282b8d6892c0b9829b45a41e06144720a2066ed542cc3b778a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6e4ac1910b666f49a10026acad50b424b233b7851fc851c6d9b125ad3eafcbb4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000.json index f1a5ed10c..5e49795a8 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_3_5_100_35000.json @@ -2,7 +2,7 @@ "modexp_3_5_100_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_35000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "175999", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999824001", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x728b8dbbe730d9acd55e30e768e6a28a04bea0c61b88108287c2c87d79c98bb8" + } } } - ], - "EIP158" : [ - { - "hash" : "0x28984fd862291b29c481d50eb7e2d25c65da464f47f46759295bb874b590f29a", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa711cfe2614927965c0f7e84e11cf6c96978548d692ae2cab096161efe009fc7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa711cfe2614927965c0f7e84e11cf6c96978548d692ae2cab096161efe009fc7", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x6e4ac1910b666f49a10026acad50b424b233b7851fc851c6d9b125ad3eafcbb4", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 3, exponent 5 and modulus 100 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760876004356004013511151558576004356004013560200160043560040161014037600161024061014051610160600060056305f5e0fff11558576001610220526102206021806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000.json index ab2a8c13a..3a586a278 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_1000000.json @@ -2,7 +2,7 @@ "modexp_49_2401_2401_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_1000000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "176127", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999823873", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8c3e32f1b4bcf3576dc6b888f5834b9113c2e5529f37a180dd4e14372ea06a68", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8c3e32f1b4bcf3576dc6b888f5834b9113c2e5529f37a180dd4e14372ea06a68", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000.json index 8ede6878f..829ddb34e 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_155000.json @@ -2,7 +2,7 @@ "modexp_49_2401_2401_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_155000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "176127", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999823873", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xc478d53ebb92e3f68b24ddd526524e010e1792f33a0ccbbd775a210ef753340c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xc478d53ebb92e3f68b24ddd526524e010e1792f33a0ccbbd775a210ef753340c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500.json index d87d4ffcd..8426a587e 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_20500.json @@ -2,7 +2,7 @@ "modexp_49_2401_2401_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xb08c4e072c117459fcaa6feb5b0e4d5402963d911c82286574fbdaa17ce236cc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "174746", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999825254", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xb08c4e072c117459fcaa6feb5b0e4d5402963d911c82286574fbdaa17ce236cc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xb08c4e072c117459fcaa6feb5b0e4d5402963d911c82286574fbdaa17ce236cc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xb08c4e072c117459fcaa6feb5b0e4d5402963d911c82286574fbdaa17ce236cc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xb08c4e072c117459fcaa6feb5b0e4d5402963d911c82286574fbdaa17ce236cc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000.json index 7040b0cf5..11c040925 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_22000.json @@ -2,7 +2,7 @@ "modexp_49_2401_2401_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_22000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "176127", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999823873", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x15c4201598ce69aa4022a9801384cb75998b3b53dd73a6019a356f4e8552afb8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x15c4201598ce69aa4022a9801384cb75998b3b53dd73a6019a356f4e8552afb8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000.json index fd2b47285..64e115d68 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_25000.json @@ -2,7 +2,7 @@ "modexp_49_2401_2401_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_25000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "176127", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999823873", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xd778884b158c93775316d9a34fa3d27e3f235fbbc3abc127798ee21e92c21d01", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xd778884b158c93775316d9a34fa3d27e3f235fbbc3abc127798ee21e92c21d01", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000.json index 0216b4f79..cd7c40bb4 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_49_2401_2401_35000.json @@ -2,7 +2,7 @@ "modexp_49_2401_2401_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_35000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "176127", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999823873", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x26b54f04e8cb2d53ad0dde9959d148fb0553cb7764b700aa85be792ab137a242", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x26b54f04e8cb2d53ad0dde9959d148fb0553cb7764b700aa85be792ab137a242", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x5ed22d476cbd50da5d14a61f4972dfe1f8f0f1bf2ee4af9eabb15c60796ce854", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 49, exponent 2401 and modulus 2401 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760896004356004013511151558576004356004013560200160043560040161014037600261024061014051610160600060056305f5e0fff11558576002610220526102206022806102808284600060046015f150505061028080516020820120905060005561028060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000.json index b92bf683d..58b2fe798 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_1000000.json @@ -2,7 +2,7 @@ "modexp_55190_55190_42965_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_1000000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x5f0fdee4137486a0a1ec376a6c8115f5aaf96577a62bf351069562eb9c34ffc8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "184042", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999815958", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5f0fdee4137486a0a1ec376a6c8115f5aaf96577a62bf351069562eb9c34ffc8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x204d61a853440aa3674a6167de390d4f9c5d76dd35ca07e7bb988521d1766b15", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x204d61a853440aa3674a6167de390d4f9c5d76dd35ca07e7bb988521d1766b15", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x906f94445ac7753feaf4a6eb0a072766dcce766b2eed6f62b2b76af178131c5b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000.json index 23ba2ed60..aa58ad450 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_155000.json @@ -2,7 +2,7 @@ "modexp_55190_55190_42965_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_155000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x5f0fdee4137486a0a1ec376a6c8115f5aaf96577a62bf351069562eb9c34ffc8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "184042", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999815958", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5f0fdee4137486a0a1ec376a6c8115f5aaf96577a62bf351069562eb9c34ffc8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe96c2dd7dfb518095fd8d6d0266543283ff42b48feec463b7371345b4a024a2b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe96c2dd7dfb518095fd8d6d0266543283ff42b48feec463b7371345b4a024a2b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x906f94445ac7753feaf4a6eb0a072766dcce766b2eed6f62b2b76af178131c5b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500.json index 94d27f2e4..ce4127123 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_20500.json @@ -2,7 +2,7 @@ "modexp_55190_55190_42965_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0xfeb15b093ba01a540cdbb1d46961237855625e41aca31875231817de90298373", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "180058", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999819942", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0xfeb15b093ba01a540cdbb1d46961237855625e41aca31875231817de90298373", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xfeb15b093ba01a540cdbb1d46961237855625e41aca31875231817de90298373", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xfeb15b093ba01a540cdbb1d46961237855625e41aca31875231817de90298373", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xfeb15b093ba01a540cdbb1d46961237855625e41aca31875231817de90298373", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000.json index a05201e73..3072e6a5d 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_22000.json @@ -2,7 +2,7 @@ "modexp_55190_55190_42965_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_22000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x5f0fdee4137486a0a1ec376a6c8115f5aaf96577a62bf351069562eb9c34ffc8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "181558", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999818442", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x5f0fdee4137486a0a1ec376a6c8115f5aaf96577a62bf351069562eb9c34ffc8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xbe005e7a45c02170b75a56d95e55e875016d5b8d1b563998ece4a605acfb8e04", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xbe005e7a45c02170b75a56d95e55e875016d5b8d1b563998ece4a605acfb8e04", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xbe005e7a45c02170b75a56d95e55e875016d5b8d1b563998ece4a605acfb8e04", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000.json index dcc6ec39e..12a112226 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_25000.json @@ -2,7 +2,7 @@ "modexp_55190_55190_42965_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_25000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x5f0fdee4137486a0a1ec376a6c8115f5aaf96577a62bf351069562eb9c34ffc8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "184042", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999815958", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5f0fdee4137486a0a1ec376a6c8115f5aaf96577a62bf351069562eb9c34ffc8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x78cded0d21e6a338a5cbd4a9a2679a8e90475f0c9ea10602b963888da61c274e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x78cded0d21e6a338a5cbd4a9a2679a8e90475f0c9ea10602b963888da61c274e", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x906f94445ac7753feaf4a6eb0a072766dcce766b2eed6f62b2b76af178131c5b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000.json index d91388d34..a7508533a 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_55190_55190_42965_35000.json @@ -2,7 +2,7 @@ "modexp_55190_55190_42965_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_35000Filler.json" }, "env" : { @@ -10,137 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x5f0fdee4137486a0a1ec376a6c8115f5aaf96577a62bf351069562eb9c34ffc8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "184042", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999815958", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb" + } } } - ], - "EIP158" : [ - { - "hash" : "0x5f0fdee4137486a0a1ec376a6c8115f5aaf96577a62bf351069562eb9c34ffc8", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x8a72f51d494591810d22a33f8dcb8d539ff83b3ef19191627d8ab2c74b3de5bc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x8a72f51d494591810d22a33f8dcb8d539ff83b3ef19191627d8ab2c74b3de5bc", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x906f94445ac7753feaf4a6eb0a072766dcce766b2eed6f62b2b76af178131c5b", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 21847450052839212624230656502990235142567050104912751880812823948662932355190, exponent 21847450052839212624230656502990235142567050104912751880812823948662932355190 and modulus 1461501637330902918203684832716283019655932542965 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0201ee", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131566", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fe12", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868434", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000.json b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000.json index c08186409..e523ced10 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_1000000.json @@ -2,7 +2,7 @@ "modexp_9_37111_37111_1000000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.b352d835.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_1000000Filler.json" }, "env" : { @@ -10,147 +10,177 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "EIP158" : [ - { - "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Frontier" : [ - { - "hash" : "0x933a3d1303443b63d389b19b1614a8826aab2f945899a8c9fbc7d101d16e066d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Homestead" : [ - { - "hash" : "0x933a3d1303443b63d389b19b1614a8826aab2f945899a8c9fbc7d101d16e066d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] - } - ], - "Metropolis" : [ - { - "hash" : "0x437ba5a6e16c7e88f7e21640e213c08af07d073f902c25060994eb79043c970c", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } }, - "logs" : [ - ] + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "329887", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999670113", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + "0x00" : "0x3961ec903a448e057fbc76e10170d02f15b9b65c2f7fc8215f611ec6dc74cf91" + } + } } - ] - }, + } + ], + "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 1000000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000.json b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000.json index 995793b1b..1fc7c1bfe 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_155000.json @@ -2,7 +2,7 @@ "modexp_9_37111_37111_155000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_155000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "326730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999673270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xe9695b10d5a72846382fba0293e877097bf8b14fc916029625b58e6ffb3a91b2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xe9695b10d5a72846382fba0293e877097bf8b14fc916029625b58e6ffb3a91b2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xe9695b10d5a72846382fba0293e877097bf8b14fc916029625b58e6ffb3a91b2", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 155000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500.json b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500.json index a63654e7c..f49d4827c 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_20500.json @@ -2,7 +2,7 @@ "modexp_9_37111_37111_20500" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_20500Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x60ac2b6aa114748d27229da002f8f6f23773fdebf6016970ce40eb50298c4807", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "192230", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999807770", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x60ac2b6aa114748d27229da002f8f6f23773fdebf6016970ce40eb50298c4807", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x60ac2b6aa114748d27229da002f8f6f23773fdebf6016970ce40eb50298c4807", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x60ac2b6aa114748d27229da002f8f6f23773fdebf6016970ce40eb50298c4807", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x60ac2b6aa114748d27229da002f8f6f23773fdebf6016970ce40eb50298c4807", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 20500 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000.json b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000.json index b96cc7386..e07ae8d0a 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_22000.json @@ -2,7 +2,7 @@ "modexp_9_37111_37111_22000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_22000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "193730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999806270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x46eed535bcc6a90365001e2c0f1a8a5a3942abd59d2a329d60df3e5be8dbe4d1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x46eed535bcc6a90365001e2c0f1a8a5a3942abd59d2a329d60df3e5be8dbe4d1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x46eed535bcc6a90365001e2c0f1a8a5a3942abd59d2a329d60df3e5be8dbe4d1", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 22000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000.json b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000.json index 8798c99e8..a3d164f22 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_9_37111_37111_35000.json @@ -2,7 +2,7 @@ "modexp_9_37111_37111_35000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_35000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "206730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999793270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x2fe33fc1963b1d4aeeafb3278bcef8221cf2bb8d3754a5760557021e5dcb8c6f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x2fe33fc1963b1d4aeeafb3278bcef8221cf2bb8d3754a5760557021e5dcb8c6f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x2fe33fc1963b1d4aeeafb3278bcef8221cf2bb8d3754a5760557021e5dcb8c6f", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 35000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000.json b/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000.json index 295d27b5a..c600e9735 100644 --- a/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000.json +++ b/GeneralStateTests/stPreCompiledContracts/modexp_9_3711_37111_25000.json @@ -2,7 +2,7 @@ "modexp_9_3711_37111_25000" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_3711_37111_25000Filler.json" }, "env" : { @@ -10,137 +10,176 @@ "currentDifficulty" : "0x020000", "currentGasLimit" : "0x5f5e100", "currentNumber" : "0x1", - "currentTimestamp" : "0x03e8", + "currentTimestamp" : "1000", "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad" }, - "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", - "post" : { - "EIP150" : [ - { - "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : 0, + "gas" : 0, + "value" : 0 + }, + "network" : [ + "Metropolis" + ], + "result" : { + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "3535353535353535353535353535353535353535" : { + "balance" : "196730", + "code" : "0x", + "nonce" : "0", + "storage" : { + } + }, + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999803270", + "code" : "0x", + "nonce" : "2", + "storage" : { + } + }, + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", + "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", + "nonce" : "1", + "storage" : { + } } } - ], - "EIP158" : [ - { - "hash" : "0x60c91f6a72960f77a772373d8a645ce35bc7e7f601421547df31212e9b1db59d", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0xa9e1762293cec0b6c6b025b3bf5294ace20f84be9d012f944d5cf9be68044fbb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0xa9e1762293cec0b6c6b025b3bf5294ace20f84be9d012f944d5cf9be68044fbb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0xa9e1762293cec0b6c6b025b3bf5294ace20f84be9d012f944d5cf9be68044fbb", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], + "explanation" : "Puts the base 9, exponent 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 and modulus 179769313486231590772930519078902473361797697894230657273430081157732675805500963132708477322407536021120113879871393357658789768814416622492847430639474124377767893424865485276302219601246094119453082952085005768838150682342462881473913110540827237163350510684586298239947245938479716304835356329624224137111 into the MODEXP precompile, saves the hash of the result. Gives the execution 25000 gas", "pre" : { - "0x0000000000000000000000000000000000000001" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000001" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000002" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000002" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000003" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000003" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000004" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000004" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000005" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000005" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000006" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000006" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000007" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000007" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x0000000000000000000000000000000000000008" : { - "balance" : "0x01", - "code" : "", - "nonce" : "0x00", + "0000000000000000000000000000000000000008" : { + "balance" : "1", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x3535353535353535353535353535353535353535" : { - "balance" : "0x0202fa", - "code" : "", - "nonce" : "0x00", + "3535353535353535353535353535353535353535" : { + "balance" : "131834", + "code" : "0x", + "nonce" : "0", "storage" : { } }, - "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { - "balance" : "0x0de0b6b3a761fd06", - "code" : "", - "nonce" : "0x01", + "82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : { + "balance" : "999999999999868166", + "code" : "0x", + "nonce" : "1", "storage" : { } }, - "0xc305c901078781c232a2a521c2af7980f8385ee9" : { - "balance" : "0x00", + "c305c901078781c232a2a521c2af7980f8385ee9" : { + "balance" : "0", "code" : "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012c576101856004356004013511151558576004356004013560200160043560040161014037608061034061014051610160600060056305f5e0fff115585760806103205261032060a0806103e08284600060046022f15050506103e08051602082012090506000556103e060206020820352604081510160206001820306601f820103905060208203f350005b", - "nonce" : "0x01", + "nonce" : "1", "storage" : { } } diff --git a/GeneralStateTests/stPreCompiledContracts/sec80.json b/GeneralStateTests/stPreCompiledContracts/sec80.json index e13ffb075..e48a40db2 100644 --- a/GeneralStateTests/stPreCompiledContracts/sec80.json +++ b/GeneralStateTests/stPreCompiledContracts/sec80.json @@ -2,81 +2,48 @@ "sec80" : { "_info" : { "comment" : "", - "filledwith" : "cpp-1.3.0+commit.57f8eb2b.Linux.g++", + "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++", "source" : "/src/GeneralStateTestsFiller/stPreCompiledContracts/sec80Filler.json" }, "env" : { - "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba", "currentDifficulty" : "0x20000", - "currentGasLimit" : "0x989680", - "currentNumber" : "0x01", - "currentTimestamp" : "0x03e8", - "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" + "currentGasLimit" : "10000000", + "currentNumber" : "1", + "currentTimestamp" : "1000", + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6" }, - "post" : { - "EIP150" : [ - { - "hash" : "0x20caf0e4334c49b11ba73bde2d58db4133c4e5b45e517fb8a56ad0be7fb6b7b5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 + "expect" : [ + { + "indexes" : { + "data" : -1, + "gas" : -1, + "value" : -1 + }, + "network" : [ + "ALL" + ], + "result" : { + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "storage" : { + "0x00" : "0xc001f00d" + } } } - ], - "EIP158" : [ - { - "hash" : "0x20caf0e4334c49b11ba73bde2d58db4133c4e5b45e517fb8a56ad0be7fb6b7b5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Frontier" : [ - { - "hash" : "0x561bf5ed8918949a2bdb15003334f0c487da57a350317346d02c92c9a4d32b88", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Homestead" : [ - { - "hash" : "0x561bf5ed8918949a2bdb15003334f0c487da57a350317346d02c92c9a4d32b88", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ], - "Metropolis" : [ - { - "hash" : "0x20caf0e4334c49b11ba73bde2d58db4133c4e5b45e517fb8a56ad0be7fb6b7b5", - "indexes" : { - "data" : 0, - "gas" : 0, - "value" : 0 - } - } - ] - }, + } + ], "pre" : { - "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "0x01312d00", + "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { + "balance" : "20000000", "code" : "0x601b565b6000555b005b630badf00d6003565b63c001f00d6003565b7319e7e376e7c213b7e7e7e46cc70a5dd086daff2a7f22ae6da6b482f9b1b19b0b897c3fd43884180a1c5ee361e1107a1bc635649dda600052601b603f537f16433dce375ce6dc8151d3f0a22728bc4a1d9fd6ed39dfd18b4609331937367f6040527f306964c0cf5d74f04129fdc60b54d35b596dde1bf89ad92cb4123318f4c0e40060605260206080607f60006000600161fffff21560075760805114601257600956", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } }, - "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7640000", + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "1000000000000000000", "code" : "", - "nonce" : "0x00", + "nonce" : "0", "storage" : { } } @@ -86,14 +53,14 @@ "" ], "gasLimit" : [ - "0x989680" + "10000000" ], - "gasPrice" : "0x01", - "nonce" : "0x00", - "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", - "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87", + "gasPrice" : "1", + "nonce" : "0", + "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", + "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87", "value" : [ - "0x0186a0" + "100000" ] } } |