Skip to content

Drop 353 resolution and fix block updating in OffersMessageFlow, replacing it all with bitcoin-payment-instructions 353 resolution #4543

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

Merged
tnull merged 3 commits into from
Apr 7, 2026
+5 −66
Merged

Drop 353 resolution and fix block updating in OffersMessageFlow, replacing it all with bitcoin-payment-instructions 353 resolution #4543

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2637b38
Drop stale DNSSec resolution logic in `OffersMessageFlow`
TheBlueMatt Apr 7, 2026
417b065
Add missing `OffersMessageHandler::best_block` updating
TheBlueMatt Apr 7, 2026
5704e8e
Note why we don't use `update_for_new_tip` in offers flow block upd
TheBlueMatt Apr 7, 2026
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
69 changes: 3 additions & 66 deletions lightning/src/offers/flow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ use crate::types::payment::{PaymentHash, PaymentSecret};
use crate::util::logger::Logger;
use crate::util::ser::Writeable;

#[cfg(feature = "dnssec")]
use {
crate::blinded_path::message::DNSResolverContext,
crate::onion_message::dns_resolution::{DNSResolverMessage, DNSSECQuery, OMNameResolver},
};

/// A BOLT12 offers code and flow utility provider, which facilitates
/// BOLT12 builder generation and onion message handling.
///
Expand All @@ -94,11 +88,6 @@ pub struct OffersMessageFlow<MR: MessageRouter, L: Logger> {
pending_async_payments_messages: Mutex<Vec<(AsyncPaymentsMessage, MessageSendInstructions)>>,
async_receive_offer_cache: Mutex<AsyncReceiveOfferCache>,

#[cfg(feature = "dnssec")]
pub(crate) hrn_resolver: OMNameResolver,
#[cfg(feature = "dnssec")]
pending_dns_onion_messages: Mutex<Vec<(DNSResolverMessage, MessageSendInstructions)>>,

logger: L,
}

Expand Down Expand Up @@ -126,11 +115,6 @@ impl<MR: MessageRouter, L: Logger> OffersMessageFlow<MR, L> {
pending_offers_messages: Mutex::new(Vec::new()),
pending_async_payments_messages: Mutex::new(Vec::new()),

#[cfg(feature = "dnssec")]
hrn_resolver: OMNameResolver::new(current_timestamp, best_block.height),
#[cfg(feature = "dnssec")]
pending_dns_onion_messages: Mutex::new(Vec::new()),

async_receive_offer_cache: Mutex::new(AsyncReceiveOfferCache::new()),

logger,
Expand Down Expand Up @@ -199,10 +183,12 @@ impl<MR: MessageRouter, L: Logger> OffersMessageFlow<MR, L> {
///
/// Must be called whenever a new chain tip becomes available. May be skipped
/// for intermediary blocks.
pub fn best_block_updated(&self, header: &Header, _height: u32) {
pub fn best_block_updated(&self, header: &Header, height: u32) {
let timestamp = &self.highest_seen_timestamp;
let block_time = header.time as usize;

*self.best_block.write().unwrap() = BestBlock::new(header.block_hash(), height);
Copy link
Copy Markdown
Collaborator

@ldk-claude-review-bot ldk-claude-review-bot Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: BestBlock::new always wipes previous_blocks history. ChannelManager::best_block_updated uses update_for_new_tip instead, which preserves the block-hash history on single-block advances. While OffersMessageFlow doesn't currently use previous_blocks, using update_for_new_tip would be more consistent and future-proof:

Suggested change
*self.best_block.write().unwrap() = BestBlock::new(header.block_hash(), height);
self.best_block.write().unwrap().update_for_new_tip(header.block_hash(), height);

Copy link
Copy Markdown
Contributor

@tnull tnull Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be a valid nit?

Copy link
Copy Markdown
Collaborator Author

@TheBlueMatt TheBlueMatt Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, I'd avoided it to make it easier to backport and because the history isn't used but you're right I should just do it in a separate commit.


loop {
// Update timestamp to be the max of its current value and the block
// timestamp. This should keep us close to the current time without relying on
Expand All @@ -220,12 +206,6 @@ impl<MR: MessageRouter, L: Logger> OffersMessageFlow<MR, L> {
break;
}
}

#[cfg(feature = "dnssec")]
{
let updated_time = timestamp.load(Ordering::Acquire) as u32;
self.hrn_resolver.new_best_block(_height, updated_time);
}
}
}

Expand Down Expand Up @@ -1306,41 +1286,6 @@ impl<MR: MessageRouter, L: Logger> OffersMessageFlow<MR, L> {
)
}

/// Enqueues the created [`DNSSECQuery`] to be sent to the counterparty.
///
/// # Peers
///
/// The user must provide a list of [`MessageForwardNode`] that will be used to generate
/// valid reply paths for the counterparty to send back the corresponding response for
/// the [`DNSSECQuery`] message.
///
/// [`supports_onion_messages`]: crate::types::features::Features::supports_onion_messages
#[cfg(feature = "dnssec")]
pub fn enqueue_dns_onion_message(
&self, message: DNSSECQuery, context: DNSResolverContext, dns_resolvers: Vec<Destination>,
peers: Vec<MessageForwardNode>,
) -> Result<(), Bolt12SemanticError> {
let reply_paths = self
.create_blinded_paths(peers, MessageContext::DNSResolver(context))
.map_err(|_| Bolt12SemanticError::MissingPaths)?;

let message_params = dns_resolvers
.iter()
.flat_map(|destination| reply_paths.iter().map(move |path| (path, destination)))
.take(OFFERS_MESSAGE_REQUEST_LIMIT);
for (reply_path, destination) in message_params {
self.pending_dns_onion_messages.lock().unwrap().push((
DNSResolverMessage::DNSSECQuery(message.clone()),
MessageSendInstructions::WithSpecifiedReplyPath {
destination: destination.clone(),
reply_path: reply_path.clone(),
},
));
}

Ok(())
}

/// Gets the enqueued [`OffersMessage`] with their corresponding [`MessageSendInstructions`].
pub fn release_pending_offers_messages(&self) -> Vec<(OffersMessage, MessageSendInstructions)> {
core::mem::take(&mut self.pending_offers_messages.lock().unwrap())
Expand All @@ -1353,14 +1298,6 @@ impl<MR: MessageRouter, L: Logger> OffersMessageFlow<MR, L> {
core::mem::take(&mut self.pending_async_payments_messages.lock().unwrap())
}

/// Gets the enqueued [`DNSResolverMessage`] with their corresponding [`MessageSendInstructions`].
#[cfg(feature = "dnssec")]
pub fn release_pending_dns_messages(
&self,
) -> Vec<(DNSResolverMessage, MessageSendInstructions)> {
core::mem::take(&mut self.pending_dns_onion_messages.lock().unwrap())
}

/// Retrieve an [`Offer`] for receiving async payments as an often-offline recipient. Will only
/// return an offer if [`Self::set_paths_to_static_invoice_server`] was called and we succeeded in
/// interactively building a [`StaticInvoice`] with the static invoice server.
Expand Down
Loading