Nikolay Volf
|
f49e32cc79
|
Merge branch 'master' into keys-cli
|
2016-03-09 19:20:17 +04: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
arkpar
|
003d1fd0cc
|
Network tracing improvements
|
2016-03-05 23:32:38 +01:00 |
|
debris
|
068d776b17
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-03-05 13:49:03 +01:00 |
|
Gav Wood
|
b14b4cfef8
|
Merge pull request #602 from ethcore/revert-595-tx_queue_integration
Revert "Transaction Queue integration"
|
2016-03-05 12:54:01 +01:00 |
|
Gav Wood
|
d330f0b7b7
|
Revert "Transaction Queue integration"
|
2016-03-05 12:53:54 +01:00 |
|
Gav Wood
|
5ac0da6bba
|
Merge pull request #601 from ethcore/fix-benches
fix benches compilation
|
2016-03-05 12:30:33 +01:00 |
|
Nikolay Volf
|
cfbaa2d6e9
|
fixed namespaces
|
2016-03-05 14:25:46 +03:00 |
|
Nikolay Volf
|
c4fe307b06
|
Merge pull request #595 from ethcore/tx_queue_integration
Transaction Queue integration
|
2016-03-05 14:21:54 +03:00 |
|
Gav Wood
|
937a8e26a6
|
Merge pull request #597 from ethcore/verifier_improvements
verifier trait improvements
|
2016-03-05 12:12:47 +01:00 |
|
Gav Wood
|
c4faa69049
|
Merge pull request #600 from ethcore/rust_stable
build on rust stable
|
2016-03-05 12:11:57 +01:00 |
|
Gav Wood
|
0768d556a9
|
Merge pull request #599 from ethcore/silent-geth
Geth import silent if no geth
|
2016-03-05 12:11:21 +01:00 |
|
Tomasz Drwięga
|
b9a6a70ced
|
Renaming bad blocks as retracted
|
2016-03-05 11:37:19 +01:00 |
|
debris
|
9e5f8d4434
|
build on rust stable
|
2016-03-05 11:36:12 +01:00 |
|
debris
|
1743e480e3
|
rust_stable
|
2016-03-05 11:35:44 +01:00 |
|
Tomasz Drwięga
|
8a13e87cbe
|
Renaming BlocksWith helper to EachBlockWith
|
2016-03-05 11:30:27 +01:00 |
|
Nikolay Volf
|
1d04a7b8f9
|
changing warning to trace
|
2016-03-05 13:16:09 +03:00 |
|
debris
|
5ad5773014
|
verifier improvements
|
2016-03-05 10:45:05 +01:00 |
|
Gav Wood
|
a7e5113f2c
|
Merge pull request #593 from ethcore/journaldb
Additional journaldb logging and assert
|
2016-03-05 09:48:01 +01:00 |
|
Gav Wood
|
504e74a9ad
|
Merge pull request #578 from ethcore/finduncles
Uncle inclusion in block authoring.
|
2016-03-05 09:47:51 +01:00 |
|
Tomasz Drwięga
|
77d526fd0b
|
Merge branch 'master' into tx_queue_integration
Conflicts:
ethcore/src/client.rs
sync/src/tests/helpers.rs
|
2016-03-05 00:57:45 +01:00 |
|
arkpar
|
a4640beb2c
|
Typo
|
2016-03-05 00:00:43 +01:00 |
|
arkpar
|
2d6738fcde
|
Additional logging and assert
|
2016-03-04 23:53:57 +01:00 |
|
Gav Wood
|
8ed632eb96
|
Merge pull request #592 from ethcore/network
Fixed potential deadlock on startup
|
2016-03-04 23:51:56 +01:00 |
|
Gav Wood
|
87cd8ebd26
|
Merge pull request #591 from ethcore/sync
Fixing an overflow panic
|
2016-03-04 23:51:45 +01:00 |
|