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

fix(monero wallet): Properly delete temporary monitoring wallet

Browse source
This commit is contained in:
Binarybaron 2025-05-26 21:04:52 +02:00
parent 80ea9a60a9
commit 96b61d33c6
1 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

44
swap/src/cli/api.rs
View file

@ -551,21 +551,11 @@ async fn init_monero_wallet(
) -> Result<(monero::Wallet, monero::WalletRpcProcess)> {
let network = env_config.monero_network;
const MONERO_BLOCKCHAIN_MONITORING_WALLET_NAME: &str = "swap-tool-blockchain-monitoring-wallet";
// Start the monero-wallet-rpc after the wallet is removed
let monero_wallet_rpc_working_dir = data_dir.join("monero");
let monero_dir = data_dir.join("monero");
// remove monitoring wallet if it exists
let wallet_path = monero_dir.join(MONERO_BLOCKCHAIN_MONITORING_WALLET_NAME);
if wallet_path.exists() {
let _ = tokio::fs::remove_file(&wallet_path).await;
}
let keys_path = wallet_path.with_extension("keys");
if keys_path.exists() {
let _ = tokio::fs::remove_file(keys_path).await;
}
let monero_wallet_rpc = monero::WalletRpc::new(monero_dir, tauri_handle).await?;
let monero_wallet_rpc =
monero::WalletRpc::new(monero_wallet_rpc_working_dir.clone(), tauri_handle).await?;
tracing::debug!(
override_monero_daemon_address = monero_daemon_address.clone().into(),
@ -577,6 +567,32 @@ async fn init_monero_wallet(
.await
.context("Failed to start monero-wallet-rpc process")?;
let monero_wallet_rpc_dir = monero_wallet_rpc_working_dir.join("monero-data");
// Remove the monitoring wallet if it exists
// It doesn't contain any coins
// Deleting it ensures we never have issues at startup
// And we reset the restore height
const MONERO_BLOCKCHAIN_MONITORING_WALLET_NAME: &str = "swap-tool-blockchain-monitoring-wallet";
let wallet_path = monero_wallet_rpc_dir.join(MONERO_BLOCKCHAIN_MONITORING_WALLET_NAME);
if wallet_path.exists() {
tracing::debug!(
wallet_path = %wallet_path.display(),
"Removing monitoring wallet"
);
let _ = tokio::fs::remove_file(&wallet_path).await;
}
let keys_path = wallet_path.with_extension("keys");
if keys_path.exists() {
tracing::debug!(
keys_path = %keys_path.display(),
"Removing monitoring wallet keys"
);
let _ = tokio::fs::remove_file(keys_path).await;
}
// Now open the wallet
let monero_wallet = monero::Wallet::open_or_create(
monero_wallet_rpc_process.endpoint(),
MONERO_BLOCKCHAIN_MONITORING_WALLET_NAME.to_string(),