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 |
|
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
|
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 |
|
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
|
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
|
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 |
|
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
|
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 |
|