Nikolay Volf
|
ddc3440712
|
Merge branch 'master' into tx-rpc-expose
Conflicts:
sync/src/chain.rs
|
2016-03-10 03:22:32 +04: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 |
|
Nikolay Volf
|
663eec8a76
|
Merge branch 'master' into tx-rpc-expose
|
2016-03-10 03:03:27 +04: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 |
|
arkpar
|
c302fa9a4e
|
Style
|
2016-03-09 18:37:44 +01:00 |
|
debris
|
423dd7e0a9
|
updated jsonrpc-core and http-server libs
|
2016-03-09 18:04:13 +01:00 |
|
debris
|
082a4d9078
|
jsonrpc uses client and sync interfaces as a preparetion for jsonrpc tests
|
2016-03-09 17:31:43 +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 |
|
arkpar
|
a069e890ba
|
Replaced --archive option with --pruning
|
2016-03-08 19:14:43 +01:00 |
|
arkpar
|
d31aa05847
|
Merge branch 'master' of github.com:ethcore/parity into jdb_option2
|
2016-03-08 18:40:21 +01:00 |
|
Arkadiy Paronyan
|
798c348d0e
|
Merge pull request #633 from ethcore/fixing_docopt
Fixing CLI parameters
|
2016-03-08 18:36:02 +01:00 |
|
arkpar
|
ca7d3b91d0
|
Merge branch 'master' of github.com:ethcore/parity into jdb_option2
|
2016-03-08 18:35:25 +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
|
1184679d23
|
Merge branch 'tx_queue_integration' into tx_queue_rpc
|
2016-03-08 10:17:01 +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 |
|
arkpar
|
57485a73ec
|
Merge branch 'master' into thread
|
2016-03-07 15:10:15 +01:00 |
|
Tomasz Drwięga
|
ab42ec8c81
|
Removing unneeded lifetime
|
2016-03-07 14:40:39 +01:00 |
|
Tomasz Drwięga
|
b61c0397bc
|
removing unused variable
|
2016-03-07 14:36:38 +01:00 |
|
Tomasz Drwięga
|
69db469d39
|
Merge branch 'master' into clippy-dev
Conflicts:
util/src/journaldb.rs
|
2016-03-07 14:35:42 +01:00 |
|
Tomasz Drwięga
|
cbc2c0cf0c
|
Fixing clippy warnings. When building on nightly it is required to enable clippy
|
2016-03-07 14:34:17 +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 |
|
Tomasz Drwięga
|
3153d12bd9
|
feature enabled when compiling without --release
|
2016-03-07 11:40:44 +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 |
|