Gav Wood
c2b6be95c8
Fetch and place in updates path.
2016-12-09 19:02:42 +01:00
Gav Wood
8903384840
Merge branch 'master' into check-updates
2016-12-07 19:19:44 +01:00
Jaco Greeff
7c054d2da0
Remove unneeded block scope
2016-12-07 17:07:28 +01:00
Jaco Greeff
46840d36c9
Add parity_removeAddress RPC
2016-12-07 16:53:46 +01:00
Gav Wood
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
Robert Habermeier
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
Robert Habermeier
085b8ad553
Merge pull request #3527 from ethcore/client-provider
...
LES Part 2
2016-12-07 09:31:50 +01:00
Robert Habermeier
398b94e6e2
Merge branch 'master' into opt-in-verifier-scaling
2016-12-06 15:37:10 +01:00
Gav Wood
ff7b918d82
Fix build.
2016-12-05 10:55:53 -08:00
Gav Wood
5e1fdc4b11
Merge remote-tracking branch 'origin/master' into fix-tx-rpc
2016-12-05 10:44:19 -08:00
Gav Wood
ad36743122
Merge pull request #3719 from ethcore/engine-block-ordering
...
Engine block ordering
2016-12-05 10:37:36 -08:00
Robert Habermeier
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
Robert Habermeier
a726472023
Merge pull request #3713 from ethcore/fix-v-u64
...
Encode networkid as a u64.
2016-12-05 17:14:07 +01:00
Robert Habermeier
5db93cd433
light: fix compile errors
2016-12-05 17:09:05 +01:00
Robert Habermeier
a6c2408562
IPC codegen in ethcore-light; remove network dependency
2016-12-05 16:56:21 +01:00
Robert Habermeier
61c3358447
move light to its own crate again
2016-12-05 16:55:33 +01:00
keorn
53b479fb7a
pass engine to snapshot service
2016-12-05 15:43:46 +00:00
keorn
94302f3f61
throw out difficulty checks
2016-12-05 15:27:44 +00:00
keorn
c61a0e97b3
make engine determine block order
2016-12-05 15:20:32 +00:00
Gav Wood
afe4cc6a05
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-05 07:09:42 -08:00
Gav Wood
459babb1a8
Logging.
2016-12-05 06:39:56 -08:00
keorn
22632e6324
make generic seal take valid rlp
2016-12-05 14:07:31 +00:00
Gav Wood
9d79cac36b
Cleanups.
2016-12-04 11:56:12 -08:00
Gav Wood
2911c549e3
Encode networkid as a u64.
2016-12-04 10:48:26 -08:00
Gav Wood
356aca2db5
Fix build.
2016-12-04 09:13:23 -08:00
Gav Wood
90a20a217f
Merge branch 'master' into check-updates
2016-12-04 09:01:50 -08:00
Gav Wood
0c7b7fc8bc
Merge pull request #3627 from ethcore/rpc-middleware
...
Dapps-specific accounts
2016-12-04 08:46:05 -08:00
Robert Habermeier
cd5b6fdf59
queue: CLI for auto-scaling and num verifiers
2016-12-02 18:21:54 +01:00
Robert Habermeier
6e1a1f9dec
Merge branch 'master' into client-provider
2016-12-02 10:06:09 +01:00
Robert Habermeier
3837114eb2
Merge pull request #3431 from ethcore/state-tests-indentation
...
indent state tests
2016-12-02 09:09:35 +01:00
Gav Wood
1dd13372b6
Merge remote-tracking branch 'origin/master' into rpc-middleware
2016-12-01 19:43:31 -08:00
Gav Wood
d3e684698a
Merge remote-tracking branch 'origin/master' into fix-tx-rpc
2016-11-30 17:15:05 -08:00
Tomasz Drwięga
8e2aca719f
Shared hash-fetch
2016-11-30 10:16:18 +01:00
Gav Wood
d525a6d7f0
Merge pull request #3654 from ethcore/clippy-bump
...
Bumping clippy
2016-11-29 18:00:13 +01:00
Gav Wood
9115214cea
Merge pull request #3636 from ethcore/fatdb
...
Return of the Fat DB
2016-11-29 16:47:09 +01:00
Tomasz Drwięga
762d8b89d6
Removing unused imports
2016-11-29 14:03:21 +01:00
Igor Artamonov
8ec8bcd626
fix after code review, rel [ 748260b]
2016-11-29 17:18:33 +06:00
Tomasz Drwięga
64b1b898f1
Fixing compilation on stable
2016-11-28 17:43:38 +01:00
Tomasz Drwięga
2b3d100de2
Fixing some clippy warnings
2016-11-28 15:54:22 +01:00
Igor Artamonov
748260bebe
invalidate blocks from future
2016-11-28 20:14:43 +06:00
Tomasz Drwięga
e1e7886918
Bumping clippy
2016-11-28 12:23:06 +01:00
arkpar
c7b359fcee
Style
2016-11-28 01:37:25 +01:00
arkpar
d0c80a6903
Updated tests
2016-11-28 01:37:25 +01:00
arkpar
3aceac60de
Use sha3 for fat key
2016-11-28 01:37:24 +01:00
arkpar
b0555fbe7c
State export
2016-11-28 01:37:24 +01:00
Gav Wood
ce3f4911a2
Merge remote-tracking branch 'origin/master' into check-updates
2016-11-27 15:01:17 +01:00
Gav Wood
0cf8db58b8
Fix tests.
2016-11-27 14:49:30 +01:00
Gav Wood
3b6d886860
Fix up the transaction JSON serialisation for RPC.
2016-11-27 14:11:37 +01:00
Tomasz Drwięga
3b595a01ad
Merge branch 'master' into rpc-middleware
2016-11-25 21:46:35 +01:00
Tomasz Drwięga
a9028ca986
Merge branch 'master' into rpc-middleware
...
Conflicts:
Cargo.lock
rpc/src/v1/tests/mocked/parity_accounts.rs
2016-11-25 21:18:02 +01:00
