From 75c229ba6853dd582313b4b52bc7d40131d1f1a4 Mon Sep 17 00:00:00 2001 From: Yeastplume Date: Wed, 5 Jun 2019 20:36:57 +0100 Subject: [PATCH] create 2.0.0 branch --- Cargo.toml | 22 +++++++++++----------- api/Cargo.toml | 14 +++++++------- chain/Cargo.toml | 10 +++++----- config/Cargo.toml | 10 +++++----- core/Cargo.toml | 6 +++--- keychain/Cargo.toml | 4 ++-- p2p/Cargo.toml | 12 ++++++------ pool/Cargo.toml | 12 ++++++------ servers/Cargo.toml | 18 +++++++++--------- store/Cargo.toml | 6 +++--- util/Cargo.toml | 2 +- 11 files changed, 58 insertions(+), 58 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a52d620b2e..75ac8495f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin" -version = "1.1.0" +version = "2.0.0-beta.1" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -24,7 +24,7 @@ blake2-rfc = "0.2" chrono = "0.4.4" clap = { version = "2.31", features = ["yaml"] } ctrlc = { version = "3.1", features = ["termination"] } -humansize = "1.1.0" +humansize = "2.0.0-beta.1" serde = "1" serde_json = "1" log = "0.4" @@ -32,13 +32,13 @@ term = "0.5" failure = "0.1" failure_derive = "0.1" -grin_api = { path = "./api", version = "1.1.0" } -grin_config = { path = "./config", version = "1.1.0" } -grin_core = { path = "./core", version = "1.1.0" } -grin_keychain = { path = "./keychain", version = "1.1.0" } -grin_p2p = { path = "./p2p", version = "1.1.0" } -grin_servers = { path = "./servers", version = "1.1.0" } -grin_util = { path = "./util", version = "1.1.0" } +grin_api = { path = "./api", version = "2.0.0-beta.1" } +grin_config = { path = "./config", version = "2.0.0-beta.1" } +grin_core = { path = "./core", version = "2.0.0-beta.1" } +grin_keychain = { path = "./keychain", version = "2.0.0-beta.1" } +grin_p2p = { path = "./p2p", version = "2.0.0-beta.1" } +grin_servers = { path = "./servers", version = "2.0.0-beta.1" } +grin_util = { path = "./util", version = "2.0.0-beta.1" } [target.'cfg(windows)'.dependencies] cursive = { version = "0.12", default-features = false, features = ["pancurses-backend"] } @@ -52,5 +52,5 @@ cursive = "0.12" built = "0.3" [dev-dependencies] -grin_chain = { path = "./chain", version = "1.1.0" } -grin_store = { path = "./store", version = "1.1.0" } +grin_chain = { path = "./chain", version = "2.0.0-beta.1" } +grin_store = { path = "./store", version = "2.0.0-beta.1" } diff --git a/api/Cargo.toml b/api/Cargo.toml index d728945a88..998f458fd4 100644 --- a/api/Cargo.toml +++ b/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_api" -version = "1.1.0" +version = "2.0.0-beta.1" authors = ["Grin Developers "] description = "APIs for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -30,9 +30,9 @@ futures = "0.1.21" rustls = "0.13" url = "1.7.0" -grin_core = { path = "../core", version = "1.1.0" } -grin_chain = { path = "../chain", version = "1.1.0" } -grin_p2p = { path = "../p2p", version = "1.1.0" } -grin_pool = { path = "../pool", version = "1.1.0" } -grin_store = { path = "../store", version = "1.1.0" } -grin_util = { path = "../util", version = "1.1.0" } +grin_core = { path = "../core", version = "2.0.0-beta.1" } +grin_chain = { path = "../chain", version = "2.0.0-beta.1" } +grin_p2p = { path = "../p2p", version = "2.0.0-beta.1" } +grin_pool = { path = "../pool", version = "2.0.0-beta.1" } +grin_store = { path = "../store", version = "2.0.0-beta.1" } +grin_util = { path = "../util", version = "2.0.0-beta.1" } diff --git a/chain/Cargo.toml b/chain/Cargo.toml index 99961b077c..2594dd1892 100644 --- a/chain/Cargo.toml +++ b/chain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_chain" -version = "1.1.0" +version = "2.0.0-beta.1" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -23,10 +23,10 @@ lru-cache = "0.1" lazy_static = "1" regex = "1" -grin_core = { path = "../core", version = "1.1.0" } -grin_keychain = { path = "../keychain", version = "1.1.0" } -grin_store = { path = "../store", version = "1.1.0" } -grin_util = { path = "../util", version = "1.1.0" } +grin_core = { path = "../core", version = "2.0.0-beta.1" } +grin_keychain = { path = "../keychain", version = "2.0.0-beta.1" } +grin_store = { path = "../store", version = "2.0.0-beta.1" } +grin_util = { path = "../util", version = "2.0.0-beta.1" } [dev-dependencies] env_logger = "0.5" diff --git a/config/Cargo.toml b/config/Cargo.toml index 96e73119f4..2457439c63 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_config" -version = "1.1.0" +version = "2.0.0-beta.1" authors = ["Grin Developers "] description = "Configuration for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -16,10 +16,10 @@ serde_derive = "1" toml = "0.4" dirs = "1.0.3" -grin_core = { path = "../core", version = "1.1.0" } -grin_servers = { path = "../servers", version = "1.1.0" } -grin_p2p = { path = "../p2p", version = "1.1.0" } -grin_util = { path = "../util", version = "1.1.0" } +grin_core = { path = "../core", version = "2.0.0-beta.1" } +grin_servers = { path = "../servers", version = "2.0.0-beta.1" } +grin_p2p = { path = "../p2p", version = "2.0.0-beta.1" } +grin_util = { path = "../util", version = "2.0.0-beta.1" } [dev-dependencies] pretty_assertions = "0.5.1" diff --git a/core/Cargo.toml b/core/Cargo.toml index be70ffdf57..92cfd16099 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_core" -version = "1.1.0" +version = "2.0.0-beta.1" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -28,8 +28,8 @@ uuid = { version = "0.6", features = ["serde", "v4"] } log = "0.4" chrono = { version = "0.4.4", features = ["serde"] } -grin_keychain = { path = "../keychain", version = "1.1.0" } -grin_util = { path = "../util", version = "1.1.0" } +grin_keychain = { path = "../keychain", version = "2.0.0-beta.1" } +grin_util = { path = "../util", version = "2.0.0-beta.1" } [dev-dependencies] serde_json = "1" diff --git a/keychain/Cargo.toml b/keychain/Cargo.toml index 7d407d67fc..b81f09652c 100644 --- a/keychain/Cargo.toml +++ b/keychain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_keychain" -version = "1.1.0" +version = "2.0.0-beta.1" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -27,4 +27,4 @@ ripemd160 = "0.7" sha2 = "0.7" pbkdf2 = "0.2" -grin_util = { path = "../util", version = "1.1.0" } +grin_util = { path = "../util", version = "2.0.0-beta.1" } diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml index 51871c1a48..c5584f5341 100644 --- a/p2p/Cargo.toml +++ b/p2p/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_p2p" -version = "1.1.0" +version = "2.0.0-beta.1" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -22,10 +22,10 @@ tempfile = "3.0.5" log = "0.4" chrono = { version = "0.4.4", features = ["serde"] } -grin_core = { path = "../core", version = "1.1.0" } -grin_store = { path = "../store", version = "1.1.0" } -grin_util = { path = "../util", version = "1.1.0" } -grin_chain = { path = "../chain", version = "1.1.0" } +grin_core = { path = "../core", version = "2.0.0-beta.1" } +grin_store = { path = "../store", version = "2.0.0-beta.1" } +grin_util = { path = "../util", version = "2.0.0-beta.1" } +grin_chain = { path = "../chain", version = "2.0.0-beta.1" } [dev-dependencies] -grin_pool = { path = "../pool", version = "1.1.0" } +grin_pool = { path = "../pool", version = "2.0.0-beta.1" } diff --git a/pool/Cargo.toml b/pool/Cargo.toml index 5444855e8f..f20f469c50 100644 --- a/pool/Cargo.toml +++ b/pool/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_pool" -version = "1.1.0" +version = "2.0.0-beta.1" authors = ["Grin Developers "] description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -19,10 +19,10 @@ chrono = "0.4.4" failure = "0.1" failure_derive = "0.1" -grin_core = { path = "../core", version = "1.1.0" } -grin_keychain = { path = "../keychain", version = "1.1.0" } -grin_store = { path = "../store", version = "1.1.0" } -grin_util = { path = "../util", version = "1.1.0" } +grin_core = { path = "../core", version = "2.0.0-beta.1" } +grin_keychain = { path = "../keychain", version = "2.0.0-beta.1" } +grin_store = { path = "../store", version = "2.0.0-beta.1" } +grin_util = { path = "../util", version = "2.0.0-beta.1" } [dev-dependencies] -grin_chain = { path = "../chain", version = "1.1.0" } +grin_chain = { path = "../chain", version = "2.0.0-beta.1" } diff --git a/servers/Cargo.toml b/servers/Cargo.toml index cf6bfcb24d..b86a94e82b 100644 --- a/servers/Cargo.toml +++ b/servers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_servers" -version = "1.1.0" +version = "2.0.0-beta.1" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -25,11 +25,11 @@ serde_json = "1" chrono = "0.4.4" tokio = "0.1.11" -grin_api = { path = "../api", version = "1.1.0" } -grin_chain = { path = "../chain", version = "1.1.0" } -grin_core = { path = "../core", version = "1.1.0" } -grin_keychain = { path = "../keychain", version = "1.1.0" } -grin_p2p = { path = "../p2p", version = "1.1.0" } -grin_pool = { path = "../pool", version = "1.1.0" } -grin_store = { path = "../store", version = "1.1.0" } -grin_util = { path = "../util", version = "1.1.0" } +grin_api = { path = "../api", version = "2.0.0-beta.1" } +grin_chain = { path = "../chain", version = "2.0.0-beta.1" } +grin_core = { path = "../core", version = "2.0.0-beta.1" } +grin_keychain = { path = "../keychain", version = "2.0.0-beta.1" } +grin_p2p = { path = "../p2p", version = "2.0.0-beta.1" } +grin_pool = { path = "../pool", version = "2.0.0-beta.1" } +grin_store = { path = "../store", version = "2.0.0-beta.1" } +grin_util = { path = "../util", version = "2.0.0-beta.1" } diff --git a/store/Cargo.toml b/store/Cargo.toml index c10b568aab..2aa44fc268 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_store" -version = "1.1.0" +version = "2.0.0-beta.1" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0" @@ -23,8 +23,8 @@ serde = "1" serde_derive = "1" log = "0.4" -grin_core = { path = "../core", version = "1.1.0" } -grin_util = { path = "../util", version = "1.1.0" } +grin_core = { path = "../core", version = "2.0.0-beta.1" } +grin_util = { path = "../util", version = "2.0.0-beta.1" } [dev-dependencies] chrono = "0.4.4" diff --git a/util/Cargo.toml b/util/Cargo.toml index e93e26c29b..4b084a21c7 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "grin_util" -version = "1.1.0" +version = "2.0.0-beta.1" authors = ["Grin Developers "] description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format." license = "Apache-2.0"