Skip to content
This repository has been archived by the owner on Dec 28, 2023. It is now read-only.

Commit

Permalink
Merge from upstream and Bump the version to 2.0.0 (mimblewimble#32)
Browse files Browse the repository at this point in the history 
* Clearer user messaging when node in use is 1.1.0 or less (mimblewimble#168)

* Modify error message when checking against old nodes to reflect 1.x.x series

* update output text

* Bump version number to official v2.0.0 release
  • Loading branch information
@garyyu
garyyu authored Jul 18, 2019
1 parent b4df71a commit dab3dc7
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 59 deletions.
56 changes: 28 additions & 28 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet"
version = "2.0.0-beta.1"
version = "2.0.0"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -30,13 +30,13 @@ log = "0.4"
linefeed = "0.5"
semver = "0.9"

grin_wallet_api = { path = "./api", version = "2.0.0-beta.1" }
grin_wallet_impls = { path = "./impls", version = "2.0.0-beta.1" }
grin_wallet_libwallet = { path = "./libwallet", version = "2.0.0-beta.1" }
grin_wallet_controller = { path = "./controller", version = "2.0.0-beta.1" }
grin_wallet_config = { path = "./config", version = "2.0.0-beta.1" }
grin_wallet_api = { path = "./api", version = "2.0.0" }
grin_wallet_impls = { path = "./impls", version = "2.0.0" }
grin_wallet_libwallet = { path = "./libwallet", version = "2.0.0" }
grin_wallet_controller = { path = "./controller", version = "2.0.0" }
grin_wallet_config = { path = "./config", version = "2.0.0" }

grin_wallet_util = { path = "./util", version = "2.0.0-beta.1" }
grin_wallet_util = { path = "./util", version = "2.0.0" }

[build-dependencies]
built = "0.3"
10 changes: 5 additions & 5 deletions api/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_api"
version = "2.0.0-beta.1"
version = "2.0.0"
authors = ["Grin Developers <[email protected]>"]
description = "Grin Wallet API"
license = "Apache-2.0"
Expand All @@ -18,11 +18,11 @@ serde_json = "1"
easy-jsonrpc = "0.5.1"
chrono = { version = "0.4.4", features = ["serde"] }

grin_wallet_libwallet = { path = "../libwallet", version = "2.0.0-beta.1" }
grin_wallet_config = { path = "../config", version = "2.0.0-beta.1" }
grin_wallet_impls = { path = "../impls", version = "2.0.0-beta.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "2.0.0" }
grin_wallet_config = { path = "../config", version = "2.0.0" }
grin_wallet_impls = { path = "../impls", version = "2.0.0" }

grin_wallet_util = { path = "../util", version = "2.0.0-beta.1" }
grin_wallet_util = { path = "../util", version = "2.0.0" }

[dev-dependencies]
serde_json = "1"
Expand Down
4 changes: 2 additions & 2 deletions config/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_config"
version = "2.0.0-beta.1"
version = "2.0.0"
authors = ["Grin Developers <[email protected]>"]
description = "Configuration for grin wallet , a simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -16,7 +16,7 @@ serde_derive = "1"
toml = "0.4"
dirs = "1.0.3"

grin_wallet_util = { path = "../util", version = "2.0.0-beta.1" }
grin_wallet_util = { path = "../util", version = "2.0.0" }

[dev-dependencies]
pretty_assertions = "0.5.1"
12 changes: 6 additions & 6 deletions controller/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_controller"
version = "2.0.0-beta.1"
version = "2.0.0"
authors = ["Grin Developers <[email protected]>"]
description = "Controllers for grin wallet instantiation"
license = "Apache-2.0"
Expand Down Expand Up @@ -32,9 +32,9 @@ chrono = { version = "0.4.4", features = ["serde"] }
easy-jsonrpc = "0.5.1"
lazy_static = "1"

grin_wallet_util = { path = "../util", version = "2.0.0-beta.1" }
grin_wallet_util = { path = "../util", version = "2.0.0" }

grin_wallet_api = { path = "../api", version = "2.0.0-beta.1" }
grin_wallet_impls = { path = "../impls", version = "2.0.0-beta.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "2.0.0-beta.1" }
grin_wallet_config = { path = "../config", version = "2.0.0-beta.1" }
grin_wallet_api = { path = "../api", version = "2.0.0" }
grin_wallet_impls = { path = "../impls", version = "2.0.0" }
grin_wallet_libwallet = { path = "../libwallet", version = "2.0.0" }
grin_wallet_config = { path = "../config", version = "2.0.0" }
8 changes: 4 additions & 4 deletions impls/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_impls"
version = "2.0.0-beta.1"
version = "2.0.0"
authors = ["Grin Developers <[email protected]>"]
description = "Concrete types derived from libwallet traits"
license = "Apache-2.0"
Expand All @@ -26,7 +26,7 @@ tokio-retry = "0.1"
uuid = { version = "0.7", features = ["serde", "v4"] }
chrono = { version = "0.4.4", features = ["serde"] }

grin_wallet_util = { path = "../util", version = "2.0.0-beta.1" }
grin_wallet_util = { path = "../util", version = "2.0.0" }

grin_wallet_libwallet = { path = "../libwallet", version = "2.0.0-beta.1" }
grin_wallet_config = { path = "../config", version = "2.0.0-beta.1" }
grin_wallet_libwallet = { path = "../libwallet", version = "2.0.0" }
grin_wallet_config = { path = "../config", version = "2.0.0" }
6 changes: 3 additions & 3 deletions libwallet/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_libwallet"
version = "2.0.0-beta.1"
version = "2.0.0"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
license = "Apache-2.0"
Expand All @@ -25,5 +25,5 @@ lazy_static = "1"
strum = "0.15"
strum_macros = "0.15"

grin_wallet_util = { path = "../util", version = "2.0.0-beta.1" }
grin_wallet_config = { path = "../config", version = "2.0.0-beta.1" }
grin_wallet_util = { path = "../util", version = "2.0.0" }
grin_wallet_config = { path = "../config", version = "2.0.0" }
6 changes: 3 additions & 3 deletions src/bin/cmd/wallet.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ pub fn wallet_command(wallet_args: &ArgMatches<'_>, config: GlobalWalletConfig)
// it gets a 404 for the version function
if Version::parse(&v.node_version) < Version::parse(MIN_COMPAT_NODE_VERSION) {
let version = if v.node_version == "1.0.0" {
"1.0.x series"
"1.x.x series"
} else {
&v.node_version
};
println!("Specified Grin Node (version {}) is outdated and incompatible with this wallet version", version);
println!("Please update the node or use a different one");
println!("The Grin Node in use (version {}) is outdated and incompatible with this wallet version.", version);
println!("Please update the node to version 2.0.0 or later and try again.");
return 1;
}
}
Expand Down
2 changes: 1 addition & 1 deletion util/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_wallet_util"
version = "2.0.0-beta.1"
version = "2.0.0"
authors = ["Grin Developers <[email protected]>"]
description = "Util, for generic utilities and to re-export grin crates"
license = "Apache-2.0"
Expand Down

0 comments on commit dab3dc7

Please sign in to comment.