Payment Retries#1059

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
TheBlueMatt merged 9 commits into from
Oct 27, 2021
Merged

Payment Retries #1059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3a4e61
Expose log_bytes! macro for use in other crates
jkczyz Aug 24, 2021
3410f18
Add PaymentId to PaymentSent event
jkczyz Oct 17, 2021
73f601f
Add PaymentId to PaymentPathFailed event
jkczyz Sep 30, 2021
5feb4dc
Rewrite Invoice's interface in terms of msats
jkczyz Oct 4, 2021
2d102a3
Unify route finding methods
jkczyz Oct 25, 2021
ad4f16b
Add InvoicePayer for retrying failed payments
jkczyz Aug 24, 2021
e523e58
Support paying zero-value invoices
jkczyz Oct 4, 2021
d9b9916
Fail payment retry if Invoice is expired
jkczyz Sep 30, 2021
010436d
Implement Payer and Router for lightning crate
jkczyz Aug 24, 2021
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
20 changes: 15 additions & 5 deletions fuzz/src/full_stack.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::DecodeError;
use lightning::ln::script::ShutdownScript;
use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use lightning::routing::router::{get_route, Payee};
use lightning::routing::router::{find_route, Payee, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
Expand DownExpand Up@@ -437,9 +437,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
}
},
4 => {
let value = slice_to_be24(get_slice!(3)) as u64;
let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
let payee = Payee::new(get_pubkey!());
let route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
let params = RouteParameters {
payee,
final_value_msat,
final_cltv_expiry_delta: 42,
};
let route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
Ok(route) => route,
Err(_) => return,
};
Expand All@@ -455,9 +460,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
}
},
15 => {
let value = slice_to_be24(get_slice!(3)) as u64;
let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
let payee = Payee::new(get_pubkey!());
let mut route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
let params = RouteParameters {
payee,
final_value_msat,
final_cltv_expiry_delta: 42,
};
let mut route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
Ok(route) => route,
Err(_) => return,
};
Expand Down
12 changes: 8 additions & 4 deletions fuzz/src/router.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs;
use lightning::routing::router::{get_route, Payee, RouteHint, RouteHintHop};
use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
Expand DownExpand Up@@ -250,10 +250,14 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
}
let scorer = Scorer::new(0);
for target in node_pks.iter() {
let payee = Payee::new(*target).with_route_hints(last_hops.clone());
let _ = get_route(&our_pubkey, &payee, &net_graph,
let params = RouteParameters {
payee: Payee::new(*target).with_route_hints(last_hops.clone()),
final_value_msat: slice_to_be64(get_slice!(8)),
final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
};
let _ = find_route(&our_pubkey, &params, &net_graph,
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger), &scorer);
Arc::clone(&logger), &scorer);
}
},
}
Expand Down
52 changes: 50 additions & 2 deletions lightning-invoice/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,12 @@
//! * For parsing use `str::parse::<Invoice>(&self)` (see the docs of `impl FromStr for Invoice`)
//! * For constructing invoices use the `InvoiceBuilder`
//! * For serializing invoices use the `Display`/`ToString` traits
pub mod payment;
pub mod utils;

extern crate bech32;
extern crate bitcoin_hashes;
extern crate lightning;
#[macro_use] extern crate lightning;
extern crate num_traits;
extern crate secp256k1;

Expand DownExpand Up@@ -1187,6 +1188,19 @@ impl Invoice {
.unwrap_or(Duration::from_secs(DEFAULT_EXPIRY_TIME))
}

/// Returns whether the invoice has expired.
pub fn is_expired(&self) -> bool {
Self::is_expired_from_epoch(self.timestamp(), self.expiry_time())
}

/// Returns whether the expiry time from the given epoch has passed.
pub(crate) fn is_expired_from_epoch(epoch: &SystemTime, expiry_time: Duration) -> bool {
match epoch.elapsed() {
Ok(elapsed) => elapsed > expiry_time,
Err(_) => false,
Comment thread
jkczyz marked this conversation as resolved.
}
}

