Commit Graph

10619 Commits

Author SHA1 Message Date
debris
32074cc420 fixed compilation issue caused by incorrect merge 2016-03-02 05:55:42 +01:00
debris
05897ddbb0 fixed pending transaction mock implementation 2016-03-02 05:50:28 +01:00
debris
5f97d51967 renamed poll_indexed to poll_manager 2016-03-02 05:46:38 +01:00
debris
3b4d4a9b63 Merge branch 'master' into rpc_poll_ids 2016-03-02 05:15:21 +01:00
debris
4571df9fc6 Merge branch 'master' of github.com:ethcore/parity into chain_generator 2016-03-02 04:54:55 +01:00
debris
010659cf12 added missing , in comment 2016-03-02 04:54:47 +01:00
debris
68ba016279 improved blockchain generator 2016-03-02 04:25:03 +01:00
arkpar
324e070581 Reverted some changes 2016-03-02 01:24:06 +01:00
arkpar
15ecba57ec Merge branch 'master' of github.com:ethcore/parity into thread 2016-03-02 01:20:41 +01: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
3ac14a6d89 Merge pull request #554 from ethcore/chain_generator
improved test chain generator
2016-03-02 00:58:52 +01:00
Gav Wood
1ad1836bd3 Merge pull request #558 from ethcore/chain_rename
Fixing spelling in propagade->propagate
2016-03-02 00:57:36 +01:00
Gav Wood
173d383f9f Merge pull request #557 from ethcore/transaction_cell
Changing RefCell to Cell in transaction.
2016-03-02 00:57:00 +01:00
Gav Wood
30c6820437 Refactor and cleanup. 2016-03-02 00:52:18 +01:00
Gav Wood
929f44fe4f Tests for Client sealing. 2016-03-02 00:34:38 +01:00
Tomasz Drwięga
c889d9b3eb Exposing transaction queue pending in RPC 2016-03-01 23:06:51 +01:00
Tomasz Drwięga
c6934431d1 Adding test for sync.chain_new_blocks. 2016-03-01 22:52:28 +01:00
Tomasz Drwięga
7565625ce0 Integrating TransactionQueue with client 2016-03-01 22:30:23 +01:00
Tomasz Drwięga
083747dc67 Lowering complexity of request_blocks 2016-03-01 22:05:54 +01:00
Tomasz Drwięga
30e7ac8d6d Fixing trivial warnings 2016-03-01 22:05:50 +01:00
Tomasz Drwięga
725e894f9b TransactionsQueue implementation 2016-03-01 21:48:58 +01:00
Tomasz Drwięga
8c9c701de5 Fixing spelling in propagade->propagate 2016-03-01 21:34:57 +01:00
Tomusdrw
aab274d3ef Changing RefCell to Cell in transaction. Implementing Copy on Uints. 2016-03-01 21:29:22 +01:00
Gav Wood
046b8e4704 Merge branch 'master' into mining 2016-03-01 20:16:27 +01:00
Gav Wood
a21fda23a6 Enable transition test. 2016-03-01 20:14:28 +01:00
Gav Wood
628a53ccec Update tests. Fix our tests. 2016-03-01 20:02:59 +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
Nikolay Volf
7c3d7fc460 Merge pull request #556 from ethcore/mordenfix
Fix for morden consensus.
2016-03-01 21:28:29 +03:00
Gav Wood
f2eae8bc50 Merge branch 'master' into mining 2016-03-01 18:46:02 +01:00
Gav Wood
61420d3c9c Fix for morden consensus. 2016-03-01 18:17:59 +01:00
Gav Wood
afc0605080 Refactor engine to make it clear that we're actually checking the seal. 2016-03-01 17:23:44 +01:00
Gav Wood
f705f6957a Merge branch 'master' into mining 2016-03-01 16:59:39 +01:00
Gav Wood
a5c65b2a3d Reduce spam. 2016-03-01 16:59:01 +01:00
Gav Wood
48df869202 --author and --extra-data options. Fixed null parent-hash. 2016-03-01 16:58:14 +01:00
debris
38d74bf78c Merge branch 'master' of github.com:ethcore/parity into chain_generator 2016-03-01 16:22:51 +01:00
debris
3e2366b38b improved chain generator 2016-03-01 16:22:06 +01:00
Marek Kotewicz
bbe2e8076b Merge pull request #550 from ethcore/chain_generator
blockchain generator
2016-03-01 16:21:27 +01:00
debris
47688e49cd removed redundant whitespaces 2016-03-01 13:54:14 +01:00
debris
063020f507 added license headers 2016-03-01 13:46:33 +01:00
debris
ab9fddf6b2 blockchain generator 2016-03-01 13:44:09 +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
Nikolay Volf
f9422ea687 Merge pull request #548 from guanqun/patch-1
[ci skip] fixup install script
2016-03-01 11:16:43 +03:00
Lu Guanqun
c45d3560b8 fixup install script
It's renamed in upstream.

ae8e470ca6
2016-03-01 10:09:22 +08:00
Gav Wood
1eca9acffb Fix is_mining. 2016-03-01 02:33:41 +01:00
Gav Wood
e366846ecf Merge pull request #546 from ethcore/clippy_warnings
Fixing clippy warnings
2016-03-01 01:52:59 +01:00
Gav Wood
5ccb172e73 Hashrate now reported correctly. 2016-03-01 01:52:22 +01:00
Gav Wood
2266d74c2a Fix JSONRPC I/O. 2016-03-01 01:15:00 +01:00
Tomasz Drwięga
816e549d4c Changing implementation of is_empty to something more efficient 2016-03-01 00:40:55 +01:00
Gav Wood
2276445790 Merge pull request #543 from wlk/ignore-out-directory
ignore out directory
2016-03-01 00:11:37 +01:00