feat: improve ctrl-c handling to deal with blocking threads and terminal shenanigans

CHANGELOG.md

@@ -51,6 +51,9 @@
 
 ### Fixed
 
+- [#2950](https://github.com/ChainSafe/forest/pull/2950): Fix cases where ctrl-c
+  would be ignored.
+
 ## Forest v0.8.2 "The Way"
 
 ### Added

Cargo.toml

@@ -123,7 +123,6 @@ quickcheck_macros = "1"
 rand = "0.8"
 rayon = "1.5"
 regex = "1.8"
-rpassword = "7.2"
 serde = { version = "1.0", default-features = false }
 serde_ipld_dagcbor = "0.2"
 serde_json = "1.0"

forest/cli/Cargo.toml

@@ -51,7 +51,6 @@ log.workspace = true
 multibase.workspace = true
 nom = "7.1.3"
 num.workspace = true
-rpassword.workspace = true
 rustyline = "10.1.1"
 serde = { workspace = true, features = ["derive"] }
 serde_json.workspace = true

forest/cli/src/cli/wallet_cmd.rs

@@ -9,6 +9,7 @@ use std::{
 use anyhow::Context;
 use base64::{prelude::BASE64_STANDARD, Engine};
 use clap::{arg, Subcommand};
+use dialoguer::{theme::ColorfulTheme, Password};
 use forest_json::{
     address::json::AddressJson,
     signature::json::{signature_type::SignatureTypeJson, SignatureJson},
@@ -22,7 +23,6 @@ use forest_shim::{
 };
 use forest_utils::io::read_file_to_string;
 use num::BigInt;
-use rpassword::read_password;
 
 use super::{handle_rpc_err, Config};
 use crate::humantoken::TokenAmountPretty as _;
@@ -150,8 +150,13 @@ impl WalletCommands {
                 let key = match path {
                     Some(path) => read_file_to_string(&PathBuf::from(path))?,
                     _ => {
-                        println!("Enter the private key: ");
-                        read_password()?
+                        tokio::task::spawn_blocking(|| {
+                            Password::with_theme(&ColorfulTheme::default())
+                                .allow_empty_password(true)
+                                .with_prompt("Enter the private key")
+                                .interact()
+                        })
+                        .await??
                     }
                 };
 

forest/daemon/Cargo.toml

@@ -12,7 +12,6 @@ name = "forest"
 path = "src/main.rs"
 
 [dependencies]
-anes.workspace = true
 anyhow.workspace = true
 atty.workspace = true
 cfg-if.workspace = true
@@ -46,7 +45,6 @@ fvm_ipld_blockstore.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 raw_sync = "0.1"
-rpassword.workspace = true
 serde_json.workspace = true
 shared_memory = "0.12"
 tempfile.workspace = true

forest/daemon/src/cli/mod.rs

@@ -1,13 +1,9 @@
 // Copyright 2019-2023 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use std::io::Write;
-
-use anes::execute;
 use clap::Parser;
 use forest_cli_shared::cli::{CliOpts, HELP_MESSAGE};
 use forest_utils::version::FOREST_VERSION_STRING;
-use tokio::{signal, task};
 
 /// CLI structure generated when interacting with Forest binary
 #[derive(Parser)]
@@ -18,15 +14,3 @@ pub struct Cli {
     pub opts: CliOpts,
     pub cmd: Option<String>,
 }
-
-pub fn set_sigint_handler() {
-    task::spawn(async {
-        let _ = signal::ctrl_c().await;
-
-        // the cursor can go missing if we hit ctrl-c during a prompt, so we always
-        // restore it
-        let mut stdout = std::io::stdout();
-        #[allow(clippy::question_mark)]
-        execute!(&mut stdout, anes::ShowCursor).unwrap();
-    });
-}