7c42241466
remove merge code
2016-12-08 22:00:26 +01:00
74770e4773
better docstrings
2016-12-08 21:49:55 +01:00
cc284dd86f
Merge branch 'master' into auth-bft
2016-12-08 21:35:08 +01:00
79ef64349c
remove assert
2016-12-08 21:27:49 +01:00
9ecb07434f
fix informant
2016-12-08 21:13:32 +01:00
2d6656fc43
Merge pull request #3725 from ethcore/engine-password
...
Make engine hold AccountProvider
2016-12-08 20:52:12 +01:00
dca752e9bb
docs, tweaks
2016-12-08 20:09:30 +01:00
3ebfa1481d
better proposal block handling
2016-12-08 12:03:34 +01:00
7c054d2da0
Remove unneeded block scope
2016-12-07 17:07:28 +01:00
46840d36c9
Add parity_removeAddress RPC
2016-12-07 16:53:46 +01:00
347634ac6c
dont rebroadcast propose
2016-12-07 16:42:58 +01:00
b73689f041
Merge branch 'engine-password' into auth-bft
2016-12-07 15:17:49 +01:00
727ace0561
add test
2016-12-07 15:14:21 +01:00
e9743a3a75
Merge branch 'master' into auth-bft
2016-12-07 14:50:17 +01:00
4361cb53e7
Merge branch 'engine-password' into auth-bft
2016-12-07 14:49:42 +01:00
5faa4a85cb
remove dummy type
2016-12-07 14:49:07 +01:00
6440ca2f68
move stuff around
2016-12-07 14:39:37 +01:00
1f0a02b638
Merge pull request #3633 from ethcore/fix-tx-rpc
...
Fix up the transaction JSON serialisation for RPC.
2016-12-07 14:34:51 +01:00
89726356a3
Merge pull request #3709 from ethcore/opt-in-verifier-scaling
...
queue: CLI for auto-scaling and num verifiers
2016-12-07 13:40:42 +01:00
c582540746
Merge branch 'engine-password' into auth-bft
2016-12-07 11:41:38 +01:00
3ae09de019
restore is_new_best
2016-12-07 11:40:46 +01:00
a296c5e226
test client message handling
2016-12-07 11:38:09 +01:00
da030fed51
Merge branch 'master' into auth-bft
2016-12-07 10:41:07 +01:00
5c333fce31
Merge branch 'engine-password' into auth-bft
2016-12-07 10:35:52 +01:00
71a96588b0
add the methods to engines
2016-12-07 10:34:06 +01:00
d9eb5e7f1d
remove uncles
2016-12-07 09:32:36 +01:00
085b8ad553
Merge pull request #3527 from ethcore/client-provider
...
LES Part 2
2016-12-07 09:31:50 +01:00
398b94e6e2
Merge branch 'master' into opt-in-verifier-scaling
2016-12-06 15:37:10 +01:00
8f641e67f3
Merge branch 'engine-password' into auth-bft
2016-12-06 13:13:02 +00:00
0a2ec319ac
rename to engine_signer
2016-12-05 21:31:38 +00:00
92d566c900
Merge branch 'master' into engine-password
2016-12-05 19:30:08 +00:00
ff7b918d82
Fix build.
2016-12-05 10:55:53 -08:00
5e1fdc4b11
Merge remote-tracking branch 'origin/master' into fix-tx-rpc
2016-12-05 10:44:19 -08:00
ad36743122
Merge pull request #3719 from ethcore/engine-block-ordering
...
Engine block ordering
2016-12-05 10:37:36 -08:00
01bf483b63
remove unnecessary impls
2016-12-05 17:29:47 +00:00
1b6ebe1a6d
possible fix for queue drop deadlock ( #3702 )
...
* possible fix for #3686
* queue: simplify conclusion, don't block on joining
* queue: park verifiers with timeout to prevent race
* more robust verification loop
* queue: re-introduce wait for verifier joining
2016-12-05 18:18:56 +01:00
81a756394a
Merge branch 'master' into engine-password
2016-12-05 17:08:57 +00:00
529a7fc33c
add password and AccountProvider
2016-12-05 17:08:16 +00:00
6fc943ca6d
Merge branch 'master' into auth-bft
2016-12-05 16:37:35 +00:00
4f857642b5
rename set_sealer
2016-12-05 16:28:56 +00:00
a726472023
Merge pull request #3713 from ethcore/fix-v-u64
...
Encode networkid as a u64.
2016-12-05 17:14:07 +01:00
a6c2408562
IPC codegen in ethcore-light; remove network dependency
2016-12-05 16:56:21 +01:00
61c3358447
move light to its own crate again
2016-12-05 16:55:33 +01:00
53b479fb7a
pass engine to snapshot service
2016-12-05 15:43:46 +00:00
94302f3f61
throw out difficulty checks
2016-12-05 15:27:44 +00:00
c61a0e97b3
make engine determine block order
2016-12-05 15:20:32 +00:00
c39d504167
Merge branch 'spec-rlp-loading' into auth-bft
2016-12-05 14:11:06 +00:00
22632e6324
make generic seal take valid rlp
2016-12-05 14:07:31 +00:00
b30c1d5602
fix tests
2016-12-05 13:24:22 +00:00
c946ffebf3
Merge branch 'master' into auth-bft
2016-12-05 11:30:11 +00:00
keorn
Gav Wood
Jaco Greeff
Robert Habermeier