debris
|
0a7cda09ff
|
changed route name to enacted and retracted
|
2016-03-10 10:17:17 +01:00 |
|
debris
|
4750d2f667
|
Merge branch 'master' into import_route
|
2016-03-10 01:04:05 +01:00 |
|
Gav Wood
|
2ecad23fab
|
Merge pull request #647 from ethcore/sync
Fixed sync handling large forks
|
2016-03-10 00:53:20 +01:00 |
|
Gav Wood
|
50c8d7f633
|
Merge pull request #607 from ethcore/tx_queue_integration
Transaction Queue Integration
|
2016-03-10 00:45:07 +01:00 |
|
Gav Wood
|
ac42045155
|
Merge pull request #639 from ethcore/keys-cli
Keys cli
|
2016-03-10 00:25:01 +01:00 |
|
debris
|
f397fb210f
|
fixed typo
|
2016-03-10 00:11:35 +01:00 |
|
arkpar
|
d7e729a4ea
|
Fixed sync handling large forks
|
2016-03-09 23:55:56 +01:00 |
|
Arkadiy Paronyan
|
095a397d7c
|
Merge pull request #643 from ethcore/fix-warning
fix build warning
|
2016-03-09 21:56:38 +01:00 |
|
debris
|
8b042ac875
|
blockchain import_route
|
2016-03-09 21:55:23 +01:00 |
|
Marek Kotewicz
|
abeb50bd08
|
Merge pull request #642 from ethcore/jsonrpc_update
updated jsonrpc-core and http-server libs
|
2016-03-09 20:46:49 +01:00 |
|
Nikolay Volf
|
accc1db43f
|
chaning docopt config a bit
|
2016-03-09 23:39:36 +04:00 |
|
Nikolay Volf
|
8a83e27d6a
|
cfg-test for noop verifier
|
2016-03-09 22:55:41 +04:00 |
|
debris
|
423dd7e0a9
|
updated jsonrpc-core and http-server libs
|
2016-03-09 18:04:13 +01:00 |
|
Tomasz Drwięga
|
02b23d3deb
|
Merge pull request #638 from ethcore/jsonrpc_panic_handle
jsonrpc panics gracefully shutdown client
|
2016-03-09 17:16:02 +01:00 |
|
Nikolay Volf
|
7ff4d14544
|
adding return to if branch
|
2016-03-09 19:27:44 +04:00 |
|
Nikolay Volf
|
f49e32cc79
|
Merge branch 'master' into keys-cli
|
2016-03-09 19:20:17 +04:00 |
|
debris
|
bcb9b0e457
|
wait_for_exit takes only one input param, which is PanicHandler
|
2016-03-09 15:32:27 +01:00 |
|
Nikolay Volf
|
6ad0ba8fe2
|
basic commands
|
2016-03-09 17:11:15 +04:00 |
|
debris
|
3655354980
|
Merge branch 'master' into jsonrpc_panic_handle
|
2016-03-09 13:46:08 +01:00 |
|
debris
|
a1640dcf72
|
jsonrpc panic handle
|
2016-03-09 11:38:53 +01:00 |
|
Tomasz Drwięga
|
e92ee1c0ea
|
Merge branch 'master' into tx_queue_integration
|
2016-03-09 09:27:20 +01:00 |
|
Arkadiy Paronyan
|
798c348d0e
|
Merge pull request #633 from ethcore/fixing_docopt
Fixing CLI parameters
|
2016-03-08 18:36:02 +01:00 |
|
Tomasz Drwięga
|
b2fc077f8c
|
Fixing CLI parameters
|
2016-03-08 16:42:33 +01:00 |
|
Tomasz Drwięga
|
f973610b38
|
Merge branch 'master' into tx_queue_integration
|
2016-03-08 10:15:11 +01:00 |
|
Gav Wood
|
9780897fc7
|
Merge pull request #628 from ethcore/gethcli
Normal CLI options with geth.
|
2016-03-07 23:35:40 +01:00 |
|
Gav Wood
|
f601975701
|
Merge pull request #626 from ethcore/network
Do not remove the peer immediatelly on send error
|
2016-03-07 12:31:32 +01:00 |
|
Gav Wood
|
ec3698066b
|
Normal CLI options with geth.
Support node identity.
Support fine-grained JSONRPC API enabling.
|
2016-03-07 12:21:11 +01:00 |
|
Tomasz Drwięga
|
e83f856104
|
Merging chain_blocks_verified to chain_new_blocks
|
2016-03-07 12:16:37 +01:00 |
|
arkpar
|
58721475ff
|
Do not remove the peer immediatelly on send error
|
2016-03-07 11:34:07 +01:00 |
|
Gav Wood
|
f9e93d594b
|
Merge pull request #622 from ethcore/jsonrpc_block_behind
Jsonrpc block behind
|
2016-03-07 11:00:56 +01:00 |
|
Arkadiy Paronyan
|
92e18a79ea
|
Merge pull request #624 from ethcore/killspam
Remove println!s.
|
2016-03-07 10:58:50 +01:00 |
|
Gav Wood
|
72016196cd
|
Remove println!s.
|
2016-03-07 10:56:39 +01:00 |
|
debris
|
bcae4f6e7b
|
fixed jsonrpc reporting current block is one less than actuall, fixed #612
|
2016-03-07 10:30:19 +01:00 |
|
Tomasz Drwięga
|
b0ac103900
|
Merge branch 'master' into tx_queue_integration
|
2016-03-07 09:54:07 +01:00 |
|
Gav Wood
|
318e7e9e04
|
Merge pull request #613 from ethcore/jdb_option1
JournalDB option 1 fix
|
2016-03-07 09:38:50 +01:00 |
|
debris
|
0da2ec1c0a
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-03-07 09:35:31 +01:00 |
|
Gav Wood
|
4d1effb008
|
Fix tests.
|
2016-03-07 09:10:02 +01:00 |
|
Gav Wood
|
73207c2355
|
Revert accidental beta regressions.
|
2016-03-07 08:01:14 +01:00 |
|
Gav Wood
|
fd87633db6
|
Remove superfluous LATEST_KEY write.
|
2016-03-07 07:57:50 +01:00 |
|
Arkadiy Paronyan
|
7e9f13750f
|
Merge pull request #611 from ethcore/network
Network tracing cleanup
|
2016-03-07 07:44:49 +01:00 |
|
Gav Wood
|
0980c7130a
|
Fix replay_keys
Counters should never have an entry with zero value.
|
2016-03-07 06:58:43 +01:00 |
|
Gav Wood
|
4230fdfffe
|
More veriosning fixups.
|
2016-03-06 22:43:21 +01:00 |
|
Gav Wood
|
bc2fb14b5d
|
Add memory usage reports.
Update to be similar to master.
|
2016-03-06 22:39:04 +01:00 |
|
Gav Wood
|
bfd882c7e0
|
Fix warnings.
|
2016-03-06 22:05:12 +01:00 |
|
Gav Wood
|
51c95d4d67
|
Implement option 1.
|
2016-03-06 21:57:55 +01:00 |
|
Tomasz Drwięga
|
e91de78528
|
Renaming back bad as retracted
|
2016-03-06 11:12:02 +01:00 |
|
Tomasz Drwięga
|
64b5e23ba5
|
Merge branch 'tx_queue_integration' of github.com:ethcore/parity into tx_queue_integration
|
2016-03-06 11:05:13 +01:00 |
|
Tomasz Drwięga
|
aaf2e0c3fb
|
Locking outside of loop
|
2016-03-06 11:04:24 +01:00 |
|
arkpar
|
003d1fd0cc
|
Network tracing improvements
|
2016-03-05 23:32:38 +01:00 |
|
Nikolay Volf
|
57e6e1e1b5
|
[ci ship] redundant lines
|
2016-03-05 20:15:19 +03:00 |
|