diff --git a/.ci/macos-release.yml b/.ci/macos-release.yml index b7ca289a..80c9789a 100644 --- a/.ci/macos-release.yml +++ b/.ci/macos-release.yml @@ -44,4 +44,5 @@ steps: $(Build.ArtifactStagingDirectory)/wallet713-$(build.my_tag)-$(build.platform)-sha256sum.txt title: '$(build.my_tag)' assetUploadMode: 'replace' - addChangeLog: false \ No newline at end of file + addChangeLog: true + compareWith: 'lastFullRelease' \ No newline at end of file diff --git a/.ci/windows-release.yml b/.ci/windows-release.yml index 684d67e6..5487e095 100644 --- a/.ci/windows-release.yml +++ b/.ci/windows-release.yml @@ -44,4 +44,5 @@ steps: $(Build.ArtifactStagingDirectory)\wallet713-$(build.my_tag)-$(build.platform)-sha256sum.txt title: '$(build.my_tag)' assetUploadMode: 'replace' - addChangeLog: false \ No newline at end of file + addChangeLog: true + compareWith: 'lastFullRelease' \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 0fe8fac4..37ed2004 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -433,6 +433,25 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "crossterm" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "crossterm_winapi 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", + "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "crossterm_winapi" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "crypto-mac" version = "0.6.2" @@ -506,6 +525,14 @@ dependencies = [ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "dont_disappear" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "crossterm 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "dtoa" version = "0.4.4" @@ -2287,6 +2314,14 @@ dependencies = [ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "termios" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.59 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "textwrap" version = "0.11.0" @@ -2693,6 +2728,7 @@ dependencies = [ "colored 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "dont_disappear 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "easy-jsonrpc 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2949,6 +2985,8 @@ dependencies = [ "checksum crossbeam-epoch 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "04c9e3102cc2d69cd681412141b390abd55a362afc1540965dad0ad4d34280b4" "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" "checksum crossbeam-utils 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" +"checksum crossterm 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2806a1083b240dd5796f5e3381de21fcf5f31c486bba5a8ab99a427b4e9bb4c9" +"checksum crossterm_winapi 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c061e4a1c47a53952ba0f2396c00a61cd7ab74482eba99b9c9cc77fdca71932" "checksum crypto-mac 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7afa06d05a046c7a47c3a849907ec303504608c927f4e85f7bfff22b7180d971" "checksum csv 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7ef22b37c7a51c564a365892c012dc0271221fdcc64c69b19ba4d6fa8bd96d9c" "checksum ct-logs 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "95a4bf5107667e12bf6ce31a3a5066d67acc88942b6742117a41198734aaccaa" @@ -2957,6 +2995,7 @@ dependencies = [ "checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" "checksum dirs 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c4ef5a8b902d393339e2a2c7fe573af92ce7e0ee5a3ff827b4c9ad7e07e4fa1" "checksum dirs-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "937756392ec77d1f2dd9dc3ac9d69867d109a2121479d72c364e42f4cab21e2d" +"checksum dont_disappear 3.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cab3e554f60d91d80a3398f1befe50f264a7f27d93f325314f2e9bc483ecb986" "checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" "checksum easy-jsonrpc 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4a851f8e0ed5790b60ded487feb0dc3c7e7da52c4a0adc57c009bfc5af8ca1a" "checksum easy-jsonrpc-proc-macro 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9fb33793846951f339a70580375734416898ff8ddbb74401865031e25ba6751" @@ -3143,6 +3182,7 @@ dependencies = [ "checksum term 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42" "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" "checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" +"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" "checksum thread-id 3.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" "checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" diff --git a/Cargo.toml b/Cargo.toml index 36bd58cc..71da3943 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,6 +49,7 @@ url = "1.7" parking_lot = "0.6" semver = "0.9.0" easy-jsonrpc = "0.5.2" +dont_disappear = "3.0.0" grin_api = "2.0.0" grin_core = "2.0.0" diff --git a/src/controller/cli.rs b/src/controller/cli.rs index eaa129fb..a6389a56 100644 --- a/src/controller/cli.rs +++ b/src/controller/cli.rs @@ -79,7 +79,6 @@ where println!(); self.start_listeners()?; - cli_message!(); self.command_loop(); Ok(()) } @@ -228,7 +227,6 @@ where println!(); break; } - cli_message!(); }, Err(err) => { println!("Unable to read line: {}", err); @@ -327,7 +325,6 @@ where let account = self.api.active_account()?; let (validated, wallet_info) = self.api.retrieve_summary_info(true, 10)?; display::info(&account, &wallet_info, validated, true); - } ("listen", Some(m)) => { let interface = match args::listen_command(m)? { diff --git a/src/main.rs b/src/main.rs index ba33d7e8..82a62bc0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -41,6 +41,7 @@ extern crate url; extern crate uuid; extern crate ws; extern crate semver; +extern crate dont_disappear; extern crate grin_api; #[macro_use] @@ -181,6 +182,8 @@ fn main() { let cli = CLI::new(container); cli.start(); + + press_any_key(); } #[cfg(windows)] @@ -192,4 +195,14 @@ pub fn enable_ansi_support() { #[cfg(not(windows))] pub fn enable_ansi_support() { +} + +#[cfg(windows)] +pub fn press_any_key() { + dont_disappear::any_key_to_continue::default(); +} + +#[cfg(not(windows))] +pub fn press_any_key() { + } \ No newline at end of file diff --git a/src/wallet/api/owner.rs b/src/wallet/api/owner.rs index b8d89320..bf10448f 100644 --- a/src/wallet/api/owner.rs +++ b/src/wallet/api/owner.rs @@ -128,7 +128,7 @@ where }?; let address = listener.address(); - cli_message!("Listener for {} started", address.bright_green()); + println!("Listener for {} started", address.bright_green()); c.listeners.insert(interface, listener); Ok(address) })