Skip to content

Commit

Permalink
Check esplora after fedimint withdraw
Browse files Browse the repository at this point in the history
  • Loading branch information
@TonyGiorgio
TonyGiorgio committed May 3, 2024
1 parent d913e4d commit f629a87
Show file tree
Hide file tree
Showing 3 changed files with 99 additions and 12 deletions.
64 changes: 62 additions & 2 deletions mutiny-core/src/federation.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use bitcoin::{
Address, Network, Txid,
};
use core::fmt;
use esplora_client::AsyncClient;
use fedimint_bip39::Bip39RootSecretStrategy;
use fedimint_client::{
derivable_secret::DerivableSecret,
Expand Down Expand Up @@ -194,6 +195,7 @@ pub(crate) struct FederationClient<S: MutinyStorage> {
#[allow(dead_code)]
fedimint_storage: FedimintStorage<S>,
gateway: Arc<RwLock<Option<LightningGateway>>>,
esplora: Arc<AsyncClient>,
network: Network,
stop: Arc<AtomicBool>,
pub(crate) logger: Arc<MutinyLogger>,
Expand All @@ -206,6 +208,7 @@ impl<S: MutinyStorage> FederationClient<S> {
federation_code: InviteCode,
xprivkey: ExtendedPrivKey,
storage: S,
esplora: Arc<AsyncClient>,
network: Network,
stop: Arc<AtomicBool>,
logger: Arc<MutinyLogger>,
Expand Down Expand Up @@ -335,6 +338,7 @@ impl<S: MutinyStorage> FederationClient<S> {
storage,
logger,
invite_code: federation_code,
esplora,
network,
stop,
gateway,
Expand Down Expand Up @@ -421,6 +425,7 @@ impl<S: MutinyStorage> FederationClient<S> {
entry,
operation_id,
self.fedimint_client.clone(),
self.esplora.clone(),
self.logger.clone(),
self.stop.clone(),
self.storage.clone(),
Expand Down Expand Up @@ -471,6 +476,7 @@ impl<S: MutinyStorage> FederationClient<S> {
let fedimint_client_clone = self.fedimint_client.clone();
let logger_clone = self.logger.clone();
let storage_clone = self.storage.clone();
let esplora_clone = self.esplora.clone();
let stop = self.stop.clone();
spawn(async move {
let operation = fedimint_client_clone
Expand All @@ -483,6 +489,7 @@ impl<S: MutinyStorage> FederationClient<S> {
operation,
id,
fedimint_client_clone,
esplora_clone,
logger_clone,
stop,
storage_clone,
Expand Down Expand Up @@ -630,6 +637,7 @@ impl<S: MutinyStorage> FederationClient<S> {
let fedimint_client_clone = self.fedimint_client.clone();
let logger_clone = self.logger.clone();
let storage_clone = self.storage.clone();
let esplora_clone = self.esplora.clone();
let stop = self.stop.clone();
spawn(async move {
let operation = fedimint_client_clone
Expand All @@ -642,6 +650,7 @@ impl<S: MutinyStorage> FederationClient<S> {
operation,
id,
fedimint_client_clone,
esplora_clone,
logger_clone,
stop,
storage_clone,
Expand Down Expand Up @@ -708,6 +717,7 @@ impl<S: MutinyStorage> FederationClient<S> {
op_id,
self.fedimint_client.clone(),
self.storage.clone(),
self.esplora.clone(),
Some(DEFAULT_PAYMENT_TIMEOUT * 1_000),
self.stop.clone(),
)
Expand Down Expand Up @@ -809,6 +819,7 @@ fn subscribe_operation_ext<S: MutinyStorage>(
entry: OperationLogEntry,
operation_id: OperationId,
fedimint_client: ClientHandleArc,
esplora: Arc<AsyncClient>,
logger: Arc<MutinyLogger>,
stop: Arc<AtomicBool>,
storage: S,
Expand All @@ -820,6 +831,7 @@ fn subscribe_operation_ext<S: MutinyStorage>(
operation_id,
fedimint_client,
storage,
esplora,
None,
stop,
)
Expand Down Expand Up @@ -940,6 +952,7 @@ async fn process_operation_until_timeout<S: MutinyStorage>(
operation_id: OperationId,
fedimint_client: ClientHandleArc,
storage: S,
esplora: Arc<AsyncClient>,
timeout: Option<u64>,
stop: Arc<AtomicBool>,
) {
Expand Down Expand Up @@ -1073,6 +1086,7 @@ async fn process_operation_until_timeout<S: MutinyStorage>(
fee.amount(),
operation_id,
storage,
esplora,
timeout,
stop,
logger,
Expand Down Expand Up @@ -1206,6 +1220,7 @@ async fn process_onchain_withdraw_outcome<S: MutinyStorage>(
fee: fedimint_ln_common::bitcoin::Amount,
operation_id: OperationId,
storage: S,
esplora: Arc<AsyncClient>,
timeout: Option<u64>,
stop: Arc<AtomicBool>,
logger: Arc<MutinyLogger>,
Expand Down Expand Up @@ -1268,8 +1283,10 @@ async fn process_onchain_withdraw_outcome<S: MutinyStorage>(
},
}

// TODO we need to get confirmations for this txid and update
break;
// we need to get confirmations for this txid and update
subscribe_onchain_confirmation_check(storage.clone(), esplora.clone(), txid, updated_transaction_details, stop, logger.clone()).await;

break
},
WithdrawState::Failed(e) => {
// TODO delete
Expand Down Expand Up @@ -1299,6 +1316,49 @@ async fn process_onchain_withdraw_outcome<S: MutinyStorage>(
}
}

async fn subscribe_onchain_confirmation_check<S: MutinyStorage>(
storage: S,
esplora: Arc<AsyncClient>,
txid: Txid,
mut transaction_details: TransactionDetails,
stop: Arc<AtomicBool>,
logger: Arc<MutinyLogger>,
) {
spawn(async move {
loop {
if stop.load(Ordering::Relaxed) {
break;
};

match esplora.get_tx_status(&txid).await {
Ok(s) => {
if s.confirmed {
log_info!(logger, "Transaction confirmed");
transaction_details.confirmation_time = ConfirmationTime::Confirmed {
height: s.block_height.expect("confirmed"),
time: now().as_secs(),
};
match persist_transaction_details(&storage, &transaction_details) {
Ok(_) => {
log_info!(logger, "Transaction updated");
break;
}
Err(e) => {
log_error!(logger, "Error updating transaction: {e}");
}
}
}
}
Err(e) => {
log_error!(logger, "Error updating transaction: {e}");
}
}

sleep(5_000).await;
}
});
}

async fn process_onchain_deposit_outcome<S: MutinyStorage>(
stream_or_outcome: UpdateStreamOrOutcome<fedimint_wallet_client::DepositState>,
original_transaction_details: Option<TransactionDetails>,
Expand Down
29 changes: 23 additions & 6 deletions mutiny-core/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ mod test_utils;
pub use crate::gossip::{GOSSIP_SYNC_TIME_KEY, NETWORK_GRAPH_KEY, PROB_SCORER_KEY};
pub use crate::keymanager::generate_seed;
pub use crate::ldkstorage::{CHANNEL_CLOSURE_PREFIX, CHANNEL_MANAGER_KEY, MONITORS_PREFIX_KEY};
use crate::storage::{
get_payment_hash_from_key, get_transaction_details, list_payment_info, persist_payment_info,
update_nostr_contact_list, IndexItem, MutinyStorage, DEVICE_ID_KEY, EXPECTED_NETWORK_KEY,
NEED_FULL_SYNC_KEY, ONCHAIN_PREFIX, PAYMENT_INBOUND_PREFIX_KEY, PAYMENT_OUTBOUND_PREFIX_KEY,
SUBSCRIPTION_TIMESTAMP, TRANSACTION_DETAILS_PREFIX_KEY,
};
use crate::utils::spawn;
use crate::{auth::MutinyAuthClient, hermes::HermesClient, logging::MutinyLogger};
use crate::{blindauth::BlindAuthClient, cashu::CashuHttpClient};
Expand Down Expand Up @@ -83,6 +77,15 @@ use crate::{
storage::get_invoice_by_hash,
};
use crate::{nostr::NostrManager, utils::sleep};
use crate::{
onchain::get_esplora_url,
storage::{
get_payment_hash_from_key, get_transaction_details, list_payment_info,
persist_payment_info, update_nostr_contact_list, IndexItem, MutinyStorage, DEVICE_ID_KEY,
EXPECTED_NETWORK_KEY, NEED_FULL_SYNC_KEY, ONCHAIN_PREFIX, PAYMENT_INBOUND_PREFIX_KEY,
PAYMENT_OUTBOUND_PREFIX_KEY, SUBSCRIPTION_TIMESTAMP, TRANSACTION_DETAILS_PREFIX_KEY,
},
};
use ::nostr::nips::nip47::Method;
use ::nostr::nips::nip57;
#[cfg(target_arch = "wasm32")]
Expand All @@ -101,6 +104,7 @@ use bitcoin::{
use bitcoin::{bip32::ExtendedPrivKey, Transaction};
use bitcoin::{hashes::sha256, Network, Txid};
use bitcoin::{hashes::Hash, Address};
use esplora_client::AsyncClient;
use fedimint_core::{api::InviteCode, config::FederationId};
use futures::{pin_mut, select, FutureExt};
use futures_util::join;
Expand Down Expand Up @@ -924,11 +928,16 @@ impl<S: MutinyStorage> MutinyWalletBuilder<S> {
}
});

let esplora_server_url = get_esplora_url(network, config.user_esplora_url.clone());
let esplora = esplora_client::Builder::new(&esplora_server_url).build_async()?;
let esplora = Arc::new(esplora);

let start = Instant::now();

let mut nm_builder = NodeManagerBuilder::new(self.xprivkey, self.storage.clone())
.with_config(config.clone());
nm_builder.with_logger(logger.clone());
nm_builder.with_esplora(esplora.clone());
let node_manager = Arc::new(nm_builder.build().await?);

log_trace!(
Expand Down Expand Up @@ -976,6 +985,7 @@ impl<S: MutinyStorage> MutinyWalletBuilder<S> {
federation_storage.clone(),
&config,
self.storage.clone(),
esplora.clone(),
stop.clone(),
&logger,
)
Expand Down Expand Up @@ -1164,6 +1174,7 @@ impl<S: MutinyStorage> MutinyWalletBuilder<S> {
subscription_client,
blind_auth_client,
hermes_client,
esplora,
auth,
stop,
logger,
Expand Down Expand Up @@ -1236,6 +1247,7 @@ pub struct MutinyWallet<S: MutinyStorage> {
subscription_client: Option<Arc<MutinySubscriptionClient>>,
blind_auth_client: Option<Arc<BlindAuthClient<S>>>,
hermes_client: Option<Arc<HermesClient<S>>>,
esplora: Arc<AsyncClient>,
pub stop: Arc<AtomicBool>,
pub logger: Arc<MutinyLogger>,
network: Network,
Expand Down Expand Up @@ -2623,6 +2635,7 @@ impl<S: MutinyStorage> MutinyWallet<S> {
self.federation_storage.clone(),
self.federations.clone(),
self.hermes_client.clone(),
self.esplora.clone(),
federation_code,
self.stop.clone(),
)
Expand Down Expand Up @@ -3280,6 +3293,7 @@ async fn create_federations<S: MutinyStorage>(
federation_storage: FederationStorage,
c: &MutinyWalletConfig,
storage: S,
esplora: Arc<AsyncClient>,
stop: Arc<AtomicBool>,
logger: &Arc<MutinyLogger>,
) -> Result<Arc<RwLock<HashMap<FederationId, Arc<FederationClient<S>>>>>, MutinyError> {
Expand All @@ -3290,6 +3304,7 @@ async fn create_federations<S: MutinyStorage>(
federation_index.federation_code,
c.xprivkey,
storage.clone(),
esplora.clone(),
c.network,
stop.clone(),
logger.clone(),
Expand All @@ -3314,6 +3329,7 @@ pub(crate) async fn create_new_federation<S: MutinyStorage>(
federation_storage: Arc<RwLock<FederationStorage>>,
federations: Arc<RwLock<HashMap<FederationId, Arc<FederationClient<S>>>>>,
hermes_client: Option<Arc<HermesClient<S>>>,
esplora: Arc<AsyncClient>,
federation_code: InviteCode,
stop: Arc<AtomicBool>,
) -> Result<FederationIdentity, MutinyError> {
Expand Down Expand Up @@ -3343,6 +3359,7 @@ pub(crate) async fn create_new_federation<S: MutinyStorage>(
federation_code.clone(),
xprivkey,
storage.clone(),
esplora,
network,
stop.clone(),
logger.clone(),
Expand Down
18 changes: 14 additions & 4 deletions mutiny-core/src/nodemanager.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ pub struct NodeBalance {
pub struct NodeManagerBuilder<S: MutinyStorage> {
xprivkey: ExtendedPrivKey,
storage: S,
esplora: Option<Arc<AsyncClient>>,
config: Option<MutinyWalletConfig>,
stop: Option<Arc<AtomicBool>>,
logger: Option<Arc<MutinyLogger>>,
Expand All @@ -242,6 +243,7 @@ impl<S: MutinyStorage> NodeManagerBuilder<S> {
NodeManagerBuilder::<S> {
xprivkey,
storage,
esplora: None,
config: None,
stop: None,
logger: None,
Expand All @@ -257,6 +259,10 @@ impl<S: MutinyStorage> NodeManagerBuilder<S> {
self.stop = Some(stop);
}

pub fn with_esplora(&mut self, esplora: Arc<AsyncClient>) {
self.esplora = Some(esplora);
}

pub fn with_logger(&mut self, logger: Arc<MutinyLogger>) {
self.logger = Some(logger);
}
Expand All @@ -271,6 +277,13 @@ impl<S: MutinyStorage> NodeManagerBuilder<S> {
.map_or_else(|| Err(MutinyError::InvalidArgumentsError), Ok)?;
let logger = self.logger.unwrap_or(Arc::new(MutinyLogger::default()));
let stop = self.stop.unwrap_or(Arc::new(AtomicBool::new(false)));
let esplora = if let Some(e) = self.esplora {
e
} else {
let esplora_server_url = get_esplora_url(c.network, c.user_esplora_url);
let esplora = Builder::new(&esplora_server_url).build_async()?;
Arc::new(esplora)
};

#[cfg(target_arch = "wasm32")]
let websocket_proxy_addr = c
Expand All @@ -280,14 +293,11 @@ impl<S: MutinyStorage> NodeManagerBuilder<S> {
let start = Instant::now();
log_info!(logger, "Building node manager components");

let esplora_server_url = get_esplora_url(c.network, c.user_esplora_url);
let esplora = Builder::new(&esplora_server_url).build_async()?;
let tx_sync = Arc::new(EsploraSyncClient::from_client(
esplora.clone(),
esplora.as_ref().clone(),
logger.clone(),
));

let esplora = Arc::new(esplora);
let fee_estimator = Arc::new(MutinyFeeEstimator::new(
self.storage.clone(),
esplora.clone(),
Expand Down

0 comments on commit f629a87

Please sign in to comment.