Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-11-25 18:26:28 -05:00
Code Issues Projects Releases Packages Wiki Activity

feat: Recover from / write down seed (#439)

Browse source 
* vendor: seed crate from monero-serai

* refactor: make approval type generic over respone from frontend

* progress

* Raphaels Progress

* feat(gui): seed import flow skeleton

* fix(gui): Seed import in the development version

* fix(gui): specify the imported seed type

* remove initializeHandle, make tauri handle non optional in state, dont allow closing seed dialog

* feat(gui): check if seed is valid dynamically

* fix(gui): refine the dynamic seed validation

* push

* progress

* progress

* Fix pending trimeout

---------

Co-authored-by: Maksim Kirillov <artist@eduroam-141-23-183-184.wlan.tu-berlin.de>
Co-authored-by: Maksim Kirillov <artist@eduroam-141-23-189-144.wlan.tu-berlin.de>
Co-authored-by: Maksim Kirillov <maksim.kirillov@staticlabs.de>
This commit is contained in:
Mohan 2025-07-02 14:01:56 +02:00 • committed by GitHub
parent b8982b5ac2
commit 7606982de3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
39 changed files with 22465 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src-tauri/src/lib.rs
View file

@ -8,10 +8,10 @@ use swap::cli::{
data,
request::{
BalanceArgs, BuyXmrArgs, CancelAndRefundArgs, CheckElectrumNodeArgs,
CheckElectrumNodeResponse, CheckMoneroNodeArgs, CheckMoneroNodeResponse,
ExportBitcoinWalletArgs, GetDataDirArgs, GetHistoryArgs, GetLogsArgs,
GetMoneroAddressesArgs, GetSwapInfoArgs, GetSwapInfosAllArgs, ListSellersArgs,
MoneroRecoveryArgs, RedactArgs, ResolveApprovalArgs, ResumeSwapArgs,
CheckElectrumNodeResponse, CheckMoneroNodeArgs, CheckMoneroNodeResponse, CheckSeedArgs,
CheckSeedResponse, ExportBitcoinWalletArgs, GetDataDirArgs, GetHistoryArgs,
GetLogsArgs, GetMoneroAddressesArgs, GetSwapInfoArgs, GetSwapInfosAllArgs,
ListSellersArgs, MoneroRecoveryArgs, RedactArgs, ResolveApprovalArgs, ResumeSwapArgs,
SuspendCurrentSwapArgs, WithdrawBtcArgs,
},
tauri_bindings::{TauriContextStatusEvent, TauriEmitter, TauriHandle, TauriSettings},
@ -93,12 +93,16 @@ macro_rules! tauri_command {
/// Represents the shared Tauri state. It is accessed by Tauri commands
struct State {
pub context: Option<Arc<Context>>,
pub handle: TauriHandle,
}
impl State {
/// Creates a new State instance with no Context
fn new() -> Self {
Self { context: None }
fn new(handle: TauriHandle) -> Self {
Self {
context: None,
handle,
}
}
/// Sets the context for the application state
@ -141,7 +145,8 @@ fn setup(app: &mut tauri::App) -> Result<(), Box<dyn std::error::Error>> {
// We need to set a value for the Tauri state right at the start
// If we don't do this, Tauri commands will panic at runtime if no value is present
let state = RwLock::new(State::new());
let handle = TauriHandle::new(app_handle.clone());
let state = RwLock::new(State::new(handle));
app_handle.manage::<RwLock<State>>(state);
Ok(())
@ -194,6 +199,7 @@ pub fn run() {
resolve_approval_request,
redact,
save_txt_files,
check_seed,
])
.setup(setup)
.build(tauri::generate_context!())
@ -234,7 +240,6 @@ tauri_command!(monero_recovery, MoneroRecoveryArgs);
tauri_command!(get_logs, GetLogsArgs);
tauri_command!(list_sellers, ListSellersArgs);
tauri_command!(cancel_and_refund, CancelAndRefundArgs);
tauri_command!(resolve_approval_request, ResolveApprovalArgs);
tauri_command!(redact, RedactArgs);
// These commands require no arguments
@ -268,6 +273,14 @@ async fn check_electrum_node(
args.request().await.to_string_result()
}
#[tauri::command]
async fn check_seed(
args: CheckSeedArgs,
_: tauri::State<'_, RwLock<State>>,
) -> Result<CheckSeedResponse, String> {
args.request().await.to_string_result()
}
// Returns the data directory
// This is independent of the context to ensure the user can open the directory even if the context cannot
// be initialized (for troubleshooting purposes)
@ -327,6 +340,23 @@ async fn save_txt_files(
Ok(())
}
#[tauri::command]
async fn resolve_approval_request(
args: ResolveApprovalArgs,
state: tauri::State<'_, RwLock<State>>,
) -> Result<(), String> {
println!("Resolving approval request");
let lock = state.read().await;
lock.handle
.resolve_approval(args.request_id.parse().unwrap(), args.accept)
.await
.to_string_result()?;
println!("Resolved approval request");
Ok(())
}
/// Tauri command to initialize the Context
#[tauri::command]
async fn initialize_context(
@ -361,14 +391,13 @@ async fn initialize_context(
}
}
// Acquire a write lock on the state
let mut state_write_lock = state
.try_write()
.context("Context is already being initialized")
.to_string_result()?;
// Get app handle and create a Tauri handle
let tauri_handle = TauriHandle::new(app_handle.clone());
let tauri_handle = state
.try_read()
.context("Context is already being initialized")
.to_string_result()?
.handle
.clone();
// Notify frontend that the context is being initialized
tauri_handle.emit_context_init_progress_event(TauriContextStatusEvent::Initializing);
@ -388,7 +417,11 @@ async fn initialize_context(
match context_result {
Ok(context_instance) => {
state_write_lock.set_context(Arc::new(context_instance));
state
.try_write()
.context("Context is already being initialized")
.to_string_result()?
.set_context(Arc::new(context_instance));
tracing::info!("Context initialized");