grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'parity/master' into bft

Browse Source 
Conflicts:
	Cargo.lock
This commit is contained in:
keorn
2016-09-27 12:37:43 +02:00
parent 9fe62d9750 bc4cbaac2b
commit fd6900bbb3
168 changed files with 5255 additions and 2166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ethkey/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "ethkey"
version = "0.2.0"
authors = ["debris <marek.kotewicz@gmail.com>"]
authors = ["Ethcore <admin@ethcore.io>"]
[dependencies]
rand = "0.3.14"
@@ -10,7 +10,7 @@ tiny-keccak = "1.0"
eth-secp256k1 = { git = "https://github.com/ethcore/rust-secp256k1" }
rustc-serialize = "0.3"
docopt = { version = "0.6", optional = true }
bigint = { path = "../util/bigint" }
ethcore-bigint = { path = "../util/bigint" }
[features]
default = []

2
ethkey/src/lib.rs
View File

@@ -20,7 +20,7 @@ extern crate lazy_static;
extern crate tiny_keccak;
extern crate secp256k1;
extern crate rustc_serialize;
extern crate bigint;
extern crate ethcore_bigint as bigint;
mod brain;
mod error;