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 |
|
Gav Wood
|
1ae573bf21
|
Fix install-deps.sh.
|
2016-03-02 13:40:11 +01:00 |
|
Gav Wood
|
47b4729332
|
Fix check.
|
2016-03-02 13:28:51 +01:00 |
|
Gav Wood
|
4fd926bfd6
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-03-02 13:27:45 +01:00 |
|
arkpar
|
041cfda80b
|
Improved journaldb logging
|
2016-03-02 13:21:33 +01:00 |
|
Gav Wood
|
3b3399ccc3
|
Merge pull request #564 from ethcore/inclusive_bloom_ranges
chainfilter shouldnt exclude to_block from results
|
2016-03-02 13:05:45 +01:00 |
|
Gav Wood
|
13deb4f048
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-03-02 13:01:48 +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 |
|
Gav Wood
|
3309959139
|
Additional check to ancient enactments.
|
2016-03-02 12:57:34 +01:00 |
|
debris
|
bdf3b197ad
|
limit serde codegen only to rpc types submodule
|
2016-03-02 12:42:08 +01:00 |
|
debris
|
28c5f6f9c3
|
fixed failing test
|
2016-03-02 12:32:30 +01:00 |
|
Marek Kotewicz
|
c9bb7ea0f4
|
Merge pull request #565 from ethcore/uint-warnings
fix uint warnings
|
2016-03-02 12:32:01 +01:00 |
|
debris
|
5a7dfa4df2
|
Merge branch 'master' into rpc_poll_ids
|
2016-03-02 12:27:38 +01:00 |
|
Marek Kotewicz
|
c46126806e
|
Merge pull request #562 from ethcore/chain_generator
Finished blockchain generator.
|
2016-03-02 12:17: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
|
6b9fde5790
|
Merge branch 'master' into mining
|
2016-03-02 08:54:21 +03:00 |
|
Nikolay Volf
|
34b812696b
|
remove unused imports
|
2016-03-02 08:49:48 +03:00 |
|
debris
|
a0acfd5113
|
Merge branch 'master' into rpc_poll_ids
|
2016-03-02 06:12:06 +01:00 |
|
debris
|
feff1f9e6e
|
chainfilter shouldnt exclude to_block from results
|
2016-03-02 06:09:27 +01:00 |
|
debris
|
4f891973aa
|
Merge branch 'master' into chain_generator
|
2016-03-02 06:03:57 +01:00 |
|
Marek Kotewicz
|
cda48e3ce8
|
Merge pull request #563 from ethcore/fixed_broken_master
fixed broken master
|
2016-03-02 06:01:52 +01:00 |
|
debris
|
67a1f2065e
|
fixed broken master
|
2016-03-02 06:01:31 +01:00 |
|
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 |
|