From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Fri, 14 May 2021 22:31:34 +0000 (+0000)
Subject: Merge pull request #922 from valentinewallace/update-default-expiry
X-Git-Tag: v0.0.98~26
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=eeabac8ccb6d9339228910145711bd5510bd0c4b;hp=0b1f0a7edc7d836e75e69442e84038f6c4116174;p=rust-lightning

Merge pull request #922 from valentinewallace/update-default-expiry

Correct default invoice expiry
---

diff --git a/fuzz/src/chanmon_consistency.rs b/fuzz/src/chanmon_consistency.rs
index 3fd6515f..be4a0ef4 100644
--- a/fuzz/src/chanmon_consistency.rs
+++ b/fuzz/src/chanmon_consistency.rs
@@ -272,7 +272,7 @@ fn get_payment_secret_hash(dest: &ChanMan, payment_id: &mut u8) -> Option<(Payme
 	let mut payment_hash;
 	for _ in 0..256 {
 		payment_hash = PaymentHash(Sha256::hash(&[*payment_id; 1]).into_inner());
-		if let Ok(payment_secret) = dest.create_inbound_payment_for_hash(payment_hash, None, 7200, 0) {
+		if let Ok(payment_secret) = dest.create_inbound_payment_for_hash(payment_hash, None, 3600, 0) {
 			return Some((payment_secret, payment_hash));
 		}
 		*payment_id = payment_id.wrapping_add(1);
diff --git a/lightning-invoice/src/utils.rs b/lightning-invoice/src/utils.rs
index 3b97a8bb..b75a215e 100644
--- a/lightning-invoice/src/utils.rs
+++ b/lightning-invoice/src/utils.rs
@@ -1,5 +1,5 @@
 //! Convenient utilities to create an invoice.
-use {Currency, Invoice, InvoiceBuilder, SignOrCreationError, RawInvoice};
+use {Currency, DEFAULT_EXPIRY_TIME, Invoice, InvoiceBuilder, SignOrCreationError, RawInvoice};
 use bech32::ToBase32;
 use bitcoin_hashes::Hash;
 use lightning::chain;
@@ -9,6 +9,7 @@ use lightning::ln::channelmanager::{ChannelManager, MIN_FINAL_CLTV_EXPIRY};
 use lightning::routing::network_graph::RoutingFees;
 use lightning::routing::router::RouteHintHop;
 use lightning::util::logger::Logger;
+use std::convert::TryInto;
 use std::ops::Deref;
 
 /// Utility to construct an invoice. Generally, unless you want to do something like a custom
@@ -54,7 +55,7 @@ where
 
 	let (payment_hash, payment_secret) = channelmanager.create_inbound_payment(
 		amt_msat,
-		7200, // default invoice expiry is 2 hours
+		DEFAULT_EXPIRY_TIME.try_into().unwrap(),
 		0,
 	);
 	let our_node_pubkey = channelmanager.get_our_node_id();
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index a9093b56..a0168bdc 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -3477,7 +3477,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 	/// `invoice_expiry_delta_secs` describes the number of seconds that the invoice is valid for
 	/// in excess of the current time. This should roughly match the expiry time set in the invoice.
 	/// After this many seconds, we will remove the inbound payment, resulting in any attempts to
-	/// pay the invoice failing. The BOLT spec suggests 7,200 secs as a default validity time for
+	/// pay the invoice failing. The BOLT spec suggests 3,600 secs as a default validity time for
 	/// invoices when no timeout is set.
 	///
 	/// Note that we use block header time to time-out pending inbound payments (with some margin