Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set preimage for fedimint invoices #1228

Merged
merged 2 commits into from
Jun 21, 2024
Merged

Set preimage for fedimint invoices #1228

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
996b7b4
Set preimage for fedimint invoices
benthecarman Jun 19, 2024
bd17605
Don't overwrite fedimint invoices in storage
benthecarman Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 31 additions & 19 deletions mutiny-core/src/federation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use crate::storage::get_invoice_by_hash;
use crate::utils::{
convert_from_fedimint_invoice, convert_to_fedimint_invoice, fetch_with_timeout, now, spawn,
};
Expand Down Expand Up @@ -507,7 +508,7 @@ impl<S: MutinyStorage> FederationClient<S> {

let desc = Description::new(String::new()).expect("empty string is valid");
let gateway = self.gateway.read().await;
let (id, invoice, _) = lightning_module
let (id, invoice, preimage) = lightning_module
.create_bolt11_invoice(
Amount::from_sats(amount),
Bolt11InvoiceDescription::Direct(&desc),
Expand All @@ -524,6 +525,7 @@ impl<S: MutinyStorage> FederationClient<S> {
let mut stored_payment: MutinyInvoice = invoice.clone().into();
stored_payment.inbound = inbound;
stored_payment.labels = labels;
stored_payment.preimage = Some(preimage.to_lower_hex_string());

log_trace!(self.logger, "Persisting payment");
let hash = stored_payment.payment_hash.into_32();
Expand Down Expand Up @@ -641,7 +643,7 @@ impl<S: MutinyStorage> FederationClient<S> {
stored_payment.labels = labels;
stored_payment.status = HTLCStatus::InFlight;
let hash = stored_payment.payment_hash.into_32();
let payment_info = PaymentInfo::from(stored_payment);
let payment_info = PaymentInfo::from(stored_payment.clone());
persist_payment_info(&self.storage, &hash, &payment_info, inbound)?;

// Subscribe and process outcome based on payment type
Expand All @@ -652,8 +654,7 @@ impl<S: MutinyStorage> FederationClient<S> {
let o = process_ln_outcome(
o,
process_pay_state_internal,
invoice.clone(),
inbound,
stored_payment,
Some(DEFAULT_PAYMENT_TIMEOUT * 1_000),
self.stop.clone(),
Arc::clone(&self.logger),
Expand All @@ -670,8 +671,7 @@ impl<S: MutinyStorage> FederationClient<S> {
let o = process_ln_outcome(
o,
process_pay_state_ln,
invoice.clone(),
inbound,
stored_payment,
Some(DEFAULT_PAYMENT_TIMEOUT * 1_000),
self.stop.clone(),
Arc::clone(&self.logger),
Expand Down Expand Up @@ -1157,15 +1157,23 @@ async fn process_operation_until_timeout<S: MutinyStorage>(
let updated_invoice = match lightning_meta.variant {
LightningOperationMetaVariant::Pay(pay_meta) => {
let hash = pay_meta.invoice.payment_hash().into_inner();
let invoice = convert_from_fedimint_invoice(&pay_meta.invoice);
if invoice.payment_hash().into_32() == hash {
let bolt11 = convert_from_fedimint_invoice(&pay_meta.invoice);
let invoice = match get_invoice_by_hash(bolt11.payment_hash(), &storage, &logger) {
Ok(invoice) => invoice,
Err(_) => {
// if we can't find the invoice, we should just create MutinyInvoice from the bolt11
let mut invoice: MutinyInvoice = bolt11.into();
invoice.inbound = false;
invoice
}
};
if invoice.payment_hash.into_32() == hash {
match lightning_module.subscribe_ln_pay(operation_id).await {
Ok(o) => Some(
process_ln_outcome(
o,
process_pay_state_ln,
invoice,
false,
timeout,
stop,
logger.clone(),
Expand All @@ -1176,7 +1184,7 @@ async fn process_operation_until_timeout<S: MutinyStorage>(
log_error!(logger, "Error trying to process stream outcome: {e}");

// return the latest status of the invoice even if it fails
Some(invoice.into())
Some(invoice)
}
}
} else {
Expand All @@ -1185,15 +1193,23 @@ async fn process_operation_until_timeout<S: MutinyStorage>(
}
LightningOperationMetaVariant::Receive { invoice, .. } => {
let hash = invoice.payment_hash().into_inner();
let invoice = convert_from_fedimint_invoice(&invoice);
if invoice.payment_hash().into_32() == hash {
let bolt11 = convert_from_fedimint_invoice(&invoice);
let invoice = match get_invoice_by_hash(bolt11.payment_hash(), &storage, &logger) {
Ok(invoice) => invoice,
Err(_) => {
// if we can't find the invoice, we should just create MutinyInvoice from the bolt11
let mut invoice: MutinyInvoice = bolt11.into();
invoice.inbound = true;
invoice
}
};
if invoice.payment_hash.into_32() == hash {
match lightning_module.subscribe_ln_receive(operation_id).await {
Ok(o) => Some(
process_ln_outcome(
o,
process_receive_state,
invoice,
true,
timeout,
stop,
logger.clone(),
Expand All @@ -1204,7 +1220,7 @@ async fn process_operation_until_timeout<S: MutinyStorage>(
log_error!(logger, "Error trying to process stream outcome: {e}");

// return the latest status of the invoice even if it fails
Some(invoice.into())
Some(invoice)
}
}
} else {
Expand Down Expand Up @@ -1336,8 +1352,7 @@ fn process_receive_state(receive_state: LnReceiveState, invoice: &mut MutinyInvo
async fn process_ln_outcome<U, F>(
stream_or_outcome: UpdateStreamOrOutcome<U>,
process_fn: F,
invoice: Bolt11Invoice,
inbound: bool,
mut invoice: MutinyInvoice,
timeout: Option<u64>,
stop: Arc<AtomicBool>,
logger: Arc<MutinyLogger>,
Expand All @@ -1353,9 +1368,6 @@ where
+ 'static,
F: Fn(U, &mut MutinyInvoice),
{
let mut invoice: MutinyInvoice = invoice.into();
invoice.inbound = inbound;

match stream_or_outcome {
UpdateStreamOrOutcome::Outcome(outcome) => {
invoice.status = outcome.into();
Expand Down
Loading