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

Swap-id as file name for generated Monero wallet

Browse source 
Instead of using the private view-key as wallet filename we use the swap-id, to be able to identify which wallet is associated with which swap.
This commit is contained in:
Daniel Karzel 2021-04-08 15:35:21 +10:00
parent 548f057726
commit 489696ee08
No known key found for this signature in database
GPG key ID: 30C3FC2E438ADB6E
4 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
swap/src/protocol/bob/swap.rs
View file

@ -8,6 +8,7 @@ use crate::{bitcoin, monero};
use anyhow::{bail, Context, Result};
use rand::rngs::OsRng;
use tokio::select;
use uuid::Uuid;
pub fn is_complete(state: &BobState) -> bool {
matches!(
@ -32,6 +33,7 @@ pub async fn run_until(
while !is_target_state(&current_state) {
current_state = next_state(
swap.swap_id,
current_state,
&mut swap.event_loop_handle,
swap.bitcoin_wallet.as_ref(),
@ -51,6 +53,7 @@ pub async fn run_until(
}
async fn next_state(
swap_id: Uuid,
state: BobState,
event_loop_handle: &mut EventLoopHandle,
bitcoin_wallet: &bitcoin::Wallet,
@ -193,17 +196,22 @@ async fn next_state(
BobState::BtcRedeemed(state) => {
let (spend_key, view_key) = state.xmr_keys();
let generated_wallet_file_name = &swap_id.to_string();
if monero_wallet
.create_from_and_load(spend_key, view_key, state.monero_wallet_restore_blockheight)
.create_from_and_load(
generated_wallet_file_name,
spend_key,
view_key,
state.monero_wallet_restore_blockheight,
)
.await
.is_err()
{
// In case we failed to refresh/sweep, when resuming the wallet might already
// exist! This is a very unlikely scenario, but if we don't take care of it we
// might not be able to ever transfer the Monero.
let wallet_name = &monero::PrivateKey::from(view_key).to_string();
tracing::warn!("Failed to generate monero wallet from keys, falling back to trying to open the the wallet if it already exists: {}", wallet_name);
monero_wallet.open(wallet_name).await?;
tracing::warn!("Failed to generate monero wallet from keys, falling back to trying to open the the wallet if it already exists: {}", swap_id);
monero_wallet.open(generated_wallet_file_name).await?;
}
// Ensure that the generated wallet is synced so we have a proper balance