Gav Wood
|
0e17cf8d3a
|
Fix tests.
|
2016-12-11 15:41:49 +01:00 |
Igor Artamonov
|
aed633d7df
|
Testnet for Ethereum Classic
|
2016-12-11 19:25:02 +06:00 |
arkpar
|
a49ff3fb32
|
Merge branch 'master' of github.com:ethcore/parity into cli-rpc
|
2016-12-11 13:30:48 +01:00 |
|
Gav Wood
|
8d7a63bbea
|
Join up the final dots.
|
2016-12-11 13:10:33 +01:00 |
|
arkpar
|
a56443aa6c
|
Tolerate error is user_defaults
|
2016-12-11 13:00:49 +01:00 |
|
arkpar
|
c777362d02
|
Sync channel for consensus test
|
2016-12-11 12:32:01 +01:00 |
|
Gav Wood
|
d9f6ea56ef
|
Don't restart if we're not in the cradle.
|
2016-12-11 04:05:02 +01:00 |
|
Gav Wood
|
2865cbaf70
|
Use file contents instead of symlink.
|
2016-12-11 03:33:10 +01:00 |
|
Gav Wood
|
7a1539cfb5
|
Fix deadlock.
|
2016-12-11 02:39:56 +01:00 |
|
Gav Wood
|
0302d582d2
|
Fix build.
|
2016-12-11 02:02:40 +01:00 |
|
Gav Wood
|
fa30dfd4b9
|
Refactor into system service, add exe redirect.
|
2016-12-10 23:58:39 +01:00 |
keorn
|
f3af0f46be
|
Merge branch 'master' into auth-bft
|
2016-12-10 18:14:35 +01:00 |
|
Gav Wood
|
316c25d9f8
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-10 14:08:41 +01:00 |
|
Gav Wood
|
82efa2675e
|
Merge remote-tracking branch 'origin/master' into consistent-id
|
2016-12-10 13:36:30 +01:00 |
|
keorn
|
e5f8044cad
|
Merge branch 'master' into auth-bft
|
2016-12-10 11:01:23 +01:00 |
|
Gav Wood
|
5f1fcf95e0
|
Make *ID names consistent with std Rust (Id)
|
2016-12-09 23:01:43 +01:00 |
Kristoffer Ström
|
0e516162c3
|
Rebased on master
|
2016-12-09 22:27:32 +01:00 |
|
Kristoffer Ström
|
7a176094d5
|
* Use try!/map_err instead of match
* Use jsonrpc_core for serializing/deserializing rpc messages
* Factor out unwraps
* Remove mem::replace
* Add nicer formating of ConfirmationRequests
|
2016-12-09 22:26:07 +01:00 |
|
Kristoffer Ström
|
273d7c00c3
|
Pass cli tests, remove compiler warnings
|
2016-12-09 22:26:07 +01:00 |
|
Kristoffer Ström
|
4e3f8bab10
|
Add Ws Json rpc client and command line utils
|
2016-12-09 22:26:05 +01:00 |
|
Gav Wood
|
46af3d18da
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-09 20:45:15 +01:00 |
|
Gav Wood
|
c2b6be95c8
|
Fetch and place in updates path.
|
2016-12-09 19:02:42 +01:00 |
|
keorn
|
fb71caffbd
|
remove double registration
|
2016-12-09 11:05:44 +01:00 |
Robert Habermeier
|
eec1929658
|
Merge branch 'master' into lightserv
|
2016-12-09 01:29:46 +01:00 |
|
Robert Habermeier
|
6f5f1f5e26
|
light: integrate with sync + serve_light CLI
|
2016-12-08 23:21:47 +01:00 |
|
keorn
|
9ecb07434f
|
fix informant
|
2016-12-08 21:13:32 +01:00 |
|
Gav Wood
|
2d6656fc43
|
Merge pull request #3725 from ethcore/engine-password
Make engine hold AccountProvider
|
2016-12-08 20:52:12 +01:00 |
|
Gav Wood
|
8903384840
|
Merge branch 'master' into check-updates
|
2016-12-07 19:19:44 +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 |
|
Gav Wood
|
b8c492644b
|
Fix more build.
|
2016-12-04 10:47:05 -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 |
|
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 |
|
Gav Wood
|
ce3f4911a2
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-11-27 15:01:17 +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 |
|
Gav Wood
|
735df6c30f
|
More work.
|
2016-11-24 17:19:48 +01:00 |
|
Gav Wood
|
03ef95ba50
|
Compiles.
|
2016-11-23 20:35:21 +01:00 |
|
Gav Wood
|
5d62cfdf6f
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-11-23 18:15:21 +01:00 |
|
Gav Wood
|
9d3b2352cc
|
More work.
|
2016-11-23 16:29:15 +01: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
|
bf9ed2d444
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-11-22 10:25:34 +01:00 |
|
Gav Wood
|
45dead9d49
|
Naming consistency and make Updater improvements.
- ID -> Id (consistency with rust libs)
|
2016-11-22 10:24:22 +01: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 |
|
keorn
|
11ccacd6d0
|
dont keep account provider in miner
|
2016-11-17 18:32:12 +00:00 |
|
keorn
|
6cb892f605
|
Merge remote-tracking branch 'parity/master' into bft
|
2016-11-17 12:19:30 +00:00 |
|
Gav Wood
|
25950345db
|
Merge pull request #3379 from ethcore/new-token
Signer new-token generates a link and opens browser
|
2016-11-16 23:48:21 +08:00 |
|
keorn
|
8ac989cbeb
|
Merge remote-tracking branch 'parity/master' into bft
|
2016-11-16 10:29:54 +00:00 |
|
Tomasz Drwięga
|
29271383dd
|
signer new-token doesn't open the browser
|
2016-11-16 09:38:09 +01:00 |
|
Gav Wood
|
8ad2526826
|
Merge pull request #3460 from ethcore/drop-spec
drop spec when no longer useful
|
2016-11-16 11:20:13 +08:00 |
|
Robert Habermeier
|
8c8bf30de5
|
drop spec when no longer useful
|
2016-11-15 19:07:23 +01:00 |
|
keorn
|
d19e8c5505
|
Merge remote-tracking branch 'parity/master' into bft
|
2016-11-15 10:26:37 +00:00 |
|
Tomasz Drwięga
|
6ea4b25859
|
Create directories only if feature is enabled
|
2016-11-15 10:28:52 +01:00 |
|
Tomasz Drwięga
|
7f011afacb
|
Tokens retention policy
|
2016-11-14 12:17:05 +01:00 |
|
keorn
|
d8e6dbd981
|
Merge branch 'master' into dev-chain
|
2016-11-14 10:05:34 +00:00 |
|
keorn
|
2d4b4cf5c9
|
revert moves to Spec
|
2016-11-14 10:04:34 +00:00 |
Jaco Greeff
|
373eb6c01b
|
Merge branch 'master' into new-token
|
2016-11-12 16:25:21 +01:00 |