Commit Graph

530 Commits

Author SHA1 Message Date
Tomasz Drwięga 3ea52c2324 Merge branch 'master' into ethminer_crate
Conflicts:
	parity/main.rs
2016-03-12 10:22:43 +01:00
Tomasz Drwięga e10457d235 Bumping clippy 2016-03-12 10:06:50 +01:00
Gav Wood 88e23fcb9a Merge pull request #634 from ethcore/jdb_option2
JournalDB with in-memory overlay (option2)
2016-03-12 10:01:17 +01:00
Gav Wood 874393ba06 Fix tests, 2016-03-12 09:57:57 +01:00
Gav Wood e6a273f3a7 Fix tests. 2016-03-12 09:53:54 +01:00
Gav Wood 12e1abdfb7 Port fixes to new infrastrtcutre. 2016-03-12 09:51:17 +01:00
Tomasz Drwięga aebc91d96f Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.toml
	rpc/Cargo.toml
	sync/Cargo.toml
2016-03-12 09:50:18 +01:00
Tomasz Drwięga 7cfe1d258b Adding more detailed logging 2016-03-11 23:49:32 +01:00
Arkadiy Paronyan 1031ce641d Merge pull request #682 from ethcore/additional_sstore_test
additional (failing) SecretStore test
2016-03-11 22:45:43 +01:00
arkpar 896ba57555 Merge branch 'master' of github.com:ethcore/parity into jdb_option2 2016-03-11 22:43:59 +01:00
Nikolay Volf b1327a045f fixed new account generation 2016-03-11 22:47:12 +04:00
debris 90e20cbcad additional (failing) sstore test 2016-03-11 20:08:01 +01:00
Tomasz Drwięga c3a79c1478 Merge branch 'master' into ethminer_crate
Conflicts:
	ethcore/src/client/client.rs
	parity/main.rs
	sync/src/chain.rs
	sync/src/lib.rs
2016-03-11 19:22:40 +01:00
Tomasz Drwięga f724cab92d Merge branch 'master' into updating_clippy
Conflicts:
	ethcore/src/lib.rs
	sync/src/chain.rs
	sync/src/lib.rs
	util/src/keys/store.rs
	util/src/lib.rs
2016-03-11 19:17:09 +01:00
Nikolay Volf 1e40997ff7 state query for archive jdb 2016-03-11 22:15:56 +04:00
Nikolay Volf 87fb0b31eb Merge branch 'master' into reorgjdb 2016-03-11 20:05:41 +04:00
Nikolay Volf 03a4f9e268 Merge pull request #673 from ethcore/boxjdb
JournalDB -> Box<JournalDB>, and it's a trait.
2016-03-11 20:03:39 +03:00
Tomasz Drwięga 9f19d2993c Merge branch 'master' into ethminer_crate
Conflicts:
	util/bigint/src/uint.rs
2016-03-11 16:24:52 +01:00
Tomasz Drwięga 179569f9f8 Adding std::mem back 2016-03-11 16:01:18 +01:00
Tomasz Drwięga 0dbe6684ad adding std::mem 2016-03-11 15:58:12 +01:00
Nikolay Volf 04af38bb0d fix test compilation 2016-03-11 18:54:28 +04:00
Nikolay Volf fcc0432856 Merge pull request #675 from ethcore/rpc_unit_tests
fixed U256 and transaction request deserialization
2016-03-11 17:25:13 +03:00
Nikolay Volf 8d67316ece Merge branch 'master' into reorgjdb
Conflicts:
	parity/main.rs
2016-03-11 17:41:04 +04:00
Gav Wood 38d470f3bc Reorganise command line options into more general engine. 2016-03-11 14:45:19 +01:00
Gav Wood 7e8b6c3660 Merge branch 'boxjdb' into reorgjdb 2016-03-11 14:06:32 +01:00
Gav Wood b25551be7b Merge pull request #671 from ethcore/clippy_hook
Removing running clippy by default on nightly.
2016-03-11 14:03:16 +01:00
Gav Wood 51cfd4b0ea Remove unneeded clone. 2016-03-11 13:58:11 +01:00
debris ecd33a6093 fixed U256 and transaction request deserialization, added tests for transaction request 2016-03-11 13:54:52 +01:00
Gav Wood 4771fdf0fb Rearrange journaldb infrastructure. 2016-03-11 13:50:39 +01:00
Gav Wood 2a856a13f0 Obvious typo fix. 2016-03-11 13:21:53 +01:00
Gav Wood d71c5d4c17 Place Sync/Send in trait. 2016-03-11 13:19:10 +01:00
Gav Wood e461916f5a Merge remote-tracking branch 'origin/master' into boxjdb 2016-03-11 12:56:33 +01:00
Gav Wood 756f964130 JournalDB -> Box<JournalDB>, and it's a trait. 2016-03-11 12:54:48 +01:00
arkpar 8f54c24e47 Merged changes from jdb_option1, keep LATEST_ERA from decreasing 2016-03-11 11:52:11 +01:00
Tomasz Drwięga d84e008e00 Removing superflous check for nightly 2016-03-11 11:16:49 +01:00
Tomasz Drwięga 8709dd28f8 Fixing clippy warnings 2016-03-11 10:58:51 +01:00
Tomasz Drwięga 3a4a7ac822 Bumping clippy version 2016-03-11 10:35:26 +01:00
arkpar 06a3abd01e Removed unused return type 2016-03-10 21:15:43 +01:00
arkpar 8785bd37e8 Merge branch 'master' of github.com:ethcore/parity into jdb_option2 2016-03-10 21:06:21 +01:00
Nikolay Volf a2dea3885b refactoring to AccountService 2016-03-10 23:09:45 +04:00
Nikolay Volf 5571503c22 traitified secret store 2016-03-10 20:18:01 +04: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
arkpar ff12b53ba6 Stop workers before stopping event loop 2016-03-10 10:40:16 +01:00
Nikolay Volf 0f056f3abb Merge branch 'master' into clippy-dev
Conflicts:
	Cargo.toml
