Commit Graph

3051 Commits

Author SHA1 Message Date
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 49f1834ffb Fixing travis yml whitespace 2016-03-08 16:40:35 +01:00
Tomasz Drwięga 9acb36af87 Fixing tests compilation. Removing ethminer dependency on client 2016-03-08 16:23:32 +01:00
Tomasz Drwięga 84444c697c Adding ethminer to dev/ci files 2016-03-08 15:53:12 +01:00
Tomasz Drwięga 99a6802b61 Moving block sealing and transaction_queue to separate create 2016-03-08 15:46:44 +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
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
arkpar 744c4c7d8b JournalDB documentation 2016-03-07 07:06:55 +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 d77d9ad9d8 JournalDB with history overlay 2016-03-06 19:57:00 +01:00
Tomasz Drwięga c49258e866 Merge branch 'tx_queue_integration' into tx_queue_rpc 2016-03-06 11:15:16 +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 ad81356683 fix namespace 2016-03-06 00:48:00 +03:00
Nikolay Volf e100ecbeac exposing in lib 2016-03-05 23:47:28 +03:00
Nikolay Volf 57e6e1e1b5 [ci ship] redundant lines 2016-03-05 20:15:19 +03:00