diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-11-18 18:46:38 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2014-11-18 18:46:38 +0800 |
| commit | 1d278d28575866f9d001fea75776fbd61cb2e3ce (patch) | |
| tree | dac09adb7015173583560f1957df5d5457d008a1 /vmSha3TestFiller.json | |
| parent | 51a0ca457fa5495d9e4fda387c9f5d3f776a56c4 (diff) | |
| parent | 09be38b0c1a7283bae8e84fe41aba8a2b916a608 (diff) | |
| download | dexon-solidity-1d278d28575866f9d001fea75776fbd61cb2e3ce.tar dexon-solidity-1d278d28575866f9d001fea75776fbd61cb2e3ce.tar.gz dexon-solidity-1d278d28575866f9d001fea75776fbd61cb2e3ce.tar.bz2 dexon-solidity-1d278d28575866f9d001fea75776fbd61cb2e3ce.tar.lz dexon-solidity-1d278d28575866f9d001fea75776fbd61cb2e3ce.tar.xz dexon-solidity-1d278d28575866f9d001fea75776fbd61cb2e3ce.tar.zst dexon-solidity-1d278d28575866f9d001fea75776fbd61cb2e3ce.zip | |
Merge branch 'develop' into mk_jsonrpc_upgrade
Conflicts:
alethzero/MainWin.cpp
libweb3jsonrpc/WebThreeStubServer.cpp
libweb3jsonrpc/abstractwebthreestubserver.h
libweb3jsonrpc/spec.json
test/jsonrpc.cpp
test/webthreestubclient.h
Diffstat (limited to 'vmSha3TestFiller.json')
| -rw-r--r-- | vmSha3TestFiller.json | 59 |
1 files changed, 56 insertions, 3 deletions
diff --git a/vmSha3TestFiller.json b/vmSha3TestFiller.json index 5f9a29b6..7ed72952 100644 --- a/vmSha3TestFiller.json +++ b/vmSha3TestFiller.json @@ -111,7 +111,7 @@ } }, - "sha3_3": { + "sha3_4": { "env" : { "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", "currentNumber" : "0", @@ -137,8 +137,61 @@ "gasPrice" : "100000000000000", "gas" : "10000" } - } - + }, + "sha3_5": { + "env" : { + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", + "currentNumber" : "0", + "currentGasLimit" : "1000000", + "currentDifficulty" : "256", + "currentTimestamp" : 1, + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" + }, + "pre" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "1000000000000000000", + "nonce" : 0, + "code" : "{ [[ 0 ]] (SHA3 10000 0xfffffffff )}", + "storage": {} + } + }, + "exec" : { + "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "value" : "1000000000000000000", + "data" : "", + "gasPrice" : "100000000000000", + "gas" : "10000" + } + }, + "sha3_6": { + "env" : { + "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6", + "currentNumber" : "0", + "currentGasLimit" : "1000000", + "currentDifficulty" : "256", + "currentTimestamp" : 1, + "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" + }, + "pre" : { + "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : { + "balance" : "1000000000000000000", + "nonce" : 0, + "code" : "{ [[ 0 ]] (SHA3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}", + "storage": {} + } + }, + "exec" : { + "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6", + "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681", + "value" : "1000000000000000000", + "data" : "", + "gasPrice" : "100000000000000", + "gas" : "10000" + } + } } |