diff --git a/Cargo.toml b/Cargo.toml index ff755a493..0218a3ae0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "grin" version = "0.1.0" -authors = ["Ignotus Peverell "] +authors = ["Grin Developers "] exclude = ["**/*.grin", "**/*.grin2"] +publish = false [workspace] members = ["api", "chain", "config", "core", "grin", "keychain", "p2p", "store", "util", "pool", "wallet"] @@ -12,15 +13,6 @@ name = "grin" path = "src/bin/grin.rs" [dependencies] -grin_api = { path = "./api" } -grin_config = { path = "./config" } -grin_core = { path = "./core" } -grin_grin = { path = "./grin" } -grin_keychain = { path = "./keychain" } -grin_p2p = { path = "./p2p"} -grin_pow = { path = "./pow"} -grin_util = { path = "./util"} -grin_wallet = { path = "./wallet" } blake2-rfc = "~0.2.17" clap = "^2.23.3" daemonize = "^0.2.3" @@ -30,6 +22,17 @@ slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_ term = "~0.4.6" time = "^0.1" chrono = "^0.4.0" + +grin_api = { path = "./api" } +grin_config = { path = "./config" } +grin_core = { path = "./core" } +grin_grin = { path = "./grin" } +grin_keychain = { path = "./keychain" } +grin_p2p = { path = "./p2p"} +grin_pow = { path = "./pow"} +grin_util = { path = "./util"} +grin_wallet = { path = "./wallet" } + #This is temporary until cursive author does a new release [dependencies.cursive] git = "https://github.com/yeastplume/Cursive" diff --git a/api/Cargo.toml b/api/Cargo.toml index 032f3a364..0c99a9b7f 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -1,16 +1,11 @@ [package] name = "grin_api" version = "0.1.0" -authors = ["Ignotus Peverell "] +authors = ["Grin Developers "] workspace = ".." +publish = false [dependencies] -grin_core = { path = "../core" } -grin_chain = { path = "../chain" } -grin_pool = { path = "../pool" } -grin_store = { path = "../store" } -grin_util = { path = "../util" } -grin_p2p = { path = "../p2p" } hyper = "~0.10.6" slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } lazy_static = "~0.2.8" @@ -22,3 +17,10 @@ urlencoded = "~0.5.0" serde = "~1.0.8" serde_derive = "~1.0.8" serde_json = "~1.0.9" + +grin_core = { path = "../core" } +grin_chain = { path = "../chain" } +grin_pool = { path = "../pool" } +grin_store = { path = "../store" } +grin_util = { path = "../util" } +grin_p2p = { path = "../p2p" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index 95858f826..4f76cb539 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "grin_chain" version = "0.1.0" -authors = ["Ignotus Peverell "] +authors = ["Grin Developers "] workspace = ".." +publish = false [dependencies] bitflags = "^1.0" @@ -18,6 +19,6 @@ grin_util = { path = "../util" } grin_store = { path = "../store" } [dev-dependencies] -env_logger="^0.3.5" +env_logger = "^0.3.5" rand = "^0.3" grin_pow = { path = "../pow" } diff --git a/config/Cargo.toml b/config/Cargo.toml index d85c45140..51e3302a1 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "grin_config" version = "0.1.0" -authors = [" yeastplume"] +authors = ["Grin Developers "] workspace = ".." +publish = false [dependencies] serde = "~1.0.8" diff --git a/core/Cargo.toml b/core/Cargo.toml index 7f84ee27d..6f74472f0 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "grin_core" version = "0.1.0" -authors = ["Ignotus Peverell "] +authors = ["Grin Developers "] workspace = ".." +publish = false [dependencies] bitflags = "^1.0" @@ -16,5 +17,6 @@ serde_derive = "~1.0.8" siphasher = "~0.1" time = "^0.1" lazy_static = "~0.2.8" + grin_keychain = { path = "../keychain" } grin_util = { path = "../util" } diff --git a/grin/Cargo.toml b/grin/Cargo.toml index 7372f8bb4..d91c22ffe 100644 --- a/grin/Cargo.toml +++ b/grin/Cargo.toml @@ -1,10 +1,21 @@ [package] name = "grin_grin" version = "0.1.0" -authors = ["Ignotus Peverell "] +authors = ["Grin Developers "] workspace = ".." +publish = false [dependencies] +hyper = "~0.10.6" +slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } +time = "^0.1" +serde = "~1.0.8" +serde_derive = "~1.0.8" +serde_json = "~1.0.8" +rand = "^0.3" +router = "~0.5.1" +itertools = "~0.6.0" + grin_api = { path = "../api" } grin_chain = { path = "../chain" } grin_core = { path = "../core" } @@ -16,16 +27,6 @@ grin_keychain = { path = "../keychain" } grin_wallet = { path = "../wallet" } grin_pow = { path = "../pow" } -hyper = "~0.10.6" -slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } -time = "^0.1" -serde = "~1.0.8" -serde_derive = "~1.0.8" -serde_json = "~1.0.8" -rand = "^0.3" -router = "~0.5.1" -itertools = "~0.6.0" - -[dev_dependencies] +[dev-dependencies] blake2-rfc = "~0.2.17" grin_config = { path = "../config" } diff --git a/keychain/Cargo.toml b/keychain/Cargo.toml index 649be6cdb..1a923bc16 100644 --- a/keychain/Cargo.toml +++ b/keychain/Cargo.toml @@ -1,7 +1,9 @@ [package] name = "grin_keychain" version = "0.1.0" -authors = ["Antioch Peverell"] +authors = ["Grin Developers "] +workspace = '..' +publish = false [dependencies] byteorder = "^1.0" @@ -12,4 +14,5 @@ slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_ serde = "~1.0.8" serde_derive = "~1.0.8" serde_json = "~1.0.8" + grin_util = { path = "../util" } diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index 3a3254b70..1305f52e6 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "grin_p2p" version = "0.1.0" -authors = ["Ignotus Peverell "] +authors = ["Grin Developers "] workspace = ".." +publish = false [dependencies] bitflags = "^1.0" diff --git a/pool/Cargo.toml b/pool/Cargo.toml index 4ee39289a..a3f68e848 100644 --- a/pool/Cargo.toml +++ b/pool/Cargo.toml @@ -1,15 +1,18 @@ [package] name = "grin_pool" version = "0.1.0" -authors = ["Grin Authors "] +authors = ["Grin Developers "] +workspace = '..' +publish = false [dependencies] blake2-rfc = "~0.2.17" -grin_core = { path = "../core" } -grin_keychain = { path = "../keychain" } -grin_util = { path = "../util" } serde = "~1.0.8" serde_derive = "~1.0.8" slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } time = "^0.1" rand = "^0.3" + +grin_core = { path = "../core" } +grin_keychain = { path = "../keychain" } +grin_util = { path = "../util" } diff --git a/pow/Cargo.toml b/pow/Cargo.toml index 8d8eb92cc..9f6bb30f0 100644 --- a/pow/Cargo.toml +++ b/pow/Cargo.toml @@ -1,8 +1,9 @@ [package] name = "grin_pow" version = "0.1.0" -authors = ["Ignotus Peverell "] +authors = ["Grin Developers "] workspace = ".." +publish = false [dependencies] blake2-rfc = "~0.2.17" diff --git a/store/Cargo.toml b/store/Cargo.toml index 99ff71754..8c1c3d127 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "grin_store" version = "0.1.0" -authors = ["Ignotus Peverell "] +authors = ["Grin Developers "] workspace = ".." +publish = false [dependencies] byteorder = "^1.0" -env_logger="^0.3.5" +env_logger = "^0.3.5" serde = "~1.0.8" serde_derive = "~1.0.8" slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } diff --git a/util/Cargo.toml b/util/Cargo.toml index 34538c58d..411f10e9d 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "grin_util" version = "0.1.0" -authors = ["Ignotus Peverell ", - "Yeastplume "] +authors = ["Grin Developers "] workspace = ".." +publish = false [dependencies] slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } @@ -20,6 +20,6 @@ zip = "^0.2.6" [dependencies.secp256k1zkp] git = "https://github.com/mimblewimble/rust-secp256k1-zkp" -tag="grin_integration_15" +tag = "grin_integration_15" #path = "../../rust-secp256k1-zkp" -features=["bullet-proof-sizing"] +features = ["bullet-proof-sizing"] diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml index 8621d2709..a92b6d472 100644 --- a/wallet/Cargo.toml +++ b/wallet/Cargo.toml @@ -1,14 +1,11 @@ [package] name = "grin_wallet" version = "0.1.0" -authors = [ - "Ignotus Peverell ", - "Laurent Meunier ", - "Antioch Peverell", -] +authors = ["Grin Developers "] +workspace = '..' +publish = false [dependencies] - byteorder = "^1.0" slog = { version = "^2.0.12", features = ["max_level_trace", "release_max_level_trace"] } rand = "^0.3" @@ -22,13 +19,14 @@ failure_derive = "0.1.1" futures = "^0.1.15" iron = "~0.5.1" hyper = "~0.11.4" -tokio-core="~0.1.1" -tokio-retry="~0.1.0" +tokio-core = "~0.1.1" +tokio-retry = "~0.1.0" router = "~0.5.1" prettytable-rs = "^0.6" term = "~0.4.6" uuid = { version = "~0.5.1", features = ["serde", "v4"] } urlencoded = "~0.5.0" + grin_api = { path = "../api" } grin_core = { path = "../core" } grin_keychain = { path = "../keychain" }