Commit Graph

721 Commits

Author SHA1 Message Date
keorn
c946ffebf3 Merge branch 'master' into auth-bft 2016-12-05 11:30:11 +00: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
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
Tomasz Drwięga
c17ef2c1a4 Fixing parsing passwords from file (#3367)
* fixing parsing passwords as inputs

* Fixing typo in test
2016-11-12 10:06:40 +01:00
keorn
15d748c2f7 Merge branch 'master' into dev-chain 2016-11-11 20:40:05 +00:00
keorn
4a65394269 change instant spec, update doc 2016-11-11 18:38:44 +00:00
keorn
53258cca6c add new dev spec 2016-11-11 17:27:20 +00:00
keorn
225d0b02e7 update parity module 2016-11-11 17:10:47 +00:00