github-jwinterm/grim
1
0
Fork 0
mirror of https://github.com/jwinterm/grim.git synced 2026-10-24 08:28:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

tor: fix service availability check

Browse Source
This commit is contained in:
ardocrat
2024-05-15 20:27:58 +03:00
parent 5749c5a367
commit 2bb51d6757
3 changed files with 112 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/views/wallets/wallet/transport.rs
+16 -12
View File
@@ -18,6 +18,8 @@ use egui::{Align, Id, Layout, Margin, RichText, Rounding, ScrollArea};
use egui::os::OperatingSystem;
use egui::scroll_area::ScrollBarVisibility;
use parking_lot::RwLock;
use tor_rtcompat::BlockOn;
use tor_rtcompat::tokio::TokioNativeTlsRuntime;
use grin_core::core::{amount_from_hr_string, amount_to_hr_string};
use grin_wallet_libwallet::SlatepackAddress;
@@ -402,7 +404,7 @@ impl WalletTransport {
ui.add_space(6.0);
}
/// Draw Tor send content.
/// Draw Tor receive content.
fn tor_receive_ui(&mut self,
ui: &mut egui::Ui,
wallet: &Wallet,
@@ -495,7 +497,7 @@ impl WalletTransport {
});
}
/// Draw Tor receive content.
/// Draw Tor send content.
fn tor_send_ui(&mut self, ui: &mut egui::Ui, cb: &dyn PlatformCallbacks) {
// Setup layout size.
let mut rect = ui.available_rect_before_wrap();
@@ -684,12 +686,13 @@ impl WalletTransport {
let send_success = self.tor_success.clone();
let mut wallet = wallet.clone();
thread::spawn(move || {
tokio::runtime::Builder::new_multi_thread()
.enable_all()
.build()
.unwrap()
let runtime = TokioNativeTlsRuntime::create().unwrap();
let runtime_tor = runtime.clone();
runtime
.block_on(async {
if wallet.send_tor(a, &addr).await.is_some() {
if wallet.send_tor(a, &addr, runtime_tor)
.await
.is_some() {
let mut w_send_success = send_success.write();
*w_send_success = true;
} else {
@@ -742,15 +745,16 @@ impl WalletTransport {
let send_success = self.tor_success.clone();
let mut wallet = wallet.clone();
thread::spawn(move || {
tokio::runtime::Builder::new_multi_thread()
.enable_all()
.build()
.unwrap()
let runtime = TokioNativeTlsRuntime::create().unwrap();
let runtime_tor = runtime.clone();
runtime
.block_on(async {
let addr_str = addr_text.as_str();
let addr = &SlatepackAddress::try_from(addr_str)
.unwrap();
if wallet.send_tor(a, &addr).await.is_some() {
if wallet.send_tor(a, &addr, runtime_tor)
.await
.is_some() {
let mut w_send_success = send_success.write();
*w_send_success = true;
} else {