Skip to content

Follow-ups for ChannelManager::create_bolt11_invoice #3405

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
merged 3 commits into from
Nov 14, 2024
Merged

Follow-ups for ChannelManager::create_bolt11_invoice #3405

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
716758f
Fix incorrect expect message
jkczyz Nov 11, 2024
e9051f8
Explain no-std Bolt11Invoice::duration_since_epoch
jkczyz Nov 11, 2024
20ef217
Expand Bolt11InvoiceParameters docs for no-std use
jkczyz Nov 12, 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
9 changes: 7 additions & 2 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9266,8 +9266,12 @@ where
let duration_since_epoch = {
use std::time::SystemTime;
SystemTime::now().duration_since(SystemTime::UNIX_EPOCH)
.expect("for the foreseeable future this shouldn't happen")
.expect("SystemTime::now() should be after SystemTime::UNIX_EPOCH")
};

// This may be up to 2 hours in the future because of bitcoin's block time rule or about
// 10-30 minutes in the past if a block hasn't been found recently. This should be fine as
// the default invoice expiration is 2 hours, though shorter expirations may be problematic.
#[cfg(not(feature = "std"))]
let duration_since_epoch =
Duration::from_secs(self.highest_seen_timestamp.load(Ordering::Acquire) as u64);
Expand Down Expand Up @@ -9356,7 +9360,8 @@ pub struct Bolt11InvoiceParameters {
/// [`DEFAULT_EXPIRY_TIME`] by default.
///
/// The creation time used is the duration since the Unix epoch for `std` builds. For non-`std`
/// builds, the highest block timestamp seen is used instead.
/// builds, the highest block timestamp seen is used instead. In the latter case, use a long
/// enough expiry to account for the average block time.
pub invoice_expiry_delta_secs: Option<u32>,

/// The minimum `cltv_expiry` for the last HTLC in the route. If not set, will use
Expand Down
Loading