diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-10 06:25:46 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-10 06:25:46 +0800 |
| commit | 9bf513e99305af733110cf23a0b47c8e73359010 (patch) | |
| tree | f9d36e1ae1f2f7c3eb803c7499a4e85a5cdcd5bd /tests/files/StateTests/stExample.json | |
| parent | cd51860bf024d949a09b3863c88a278a386227a7 (diff) | |
| parent | 676a0de58d3d7c508b0eeeff192d2095a46f7382 (diff) | |
| download | go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.gz go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.bz2 go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.lz go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.xz go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.tar.zst go-tangerine-9bf513e99305af733110cf23a0b47c8e73359010.zip | |
Merge ethereum/poc-9 into accounts-integration
Conflicts:
cmd/utils/cmd.go
cmd/utils/flags.go
core/manager.go
eth/backend.go
rpc/http/server.go
xeth/xeth.go
Diffstat (limited to 'tests/files/StateTests/stExample.json')
| -rw-r--r-- | tests/files/StateTests/stExample.json | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/tests/files/StateTests/stExample.json b/tests/files/StateTests/stExample.json index 8b9d6f206..40a5b2c17 100644 --- a/tests/files/StateTests/stExample.json +++ b/tests/files/StateTests/stExample.json @@ -13,21 +13,29 @@ "out" : "0x", "post" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { - "balance" : "1000000000000000000", + "balance" : "1000000000000100000", "code" : "0x6001600101600055", "nonce" : "0", "storage" : { + "0x" : "0x02" } }, - "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "1000000000000000000", + "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { + "balance" : "41012", "code" : "0x", "nonce" : "0", "storage" : { } + }, + "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { + "balance" : "999999999999858988", + "code" : "0x", + "nonce" : "1", + "storage" : { + } } }, - "postStateRoot" : "4b4b7a0d58a2388c0e6b3b048c3c27edd6febc6f04171167ed15a77ab2e60b16", + "postStateRoot" : "17454a767e5f04461256f3812ffca930443c04a47d05ce3f38940c4a14b8c479", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "1000000000000000000", @@ -44,10 +52,9 @@ } } }, - "preStateRoot" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421", "transaction" : { "data" : "", - "gasLimit" : "10000", + "gasLimit" : "400000", "gasPrice" : "1", "nonce" : "0", "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", |