keorn
|
9ecb07434f
|
fix informant
|
2016-12-08 21:13:32 +01:00 |
|
keorn
|
aa9caac750
|
revert cli default
|
2016-12-07 15:36:20 +01:00 |
|
keorn
|
e9743a3a75
|
Merge branch 'master' into auth-bft
|
2016-12-07 14:50:17 +01:00 |
|
keorn
|
5c333fce31
|
Merge branch 'engine-password' into auth-bft
|
2016-12-07 10:35:52 +01:00 |
|
keorn
|
71a96588b0
|
add the methods to engines
|
2016-12-07 10:34:06 +01:00 |
|
Robert Habermeier
|
398b94e6e2
|
Merge branch 'master' into opt-in-verifier-scaling
|
2016-12-06 15:37:10 +01:00 |
|
keorn
|
8f641e67f3
|
Merge branch 'engine-password' into auth-bft
|
2016-12-06 13:13:02 +00:00 |
|
keorn
|
b089aa7a6b
|
fix password loading
|
2016-12-06 08:38:41 +00:00 |
|
keorn
|
0a2ec319ac
|
rename to engine_signer
|
2016-12-05 21:31:38 +00:00 |
|
keorn
|
5e7c21ad4a
|
add a cli flag
|
2016-12-05 19:23:03 +00:00 |
|
keorn
|
81a756394a
|
Merge branch 'master' into engine-password
|
2016-12-05 17:08:57 +00:00 |
|
keorn
|
529a7fc33c
|
add password and AccountProvider
|
2016-12-05 17:08:16 +00:00 |
|
keorn
|
6fc943ca6d
|
Merge branch 'master' into auth-bft
|
2016-12-05 16:37:35 +00:00 |
|
Gav Wood
|
43ec3d8f79
|
network_id -> u64
|
2016-12-05 06:54:31 -08:00 |
|
Robert Habermeier
|
767d486014
|
fix config test
|
2016-12-05 14:12:40 +01:00 |
|
keorn
|
c946ffebf3
|
Merge branch 'master' into auth-bft
|
2016-12-05 11:30:11 +00:00 |
|
Gav Wood
|
2911c549e3
|
Encode networkid as a u64.
|
2016-12-04 10:48:26 -08:00 |
|
Robert Habermeier
|
80f98bc8b7
|
fix tests
|
2016-12-02 18:52:02 +01:00 |
|
Robert Habermeier
|
cd5b6fdf59
|
queue: CLI for auto-scaling and num verifiers
|
2016-12-02 18:21:54 +01:00 |
|
Gav Wood
|
1dd13372b6
|
Merge remote-tracking branch 'origin/master' into rpc-middleware
|
2016-12-01 19:43:31 -08:00 |
|
keorn
|
155da50fcd
|
Merge branch 'master' into auth-bft
|
2016-11-30 13:06:21 +00:00 |
|
keorn
|
4ef5badcea
|
fix parity tests merge
|
2016-11-30 12:58:45 +00: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
|
c97c59f62f
|
returning errors with extra fields in config file (#3663)
|
2016-11-29 13:23:28 +01:00 |
|
Tomasz Drwięga
|
2b3d100de2
|
Fixing some clippy warnings
|
2016-11-28 15:54:22 +01:00 |
|
arkpar
|
dfd17949ef
|
Added a test
|
2016-11-28 12:08:12 +01:00 |
|
keorn
|
5c0e89ae9a
|
Merge branch 'master' into auth-bft
|
2016-11-28 09:50:22 +00:00 |
|
arkpar
|
fa45413a90
|
Extened API
|
2016-11-28 01:37:25 +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
|
e91f7977fb
|
Storage export
|
2016-11-28 01:37:24 +01:00 |
|
arkpar
|
b0555fbe7c
|
State export
|
2016-11-28 01:37:24 +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 |
|
arkpar
|
ffa123c949
|
Set default tx price to 0.0025 USD
|
2016-11-25 15:13:51 +01:00 |
|
Tomasz Drwięga
|
9b9bdaa1b1
|
Appending logs by default (#3609)
|
2016-11-25 13:04:02 +01:00 |
|
keorn
|
a143da2cb8
|
fix complete build
|
2016-11-25 11:36:25 +00:00 |
|
keorn
|
1692c07ba6
|
Merge branch 'master' into auth-bft
|
2016-11-25 10:51:06 +00:00 |
|
Tomasz Drwięga
|
cd6f565f69
|
RPC Middleware & Get/Set dapp-specific accounts
|
2016-11-23 16:27:05 +01:00 |
|
arkpar
|
7da8f019d5
|
--no-ancient-blocks
|
2016-11-22 18:15:55 +01:00 |
|
keorn
|
340d377930
|
Revert "dont keep account provider in miner"
This reverts commit 11ccacd6d0.
|
2016-11-22 16:05:27 +00:00 |
|
Gav Wood
|
4c83eff912
|
Merge pull request #3552 from ethcore/import-msg
Import account message
|
2016-11-22 00:03:36 +01:00 |
|
arkpar
|
efdf017c43
|
Import account message
|
2016-11-21 15:03:20 +01:00 |
|
arkpar
|
8bb8ecac2d
|
--testnet set to ropset
|
2016-11-21 14:39:26 +01:00 |
|
keorn
|
6e0bd4072b
|
Merge branch 'master' into auth-bft
|
2016-11-21 12:17:00 +00:00 |
|
Tomasz Drwięga
|
94328e9784
|
Fixing main
|
2016-11-20 22:40:23 +01:00 |
|
Arkadiy Paronyan
|
efd1d9bd0e
|
Ropsten network (#3539)
* Ropsten network
* Sorted premine
* Comas
* Removed trailing coma
|
2016-11-20 16:38:45 +01:00 |
|
keorn
|
9d61071dd7
|
Merge branch 'miner-no-ap' into auth-bft
|
2016-11-17 22:04:07 +00:00 |
|