Gav Wood
|
29ddf34d6d
|
Merge pull request #660 from ethcore/poll_get
Removing get prefix from poll_info
|
2016-03-10 15:24:09 +01:00 |
|
Tomasz Drwięga
|
027f122aea
|
Removing get prefix from poll_info
|
2016-03-10 14:24:33 +01:00 |
|
Gav Wood
|
4cfcaf8521
|
Merge pull request #657 from ethcore/tx_queue_update_height_bug
Tx queue update height bug
|
2016-03-10 13:20:00 +01:00 |
|
Gav Wood
|
f708d36fad
|
Merge pull request #651 from ethcore/tx_queue_integration
Tx_queue_docs -> To master
|
2016-03-10 13:19:40 +01:00 |
|
Gav Wood
|
16e12b1ae5
|
Merge pull request #645 from ethcore/import_route
blockchain import_route
|
2016-03-10 13:14:56 +01:00 |
|
Gav Wood
|
1a28e9297c
|
Merge pull request #655 from ethcore/io
Stop workers before stopping event loop
|
2016-03-10 12:53:00 +01:00 |
|
Tomasz Drwięga
|
d4e7eafede
|
Merge branch 'master' into tx_queue_integration
Conflicts:
sync/src/transaction_queue.rs
|
2016-03-10 11:23:39 +01:00 |
|
Tomasz Drwięga
|
6d0578e19c
|
Additional explanation for ordering of commit/insert_block
|
2016-03-10 11:16:54 +01:00 |
|
Tomasz Drwięga
|
0cf405527e
|
Fixing update height bug
|
2016-03-10 11:14:25 +01:00 |
|
Gav Wood
|
99e577ad2f
|
Merge pull request #650 from ethcore/tx_queue_validation
Validate sender before importing to queue
|
2016-03-10 11:14:22 +01:00 |
|
Tomasz Drwięga
|
276768a826
|
Failing test case for #656
|
2016-03-10 11:11:59 +01:00 |
|
Gav Wood
|
249a89fc2d
|
Merge pull request #627 from ethcore/clippy-dev
`dev` feature enabled when compiling without `--release`
|
2016-03-10 11:05:56 +01:00 |
|
arkpar
|
ff12b53ba6
|
Stop workers before stopping event loop
|
2016-03-10 10:40:16 +01:00 |
|
debris
|
190a2c3b35
|
Merge branch 'master' of github.com:ethcore/parity into import_route
|
2016-03-10 10:17:44 +01:00 |
|
debris
|
0a7cda09ff
|
changed route name to enacted and retracted
|
2016-03-10 10:17:17 +01:00 |
|
Tomasz Drwięga
|
9f77a85491
|
Fixing compilation on nightly
|
2016-03-10 09:35:46 +01:00 |
|
Tomasz Drwięga
|
878e38c0cf
|
Fixing deps again
|
2016-03-10 09:33:25 +01:00 |
|
Tomasz Drwięga
|
c3803807a9
|
Merge pull request #648 from ethcore/bq-fix
Don't call mark_as_bad needlessly
|
2016-03-10 09:28:26 +01:00 |
|
Tomasz Drwięga
|
6864a08000
|
Merge branch 'master' into tx_queue_validation
|
2016-03-10 09:26:57 +01:00 |
|
Tomasz Drwięga
|
3c1888c26a
|
Fixing deps
|
2016-03-10 09:26:04 +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
|
204d31a056
|
Merge pull request #631 from ethcore/tx_queue_docs
Additional documentation for transaction queue
|
2016-03-10 00:45:30 +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 |
|
arkpar
|
84a741d0f9
|
Don't call mark_as_bad needlessly
|
2016-03-10 00:21:07 +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 |
|
Nikolay Volf
|
0f056f3abb
|
Merge branch 'master' into clippy-dev
Conflicts:
Cargo.toml
|
2016-03-10 02:45:53 +04: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
|
f84d40734d
|
Validating sender before importing to queuue
|
2016-03-09 10:26:51 +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
|
799d3bd2c8
|
Fixing doc test for queue
|
2016-03-08 12:42:32 +01:00 |
|
Tomasz Drwięga
|
655bb0ed5d
|
Additional documentation for transaction queue
|
2016-03-08 12:36:06 +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 |
|