grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,320 Commits 1 Branch 329 Tags 59 MiB
986f485b3e
Commit Graph

357 Commits

Author SHA1 Message Date
Tomasz Drwięga
5369a129ae Signer provenance (#4477) 
* Signer - Tracking Request Provenance

* Basic UI

* Changing messages

* VecDeque::from

* Fix dapps tests

* Addressing UI grumbles
 2017-02-14 22:45:43 +01:00
maciejhirsz
3c634701dd Squashed 2017-02-14 19:30:37 +01:00
Tomasz Drwięga
f1e99ea2e4 Serde 0.9 (#4508) 
* Porting json

* Dapps

* Rpc & Ethstore

* New ethabi

* Last bunch of fixes

* Fixing last test

* Removing build script

* Adding ethcore-ipc-tests back

* Fixing grumbles

* Fixing blockchain tests (inference regression?)
 2017-02-13 18:38:47 +03:00
Nikolay Volf
1acc8031ce Stratum up (#4233) 
* flush work

* flush work

* flush work

* flush work

* generalized notifiers

* general setup with modules

* general setup with modules

* all binded

* catch up with master

* all dependencies injected

* stratum another up

* tcp update

* submitwork routine

* finalize & fix warnings

* merge bugs, review fixes

* merge bugs, review fixes

* new cli mess cleanup

* usage.txt swap

* flush work

* cli adopt

* compilation with new cli sorted

* subid space in json

* serialization issues

* grumbles addressed

* more grumbles

* remove last_work note for now

* fix compilation

* fix tests

* merge bugs

* no obliged ipc

* moving notifiers

* no optional feature now

* refactored again

* working on tests

* refactor to new tcp/ip

* stratum lib ok

* ethcore crate ok

* wip on tests

* final test working

* fix warnings, \n-terminated response

* new compatibility

* re-pushing work once anybody submitted

* various review and general fixes

* reviewe fixes

* remove redundant notifier

* one symbol -> huge bug

* ensure write lock isn't held when calling handlers

* extern declarations moved

* options to stratum mod, SocketAddr strongly-typed instantiation

* Minor style fix.

* Whitespace and phrasing

* Whitespace
 2017-01-25 11:03:36 +01:00
Arkadiy Paronyan
d608ad2011 jsonr rpc bump for IPC fix (#4200) 2017-01-18 12:54:35 +01:00
Tomasz Drwięga
41da1a0a79 New jsonrpc-core with futures and metadata support (#3859) 
* Bumping serde & serde_json

* Super-initial usage of new jsonrpc

* Single event loop for jsonrpc

* Metadata

* Supporting metadata extraction for eth_accounts

* Fixing Cargo.lock

* Removing uneccessary clones

* Fixing unused import

* Unused import

* Fixing test
 2017-01-11 20:02:27 +01:00
Arkadiy Paronyan
148ea37687 v1.6 in master (#4113) 2017-01-10 15:41:59 +01:00
Tomasz Drwięga
f0387c33c6 Global Fetch Service (#3915) 
* Dapps web

Conflicts:
	dapps/src/apps/fetcher.rs
	dapps/src/handlers/fetch.rs

* Rewriting fetch

* Parity-wide fetch service

* Obey the limits and support cancellation.

* Removing temporary files.

* Actually use Fetch for dapps

* Re-implementing file fetching to avoid temporary files.

* Serde to 0.8.19

* Fixing content & dapps fetch
 2016-12-22 18:26:39 +01:00
Gav Wood
b2b3a0eb34
Final fixups for updater 
- Wire up platforms to match those of CI.
- Introduce "final" feature to tag version with "nightly".
 2016-12-17 14:36:30 +01:00
Gav Wood
fa319ff64c
Remove duplicate line. 2016-12-15 18:24:18 +01:00
Gav Wood
c12702fc51
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 18:23:02 +01:00
Gav Wood
590428e7f2
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 15:12:09 +01:00
Gav Wood
0da564a4c2 Merge branch 'master' into cli-rpc 2016-12-15 14:45:15 +01:00
Tomasz Drwięga
1d80725f66 Merge branch 'master' into cli-rpc 2016-12-14 14:12:27 +01:00
arkpar
be5fefe772 Merge branch 'master' of github.com:ethcore/parity into new-dirs 2016-12-14 00:04:11 +01:00
arkpar
6e3e1ea88b XDG paths 2016-12-13 23:38:29 +01:00
Gav Wood
94f5501c61
authors & homepage => Parity 2016-12-11 19:43:58 +01:00
Gav Wood
10b0898bdf
Crate tidyups. 
- Move Updater into its own crate.
- Change ethcore -> parity in authors, homepages and licenses.
 2016-12-11 19:14:42 +01:00
Gav Wood
e09b1faf20
Fix semver version issues. 2016-12-11 17:13:26 +01:00
arkpar
a49ff3fb32 Merge branch 'master' of github.com:ethcore/parity into cli-rpc 2016-12-11 13:30:48 +01:00
Gav Wood
0302d582d2
Fix build. 2016-12-11 02:02:40 +01:00
Kristoffer Ström
0e516162c3 Rebased on master 2016-12-09 22:27:32 +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
Robert Habermeier
efd66f566d ethsync: optional ipc codegen 2016-12-08 19:52:48 +01:00
Arkadiy Paronyan
15ec63750e Enable Panic=abort (#3423) 
* Enable panic=abort

* Update remaining crate versions to 1.5

* Run tests in release mode

* Enable panic=abort for release profile only

* Added travis_wait

* Travis timeout set to 40
 2016-12-08 11:31:57 +01:00
Robert Habermeier
cdc758368a les: flesh out event handler 2016-12-07 13:52:45 +01:00
Robert Habermeier
b38d95328d light: conditional compilation 2016-12-07 10:50:24 +01:00
NikVolf
42fc770d30 use crates.io crate 2016-12-05 16:25:03 +03:00
Gav Wood
1dd13372b6
Merge remote-tracking branch 'origin/master' into rpc-middleware 2016-12-01 19:43:31 -08:00
Tomasz Drwięga
e1e7886918 Bumping clippy 2016-11-28 12:23:06 +01:00
Tomasz Drwięga
cd6f565f69 RPC Middleware & Get/Set dapp-specific accounts 2016-11-23 16:27:05 +01:00
Tomasz Drwięga
94328e9784 Fixing main 2016-11-20 22:40:23 +01:00
Arkadiy Paronyan
d37f4cc82f v1.5 (#3195) 2016-11-04 17:27:11 +01:00
Tomasz Drwięga
88997801d0 Clippy bump (#2877) 
* Bumping clippy

* Fixing warnings

* Fix the "fix"
 2016-10-27 08:28:12 +02:00
Arkadiy Paronyan
5b978be034 Get rid of MemoryDB denote (#2881) 2016-10-26 13:53:47 +02:00
Tomasz Drwięga
aca82fb84b Removing submodule in favour of rust crate (#2756) 
* Removing submodule

* Fixing UI dependency structure.

* Merging RS and JS package

* Updating release script to push also rs files

* fix merge gone wrong

* Fixing compilation
 2016-10-22 20:07:12 +02:00
Nikolay Volf
723eb164d1 disable ipc by default (#2657) 2016-10-18 14:03:36 +02:00
Nikolay Volf
0002bfadab accident repair 2016-10-04 19:22:26 +03:00
Nikolay Volf
2b147616fd derive -> ipc 2016-10-04 19:20:16 +03:00
Tomasz Drwięga
48bb890045 Better EVM informant & Slow transactions warning (#2436) 
* EVM informant. Slow transactions tracking

* Additional feature for tests
 2016-10-03 23:29:46 +02:00
Arkadiy Paronyan
80afb78c7f Disabling debug symbols due to rustc 1.12 memory usage 2016-10-02 09:40:54 +02:00
Marek Kotewicz
56eb97abbf user defaults (#2014) 
* user defaults

* finished user defaults

* user defaults are network-dependent

* added tests for newly added functions, logger is initialized first

* dir cleanup in progress

* user_file is placed next to snapshots
 2016-09-26 19:21:25 +02:00
Tomasz Drwięga
598e9cea85 Fixing jit feature compilation (#2310) 2016-09-26 18:38:54 +02:00
Tomusdrw
9bf29a555a Fixing evm-debug 2016-09-19 01:51:59 +02:00
Tomasz Drwięga
7f7e74869c Bump clippy & Fix warnings (#2109) 
* Bump clippy

* Fixing warnings
 2016-09-16 23:03:26 +02:00
Tomasz Drwięga
db59d9a4ae Merge branch 'master' into config-files 2016-09-12 00:57:25 +02:00
Tomasz Drwięga
62de1c3891 Config files WiP 2016-09-10 22:14:15 +02:00
debris
e9593e0abb ethkey-cli 2016-09-07 13:59:14 +02:00
arkpar
fca2b1a242 Forward ethstore-cli feature 2016-09-07 13:49:11 +02:00
Robert Habermeier
74ffcff99c port parity itself 2016-09-01 14:55:07 +02:00
Nikolay Volf
d631162440 Stratum IPC service (#1959) 
* boot binaries reorg & helpers

* stratum ipc service

* spaces in cli
 2016-08-24 18:35:38 +02:00
Tomasz Drwięga
f4826d1b2a Bump clippy (#1982) 2016-08-23 10:10:19 +02:00
Nipunn Koorapati
880b7b811e Upgrade hyper dependency to 0.9 (#1973) 2016-08-22 15:16:23 +02:00
Tomasz Drwięga
d996754927 Getting rid of syntex 2016-08-19 14:26:03 +02:00
Nikolay Volf
070a2157e6 Stratum protocol general (#1954) 
* stratum stub

* basic subscription

* workers, authorizations stubs

* push messages

* authorizing workers

* push tests (failing)

* traits.rs forgotten

* version bump

* parking lot rwlock

* trace for else

* various fixes

* fix last test

* bump version

* logger under test mod

* dependencies dependant

* extra line demolition
 2016-08-19 10:20:39 +02:00
Tomasz Drwięga
bcf6b0b7d8 Bump clippy, fix warnings (#1939) 
* Bumping clippy

* Fixing warnings
 2016-08-17 16:06:41 +02:00
Nikolay Volf
8710b4a3f4 ipc as a deault feature (#1927) 2016-08-17 15:52:57 +02:00
arkpar
69d1c1f237 v1.4.0 2016-08-09 11:40:57 +02:00
Arkadiy Paronyan
05bfdc508e Split IO and network crates (#1828) 
* Abort on panic

* Split IO and network crates

* Restore panic handler

* Fixed doc tests
 2016-08-05 10:32:04 +02:00
Tomasz Drwięga
deceb5fd56 Bumping clippy & fixing warnings (#1823) 
* Bumping clippy

* Fixing clippy warnings

* Cargo.lock (latest nightly?)
 2016-08-03 19:01:48 +02:00
Tomasz Drwięga
0c7ab34c32 Development mode for Signer UI (#1788) 
* Development mode for Signer

* CLI option for signer-dev

* Renaming CLI option

* Make obvious that CLI option is insecure.

[ci:skip]

* Additional warning over security
 2016-08-02 17:53:53 +01:00
Nikolay Volf
4e72608441 Fix ipc tests and bring to CI (#1789) 
* fixed compilation

* Fix warnings

* fix remaining tests

* add to ci and fix test.sh
 2016-08-01 06:32:07 -07:00
Tomasz Drwięga
171244a471 Splitting documentation into separate build job (#1752) 
* Splitting documentation into separate build job

* Updating rust to stable [ci skip]
 2016-07-28 20:27:10 +02:00
Nikolay Volf
f614a69929 moving to the single binary (#1710) 2016-07-26 00:21:08 +02:00
Nikolay Volf
8ab56ea3d1 IPC (feature-gated) (#1654) 
* moving ipc deriving to trait

* refactoring of the client

* all compiled

* proved all working

* warnings purged

* allow hypervisor to specify initialization payload in two ways

* using binary initialisation payload for sync

* some docs

* logger to separate crate

* log settings for sync bin

* forwarding logging arguments to the sync
 2016-07-20 18:13:56 +02:00
NikVolf
028d6f6853 Merge branch 'master' into sync-svc 2016-07-18 15:20:57 +02:00
Tomasz Drwięga
a2735308b9 Merge branch 'master' into new-ui 2016-07-17 17:41:58 +02:00
NikVolf
ac8db8f101 redundant crate 2016-07-16 16:00:14 +02:00
NikVolf
be25e930e5 Merge branch 'master' into sync-svc 2016-07-16 15:57:30 +02:00
NikVolf
fea05dc594 toml file fix 2016-07-16 15:55:07 +02:00
NikVolf
507a4ea26c basic layout of sync executable and minor fixes in the api 2016-07-15 15:32:29 +02:00
Tomasz Drwięga
3d35529016 Precompiled JS features 2016-07-15 10:34:33 +02:00
Gav Wood
d14b6871a5 Cleanup of colour code. Use is_a_tty. (#1621) 
* Cleanup of colour code. Use is_a_tty.

* Fix test build.

* Another fix.
 2016-07-15 10:11:14 +02:00
Tomasz Drwięga
e0f6709f05 Merge branch 'master' into noui 
Conflicts:
	Cargo.toml
 2016-07-13 11:48:04 +02:00
Tomasz Drwięga
29076da4b7 UI feature 2016-07-13 11:10:43 +02:00
Gav Wood
3abe3e1fbc Fix logging (#1590) 
* Strip colour for everywhere except the terminal.

* Log to file.

Fixes #1560.

* Fix indentation.

[ci:skip]

* Remove unnecessary clone()ing.

* Update setup_log.rs

* remove unnecessary mutex in logging (#1601)
 2016-07-13 09:05:26 +02:00
Tomasz Drwięga
11cae70cdd No-ui compilation feature 2016-07-12 20:15:36 +02:00
Tomasz Drwięga
fbc0e0039a Bump clippy (#1587) 
* Bumping clippy

* Fixing warnings
 2016-07-12 10:34:08 +02:00
Marek Kotewicz
c5ed363bba cleaned up parity/signer (#1551) 
* cleanup parity/signer

* remove redundant import of signer crate from main.rs

* rpc and signer are no longer optional

* move importing extern crates to main.rs file
 2016-07-11 17:11:49 +02:00
Nikolay Volf
32a4a060d6 bringing hypervisor as a crate in ipc dir (#1565) 
* resurrecting hypervisor in ipc namespace

* get rid of the quotes

* target: hypervisor
 2016-07-09 17:18:34 +02:00
Tomasz Drwięga
5c438cc58a Bumping clippy (#1532) 2016-07-04 11:52:59 +02:00
Arkadiy Paronyan
a72d8ee0e7 v1.3.0 (#1421) 2016-06-25 10:32:05 +02:00
Tomasz Drwięga
a76e3a134f Bumping clippy 2016-06-23 10:54:25 +02:00
NikVolf
5920a7068f installer initial, ui option for executable 2016-06-14 17:12:46 +03:00
Arkadiy Paronyan
6b12334136 Windows build (#1253) 
* Networking refactoring

* Fixed typo

* Trace logging

* Updated dependencies for windows build

* Windows fixes

* use mio 0.5

* nix build

* Windows build fix

* style

* removed unused import

* ipc crate version bump

* ipc config for named pipes

* tweaks and fixes

* tweaks and fixes

* final version bump

* Fixed tests

* Disable color output on windows

* Added missing doc
 2016-06-13 18:55:24 +02:00
Tomasz Drwięga
fca22e92ce Bumping clippy 2016-06-12 11:26:07 +02:00
Arkadiy Paronyan
98d9752097 Merge pull request #1219 from ethcore/clippy-bump 
Clippy bump & fixing warnings
 2016-06-06 11:46:59 +02:00
Tomasz Drwięga
a063a63ac7 Merge branch 'master' into serde-bump 
Conflicts:
	ethcore/src/types/state_diff.rs
 2016-06-06 10:10:06 +02:00
Tomasz Drwięga
ae2deaaf72 Bumping clippy version 2016-06-03 11:15:38 +02:00
Tomasz Drwięga
5f68b81f68 Updating jsonrpc-core 2016-06-01 20:32:16 +02:00
Tomasz Drwięga
1fd9110829 Serde bump 2016-06-01 17:59:21 +02:00
Nikolay Volf
f5ed31792f fixed sync with client only 2016-05-31 20:54:02 +02:00
Tomasz Drwięga
977ad428ae Merge branch 'master' into signer-crate 
Conflicts:
	.travis.yml
	Cargo.toml
	cov.sh
	doc.sh
	fmt.sh
	hook.sh
	test.sh
 2016-05-26 18:58:25 +02:00
Tomasz Drwięga
cc1a334ba7 Renaming dapps repos. Updating dapps (#1142) 
* Renaming dapps repos. Updating dapps

* Skipping legacy options for compatibility. Fixing tabs

* Fixing CLI options
 2016-05-26 18:21:15 +02:00
Tomasz Drwięga
28545d706f Empty trusted signer crate with it's general purpose 2016-05-26 16:43:04 +02:00
Tomasz Drwięga
fa6b35ec8d Bumping clippy. Fixing warnings (#1139) 
* Bumping clippy. Fixing warnings

* Removing unused import

* Fixing complexity and arguments warning on two functions
 2016-05-25 17:03:58 +02:00
Gav Wood
27380cdadb Coloured, padding logging. (#1133) 
* Add info message for mined block.

* Coloured, padding logging.

* Remove superfluous logs.

* Use better term colour module.
 2016-05-24 20:30:21 +02:00
Tomasz Drwięga
9b9ea93ff7 Bumping clippy & crossbeam 2016-05-17 09:33:01 +02:00
Nikolay Volf
d9acbbb027 finalizing deps rearrange 2016-05-06 16:40:24 +04:00
Nikolay Volf
c16a46dca7 all to ethcore 2016-05-06 14:58:37 +04:00
Nikolay Volf
aa6db4e69d placing right versions 2016-05-06 01:54:15 +04:00
Nikolay Volf
c449bf5663 JSON-RPC over IPC (#1039) 
* moving namespaces for http/rpc

* cli options for ipc

* jsonrpc exposed fully

* updating json-ipc-server & removing non-standart traces api from defaults

* spelling & format
 2016-05-04 15:37:09 +02:00
arkpar
008d009e3e Version 1.2 2016-05-02 15:02:26 +02:00
Tomasz Drwięga
e2465b1eab Bumping clippy & fixing warnings (#1024) 
* Bumping clippy

* Fixing warnings found by clippy
 2016-05-02 13:13:12 +02:00
Nikolay Volf
7cacdba191 fixing codegen links 2016-04-25 06:29:20 +03:00
petevine
763d78af87 Update dependencies 2016-04-17 01:50:04 +02:00
NikVolf
dc7e105ef8 Merge branch 'master' into ipc-hypervisor 2016-04-14 21:57:24 +03:00
NikVolf
405e3e2e7d initial setup 2016-04-13 19:03:57 +03:00
Tomasz Drwięga
6b03a3218c Bumping clippy version 2016-04-12 13:51:39 +02:00
NikVolf
69add61174 basic upgrade scenario 2016-04-10 16:12:20 +03:00
Tomasz Drwięga
508daad011 Enabling webapps by default 2016-04-08 11:18:46 +02:00
Tomasz Drwięga
1e9e0c32fa Disabling webapp server by default 2016-04-07 12:15:39 +02:00
Tomasz Drwięga
e3ce5d94e1 Adding webapps crate 2016-04-07 10:49:00 +02:00
Tomasz Drwięga
e8fa429438 Bumping clippy 2016-04-06 09:53:56 +02:00
Gav Wood
63a9fa172c Avoid openssl dep. 2016-03-28 10:25:19 +02:00
Gav Wood
b606fb68cf USD-based pricing of gas. 2016-03-28 00:49:35 +02:00
NikVolf
c014d5d12e debug symbols for master/beta 2016-03-25 16:55:48 +03:00
Gav Wood
0e026ed11f Fix author reporting. num_cpus for JSONRPC threads. 2016-03-22 19:12:17 +01:00
debris
b9623e6c5b improvements to build, updated dependencies, moved rpctest to its own submodule 2016-03-19 23:27:50 +01:00
debris
757f0c9bc4 Merge branch 'master' of github.com:ethcore/parity into ethrpc_test 2016-03-18 18:05:29 +01:00
Tomasz Drwięga
338e5fadb9 Bumping clippy 2016-03-18 10:08:47 +01:00
debris
f92a0c8df2 rpctest executable 2016-03-17 11:50:31 +01:00
debris
d96858d38c proper blockchain json parsing 2016-03-15 18:17:48 +01:00
arkpar
9e7ff2c00e Version 1.1 2016-03-14 01:00:17 +01:00
Gav Wood
4a58e142bd Remove duplicate ciippys. 2016-03-13 15:02:08 +01:00
Gav Wood
02f43f2e8c Merge branch 'ethminer_crate' 2016-03-13 15:00:47 +01:00
Tomasz Drwięga
e10457d235 Bumping clippy 2016-03-12 10:06:50 +01:00
Tomasz Drwięga
aebc91d96f Merge branch 'master' into ethminer_crate 
Conflicts:
	Cargo.toml
	rpc/Cargo.toml
	sync/Cargo.toml
 2016-03-12 09:50:18 +01:00
Tomasz Drwięga
f724cab92d Merge branch 'master' into updating_clippy 
Conflicts:
	ethcore/src/lib.rs
	sync/src/chain.rs
	sync/src/lib.rs
	util/src/keys/store.rs
	util/src/lib.rs
 2016-03-11 19:17:09 +01:00
Tomasz Drwięga
03da6c991f Merge branch 'master' into ethminer_crate 
Conflicts:
	Cargo.lock
	Cargo.toml
	ethcore/src/client/client.rs
	hook.sh
	parity/main.rs
	rpc/Cargo.toml
	rpc/src/v1/impls/eth.rs
	sync/Cargo.toml
	sync/src/tests/helpers.rs
 2016-03-11 14:37:07 +01:00
Gav Wood
b25551be7b Merge pull request #671 from ethcore/clippy_hook 
Removing running clippy by default on nightly.
 2016-03-11 14:03:16 +01:00
Tomasz Drwięga
d84e008e00 Removing superflous check for nightly 2016-03-11 11:16:49 +01:00
Tomasz Drwięga
a8a21da9ba Updating hook and removing running clippy from dev-dependencies 2016-03-11 11:05:20 +01:00
Tomasz Drwięga
3a4a7ac822 Bumping clippy version 2016-03-11 10:35:26 +01:00
arkpar
a6b5aad8c9 Merge branch 'master' of github.com:ethcore/parity into thread 2016-03-10 18:40:17 +01:00
Tomasz Drwięga
2e72173620 Merge branch 'master' into ethminer_crate 
Conflicts:
	Cargo.lock
	Cargo.toml
	hook.sh
	miner/src/transaction_queue.rs
	rpc/Cargo.toml
	sync/Cargo.toml
	sync/src/chain.rs
 2016-03-10 12:25:36 +01:00
Tomasz Drwięga
2f9b955210 Merge branch 'master' into ethminer_crate 
Conflicts:
	parity/main.rs
 2016-03-10 09:39:26 +01:00
Tomasz Drwięga
9f77a85491 Fixing compilation on nightly 2016-03-10 09:35:46 +01:00
Tomasz Drwięga
878e38c0cf Fixing deps again 2016-03-10 09:33:25 +01:00
Tomasz Drwięga
3c1888c26a Fixing deps 2016-03-10 09:26:04 +01:00
Nikolay Volf
0f056f3abb Merge branch 'master' into clippy-dev 
Conflicts:
	Cargo.toml
 2016-03-10 02:45:53 +04:00
Nikolay Volf
6ad0ba8fe2 basic commands 2016-03-09 17:11:15 +04:00
Tomasz Drwięga
84444c697c Adding ethminer to dev/ci files 2016-03-08 15:53:12 +01:00
Tomasz Drwięga
99a6802b61 Moving block sealing and transaction_queue to separate create 2016-03-08 15:46:44 +01:00
Tomasz Drwięga
cbc2c0cf0c Fixing clippy warnings. When building on nightly it is required to enable clippy 2016-03-07 14:34:17 +01:00
Tomasz Drwięga
3153d12bd9 feature enabled when compiling without --release 2016-03-07 11:40:44 +01:00
arkpar
cb4d17825b Fixed lock order 2016-02-29 19:49:29 +01:00
arkpar
0ccbba9073 Merge branch 'master' of github.com:ethcore/parity into thread 2016-02-29 18:11:59 +01:00
arkpar
08d54f9b49 Merge branch 'master' of github.com:ethcore/parity into thread 2016-02-26 13:38:06 +01:00