Skip to content

Commit

Permalink
bump for release
Browse files Browse the repository at this point in the history
  • Loading branch information
@cgilliard
cgilliard committed Jun 2, 2020
1 parent 317828a commit 41141a2
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 48 deletions.
44 changes: 21 additions & 23 deletions Cargo.lock
View file

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

48 changes: 24 additions & 24 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "mwc713"
version = "3.2.1-beta.1"
version = "3.2.1"
authors = ["vault713 devs"]
description = "A wallet that makes it easy to send, store, and swap MWC."
keywords = [ "grin", "mimblewimble", "rust", "crypto", "cryptocurrency" ]
Expand Down Expand Up @@ -56,32 +56,32 @@ zip = { version = "0.5", features = ["deflate"] }


# Release
#grin_core = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
#grin_keychain = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
grin_core = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
grin_keychain = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
#grin_chain = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
#grin_util = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
#grin_api = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
#grin_store = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
#grin_p2p = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
#grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", tag = "3.2.0" }
#grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", tag = "3.2.0" }
#grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", tag = "3.2.0" }
#grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", tag = "3.2.0" }
#grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", tag = "3.2.0" }
grin_util = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
grin_api = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
grin_store = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
grin_p2p = { git = "https://github.com/mwcproject/mwc-node", tag = "3.2.1" }
grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", tag = "3.2.1" }
grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", tag = "3.2.1" }
grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", tag = "3.2.1" }
grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", tag = "3.2.1" }
grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", tag = "3.2.1" }

# For bleeding edge
grin_core = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
grin_keychain = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
grin_chain = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
grin_util = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
grin_api = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
grin_store = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
grin_p2p = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
#grin_core = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
#grin_keychain = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
#grin_chain = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
#grin_util = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
#grin_api = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
#grin_store = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
#grin_p2p = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
#grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
#grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
#grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
#grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
#grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }

# For local testing
#grin_api = { path = "../mwc-node/api", version= "3.1.3"}
Expand Down
3 changes: 3 additions & 0 deletions src/cli/parser.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ impl<'a, 'b> Parser {
.arg(
Arg::from_usage("[mwcmqs] -s, --mwcmqs 'start the mwcmqs listener'")
)
.arg(
Arg::from_usage("[tor] -t, --tor 'start the tor listener'")
)
)
.subcommand(
SubCommand::with_name("stop")
Expand Down
9 changes: 8 additions & 1 deletion src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,11 @@ fn do_command(
.subcommand_matches("listen")
.unwrap()
.is_present("keybase");
if mwcmqs || !keybase {
let tor = matches
.subcommand_matches("listen")
.unwrap()
.is_present("tor");
if mwcmqs || (!keybase && !tor) {
let is_running = match mwcmqs_broker {
Some((_, subscriber)) => subscriber.is_running(),
_ => false,
Expand All @@ -1038,6 +1042,9 @@ fn do_command(
*keybase_broker = Some((publisher, subscriber));
}
}
if tor {
println!("tor not implemented.");
}
}
Some("stop") => {
let mwcmqs = matches
Expand Down

0 comments on commit 41141a2

Please sign in to comment.