Skip to content

Commit e802f9a

Browse files
Check and refresh served static invoices
As an async recipient, we need to interactively build offers and corresponding static invoices, the latter of which an always-online node will serve to payers on our behalf. Offers may be very long-lived and have a longer expiration than their corresponding static invoice. Therefore, persist a fresh invoice with the static invoice server when the current invoice gets close to expiration.
1 parent 11f7b0e commit e802f9a

File tree

3 files changed

+140
-9
lines changed

3 files changed

+140
-9
lines changed

lightning/src/ln/channelmanager.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4955,9 +4955,11 @@ where
49554955

49564956
#[cfg(async_payments)]
49574957
fn check_refresh_async_receive_offers(&self) {
4958-
match self.flow.check_refresh_async_receive_offers(
4959-
self.get_peers_for_blinded_path(), &*self.entropy_source
4960-
) {
4958+
let peers = self.get_peers_for_blinded_path();
4959+
let channels = self.list_usable_channels();
4960+
let entropy = &*self.entropy_source;
4961+
let router = &*self.router;
4962+
match self.flow.check_refresh_async_receive_offers(peers, channels, entropy, router) {
49614963
Err(()) => {
49624964
log_error!(self.logger, "Failed to create blinded paths when requesting async receive offer paths");
49634965
},

lightning/src/offers/async_receive_offer_cache.rs

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use crate::util::ser::{Readable, Writeable, Writer};
2222
use core::time::Duration;
2323
#[cfg(async_payments)]
2424
use {
25-
crate::blinded_path::message::AsyncPaymentsContext,
25+
crate::blinded_path::message::AsyncPaymentsContext, crate::offers::offer::OfferId,
2626
crate::onion_message::async_payments::OfferPaths,
2727
};
2828

@@ -190,6 +190,63 @@ impl AsyncReceiveOfferCache {
190190
self.last_offer_paths_request_timestamp = Duration::from_secs(0);
191191
}
192192

193+
/// Returns an iterator over the list of cached offers where the invoice is expiring soon and we
194+
/// need to send an updated one to the static invoice server.
195+
pub(super) fn offers_needing_invoice_refresh(
196+
&self, duration_since_epoch: Duration,
197+
) -> impl Iterator<Item = (&Offer, Nonce, Duration, &Responder)> {
198+
self.offers.iter().filter_map(move |offer| {
199+
const ONE_DAY: Duration = Duration::from_secs(24 * 60 * 60);
200+
201+
if offer.offer.is_expired_no_std(duration_since_epoch) {
202+
return None;
203+
}
204+
if offer.invoice_update_attempts >= Self::MAX_UPDATE_ATTEMPTS {
205+
return None;
206+
}
207+
208+
let time_until_invoice_expiry =
209+
offer.static_invoice_absolute_expiry.saturating_sub(duration_since_epoch);
210+
let time_until_offer_expiry = offer
211+
.offer
212+
.absolute_expiry()
213+
.unwrap_or_else(|| Duration::from_secs(u64::MAX))
214+
.saturating_sub(duration_since_epoch);
215+
216+
// Update the invoice if it expires in less than a day, as long as the offer has a longer
217+
// expiry than that.
218+
let needs_update = time_until_invoice_expiry < ONE_DAY
219+
&& time_until_offer_expiry > time_until_invoice_expiry;
220+
if needs_update {
221+
Some((
222+
&offer.offer,
223+
offer.offer_nonce,
224+
offer.offer_created_at,
225+
&offer.update_static_invoice_path,
226+
))
227+
} else {
228+
None
229+
}
230+
})
231+
}
232+
233+
/// Indicates that we've sent onion messages attempting to update the static invoice corresponding
234+
/// to the provided offer_id. Calling this method allows the cache to self-limit how many invoice
235+
/// update requests are sent.
236+
///
237+
/// Errors if the offer corresponding to the provided offer_id could not be found.
238+
pub(super) fn increment_invoice_update_attempts(
239+
&mut self, offer_id: OfferId,
240+
) -> Result<(), ()> {
241+
match self.offers.iter_mut().find(|offer| offer.offer.id() == offer_id) {
242+
Some(offer) => {
243+
offer.invoice_update_attempts += 1;
244+
Ok(())
245+
},
246+
None => return Err(()),
247+
}
248+
}
249+
193250
/// Should be called when we receive a [`StaticInvoicePersisted`] message from the static invoice
194251
/// server, which indicates that a new offer was persisted by the server and they are ready to
195252
/// serve the corresponding static invoice to payers on our behalf.

lightning/src/offers/flow.rs

Lines changed: 77 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,8 +1115,9 @@ where
11151115
core::mem::take(&mut self.pending_dns_onion_messages.lock().unwrap())
11161116
}
11171117

1118-
/// Sends out [`OfferPathsRequest`] onion messages if we are an often-offline recipient and are
1119-
/// configured to interactively build offers and static invoices with a static invoice server.
1118+
/// Sends out [`OfferPathsRequest`] and [`ServeStaticInvoice`] onion messages if we are an
1119+
/// often-offline recipient and are configured to interactively build offers and static invoices
1120+
/// with a static invoice server.
11201121
///
11211122
/// # Usage
11221123
///
@@ -1125,11 +1126,13 @@ where
11251126
///
11261127
/// Errors if we failed to create blinded reply paths when sending an [`OfferPathsRequest`] message.
11271128
#[cfg(async_payments)]
1128-
pub(crate) fn check_refresh_async_receive_offers<ES: Deref>(
1129-
&self, peers: Vec<MessageForwardNode>, entropy: ES,
1129+
pub(crate) fn check_refresh_async_receive_offers<ES: Deref, R: Deref>(
1130+
&self, peers: Vec<MessageForwardNode>, usable_channels: Vec<ChannelDetails>, entropy: ES,
1131+
router: R,
11301132
) -> Result<(), ()>
11311133
where
11321134
ES::Target: EntropySource,
1135+
R::Target: Router,
11331136
{
11341137
// Terminate early if this node does not intend to receive async payments.
11351138
if self.paths_to_static_invoice_server.is_empty() {
@@ -1155,7 +1158,7 @@ where
11551158
path_absolute_expiry: duration_since_epoch
11561159
.saturating_add(TEMP_REPLY_PATH_RELATIVE_EXPIRY),
11571160
});
1158-
let reply_paths = match self.create_blinded_paths(peers, context) {
1161+
let reply_paths = match self.create_blinded_paths(peers.clone(), context) {
11591162
Ok(paths) => paths,
11601163
Err(()) => {
11611164
return Err(());
@@ -1175,9 +1178,78 @@ where
11751178
);
11761179
}
11771180

1181+
self.check_refresh_static_invoices(peers, usable_channels, entropy, router);
1182+
11781183
Ok(())
11791184
}
11801185

1186+
/// If a static invoice server has persisted an offer for us but the corresponding invoice is
1187+
/// expiring soon, we need to refresh that invoice. Here we enqueue the onion messages that will
1188+
/// be used to request invoice refresh, based on the offers provided by the cache.
1189+
#[cfg(async_payments)]
1190+
fn check_refresh_static_invoices<ES: Deref, R: Deref>(
1191+
&self, peers: Vec<MessageForwardNode>, usable_channels: Vec<ChannelDetails>, entropy: ES,
1192+
router: R,
1193+
) where
1194+
ES::Target: EntropySource,
1195+
R::Target: Router,
1196+
{
1197+
let duration_since_epoch = self.duration_since_epoch();
1198+
1199+
let mut serve_static_invoice_messages = Vec::new();
1200+
{
1201+
let cache = self.async_receive_offer_cache.lock().unwrap();
1202+
for offer_and_metadata in cache.offers_needing_invoice_refresh(duration_since_epoch) {
1203+
let (offer, offer_nonce, offer_created_at, update_static_invoice_path) =
1204+
offer_and_metadata;
1205+
let offer_id = offer.id();
1206+
1207+
let (serve_invoice_msg, reply_path_ctx) = match self
1208+
.create_serve_static_invoice_message(
1209+
offer.clone(),
1210+
offer_nonce,
1211+
offer_created_at,
1212+
peers.clone(),
1213+
usable_channels.clone(),
1214+
update_static_invoice_path.clone(),
1215+
&*entropy,
1216+
&*router,
1217+
) {
1218+
Ok((msg, ctx)) => (msg, ctx),
1219+
Err(()) => continue,
1220+
};
1221+
serve_static_invoice_messages.push((serve_invoice_msg, reply_path_ctx, offer_id));
1222+
}
1223+
}
1224+
1225+
// Enqueue the new serve_static_invoice messages in a separate loop to avoid holding the offer
1226+
// cache lock and the pending_async_payments_messages lock at the same time.
1227+
for (serve_invoice_msg, reply_path_ctx, offer_id) in serve_static_invoice_messages {
1228+
let context = MessageContext::AsyncPayments(reply_path_ctx);
1229+
let reply_paths = match self.create_blinded_paths(peers.clone(), context) {
1230+
Ok(paths) => paths,
1231+
Err(()) => continue,
1232+
};
1233+
1234+
{
1235+
// We can't fail past this point, so indicate to the cache that we've requested an invoice
1236+
// update.
1237+
let mut cache = self.async_receive_offer_cache.lock().unwrap();
1238+
if cache.increment_invoice_update_attempts(offer_id).is_err() {
1239+
continue;
1240+
}
1241+
}
1242+
1243+
let message = AsyncPaymentsMessage::ServeStaticInvoice(serve_invoice_msg);
1244+
enqueue_onion_message_with_reply_paths(
1245+
message,
1246+
&self.paths_to_static_invoice_server,
1247+
reply_paths,
1248+
&mut self.pending_async_payments_messages.lock().unwrap(),
1249+
);
1250+
}
1251+
}
1252+
11811253
/// Handles an incoming [`OfferPaths`] message from the static invoice server, sending out
11821254
/// [`ServeStaticInvoice`] onion messages in response if we want to use the paths we've received
11831255
/// to build and cache an async receive offer.

0 commit comments

Comments
 (0)