/// Returns the invoice's `min_final_cltv_expiry` time, if present, otherwise
/// [`DEFAULT_MIN_FINAL_CLTV_EXPIRY`].
pub fn min_final_cltv_expiry(&self) -> u64 {
Expand DownExpand Up@@ -1219,8 +1233,13 @@ impl Invoice {
self.signed_invoice.currency()
}

/// Returns the amount if specified in the invoice as millisatoshis.
pub fn amount_milli_satoshis(&self) -> Option<u64> {
self.signed_invoice.amount_pico_btc().map(|v| v / 10)
}

/// Returns the amount if specified in the invoice as pico <currency>.
pub fn amount_pico_btc(&self) -> Option<u64> {
fn amount_pico_btc(&self) -> Option<u64> {
self.signed_invoice.amount_pico_btc()
}
}
Expand DownExpand Up@@ -1867,6 +1886,7 @@ mod test {
assert!(invoice.check_signature().is_ok());
assert_eq!(invoice.tagged_fields().count(), 10);

assert_eq!(invoice.amount_milli_satoshis(), Some(123));
assert_eq!(invoice.amount_pico_btc(), Some(1230));
assert_eq!(invoice.currency(), Currency::BitcoinTestnet);
assert_eq!(
Expand DownExpand Up@@ -1913,5 +1933,33 @@ mod test {

assert_eq!(invoice.min_final_cltv_expiry(), DEFAULT_MIN_FINAL_CLTV_EXPIRY);
assert_eq!(invoice.expiry_time(), Duration::from_secs(DEFAULT_EXPIRY_TIME));
assert!(!invoice.is_expired());
}

#[test]
fn test_expiration() {
use ::*;
use secp256k1::Secp256k1;
use secp256k1::key::SecretKey;

let timestamp = SystemTime::now()
.checked_sub(Duration::from_secs(DEFAULT_EXPIRY_TIME * 2))
.unwrap();
let signed_invoice = InvoiceBuilder::new(Currency::Bitcoin)
.description("Test".into())
.payment_hash(sha256::Hash::from_slice(&[0;32][..]).unwrap())
.payment_secret(PaymentSecret([0; 32]))
.timestamp(timestamp)
.build_raw()
.unwrap()
.sign::<_, ()>(|hash| {
let privkey = SecretKey::from_slice(&[41; 32]).unwrap();
let secp_ctx = Secp256k1::new();
Ok(secp_ctx.sign_recoverable(hash, &privkey))
})
.unwrap();
let invoice = Invoice::from_signed(signed_invoice).unwrap();

assert!(invoice.is_expired());
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Payment Retries#1059

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

TheBlueMatt
merged 9 commits into

from

Oct 27, 2021
 Merged


Payment Retries
#1059
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a3a4e61

Expose log_bytes! macro for use in other crates


jkczyz Aug 24, 2021
3410f18

Add PaymentId to PaymentSent event


jkczyz Oct 17, 2021
73f601f

Add PaymentId to PaymentPathFailed event


jkczyz Sep 30, 2021
5feb4dc

Rewrite Invoice's interface in terms of msats


jkczyz Oct 4, 2021
2d102a3

Unify route finding methods


jkczyz Oct 25, 2021
ad4f16b

Add InvoicePayer for retrying failed payments


jkczyz Aug 24, 2021
e523e58

Support paying zero-value invoices


jkczyz Oct 4, 2021
d9b9916

Fail payment retry if Invoice is expired


jkczyz Sep 30, 2021
010436d

Implement Payer and Router for lightning crate


jkczyz Aug 24, 2021

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


20 changes: 15 additions & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::DecodeError;
use lightning::ln::script::ShutdownScript;
use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use lightning::routing::router::{get_route, Payee};
use lightning::routing::router::{find_route, Payee, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
Expand DownExpand Up@@ -437,9 +437,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 4 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -455,9 +460,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 15 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let mut route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

12 changes: 8 additions & 4 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs;
use lightning::routing::router::{get_route, Payee, RouteHint, RouteHintHop};
use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
Expand DownExpand Up@@ -250,10 +250,14 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 let scorer = Scorer::new(0);
 for target in node_pks.iter() {
 let payee = Payee::new(*target).with_route_hints(last_hops.clone());
 let _ = get_route(&our_pubkey, &payee, &net_graph,
 let params = RouteParameters {
 payee: Payee::new(*target).with_route_hints(last_hops.clone()),
 final_value_msat: slice_to_be64(get_slice!(8)),
 final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
 };
 let _ = find_route(&our_pubkey, &params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer);
 }
 },
 }
Expand Down

52 changes: 50 additions & 2 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,12 @@
//! * For parsing use `str::parse::<Invoice>(&self)` (see the docs of `impl FromStr for Invoice`)
//! * For constructing invoices use the `InvoiceBuilder`
//! * For serializing invoices use the `Display`/`ToString` traits
pub mod payment;
pub mod utils;

extern crate bech32;
extern crate bitcoin_hashes;
extern crate lightning;
#[macro_use] extern crate lightning;
extern crate num_traits;
extern crate secp256k1;

Expand DownExpand Up@@ -1187,6 +1188,19 @@ impl Invoice {
 .unwrap_or(Duration::from_secs(DEFAULT_EXPIRY_TIME))
	}

	/// Returns whether the invoice has expired.
	pub fn is_expired(&self) -> bool {
 Self::is_expired_from_epoch(self.timestamp(), self.expiry_time())
	}

	/// Returns whether the expiry time from the given epoch has passed.
	pub(crate) fn is_expired_from_epoch(epoch: &SystemTime, expiry_time: Duration) -> bool {
 match epoch.elapsed() {
 Ok(elapsed) => elapsed > expiry_time,
 Err(_) => false,
Comment thread
jkczyz marked this conversation as resolved.

 }
	}

	/// Returns the invoice's `min_final_cltv_expiry` time, if present, otherwise
	/// [`DEFAULT_MIN_FINAL_CLTV_EXPIRY`].
	pub fn min_final_cltv_expiry(&self) -> u64 {
Expand DownExpand Up@@ -1219,8 +1233,13 @@ impl Invoice {
 self.signed_invoice.currency()
	}

	/// Returns the amount if specified in the invoice as millisatoshis.
	pub fn amount_milli_satoshis(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc().map(|v| v / 10)
	}

	/// Returns the amount if specified in the invoice as pico <currency>.
pub fn amount_pico_btc(&self) -> Option<u64> {
	fn amount_pico_btc(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc()
	}
}
Expand DownExpand Up@@ -1867,6 +1886,7 @@ mod test {
 assert!(invoice.check_signature().is_ok());
 assert_eq!(invoice.tagged_fields().count(), 10);

 assert_eq!(invoice.amount_milli_satoshis(), Some(123));
 assert_eq!(invoice.amount_pico_btc(), Some(1230));
 assert_eq!(invoice.currency(), Currency::BitcoinTestnet);
 assert_eq!(
Expand DownExpand Up@@ -1913,5 +1933,33 @@ mod test {

 assert_eq!(invoice.min_final_cltv_expiry(), DEFAULT_MIN_FINAL_CLTV_EXPIRY);
 assert_eq!(invoice.expiry_time(), Duration::from_secs(DEFAULT_EXPIRY_TIME));
 assert!(!invoice.is_expired());
	}

	#[test]
	fn test_expiration() {
 use ::*;
 use secp256k1::Secp256k1;
 use secp256k1::key::SecretKey;

 let timestamp = SystemTime::now()
 .checked_sub(Duration::from_secs(DEFAULT_EXPIRY_TIME * 2))
 .unwrap();
 let signed_invoice = InvoiceBuilder::new(Currency::Bitcoin)
 .description("Test".into())
 .payment_hash(sha256::Hash::from_slice(&[0;32][..]).unwrap())
 .payment_secret(PaymentSecret([0; 32]))
 .timestamp(timestamp)
 .build_raw()
 .unwrap()
 .sign::<_, ()>(|hash| {
 let privkey = SecretKey::from_slice(&[41; 32]).unwrap();
 let secp_ctx = Secp256k1::new();
 Ok(secp_ctx.sign_recoverable(hash, &privkey))
 })
 .unwrap();
 let invoice = Invoice::from_signed(signed_invoice).unwrap();

 assert!(invoice.is_expired());
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Payment Retries#1059

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

TheBlueMatt
merged 9 commits into

from

Oct 27, 2021
 Merged


Payment Retries
#1059
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a3a4e61

Expose log_bytes! macro for use in other crates


jkczyz Aug 24, 2021
3410f18

Add PaymentId to PaymentSent event


jkczyz Oct 17, 2021
73f601f

Add PaymentId to PaymentPathFailed event


jkczyz Sep 30, 2021
5feb4dc

Rewrite Invoice's interface in terms of msats


jkczyz Oct 4, 2021
2d102a3

Unify route finding methods


jkczyz Oct 25, 2021
ad4f16b

Add InvoicePayer for retrying failed payments


jkczyz Aug 24, 2021
e523e58

Support paying zero-value invoices


jkczyz Oct 4, 2021
d9b9916

Fail payment retry if Invoice is expired


jkczyz Sep 30, 2021
010436d

Implement Payer and Router for lightning crate


jkczyz Aug 24, 2021

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


20 changes: 15 additions & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::DecodeError;
use lightning::ln::script::ShutdownScript;
use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use lightning::routing::router::{get_route, Payee};
use lightning::routing::router::{find_route, Payee, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
Expand DownExpand Up@@ -437,9 +437,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 4 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -455,9 +460,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 15 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let mut route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

12 changes: 8 additions & 4 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs;
use lightning::routing::router::{get_route, Payee, RouteHint, RouteHintHop};
use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
Expand DownExpand Up@@ -250,10 +250,14 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 let scorer = Scorer::new(0);
 for target in node_pks.iter() {
 let payee = Payee::new(*target).with_route_hints(last_hops.clone());
 let _ = get_route(&our_pubkey, &payee, &net_graph,
 let params = RouteParameters {
 payee: Payee::new(*target).with_route_hints(last_hops.clone()),
 final_value_msat: slice_to_be64(get_slice!(8)),
 final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
 };
 let _ = find_route(&our_pubkey, &params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer);
 }
 },
 }
Expand Down

52 changes: 50 additions & 2 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,12 @@
//! * For parsing use `str::parse::<Invoice>(&self)` (see the docs of `impl FromStr for Invoice`)
//! * For constructing invoices use the `InvoiceBuilder`
//! * For serializing invoices use the `Display`/`ToString` traits
pub mod payment;
pub mod utils;

extern crate bech32;
extern crate bitcoin_hashes;
extern crate lightning;
#[macro_use] extern crate lightning;
extern crate num_traits;
extern crate secp256k1;

Expand DownExpand Up@@ -1187,6 +1188,19 @@ impl Invoice {
 .unwrap_or(Duration::from_secs(DEFAULT_EXPIRY_TIME))
	}

	/// Returns whether the invoice has expired.
	pub fn is_expired(&self) -> bool {
 Self::is_expired_from_epoch(self.timestamp(), self.expiry_time())
	}

	/// Returns whether the expiry time from the given epoch has passed.
	pub(crate) fn is_expired_from_epoch(epoch: &SystemTime, expiry_time: Duration) -> bool {
 match epoch.elapsed() {
 Ok(elapsed) => elapsed > expiry_time,
 Err(_) => false,
Comment thread
jkczyz marked this conversation as resolved.

 }
	}

	/// Returns the invoice's `min_final_cltv_expiry` time, if present, otherwise
	/// [`DEFAULT_MIN_FINAL_CLTV_EXPIRY`].
	pub fn min_final_cltv_expiry(&self) -> u64 {
Expand DownExpand Up@@ -1219,8 +1233,13 @@ impl Invoice {
 self.signed_invoice.currency()
	}

	/// Returns the amount if specified in the invoice as millisatoshis.
	pub fn amount_milli_satoshis(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc().map(|v| v / 10)
	}

	/// Returns the amount if specified in the invoice as pico <currency>.
pub fn amount_pico_btc(&self) -> Option<u64> {
	fn amount_pico_btc(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc()
	}
}
Expand DownExpand Up@@ -1867,6 +1886,7 @@ mod test {
 assert!(invoice.check_signature().is_ok());
 assert_eq!(invoice.tagged_fields().count(), 10);

 assert_eq!(invoice.amount_milli_satoshis(), Some(123));
 assert_eq!(invoice.amount_pico_btc(), Some(1230));
 assert_eq!(invoice.currency(), Currency::BitcoinTestnet);
 assert_eq!(
Expand DownExpand Up@@ -1913,5 +1933,33 @@ mod test {

 assert_eq!(invoice.min_final_cltv_expiry(), DEFAULT_MIN_FINAL_CLTV_EXPIRY);
 assert_eq!(invoice.expiry_time(), Duration::from_secs(DEFAULT_EXPIRY_TIME));
 assert!(!invoice.is_expired());
	}

	#[test]
	fn test_expiration() {
 use ::*;
 use secp256k1::Secp256k1;
 use secp256k1::key::SecretKey;

 let timestamp = SystemTime::now()
 .checked_sub(Duration::from_secs(DEFAULT_EXPIRY_TIME * 2))
 .unwrap();
 let signed_invoice = InvoiceBuilder::new(Currency::Bitcoin)
 .description("Test".into())
 .payment_hash(sha256::Hash::from_slice(&[0;32][..]).unwrap())
 .payment_secret(PaymentSecret([0; 32]))
 .timestamp(timestamp)
 .build_raw()
 .unwrap()
 .sign::<_, ()>(|hash| {
 let privkey = SecretKey::from_slice(&[41; 32]).unwrap();
 let secp_ctx = Secp256k1::new();
 Ok(secp_ctx.sign_recoverable(hash, &privkey))
 })
 .unwrap();
 let invoice = Invoice::from_signed(signed_invoice).unwrap();

 assert!(invoice.is_expired());
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Payment Retries#1059

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

TheBlueMatt
merged 9 commits into

from

Oct 27, 2021
 Merged


Payment Retries
#1059
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a3a4e61

Expose log_bytes! macro for use in other crates


jkczyz Aug 24, 2021
3410f18

Add PaymentId to PaymentSent event


jkczyz Oct 17, 2021
73f601f

Add PaymentId to PaymentPathFailed event


jkczyz Sep 30, 2021
5feb4dc

Rewrite Invoice's interface in terms of msats


jkczyz Oct 4, 2021
2d102a3

Unify route finding methods


jkczyz Oct 25, 2021
ad4f16b

Add InvoicePayer for retrying failed payments


jkczyz Aug 24, 2021
e523e58

Support paying zero-value invoices


jkczyz Oct 4, 2021
d9b9916

Fail payment retry if Invoice is expired


jkczyz Sep 30, 2021
010436d

Implement Payer and Router for lightning crate


jkczyz Aug 24, 2021

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


20 changes: 15 additions & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::DecodeError;
use lightning::ln::script::ShutdownScript;
use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use lightning::routing::router::{get_route, Payee};
use lightning::routing::router::{find_route, Payee, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
Expand DownExpand Up@@ -437,9 +437,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 4 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -455,9 +460,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 15 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let mut route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

12 changes: 8 additions & 4 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs;
use lightning::routing::router::{get_route, Payee, RouteHint, RouteHintHop};
use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
Expand DownExpand Up@@ -250,10 +250,14 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 let scorer = Scorer::new(0);
 for target in node_pks.iter() {
 let payee = Payee::new(*target).with_route_hints(last_hops.clone());
 let _ = get_route(&our_pubkey, &payee, &net_graph,
 let params = RouteParameters {
 payee: Payee::new(*target).with_route_hints(last_hops.clone()),
 final_value_msat: slice_to_be64(get_slice!(8)),
 final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
 };
 let _ = find_route(&our_pubkey, &params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer);
 }
 },
 }
Expand Down

52 changes: 50 additions & 2 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,12 @@
//! * For parsing use `str::parse::<Invoice>(&self)` (see the docs of `impl FromStr for Invoice`)
//! * For constructing invoices use the `InvoiceBuilder`
//! * For serializing invoices use the `Display`/`ToString` traits
pub mod payment;
pub mod utils;

extern crate bech32;
extern crate bitcoin_hashes;
extern crate lightning;
#[macro_use] extern crate lightning;
extern crate num_traits;
extern crate secp256k1;

Expand DownExpand Up@@ -1187,6 +1188,19 @@ impl Invoice {
 .unwrap_or(Duration::from_secs(DEFAULT_EXPIRY_TIME))
	}

	/// Returns whether the invoice has expired.
	pub fn is_expired(&self) -> bool {
 Self::is_expired_from_epoch(self.timestamp(), self.expiry_time())
	}

	/// Returns whether the expiry time from the given epoch has passed.
	pub(crate) fn is_expired_from_epoch(epoch: &SystemTime, expiry_time: Duration) -> bool {
 match epoch.elapsed() {
 Ok(elapsed) => elapsed > expiry_time,
 Err(_) => false,
Comment thread
jkczyz marked this conversation as resolved.

 }
	}

	/// Returns the invoice's `min_final_cltv_expiry` time, if present, otherwise
	/// [`DEFAULT_MIN_FINAL_CLTV_EXPIRY`].
	pub fn min_final_cltv_expiry(&self) -> u64 {
Expand DownExpand Up@@ -1219,8 +1233,13 @@ impl Invoice {
 self.signed_invoice.currency()
	}

	/// Returns the amount if specified in the invoice as millisatoshis.
	pub fn amount_milli_satoshis(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc().map(|v| v / 10)
	}

	/// Returns the amount if specified in the invoice as pico <currency>.
pub fn amount_pico_btc(&self) -> Option<u64> {
	fn amount_pico_btc(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc()
	}
}
Expand DownExpand Up@@ -1867,6 +1886,7 @@ mod test {
 assert!(invoice.check_signature().is_ok());
 assert_eq!(invoice.tagged_fields().count(), 10);

 assert_eq!(invoice.amount_milli_satoshis(), Some(123));
 assert_eq!(invoice.amount_pico_btc(), Some(1230));
 assert_eq!(invoice.currency(), Currency::BitcoinTestnet);
 assert_eq!(
Expand DownExpand Up@@ -1913,5 +1933,33 @@ mod test {

 assert_eq!(invoice.min_final_cltv_expiry(), DEFAULT_MIN_FINAL_CLTV_EXPIRY);
 assert_eq!(invoice.expiry_time(), Duration::from_secs(DEFAULT_EXPIRY_TIME));
 assert!(!invoice.is_expired());
	}

	#[test]
	fn test_expiration() {
 use ::*;
 use secp256k1::Secp256k1;
 use secp256k1::key::SecretKey;

 let timestamp = SystemTime::now()
 .checked_sub(Duration::from_secs(DEFAULT_EXPIRY_TIME * 2))
 .unwrap();
 let signed_invoice = InvoiceBuilder::new(Currency::Bitcoin)
 .description("Test".into())
 .payment_hash(sha256::Hash::from_slice(&[0;32][..]).unwrap())
 .payment_secret(PaymentSecret([0; 32]))
 .timestamp(timestamp)
 .build_raw()
 .unwrap()
 .sign::<_, ()>(|hash| {
 let privkey = SecretKey::from_slice(&[41; 32]).unwrap();
 let secp_ctx = Secp256k1::new();
 Ok(secp_ctx.sign_recoverable(hash, &privkey))
 })
 .unwrap();
 let invoice = Invoice::from_signed(signed_invoice).unwrap();

 assert!(invoice.is_expired());
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Payment Retries#1059

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

TheBlueMatt
merged 9 commits into

from

Oct 27, 2021
 Merged


Payment Retries
#1059
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a3a4e61

Expose log_bytes! macro for use in other crates


jkczyz Aug 24, 2021
3410f18

Add PaymentId to PaymentSent event


jkczyz Oct 17, 2021
73f601f

Add PaymentId to PaymentPathFailed event


jkczyz Sep 30, 2021
5feb4dc

Rewrite Invoice's interface in terms of msats


jkczyz Oct 4, 2021
2d102a3

Unify route finding methods


jkczyz Oct 25, 2021
ad4f16b

Add InvoicePayer for retrying failed payments


jkczyz Aug 24, 2021
e523e58

Support paying zero-value invoices


jkczyz Oct 4, 2021
d9b9916

Fail payment retry if Invoice is expired


jkczyz Sep 30, 2021
010436d

Implement Payer and Router for lightning crate


jkczyz Aug 24, 2021

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


20 changes: 15 additions & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::DecodeError;
use lightning::ln::script::ShutdownScript;
use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use lightning::routing::router::{get_route, Payee};
use lightning::routing::router::{find_route, Payee, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
Expand DownExpand Up@@ -437,9 +437,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 4 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -455,9 +460,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 15 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let mut route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

12 changes: 8 additions & 4 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs;
use lightning::routing::router::{get_route, Payee, RouteHint, RouteHintHop};
use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
Expand DownExpand Up@@ -250,10 +250,14 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 let scorer = Scorer::new(0);
 for target in node_pks.iter() {
 let payee = Payee::new(*target).with_route_hints(last_hops.clone());
 let _ = get_route(&our_pubkey, &payee, &net_graph,
 let params = RouteParameters {
 payee: Payee::new(*target).with_route_hints(last_hops.clone()),
 final_value_msat: slice_to_be64(get_slice!(8)),
 final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
 };
 let _ = find_route(&our_pubkey, &params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer);
 }
 },
 }
Expand Down

52 changes: 50 additions & 2 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,12 @@
//! * For parsing use `str::parse::<Invoice>(&self)` (see the docs of `impl FromStr for Invoice`)
//! * For constructing invoices use the `InvoiceBuilder`
//! * For serializing invoices use the `Display`/`ToString` traits
pub mod payment;
pub mod utils;

extern crate bech32;
extern crate bitcoin_hashes;
extern crate lightning;
#[macro_use] extern crate lightning;
extern crate num_traits;
extern crate secp256k1;

Expand DownExpand Up@@ -1187,6 +1188,19 @@ impl Invoice {
 .unwrap_or(Duration::from_secs(DEFAULT_EXPIRY_TIME))
	}

	/// Returns whether the invoice has expired.
	pub fn is_expired(&self) -> bool {
 Self::is_expired_from_epoch(self.timestamp(), self.expiry_time())
	}

	/// Returns whether the expiry time from the given epoch has passed.
	pub(crate) fn is_expired_from_epoch(epoch: &SystemTime, expiry_time: Duration) -> bool {
 match epoch.elapsed() {
 Ok(elapsed) => elapsed > expiry_time,
 Err(_) => false,
Comment thread
jkczyz marked this conversation as resolved.

 }
	}

	/// Returns the invoice's `min_final_cltv_expiry` time, if present, otherwise
	/// [`DEFAULT_MIN_FINAL_CLTV_EXPIRY`].
	pub fn min_final_cltv_expiry(&self) -> u64 {
Expand DownExpand Up@@ -1219,8 +1233,13 @@ impl Invoice {
 self.signed_invoice.currency()
	}

	/// Returns the amount if specified in the invoice as millisatoshis.
	pub fn amount_milli_satoshis(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc().map(|v| v / 10)
	}

	/// Returns the amount if specified in the invoice as pico <currency>.
pub fn amount_pico_btc(&self) -> Option<u64> {
	fn amount_pico_btc(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc()
	}
}
Expand DownExpand Up@@ -1867,6 +1886,7 @@ mod test {
 assert!(invoice.check_signature().is_ok());
 assert_eq!(invoice.tagged_fields().count(), 10);

 assert_eq!(invoice.amount_milli_satoshis(), Some(123));
 assert_eq!(invoice.amount_pico_btc(), Some(1230));
 assert_eq!(invoice.currency(), Currency::BitcoinTestnet);
 assert_eq!(
Expand DownExpand Up@@ -1913,5 +1933,33 @@ mod test {

 assert_eq!(invoice.min_final_cltv_expiry(), DEFAULT_MIN_FINAL_CLTV_EXPIRY);
 assert_eq!(invoice.expiry_time(), Duration::from_secs(DEFAULT_EXPIRY_TIME));
 assert!(!invoice.is_expired());
	}

	#[test]
	fn test_expiration() {
 use ::*;
 use secp256k1::Secp256k1;
 use secp256k1::key::SecretKey;

 let timestamp = SystemTime::now()
 .checked_sub(Duration::from_secs(DEFAULT_EXPIRY_TIME * 2))
 .unwrap();
 let signed_invoice = InvoiceBuilder::new(Currency::Bitcoin)
 .description("Test".into())
 .payment_hash(sha256::Hash::from_slice(&[0;32][..]).unwrap())
 .payment_secret(PaymentSecret([0; 32]))
 .timestamp(timestamp)
 .build_raw()
 .unwrap()
 .sign::<_, ()>(|hash| {
 let privkey = SecretKey::from_slice(&[41; 32]).unwrap();
 let secp_ctx = Secp256k1::new();
 Ok(secp_ctx.sign_recoverable(hash, &privkey))
 })
 .unwrap();
 let invoice = Invoice::from_signed(signed_invoice).unwrap();

 assert!(invoice.is_expired());
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Payment Retries#1059

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

TheBlueMatt
merged 9 commits into

from

Oct 27, 2021
 Merged


Payment Retries
#1059
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a3a4e61

Expose log_bytes! macro for use in other crates


jkczyz Aug 24, 2021
3410f18

Add PaymentId to PaymentSent event


jkczyz Oct 17, 2021
73f601f

Add PaymentId to PaymentPathFailed event


jkczyz Sep 30, 2021
5feb4dc

Rewrite Invoice's interface in terms of msats


jkczyz Oct 4, 2021
2d102a3

Unify route finding methods


jkczyz Oct 25, 2021
ad4f16b

Add InvoicePayer for retrying failed payments


jkczyz Aug 24, 2021
e523e58

Support paying zero-value invoices


jkczyz Oct 4, 2021
d9b9916

Fail payment retry if Invoice is expired


jkczyz Sep 30, 2021
010436d

Implement Payer and Router for lightning crate


jkczyz Aug 24, 2021

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


20 changes: 15 additions & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::DecodeError;
use lightning::ln::script::ShutdownScript;
use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use lightning::routing::router::{get_route, Payee};
use lightning::routing::router::{find_route, Payee, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
Expand DownExpand Up@@ -437,9 +437,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 4 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -455,9 +460,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 15 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let mut route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

12 changes: 8 additions & 4 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs;
use lightning::routing::router::{get_route, Payee, RouteHint, RouteHintHop};
use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
Expand DownExpand Up@@ -250,10 +250,14 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 let scorer = Scorer::new(0);
 for target in node_pks.iter() {
 let payee = Payee::new(*target).with_route_hints(last_hops.clone());
 let _ = get_route(&our_pubkey, &payee, &net_graph,
 let params = RouteParameters {
 payee: Payee::new(*target).with_route_hints(last_hops.clone()),
 final_value_msat: slice_to_be64(get_slice!(8)),
 final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
 };
 let _ = find_route(&our_pubkey, &params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer);
 }
 },
 }
Expand Down

52 changes: 50 additions & 2 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,12 @@
//! * For parsing use `str::parse::<Invoice>(&self)` (see the docs of `impl FromStr for Invoice`)
//! * For constructing invoices use the `InvoiceBuilder`
//! * For serializing invoices use the `Display`/`ToString` traits
pub mod payment;
pub mod utils;

extern crate bech32;
extern crate bitcoin_hashes;
extern crate lightning;
#[macro_use] extern crate lightning;
extern crate num_traits;
extern crate secp256k1;

Expand DownExpand Up@@ -1187,6 +1188,19 @@ impl Invoice {
 .unwrap_or(Duration::from_secs(DEFAULT_EXPIRY_TIME))
	}

	/// Returns whether the invoice has expired.
	pub fn is_expired(&self) -> bool {
 Self::is_expired_from_epoch(self.timestamp(), self.expiry_time())
	}

	/// Returns whether the expiry time from the given epoch has passed.
	pub(crate) fn is_expired_from_epoch(epoch: &SystemTime, expiry_time: Duration) -> bool {
 match epoch.elapsed() {
 Ok(elapsed) => elapsed > expiry_time,
 Err(_) => false,
Comment thread
jkczyz marked this conversation as resolved.

 }
	}

	/// Returns the invoice's `min_final_cltv_expiry` time, if present, otherwise
	/// [`DEFAULT_MIN_FINAL_CLTV_EXPIRY`].
	pub fn min_final_cltv_expiry(&self) -> u64 {
Expand DownExpand Up@@ -1219,8 +1233,13 @@ impl Invoice {
 self.signed_invoice.currency()
	}

	/// Returns the amount if specified in the invoice as millisatoshis.
	pub fn amount_milli_satoshis(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc().map(|v| v / 10)
	}

	/// Returns the amount if specified in the invoice as pico <currency>.
pub fn amount_pico_btc(&self) -> Option<u64> {
	fn amount_pico_btc(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc()
	}
}
Expand DownExpand Up@@ -1867,6 +1886,7 @@ mod test {
 assert!(invoice.check_signature().is_ok());
 assert_eq!(invoice.tagged_fields().count(), 10);

 assert_eq!(invoice.amount_milli_satoshis(), Some(123));
 assert_eq!(invoice.amount_pico_btc(), Some(1230));
 assert_eq!(invoice.currency(), Currency::BitcoinTestnet);
 assert_eq!(
Expand DownExpand Up@@ -1913,5 +1933,33 @@ mod test {

 assert_eq!(invoice.min_final_cltv_expiry(), DEFAULT_MIN_FINAL_CLTV_EXPIRY);
 assert_eq!(invoice.expiry_time(), Duration::from_secs(DEFAULT_EXPIRY_TIME));
 assert!(!invoice.is_expired());
	}

	#[test]
	fn test_expiration() {
 use ::*;
 use secp256k1::Secp256k1;
 use secp256k1::key::SecretKey;

 let timestamp = SystemTime::now()
 .checked_sub(Duration::from_secs(DEFAULT_EXPIRY_TIME * 2))
 .unwrap();
 let signed_invoice = InvoiceBuilder::new(Currency::Bitcoin)
 .description("Test".into())
 .payment_hash(sha256::Hash::from_slice(&[0;32][..]).unwrap())
 .payment_secret(PaymentSecret([0; 32]))
 .timestamp(timestamp)
 .build_raw()
 .unwrap()
 .sign::<_, ()>(|hash| {
 let privkey = SecretKey::from_slice(&[41; 32]).unwrap();
 let secp_ctx = Secp256k1::new();
 Ok(secp_ctx.sign_recoverable(hash, &privkey))
 })
 .unwrap();
 let invoice = Invoice::from_signed(signed_invoice).unwrap();

 assert!(invoice.is_expired());
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Payment Retries#1059

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

TheBlueMatt
merged 9 commits into

from

Oct 27, 2021
 Merged


Payment Retries
#1059
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a3a4e61

Expose log_bytes! macro for use in other crates


jkczyz Aug 24, 2021
3410f18

Add PaymentId to PaymentSent event


jkczyz Oct 17, 2021
73f601f

Add PaymentId to PaymentPathFailed event


jkczyz Sep 30, 2021
5feb4dc

Rewrite Invoice's interface in terms of msats


jkczyz Oct 4, 2021
2d102a3

Unify route finding methods


jkczyz Oct 25, 2021
ad4f16b

Add InvoicePayer for retrying failed payments


jkczyz Aug 24, 2021
e523e58

Support paying zero-value invoices


jkczyz Oct 4, 2021
d9b9916

Fail payment retry if Invoice is expired


jkczyz Sep 30, 2021
010436d

Implement Payer and Router for lightning crate


jkczyz Aug 24, 2021

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


20 changes: 15 additions & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::DecodeError;
use lightning::ln::script::ShutdownScript;
use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use lightning::routing::router::{get_route, Payee};
use lightning::routing::router::{find_route, Payee, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
Expand DownExpand Up@@ -437,9 +437,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 4 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -455,9 +460,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 15 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let mut route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

12 changes: 8 additions & 4 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs;
use lightning::routing::router::{get_route, Payee, RouteHint, RouteHintHop};
use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
Expand DownExpand Up@@ -250,10 +250,14 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 let scorer = Scorer::new(0);
 for target in node_pks.iter() {
 let payee = Payee::new(*target).with_route_hints(last_hops.clone());
 let _ = get_route(&our_pubkey, &payee, &net_graph,
 let params = RouteParameters {
 payee: Payee::new(*target).with_route_hints(last_hops.clone()),
 final_value_msat: slice_to_be64(get_slice!(8)),
 final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
 };
 let _ = find_route(&our_pubkey, &params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer);
 }
 },
 }
Expand Down

52 changes: 50 additions & 2 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,12 @@
//! * For parsing use `str::parse::<Invoice>(&self)` (see the docs of `impl FromStr for Invoice`)
//! * For constructing invoices use the `InvoiceBuilder`
//! * For serializing invoices use the `Display`/`ToString` traits
pub mod payment;
pub mod utils;

extern crate bech32;
extern crate bitcoin_hashes;
extern crate lightning;
#[macro_use] extern crate lightning;
extern crate num_traits;
extern crate secp256k1;

Expand DownExpand Up@@ -1187,6 +1188,19 @@ impl Invoice {
 .unwrap_or(Duration::from_secs(DEFAULT_EXPIRY_TIME))
	}

	/// Returns whether the invoice has expired.
	pub fn is_expired(&self) -> bool {
 Self::is_expired_from_epoch(self.timestamp(), self.expiry_time())
	}

	/// Returns whether the expiry time from the given epoch has passed.
	pub(crate) fn is_expired_from_epoch(epoch: &SystemTime, expiry_time: Duration) -> bool {
 match epoch.elapsed() {
 Ok(elapsed) => elapsed > expiry_time,
 Err(_) => false,
Comment thread
jkczyz marked this conversation as resolved.

 }
	}

	/// Returns the invoice's `min_final_cltv_expiry` time, if present, otherwise
	/// [`DEFAULT_MIN_FINAL_CLTV_EXPIRY`].
	pub fn min_final_cltv_expiry(&self) -> u64 {
Expand DownExpand Up@@ -1219,8 +1233,13 @@ impl Invoice {
 self.signed_invoice.currency()
	}

	/// Returns the amount if specified in the invoice as millisatoshis.
	pub fn amount_milli_satoshis(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc().map(|v| v / 10)
	}

	/// Returns the amount if specified in the invoice as pico <currency>.
pub fn amount_pico_btc(&self) -> Option<u64> {
	fn amount_pico_btc(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc()
	}
}
Expand DownExpand Up@@ -1867,6 +1886,7 @@ mod test {
 assert!(invoice.check_signature().is_ok());
 assert_eq!(invoice.tagged_fields().count(), 10);

 assert_eq!(invoice.amount_milli_satoshis(), Some(123));
 assert_eq!(invoice.amount_pico_btc(), Some(1230));
 assert_eq!(invoice.currency(), Currency::BitcoinTestnet);
 assert_eq!(
Expand DownExpand Up@@ -1913,5 +1933,33 @@ mod test {

 assert_eq!(invoice.min_final_cltv_expiry(), DEFAULT_MIN_FINAL_CLTV_EXPIRY);
 assert_eq!(invoice.expiry_time(), Duration::from_secs(DEFAULT_EXPIRY_TIME));
 assert!(!invoice.is_expired());
	}

	#[test]
	fn test_expiration() {
 use ::*;
 use secp256k1::Secp256k1;
 use secp256k1::key::SecretKey;

 let timestamp = SystemTime::now()
 .checked_sub(Duration::from_secs(DEFAULT_EXPIRY_TIME * 2))
 .unwrap();
 let signed_invoice = InvoiceBuilder::new(Currency::Bitcoin)
 .description("Test".into())
 .payment_hash(sha256::Hash::from_slice(&[0;32][..]).unwrap())
 .payment_secret(PaymentSecret([0; 32]))
 .timestamp(timestamp)
 .build_raw()
 .unwrap()
 .sign::<_, ()>(|hash| {
 let privkey = SecretKey::from_slice(&[41; 32]).unwrap();
 let secp_ctx = Secp256k1::new();
 Ok(secp_ctx.sign_recoverable(hash, &privkey))
 })
 .unwrap();
 let invoice = Invoice::from_signed(signed_invoice).unwrap();

 assert!(invoice.is_expired());
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Payment Retries#1059

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

TheBlueMatt
merged 9 commits into

from

Oct 27, 2021
 Merged


Payment Retries
#1059
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
a3a4e61

Expose log_bytes! macro for use in other crates


jkczyz Aug 24, 2021
3410f18

Add PaymentId to PaymentSent event


jkczyz Oct 17, 2021
73f601f

Add PaymentId to PaymentPathFailed event


jkczyz Sep 30, 2021
5feb4dc

Rewrite Invoice's interface in terms of msats


jkczyz Oct 4, 2021
2d102a3

Unify route finding methods


jkczyz Oct 25, 2021
ad4f16b

Add InvoicePayer for retrying failed payments


jkczyz Aug 24, 2021
e523e58

Support paying zero-value invoices


jkczyz Oct 4, 2021
d9b9916

Fail payment retry if Invoice is expired


jkczyz Sep 30, 2021
010436d

Implement Payer and Router for lightning crate


jkczyz Aug 24, 2021

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


20 changes: 15 additions & 5 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,7 +38,7 @@ use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,Ig
use lightning::ln::msgs::DecodeError;
use lightning::ln::script::ShutdownScript;
use lightning::routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
use lightning::routing::router::{get_route, Payee};
use lightning::routing::router::{find_route, Payee, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::config::UserConfig;
use lightning::util::errors::APIError;
Expand DownExpand Up@@ -437,9 +437,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 4 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand All@@ -455,9 +460,14 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
 }
 },
 15 => {
 let value = slice_to_be24(get_slice!(3)) as u64;
 let final_value_msat = slice_to_be24(get_slice!(3)) as u64;
 let payee = Payee::new(get_pubkey!());
 let mut route = match get_route(&our_id, &payee, &net_graph_msg_handler.network_graph, None, value, 42, Arc::clone(&logger), &scorer) {
 let params = RouteParameters {
 payee,
 final_value_msat,
 final_cltv_expiry_delta: 42,
 };
 let mut route = match find_route(&our_id, &params, &net_graph_msg_handler.network_graph, None, Arc::clone(&logger), &scorer) {
 Ok(route) => route,
 Err(_) => return,
 };
Expand Down

12 changes: 8 additions & 4 deletions
fuzz/src/router.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,7 @@ use lightning::chain::transaction::OutPoint;
use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs;
use lightning::routing::router::{get_route, Payee, RouteHint, RouteHintHop};
use lightning::routing::router::{find_route, Payee, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scorer::Scorer;
use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
Expand DownExpand Up@@ -250,10 +250,14 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 }
 let scorer = Scorer::new(0);
 for target in node_pks.iter() {
 let payee = Payee::new(*target).with_route_hints(last_hops.clone());
 let _ = get_route(&our_pubkey, &payee, &net_graph,
 let params = RouteParameters {
 payee: Payee::new(*target).with_route_hints(last_hops.clone()),
 final_value_msat: slice_to_be64(get_slice!(8)),
 final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
 };
 let _ = find_route(&our_pubkey, &params, &net_graph,
 first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger), &scorer);
 Arc::clone(&logger), &scorer);
 }
 },
 }
Expand Down

52 changes: 50 additions & 2 deletions
lightning-invoice/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,11 +15,12 @@
//! * For parsing use `str::parse::<Invoice>(&self)` (see the docs of `impl FromStr for Invoice`)
//! * For constructing invoices use the `InvoiceBuilder`
//! * For serializing invoices use the `Display`/`ToString` traits
pub mod payment;
pub mod utils;

extern crate bech32;
extern crate bitcoin_hashes;
extern crate lightning;
#[macro_use] extern crate lightning;
extern crate num_traits;
extern crate secp256k1;

Expand DownExpand Up@@ -1187,6 +1188,19 @@ impl Invoice {
 .unwrap_or(Duration::from_secs(DEFAULT_EXPIRY_TIME))
	}

	/// Returns whether the invoice has expired.
	pub fn is_expired(&self) -> bool {
 Self::is_expired_from_epoch(self.timestamp(), self.expiry_time())
	}

	/// Returns whether the expiry time from the given epoch has passed.
	pub(crate) fn is_expired_from_epoch(epoch: &SystemTime, expiry_time: Duration) -> bool {
 match epoch.elapsed() {
 Ok(elapsed) => elapsed > expiry_time,
 Err(_) => false,
Comment thread
jkczyz marked this conversation as resolved.

 }
	}

	/// Returns the invoice's `min_final_cltv_expiry` time, if present, otherwise
	/// [`DEFAULT_MIN_FINAL_CLTV_EXPIRY`].
	pub fn min_final_cltv_expiry(&self) -> u64 {
Expand DownExpand Up@@ -1219,8 +1233,13 @@ impl Invoice {
 self.signed_invoice.currency()
	}

	/// Returns the amount if specified in the invoice as millisatoshis.
	pub fn amount_milli_satoshis(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc().map(|v| v / 10)
	}

	/// Returns the amount if specified in the invoice as pico <currency>.
pub fn amount_pico_btc(&self) -> Option<u64> {
	fn amount_pico_btc(&self) -> Option<u64> {
 self.signed_invoice.amount_pico_btc()
	}
}
Expand DownExpand Up@@ -1867,6 +1886,7 @@ mod test {
 assert!(invoice.check_signature().is_ok());
 assert_eq!(invoice.tagged_fields().count(), 10);

 assert_eq!(invoice.amount_milli_satoshis(), Some(123));
 assert_eq!(invoice.amount_pico_btc(), Some(1230));
 assert_eq!(invoice.currency(), Currency::BitcoinTestnet);
 assert_eq!(
Expand DownExpand Up@@ -1913,5 +1933,33 @@ mod test {

 assert_eq!(invoice.min_final_cltv_expiry(), DEFAULT_MIN_FINAL_CLTV_EXPIRY);
 assert_eq!(invoice.expiry_time(), Duration::from_secs(DEFAULT_EXPIRY_TIME));
 assert!(!invoice.is_expired());
	}

	#[test]
	fn test_expiration() {
 use ::*;
 use secp256k1::Secp256k1;
 use secp256k1::key::SecretKey;

 let timestamp = SystemTime::now()
 .checked_sub(Duration::from_secs(DEFAULT_EXPIRY_TIME * 2))
 .unwrap();
 let signed_invoice = InvoiceBuilder::new(Currency::Bitcoin)
 .description("Test".into())
 .payment_hash(sha256::Hash::from_slice(&[0;32][..]).unwrap())
 .payment_secret(PaymentSecret([0; 32]))
 .timestamp(timestamp)
 .build_raw()
 .unwrap()
 .sign::<_, ()>(|hash| {
 let privkey = SecretKey::from_slice(&[41; 32]).unwrap();
 let secp_ctx = Secp256k1::new();
 Ok(secp_ctx.sign_recoverable(hash, &privkey))
 })
 .unwrap();
 let invoice = Invoice::from_signed(signed_invoice).unwrap();

 assert!(invoice.is_expired());
	}
}
Loading