2016-03-10 02:45:53 +04:00
arkpar c302fa9a4e Style 2016-03-09 18:37:44 +01:00
Nikolay Volf 6ad0ba8fe2 basic commands 2016-03-09 17:11:15 +04: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 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 72016196cd Remove println!s. 2016-03-07 10:56:39 +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
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
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
arkpar 003d1fd0cc Network tracing improvements 2016-03-05 23:32:38 +01:00
Nikolay Volf cfbaa2d6e9 fixed namespaces 2016-03-05 14:25:46 +03:00
Nikolay Volf 1d04a7b8f9 changing warning to trace 2016-03-05 13:16:09 +03: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 e11b74e8d2 Merge pull request #589 from ethcore/disablejournaldb
JournalDB can now operate in "archive" mode
2016-03-04 23:51:21 +01:00
Gav Wood 559e01ea84 Review remarks resolved. 2016-03-04 22:54:59 +01:00
arkpar 182aec2f94 Fixed potential deadlock on startup 2016-03-04 22:01:36 +01:00
Gav Wood ba67b67ff3 JournalDB can now operate in "archive" mode. 2016-03-04 20:19:36 +01:00
Nikolay Volf 2e3fb103ab extended secret store operations 2016-03-04 20:08:42 +03:00
Nikolay Volf d59972a9ac deserialization for uint generic 2016-03-04 20:07:23 +03:00
Nikolay Volf ae51d99fb8 [ci skip] trailing commas 2016-03-04 16:40:17 +03:00
Nikolay Volf 0d01099f44 moving unlock logics to secret-store itself 2016-03-04 16:23:00 +03:00
Nikolay Volf e17b2a4db8 replacing unsafe cell with rwlock 2016-03-04 14:48:05 +03:00
Gav Wood 1a7ef8cc85 Merge pull request #560 from ethcore/clippy_warnings
Fixing clippy warnings = small refactoring of `request_blocks`
2016-03-02 19:06:45 +01:00
Gav Wood f5de0187e7 Merge remote-tracking branch 'origin/master' into clippy_warnings 2016-03-02 13:40:35 +01:00
arkpar 041cfda80b Improved journaldb logging 2016-03-02 13:21:33 +01:00
Gav Wood 931c293426 Merge pull request #567 from ethcore/fix-kcov
Fix coverage test run
2016-03-02 13:01:14 +01:00
Gav Wood 162300a4a6 Merge pull request #547 from ethcore/mining
Mining
2016-03-02 13:00:22 +01:00
Marek Kotewicz c9bb7ea0f4 Merge pull request #565 from ethcore/uint-warnings
fix uint warnings
2016-03-02 12:32:01 +01:00
Nikolay Volf 771fbcbd27 remove redundant modification 2016-03-02 13:02:33 +03:00
Nikolay Volf 5dfc3d2849 resolving path at runtime 2016-03-02 13:01:38 +03:00
Nikolay Volf 34b812696b remove unused imports 2016-03-02 08:49:48 +03:00
Gav Wood d55aa54412 Merge branch 'master' into mining 2016-03-02 00:59:39 +01:00
Gav Wood 0082d12ea9 Merge pull request #544 from ethcore/uint-refact
uint to separate crate
2016-03-02 00:59:03 +01:00
Gav Wood 30c6820437 Refactor and cleanup. 2016-03-02 00:52:18 +01:00
Tomasz Drwięga 30e7ac8d6d Fixing trivial warnings 2016-03-01 22:05:50 +01:00
Tomusdrw aab274d3ef Changing RefCell to Cell in transaction. Implementing Copy on Uints. 2016-03-01 21:29:22 +01:00
Gav Wood 140711dd8a Fixups from review.
Reduce size of default extra-data.
Introduce find_uncle_headers.
2016-03-01 19:59:12 +01:00
Gav Wood f705f6957a Merge branch 'master' into mining 2016-03-01 16:59:39 +01:00
Gav Wood 48df869202 --author and --extra-data options. Fixed null parent-hash. 2016-03-01 16:58:14 +01:00
Nikolay Volf be4cfa83b3 Merge pull request #545 from ethcore/table
Sparse Table Implementation (Row, Col) -> Val
2016-03-01 15:01:35 +03:00
Tomasz Drwięga 816e549d4c Changing implementation of is_empty to something more efficient 2016-03-01 00:40:55 +01:00
Tomasz Drwięga ed6a35f618 More idiomatic implementations 2016-03-01 00:00:52 +01:00
Tomasz Drwięga 2f3b0c9d1c Removing get_ prefix 2016-02-29 23:57:02 +01:00
Nikolay Volf 82a528961b remove line 2016-03-01 01:13:00 +03:00
Tomasz Drwięga 212aac42bd Removing clippy warnings 2016-02-29 23:09:51 +01:00