Commit Graph

3742 Commits

Author SHA1 Message Date
Nikolay Volf
c72c27b47e client integration 2016-03-04 20:09:21 +03: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
Tomasz Drwięga
d9f23470c4 Merge branch 'tx_queue_integration' into tx_queue_rpc 2016-03-04 16:54:00 +01:00
Tomasz Drwięga
bcaed67eaa Swapping order of inserting block to chain and commiting to DB to avoid race conditions 2016-03-04 16:48:10 +01:00
Tomasz Drwięga
bd7614f445 Merge branch 'tx_queue' into tx_queue_integration
Conflicts:
	sync/src/transaction_queue.rs
2016-03-04 16:25:39 +01:00
Tomasz Drwięga
677c3996b9 Taking expected nonce from state into consideration when removing txs 2016-03-04 16:12:48 +01:00
Tomasz Drwięga
b320ff4602 Getting rid of first_nonces (we can fetch it from state) 2016-03-04 15:02:11 +01:00
Nikolay Volf
ae51d99fb8 [ci skip] trailing commas 2016-03-04 16:40:17 +03:00
Nikolay Volf
4131a60b43 Merge branch 'master' into json-rpc-personal 2016-03-04 16:25:49 +03:00
Nikolay Volf
0d01099f44 moving unlock logics to secret-store itself 2016-03-04 16:23:00 +03:00
Marek Kotewicz
9c1f3d5fff Merge pull request #582 from ethcore/secret-store-sync-ready
making key directory thread-safe
2016-03-04 13:22:32 +01:00
Gav Wood
ee312cba1c Merge pull request #581 from ethcore/verifier_trait
verifier trait
2016-03-04 12:58:10 +01:00
Nikolay Volf
4f62e80de7 name fix 2016-03-04 14:53:18 +03:00
Nikolay Volf
da65761712 Merge branch 'secret-store-sync-ready' into json-rpc-personal 2016-03-04 14:49:00 +03:00
Nikolay Volf
e17b2a4db8 replacing unsafe cell with rwlock 2016-03-04 14:48:05 +03:00
Nikolay Volf
6a57e83509 json rpc personal service 2016-03-04 14:46:54 +03:00
Tomasz Drwięga
410bd263dd Merge branch 'tx_queue_integration' into tx_queue_rpc 2016-03-04 12:34:34 +01:00
Tomasz Drwięga
f7371daca3 Merge branch 'tx_queue' into tx_queue_integration 2016-03-04 12:20:31 +01:00
debris
706ce5dfb6 verifier trait 2016-03-04 11:56:04 +01:00
Tomasz Drwięga
8542d651ae Refactoring transactions queue to avoid cloning transactions 2016-03-04 11:45:20 +01:00
Gav Wood
52dceff3ea Merge branch 'master' into finduncles 2016-03-03 15:16:56 +01:00
Gav Wood
00b5fcebe3 Merge pull request #580 from ethcore/fixblockchainmem
shrink_to_fit after removing hashes.
2016-03-03 15:08:47 +01:00
Gav Wood
f8dc1f2e3a Avoid leaking block_details.
Fixes #576
2016-03-03 12:56:34 +01:00
Gav Wood
09e01fa0f8 Merge pull request #504 from ethcore/rpc_poll_ids
support for rpc polling
2016-03-03 12:44:27 +01:00
Gav Wood
f9533c5d16 Merge pull request #569 from ethcore/rpc_serde_generator
limit serde codegen only to rpc types submodule
2016-03-03 12:43:05 +01:00
Gav Wood
806f962b7d Merge pull request #573 from ethcore/issue-test/568
fork test for Issue test/568
2016-03-03 12:41:32 +01:00
Gav Wood
dadc2a96ea shrink_to_fit after removing hashes. 2016-03-03 12:39:19 +01:00
Gav Wood
df77f51bcc History to 30 to pass tests. 2016-03-03 11:47:24 +01:00
Gav Wood
3daa4c6497 Fix max uncles. 2016-03-03 11:39:00 +01:00
Gav Wood
6933bb971b Test. 2016-03-02 23:41:15 +01:00
Tomasz Drwięga
f4a71dc03c Merge branch 'tx_queue' into tx_queue_integration 2016-03-02 21:27:08 +01:00
Tomasz Drwięga
fc9999fb05 Changing uint to numbers 2016-03-02 21:26:48 +01:00
Tomasz Drwięga
82866fcab5 Merge branch 'master' into tx_queue 2016-03-02 21:14:11 +01:00
Gav Wood
039c0056bc Uncle inclusion in block authoring. Still need tests. 2016-03-02 19:38:00 +01: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
877270c35f Fixes. 2016-03-02 18:32:54 +01:00
Gav Wood
42df98450c Include uncles in exclused. 2016-03-02 18:05:47 +01:00
Gav Wood
671965d44f Test for ancestry. 2016-03-02 17:31:42 +01:00
Gav Wood
c75737bcf0 Add ancestry iterator. 2016-03-02 17:04:44 +01:00
Nikolay Volf
c4333461bb Merge pull request #571 from ethcore/journaldb
Improved journaldb logging
2016-03-02 18:07:01 +03:00
Gav Wood
f1cd0299cc Merge pull request #570 from ethcore/ancientenactcheck
Additional check to ancient enactments.
2016-03-02 15:44:43 +01:00
Gav Wood
3c7814c8ac Remove debug line. 2016-03-02 15:43:48 +01:00
Nikolay Volf
028434f93d Merge branch 'master' into issue-test/568
Conflicts:
	ethcore/src/tests/client.rs
2016-03-02 17:15:09 +03:00
Nikolay Volf
02aad03f92 helpers 2016-03-02 17:06:53 +03:00
debris
e66dbac11b Merge branch 'master' into rpc_serde_generator 2016-03-02 14:17:34 +01:00
debris
b1a62575c9 fixed PollFilter::PendingTransaction returning empty hash 2016-03-02 14:09:44 +01:00
debris
190468e1f8 fixed trailing , 2016-03-02 14:03:43 +01:00
debris
03ffcd0e64 Merge branch 'master' into rpc_poll_ids 2016-03-02 13:59:03 +01:00
Gav Wood
f5de0187e7 Merge remote-tracking branch 'origin/master' into clippy_warnings 2016-03-02 13:40:35 +01:00