github-jwinterm/grim
1
0
Fork 0
mirror of https://github.com/jwinterm/grim.git synced 2026-10-17 06:11:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not hang on tor service launch at ui

Browse Source 
- Retrieve secret key on wallet sync to prevent lock at UI

Reviewed-on: https://code.gri.mw/GUI/grim/pulls/51
This commit is contained in:
ardocrat
2026-02-26 14:12:39 +00:00
parent 9f2ad32031
commit a499c91619
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/wallets/wallet/transport/content.rs
+5 -5
View File
@@ -126,14 +126,14 @@ impl WalletTransportContent {
// Draw button to enable/disable Tor listener for current wallet.
let service_id = &wallet.identifier();
if !Tor::is_service_starting(service_id) && wallet.foreign_api_port().is_some() {
if !Tor::is_service_starting(service_id) && wallet.foreign_api_port().is_some() &&
wallet.secret_key().is_some() {
if !Tor::is_service_running(service_id) {
let r = CornerRadius::default();
View::item_button(ui, r, POWER, Some(Colors::green()), || {
if let Ok(key) = wallet.get_secret_key() {
let api_port = wallet.foreign_api_port().unwrap();
Tor::start_service(api_port, key, service_id);
}
let api_port = wallet.foreign_api_port().unwrap();
let key = wallet.secret_key().unwrap();
Tor::start_service(api_port, key, service_id);
});
} else {
let r = CornerRadius::default();
src/gui/views/wallets/wallet/transport/settings.rs
+4 -3
View File
@@ -66,9 +66,10 @@ impl WalletTransportSettingsContent {
// Restart running service or rebuild client.
let service_id = &wallet.identifier();
if Tor::is_service_running(service_id) {
if let Ok(key) = wallet.get_secret_key() {
let api_port = wallet.foreign_api_port().unwrap();
Tor::restart_service(api_port, key, service_id);
if let Some(key) = wallet.secret_key() {
if let Some(api_port) = wallet.foreign_api_port() {
Tor::restart_service(api_port, key, service_id);
}
}
} else {
Tor::rebuild_client();
src/wallet/wallet.rs
+25 -4
View File
@@ -93,6 +93,8 @@ pub struct Wallet {
/// Running wallet foreign API server and port.
foreign_api_server: Arc<RwLock<Option<(ApiServer, u16)>>>,
/// Running wallet foreign API server and port.
secret_key: Arc<RwLock<Option<SecretKey>>>,
/// Flag to check if wallet repairing and restoring missing outputs is needed.
repair_needed: Arc<AtomicBool>,
@@ -126,6 +128,7 @@ impl Wallet {
slatepack_address: Arc::new(RwLock::new(None)),
sync_thread: Arc::from(RwLock::new(None)),
foreign_api_server: Arc::new(RwLock::new(None)),
secret_key: Arc::new(RwLock::new(None)),
reopen: Arc::new(AtomicBool::new(false)),
is_open: Arc::from(AtomicBool::new(false)),
closing: Arc::new(AtomicBool::new(false)),
@@ -370,8 +373,14 @@ impl Wallet {
Ok(w_inst.parent_key_id())
}
/// Get wallet [`SecretKey`] for transports.
pub fn get_secret_key(&self) -> Result<SecretKey, Error> {
/// Get wallet [`SecretKey`] for transport.
pub fn secret_key(&self) -> Option<SecretKey> {
let r_key = self.secret_key.read();
r_key.clone()
}
/// Retrieve wallet [`SecretKey`] for transport.
fn get_secret_key(&self) -> Result<SecretKey, Error> {
let r_inst = self.instance.as_ref().read();
let instance = r_inst.clone().unwrap();
let mut w_lock = instance.lock();
@@ -658,6 +667,10 @@ impl Wallet {
let mut w_data = self.data.write();
*w_data = None;
// Clear secret key for previous account.
let mut w_key = self.secret_key.write();
*w_key = None;
// Reset progress values.
self.info_sync_progress.store(0, Ordering::Relaxed);
@@ -1250,14 +1263,22 @@ fn start_sync(wallet: Wallet) -> Thread {
}
}
// Setup secret key if not set.
if wallet.secret_key().is_none() {
let mut w_key = wallet.secret_key.write();
if let Ok(key) = wallet.get_secret_key() {
*w_key = Some(key);
}
}
// Start unfailed Tor service if API server is running.
let service_id = wallet.identifier();
if wallet.auto_start_tor_listener() && api_server_running &&
!Tor::is_service_failed(&service_id) {
let r_foreign_api = wallet.foreign_api_server.read();
let api = r_foreign_api.as_ref().unwrap();
if let Ok(sec_key) = wallet.get_secret_key() {
Tor::start_service(api.1, sec_key, &wallet.identifier());
if let Some(key) = wallet.secret_key() {
Tor::start_service(api.1, key, &wallet.identifier());
}
}
}