Commit Graph

2134 Commits

Author SHA1 Message Date
Gav Wood
0a41dedc05 Merge pull request #414 from ethcore/state
Use latest era instead of end era as journal marker
2016-02-11 18:44:52 +01:00
arkpar
aed348ce8b Merge branch 'master' of github.com:ethcore/parity into net 2016-02-11 18:36:45 +01:00
arkpar
f4d8070bda Fixed one extra block/header being requested 2016-02-11 18:36:26 +01:00
Arkadiy Paronyan
6c8f82d865 Merge pull request #402 from ethcore/jsonrpc2
api changes
2016-02-11 18:35:15 +01:00
Nikolay Volf
d9b6ab1128 flush 2016-02-11 19:48:47 +03:00
Nikolay Volf
02990290c6 json generation 2016-02-11 18:25:00 +03:00
Nikolay Volf
e61376565e parsing tests 2016-02-11 16:17:38 +03:00
arkpar
64b15cdbc0 Merge branch 'master' of github.com:ethcore/parity into net 2016-02-11 14:08:56 +01:00
arkpar
6281d18227 net-key option 2016-02-11 14:08:52 +01:00
arkpar
0d0441a186 Use latest era instead of end era as journal marker 2016-02-11 13:32:27 +01:00
Gav Wood
413502e7f6 Merge branch 'master' of github.com:ethcore/parity 2016-02-11 11:56:09 +01:00
Gav Wood
3bfe8bea45 Deps script. 2016-02-11 11:55:49 +01:00
Arkadiy Paronyan
7b47635879 Merge pull request #408 from ethcore/noinitnodes
Option for no init nodes.
2016-02-11 11:15:07 +01:00
Gav Wood
439e99d32b Option for no init nodes. 2016-02-11 10:46:55 +01:00
Gav Wood
25e2e382ea Add contributing agreement. 2016-02-11 10:34:52 +01:00
debris
b0f2ae147b Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-11 10:20:15 +01:00
Nikolay Volf
50a6e90e3d Merge pull request #406 from ethcore/net
Fixed block_bodies not returning a list
2016-02-11 04:32:19 +03:00
Nikolay Volf
f0431218d6 basic parsing 2016-02-11 04:22:59 +03:00
Arkadiy Paronyan
83c4a05d31 Merge pull request #405 from ethcore/cliopt
Fix test.
2016-02-11 02:08:36 +01:00
arkpar
7bb661e21c Fixed block_bodies not returning a list 2016-02-11 02:07:46 +01:00
Nikolay Volf
ebe3990d0d fixing tests and build 2016-02-11 03:40:22 +03:00
Nikolay Volf
e19b89be2c flush 2016-02-11 03:32:44 +03:00
Gav Wood
5f742c9142 Fix test. 2016-02-11 00:38:19 +01:00
Arkadiy Paronyan
61c8f7b00b Merge pull request #404 from ethcore/cliopt
Allow path to be configured.
2016-02-10 23:55:48 +01:00
Gav Wood
b4faad8469 Merge branch 'master' into cliopt 2016-02-10 23:51:22 +01:00
Nikolay Volf
7bfb832312 type metadata for key files 2016-02-11 01:06:35 +03:00
debris
e577431051 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-10 23:06:03 +01:00
debris
4fe86a4419 eth_getBlockByNumber 2016-02-10 22:54:12 +01:00
debris
93975be5e3 transaction by block number and index 2016-02-10 22:36:59 +01:00
debris
df0fa06e8a applied client interface changes to sync tests 2016-02-10 22:16:25 +01:00
debris
484a4d8bdd Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-10 21:52:52 +01:00
Gav Wood
3e49c960a0 Install both rocksdb deps. 2016-02-10 21:31:21 +01:00
Gav Wood
cb09768145 Fix deps script again. 2016-02-10 21:22:24 +01:00
Gav Wood
30f291e6ce Merge branch 'master' of github.com:ethcore/parity 2016-02-10 21:21:32 +01:00
Gav Wood
25c3e49b4f Fix deps script. 2016-02-10 21:21:17 +01:00
Gav Wood
9ac4f51601 Allow path to be configured. 2016-02-10 21:17:47 +01:00
Nikolay Volf
428962df35 Merge pull request #400 from ethcore/upnp
Upnp
2016-02-10 22:25:19 +03:00
debris
db35e21bcd few client methods use BlockId instead of hash and BlockNumber 2016-02-10 19:29:27 +01:00
Arkadiy Paronyan
0f665a6cbc Merge pull request #398 from ethcore/jsonrpc2
eth_syncing, fixed #397
2016-02-10 19:13:00 +01:00
Gav Wood
1d60e38f14 Merge pull request #399 from ethcore/sigterm
Using modified version of ctrlc that catches SIGTERM
2016-02-10 18:34:53 +01:00
Gav Wood
0e679fbee5 Revert collecting trie stats. 2016-02-10 18:26:39 +01:00
debris
2c360d6c9b fixed protocol_version, hash_rate, block_number and gas_price methods 2016-02-10 18:26:06 +01:00
Gav Wood
e8aaf26ab4 Revert printing trie insertion stats. 2016-02-10 18:26:03 +01:00
Gav Wood
637ca97dc6 Synchronous UPnP. 2016-02-10 18:11:10 +01:00
debris
a938ac67d1 eth_syncing use best_block_hash instead of last_imported_block_number 2016-02-10 18:03:29 +01:00
Gav Wood
39d5b68785 Merge branch 'master' of github.com:ethcore/parity 2016-02-10 17:21:07 +01:00
Nikolay Volf
66a370af9b Merge pull request #396 from ethcore/close_gently
Catching panics.
2016-02-10 18:55:53 +03:00
Tomusdrw
d7a36f4a9d Using modified version of ctrlc that catches SIGTERM 2016-02-10 16:55:15 +01:00
Gav Wood
5c73c298dc Merge branch 'master' of github.com:ethcore/parity 2016-02-10 16:46:06 +01:00
Gav Wood
35374ac09c Start of UPnP. 2016-02-10 16:45:54 +01:00