Skip to content

Payment Retries in ChannelManager - #1096

Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries
Sep 30, 2021
Merged

Payment Retries in ChannelManager#1096
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries

Conversation

@valentinewallace

@valentinewallacevalentinewallace commented Sep 24, 2021

Copy link
Copy Markdown
Contributor

Seeking concept ACKs on the new pending_outbound_payments format/new enum @jkczyz@TheBlueMatt

Also left a comment on an open question about retrying payments that have been completely removed.

TODOs

  • test retrying a completely failed payment
  • check total_msat is sane on retry
  • test retrying w/ bad payment_hash, amt, etc
  • impl expiring outbound payments

@codecov

codecovBot commented Sep 24, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1096 (3e6297a) into main (5811f5b) will increase coverage by 0.41%.
The diff coverage is 96.27%.

Impacted file tree graph

@@ Coverage Diff @@## main #1096 +/- ##
==========================================
+ Coverage 90.73% 91.14% +0.41% 
==========================================
Files 65 65 Lines 34318 37177 +2859 ==========================================
+ Hits 31137 33884 +2747 - Misses 3181 3293 +112 
Impacted FilesCoverage Δ
lightning/src/ln/channelmanager.rs87.28% <93.75%> (+2.35%)⬆️
lightning/src/ln/functional_tests.rs97.41% <98.66%> (-0.04%)⬇️
lightning/src/ln/channel.rs91.48% <100.00%> (+2.83%)⬆️
lightning/src/chain/mod.rs55.55% <0.00%> (-3.27%)⬇️
lightning-block-sync/src/lib.rs93.49% <0.00%> (-1.69%)⬇️
lightning/src/ln/script.rs93.06% <0.00%> (-0.69%)⬇️
lightning-net-tokio/src/lib.rs76.69% <0.00%> (-0.59%)⬇️
lightning/src/util/ser_macros.rs86.51% <0.00%> (-0.33%)⬇️
lightning-block-sync/src/http.rs93.30% <0.00%> (-0.22%)⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5811f5b...3e6297a. Read the comment docs.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}

impl PendingOutboundPayment {
fn remove(&mut self, session_priv: &[u8; 32]) -> bool {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Heh, match the hashset api, slick, i like it.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}
} else {
// XXX they could retry with a bogus amt/hash/secret/payment_id here and we wouldn't catch it atm
// should we keep payments in pending_outbound_payments until they succeed/expire/manually removed?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hmm, I was kinda figuring we'd require users just call send_payment again, though I admit it would be kinda slick to let them just call the same method here. I guess we could do something like time out pending all-paths-failed payments after, eg, 3 blocks or so? Do you have an opinion @jkczyz?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah, I figured once a payment has failed (and thus ChannelManager has been cleaned up), retrying would just involve calling send_payment again as is currently done in #1059. So the retry interface would be specific to retrying a path failure for MPP.

Originally, I hoped it could be a single interface across any send/retry scenario. See conversation here: #1053 (comment). But that seemed to not be ideal.

If we could have a single call for any retry scenario, that would be nice. It mostly just prevents us from needing to switch on all_paths_failed.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Yea, I was thinking we'd have separate interfaces, but maybe the memory usage is not so bad? Like, we'd have a bunch of memory used for failed payments, but we could time-box it. For high-volume scenarios it could be a real concern, but we'd clean up any memory (a) after the payment succeeds, even across a different path, or (b) after some time. Maybe we can figure out how to address the DoS later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We could parameterize send_payment further by the invoice expiry, and remove pending outbounds at min(invoice_expiry, 3 blocks) maybe?

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Well we either have to handle it here or in #1059, both for 0.0.102. I suppose we can punt "tightly limit expiry time" to a later release, even if we do expire here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Right, my point was its probably ~the same amount of code to handle switching between retry_payment and send_payment in #1059 as it is to just call retry_payment instead of send_payment and not remove the payment entry until a payment succeeds in this PR :)

@valentinewallacevalentinewallaceSep 27, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

> not remove the payment entry until a payment succeeds in this PR :)
Hmm, so when I keep failed payments, then retry a payment with all_paths_failed, it fails due to we didn't have a corresponding inbound payment (on the receiver end). Gotta make it symmetrical (i.e. keep failed payments on receiver end as well), I suppose?
Actually, this seems like it could be an issue for #1059 as well iiuc

EDIT: disregard, should never retry if rejected_by_dest anyway

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Naming looks good.

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines -5265 to +5414
(1, pending_outbound_payments, required),
(1, pending_outbound_payments_compat_2, required),
(3, pending_outbound_payments, required),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Will changing the order break the format?

@valentinewallacevalentinewallaceSep 28, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

IIUC, if e.g. in 0.0.102 we change the hashmap serialization format that corresponds to the 1 tlv type here, 0.0.101 clients will fail to deserialize it (hope that answers)

@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 4 times, most recently from e5654b8 to c4ac620CompareSeptember 28, 2021 01:43
@valentinewallace
valentinewallace marked this pull request as ready for review September 28, 2021 22:32

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks good!

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Leftover from previous PR Jeff feedback.
Useful in upcoming commits as we'll expose this to users for payment retries
Used in upcoming commits for retries
We want to reuse send_payment internal functions for retries,
so some need to now be parameterized by PaymentId to avoid
generating a new PaymentId on retry
Retrying a partial payment means send_payment_internal needs to be parameterized
by a total payment amount, else 'HTLC values do not match' errors
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 58afd58 to 977dbf8CompareSeptember 28, 2021 23:55
@TheBlueMattTheBlueMatt added this to the 0.0.102 milestone Sep 29, 2021
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/functional_tests.rs
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 98a225e to 8460a97CompareSeptember 29, 2021 23:47
Comment threadlightning/src/ln/channelmanager.rs Outdated

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM module some minor comments

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
This is because we want the ability to retry completely failed
payments.
Upcoming commits will remove these payments on timeout to prevent
DoS issues
Also test that this removal allows retrying single-path payments
@TheBlueMatt
TheBlueMatt merged commit 7aa2cac into lightningdevkit:mainSep 30, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@TheBlueMatt@arik-so@jkczyz
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Payment Retries in ChannelManager by valentinewallace · Pull Request #1096 · lightningdevkit/rust-lightning · GitHub
Skip to content

Payment Retries in ChannelManager - #1096

Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries
Sep 30, 2021
Merged

Payment Retries in ChannelManager#1096
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries

Conversation

@valentinewallace

@valentinewallacevalentinewallace commented Sep 24, 2021

Copy link
Copy Markdown
Contributor

Seeking concept ACKs on the new pending_outbound_payments format/new enum @jkczyz@TheBlueMatt

Also left a comment on an open question about retrying payments that have been completely removed.

TODOs

  • test retrying a completely failed payment
  • check total_msat is sane on retry
  • test retrying w/ bad payment_hash, amt, etc
  • impl expiring outbound payments

@codecov

codecovBot commented Sep 24, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1096 (3e6297a) into main (5811f5b) will increase coverage by 0.41%.
The diff coverage is 96.27%.

Impacted file tree graph

@@ Coverage Diff @@## main #1096 +/- ##
==========================================
+ Coverage 90.73% 91.14% +0.41% 
==========================================
Files 65 65 Lines 34318 37177 +2859 ==========================================
+ Hits 31137 33884 +2747 - Misses 3181 3293 +112 
Impacted FilesCoverage Δ
lightning/src/ln/channelmanager.rs87.28% <93.75%> (+2.35%)⬆️
lightning/src/ln/functional_tests.rs97.41% <98.66%> (-0.04%)⬇️
lightning/src/ln/channel.rs91.48% <100.00%> (+2.83%)⬆️
lightning/src/chain/mod.rs55.55% <0.00%> (-3.27%)⬇️
lightning-block-sync/src/lib.rs93.49% <0.00%> (-1.69%)⬇️
lightning/src/ln/script.rs93.06% <0.00%> (-0.69%)⬇️
lightning-net-tokio/src/lib.rs76.69% <0.00%> (-0.59%)⬇️
lightning/src/util/ser_macros.rs86.51% <0.00%> (-0.33%)⬇️
lightning-block-sync/src/http.rs93.30% <0.00%> (-0.22%)⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5811f5b...3e6297a. Read the comment docs.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}

impl PendingOutboundPayment {
fn remove(&mut self, session_priv: &[u8; 32]) -> bool {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Heh, match the hashset api, slick, i like it.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}
} else {
// XXX they could retry with a bogus amt/hash/secret/payment_id here and we wouldn't catch it atm
// should we keep payments in pending_outbound_payments until they succeed/expire/manually removed?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hmm, I was kinda figuring we'd require users just call send_payment again, though I admit it would be kinda slick to let them just call the same method here. I guess we could do something like time out pending all-paths-failed payments after, eg, 3 blocks or so? Do you have an opinion @jkczyz?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah, I figured once a payment has failed (and thus ChannelManager has been cleaned up), retrying would just involve calling send_payment again as is currently done in #1059. So the retry interface would be specific to retrying a path failure for MPP.

Originally, I hoped it could be a single interface across any send/retry scenario. See conversation here: #1053 (comment). But that seemed to not be ideal.

If we could have a single call for any retry scenario, that would be nice. It mostly just prevents us from needing to switch on all_paths_failed.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Yea, I was thinking we'd have separate interfaces, but maybe the memory usage is not so bad? Like, we'd have a bunch of memory used for failed payments, but we could time-box it. For high-volume scenarios it could be a real concern, but we'd clean up any memory (a) after the payment succeeds, even across a different path, or (b) after some time. Maybe we can figure out how to address the DoS later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We could parameterize send_payment further by the invoice expiry, and remove pending outbounds at min(invoice_expiry, 3 blocks) maybe?

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Well we either have to handle it here or in #1059, both for 0.0.102. I suppose we can punt "tightly limit expiry time" to a later release, even if we do expire here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Right, my point was its probably ~the same amount of code to handle switching between retry_payment and send_payment in #1059 as it is to just call retry_payment instead of send_payment and not remove the payment entry until a payment succeeds in this PR :)

@valentinewallacevalentinewallaceSep 27, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

> not remove the payment entry until a payment succeeds in this PR :)
Hmm, so when I keep failed payments, then retry a payment with all_paths_failed, it fails due to we didn't have a corresponding inbound payment (on the receiver end). Gotta make it symmetrical (i.e. keep failed payments on receiver end as well), I suppose?
Actually, this seems like it could be an issue for #1059 as well iiuc

EDIT: disregard, should never retry if rejected_by_dest anyway

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Naming looks good.

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines -5265 to +5414
(1, pending_outbound_payments, required),
(1, pending_outbound_payments_compat_2, required),
(3, pending_outbound_payments, required),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Will changing the order break the format?

@valentinewallacevalentinewallaceSep 28, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

IIUC, if e.g. in 0.0.102 we change the hashmap serialization format that corresponds to the 1 tlv type here, 0.0.101 clients will fail to deserialize it (hope that answers)

@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 4 times, most recently from e5654b8 to c4ac620CompareSeptember 28, 2021 01:43
@valentinewallace
valentinewallace marked this pull request as ready for review September 28, 2021 22:32

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks good!

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Leftover from previous PR Jeff feedback.
Useful in upcoming commits as we'll expose this to users for payment retries
Used in upcoming commits for retries
We want to reuse send_payment internal functions for retries,
so some need to now be parameterized by PaymentId to avoid
generating a new PaymentId on retry
Retrying a partial payment means send_payment_internal needs to be parameterized
by a total payment amount, else 'HTLC values do not match' errors
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 58afd58 to 977dbf8CompareSeptember 28, 2021 23:55
@TheBlueMattTheBlueMatt added this to the 0.0.102 milestone Sep 29, 2021
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/functional_tests.rs
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 98a225e to 8460a97CompareSeptember 29, 2021 23:47
Comment threadlightning/src/ln/channelmanager.rs Outdated

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM module some minor comments

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
This is because we want the ability to retry completely failed
payments.
Upcoming commits will remove these payments on timeout to prevent
DoS issues
Also test that this removal allows retrying single-path payments
@TheBlueMatt
TheBlueMatt merged commit 7aa2cac into lightningdevkit:mainSep 30, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@TheBlueMatt@arik-so@jkczyz
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Payment Retries in ChannelManager by valentinewallace · Pull Request #1096 · lightningdevkit/rust-lightning · GitHub
Skip to content

Payment Retries in ChannelManager - #1096

Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries
Sep 30, 2021
Merged

Payment Retries in ChannelManager#1096
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries

Conversation

@valentinewallace

@valentinewallacevalentinewallace commented Sep 24, 2021

Copy link
Copy Markdown
Contributor

Seeking concept ACKs on the new pending_outbound_payments format/new enum @jkczyz@TheBlueMatt

Also left a comment on an open question about retrying payments that have been completely removed.

TODOs

  • test retrying a completely failed payment
  • check total_msat is sane on retry
  • test retrying w/ bad payment_hash, amt, etc
  • impl expiring outbound payments

@codecov

codecovBot commented Sep 24, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1096 (3e6297a) into main (5811f5b) will increase coverage by 0.41%.
The diff coverage is 96.27%.

Impacted file tree graph

@@ Coverage Diff @@## main #1096 +/- ##
==========================================
+ Coverage 90.73% 91.14% +0.41% 
==========================================
Files 65 65 Lines 34318 37177 +2859 ==========================================
+ Hits 31137 33884 +2747 - Misses 3181 3293 +112 
Impacted FilesCoverage Δ
lightning/src/ln/channelmanager.rs87.28% <93.75%> (+2.35%)⬆️
lightning/src/ln/functional_tests.rs97.41% <98.66%> (-0.04%)⬇️
lightning/src/ln/channel.rs91.48% <100.00%> (+2.83%)⬆️
lightning/src/chain/mod.rs55.55% <0.00%> (-3.27%)⬇️
lightning-block-sync/src/lib.rs93.49% <0.00%> (-1.69%)⬇️
lightning/src/ln/script.rs93.06% <0.00%> (-0.69%)⬇️
lightning-net-tokio/src/lib.rs76.69% <0.00%> (-0.59%)⬇️
lightning/src/util/ser_macros.rs86.51% <0.00%> (-0.33%)⬇️
lightning-block-sync/src/http.rs93.30% <0.00%> (-0.22%)⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5811f5b...3e6297a. Read the comment docs.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}

impl PendingOutboundPayment {
fn remove(&mut self, session_priv: &[u8; 32]) -> bool {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Heh, match the hashset api, slick, i like it.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}
} else {
// XXX they could retry with a bogus amt/hash/secret/payment_id here and we wouldn't catch it atm
// should we keep payments in pending_outbound_payments until they succeed/expire/manually removed?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hmm, I was kinda figuring we'd require users just call send_payment again, though I admit it would be kinda slick to let them just call the same method here. I guess we could do something like time out pending all-paths-failed payments after, eg, 3 blocks or so? Do you have an opinion @jkczyz?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah, I figured once a payment has failed (and thus ChannelManager has been cleaned up), retrying would just involve calling send_payment again as is currently done in #1059. So the retry interface would be specific to retrying a path failure for MPP.

Originally, I hoped it could be a single interface across any send/retry scenario. See conversation here: #1053 (comment). But that seemed to not be ideal.

If we could have a single call for any retry scenario, that would be nice. It mostly just prevents us from needing to switch on all_paths_failed.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Yea, I was thinking we'd have separate interfaces, but maybe the memory usage is not so bad? Like, we'd have a bunch of memory used for failed payments, but we could time-box it. For high-volume scenarios it could be a real concern, but we'd clean up any memory (a) after the payment succeeds, even across a different path, or (b) after some time. Maybe we can figure out how to address the DoS later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We could parameterize send_payment further by the invoice expiry, and remove pending outbounds at min(invoice_expiry, 3 blocks) maybe?

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Well we either have to handle it here or in #1059, both for 0.0.102. I suppose we can punt "tightly limit expiry time" to a later release, even if we do expire here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Right, my point was its probably ~the same amount of code to handle switching between retry_payment and send_payment in #1059 as it is to just call retry_payment instead of send_payment and not remove the payment entry until a payment succeeds in this PR :)

@valentinewallacevalentinewallaceSep 27, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

> not remove the payment entry until a payment succeeds in this PR :)
Hmm, so when I keep failed payments, then retry a payment with all_paths_failed, it fails due to we didn't have a corresponding inbound payment (on the receiver end). Gotta make it symmetrical (i.e. keep failed payments on receiver end as well), I suppose?
Actually, this seems like it could be an issue for #1059 as well iiuc

EDIT: disregard, should never retry if rejected_by_dest anyway

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Naming looks good.

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines -5265 to +5414
(1, pending_outbound_payments, required),
(1, pending_outbound_payments_compat_2, required),
(3, pending_outbound_payments, required),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Will changing the order break the format?

@valentinewallacevalentinewallaceSep 28, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

IIUC, if e.g. in 0.0.102 we change the hashmap serialization format that corresponds to the 1 tlv type here, 0.0.101 clients will fail to deserialize it (hope that answers)

@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 4 times, most recently from e5654b8 to c4ac620CompareSeptember 28, 2021 01:43
@valentinewallace
valentinewallace marked this pull request as ready for review September 28, 2021 22:32

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks good!

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Leftover from previous PR Jeff feedback.
Useful in upcoming commits as we'll expose this to users for payment retries
Used in upcoming commits for retries
We want to reuse send_payment internal functions for retries,
so some need to now be parameterized by PaymentId to avoid
generating a new PaymentId on retry
Retrying a partial payment means send_payment_internal needs to be parameterized
by a total payment amount, else 'HTLC values do not match' errors
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 58afd58 to 977dbf8CompareSeptember 28, 2021 23:55
@TheBlueMattTheBlueMatt added this to the 0.0.102 milestone Sep 29, 2021
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/functional_tests.rs
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 98a225e to 8460a97CompareSeptember 29, 2021 23:47
Comment threadlightning/src/ln/channelmanager.rs Outdated

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM module some minor comments

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
This is because we want the ability to retry completely failed
payments.
Upcoming commits will remove these payments on timeout to prevent
DoS issues
Also test that this removal allows retrying single-path payments
@TheBlueMatt
TheBlueMatt merged commit 7aa2cac into lightningdevkit:mainSep 30, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Payment Retries in ChannelManager - #1096

Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries
Sep 30, 2021
Merged

Payment Retries in ChannelManager#1096
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries

Conversation

@valentinewallace

@valentinewallacevalentinewallace commented Sep 24, 2021

Copy link
Copy Markdown
Contributor

Seeking concept ACKs on the new pending_outbound_payments format/new enum @jkczyz@TheBlueMatt

Also left a comment on an open question about retrying payments that have been completely removed.

TODOs

  • test retrying a completely failed payment
  • check total_msat is sane on retry
  • test retrying w/ bad payment_hash, amt, etc
  • impl expiring outbound payments

@codecov

codecovBot commented Sep 24, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1096 (3e6297a) into main (5811f5b) will increase coverage by 0.41%.
The diff coverage is 96.27%.

Impacted file tree graph

@@ Coverage Diff @@## main #1096 +/- ##
==========================================
+ Coverage 90.73% 91.14% +0.41% 
==========================================
Files 65 65 Lines 34318 37177 +2859 ==========================================
+ Hits 31137 33884 +2747 - Misses 3181 3293 +112 
Impacted FilesCoverage Δ
lightning/src/ln/channelmanager.rs87.28% <93.75%> (+2.35%)⬆️
lightning/src/ln/functional_tests.rs97.41% <98.66%> (-0.04%)⬇️
lightning/src/ln/channel.rs91.48% <100.00%> (+2.83%)⬆️
lightning/src/chain/mod.rs55.55% <0.00%> (-3.27%)⬇️
lightning-block-sync/src/lib.rs93.49% <0.00%> (-1.69%)⬇️
lightning/src/ln/script.rs93.06% <0.00%> (-0.69%)⬇️
lightning-net-tokio/src/lib.rs76.69% <0.00%> (-0.59%)⬇️
lightning/src/util/ser_macros.rs86.51% <0.00%> (-0.33%)⬇️
lightning-block-sync/src/http.rs93.30% <0.00%> (-0.22%)⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5811f5b...3e6297a. Read the comment docs.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}

impl PendingOutboundPayment {
fn remove(&mut self, session_priv: &[u8; 32]) -> bool {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Heh, match the hashset api, slick, i like it.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}
} else {
// XXX they could retry with a bogus amt/hash/secret/payment_id here and we wouldn't catch it atm
// should we keep payments in pending_outbound_payments until they succeed/expire/manually removed?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hmm, I was kinda figuring we'd require users just call send_payment again, though I admit it would be kinda slick to let them just call the same method here. I guess we could do something like time out pending all-paths-failed payments after, eg, 3 blocks or so? Do you have an opinion @jkczyz?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah, I figured once a payment has failed (and thus ChannelManager has been cleaned up), retrying would just involve calling send_payment again as is currently done in #1059. So the retry interface would be specific to retrying a path failure for MPP.

Originally, I hoped it could be a single interface across any send/retry scenario. See conversation here: #1053 (comment). But that seemed to not be ideal.

If we could have a single call for any retry scenario, that would be nice. It mostly just prevents us from needing to switch on all_paths_failed.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Yea, I was thinking we'd have separate interfaces, but maybe the memory usage is not so bad? Like, we'd have a bunch of memory used for failed payments, but we could time-box it. For high-volume scenarios it could be a real concern, but we'd clean up any memory (a) after the payment succeeds, even across a different path, or (b) after some time. Maybe we can figure out how to address the DoS later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We could parameterize send_payment further by the invoice expiry, and remove pending outbounds at min(invoice_expiry, 3 blocks) maybe?

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Well we either have to handle it here or in #1059, both for 0.0.102. I suppose we can punt "tightly limit expiry time" to a later release, even if we do expire here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Right, my point was its probably ~the same amount of code to handle switching between retry_payment and send_payment in #1059 as it is to just call retry_payment instead of send_payment and not remove the payment entry until a payment succeeds in this PR :)

@valentinewallacevalentinewallaceSep 27, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

> not remove the payment entry until a payment succeeds in this PR :)
Hmm, so when I keep failed payments, then retry a payment with all_paths_failed, it fails due to we didn't have a corresponding inbound payment (on the receiver end). Gotta make it symmetrical (i.e. keep failed payments on receiver end as well), I suppose?
Actually, this seems like it could be an issue for #1059 as well iiuc

EDIT: disregard, should never retry if rejected_by_dest anyway

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Naming looks good.

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines -5265 to +5414
(1, pending_outbound_payments, required),
(1, pending_outbound_payments_compat_2, required),
(3, pending_outbound_payments, required),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Will changing the order break the format?

@valentinewallacevalentinewallaceSep 28, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

IIUC, if e.g. in 0.0.102 we change the hashmap serialization format that corresponds to the 1 tlv type here, 0.0.101 clients will fail to deserialize it (hope that answers)

@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 4 times, most recently from e5654b8 to c4ac620CompareSeptember 28, 2021 01:43
@valentinewallace
valentinewallace marked this pull request as ready for review September 28, 2021 22:32

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks good!

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Leftover from previous PR Jeff feedback.
Useful in upcoming commits as we'll expose this to users for payment retries
Used in upcoming commits for retries
We want to reuse send_payment internal functions for retries,
so some need to now be parameterized by PaymentId to avoid
generating a new PaymentId on retry
Retrying a partial payment means send_payment_internal needs to be parameterized
by a total payment amount, else 'HTLC values do not match' errors
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 58afd58 to 977dbf8CompareSeptember 28, 2021 23:55
@TheBlueMattTheBlueMatt added this to the 0.0.102 milestone Sep 29, 2021
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/functional_tests.rs
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 98a225e to 8460a97CompareSeptember 29, 2021 23:47
Comment threadlightning/src/ln/channelmanager.rs Outdated

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM module some minor comments

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
This is because we want the ability to retry completely failed
payments.
Upcoming commits will remove these payments on timeout to prevent
DoS issues
Also test that this removal allows retrying single-path payments
@TheBlueMatt
TheBlueMatt merged commit 7aa2cac into lightningdevkit:mainSep 30, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Payment Retries in ChannelManager - #1096

Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries
Sep 30, 2021
Merged

Payment Retries in ChannelManager#1096
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries

Conversation

@valentinewallace

@valentinewallacevalentinewallace commented Sep 24, 2021

Copy link
Copy Markdown
Contributor

Seeking concept ACKs on the new pending_outbound_payments format/new enum @jkczyz@TheBlueMatt

Also left a comment on an open question about retrying payments that have been completely removed.

TODOs

  • test retrying a completely failed payment
  • check total_msat is sane on retry
  • test retrying w/ bad payment_hash, amt, etc
  • impl expiring outbound payments

@codecov

codecovBot commented Sep 24, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1096 (3e6297a) into main (5811f5b) will increase coverage by 0.41%.
The diff coverage is 96.27%.

Impacted file tree graph

@@ Coverage Diff @@## main #1096 +/- ##
==========================================
+ Coverage 90.73% 91.14% +0.41% 
==========================================
Files 65 65 Lines 34318 37177 +2859 ==========================================
+ Hits 31137 33884 +2747 - Misses 3181 3293 +112 
Impacted FilesCoverage Δ
lightning/src/ln/channelmanager.rs87.28% <93.75%> (+2.35%)⬆️
lightning/src/ln/functional_tests.rs97.41% <98.66%> (-0.04%)⬇️
lightning/src/ln/channel.rs91.48% <100.00%> (+2.83%)⬆️
lightning/src/chain/mod.rs55.55% <0.00%> (-3.27%)⬇️
lightning-block-sync/src/lib.rs93.49% <0.00%> (-1.69%)⬇️
lightning/src/ln/script.rs93.06% <0.00%> (-0.69%)⬇️
lightning-net-tokio/src/lib.rs76.69% <0.00%> (-0.59%)⬇️
lightning/src/util/ser_macros.rs86.51% <0.00%> (-0.33%)⬇️
lightning-block-sync/src/http.rs93.30% <0.00%> (-0.22%)⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5811f5b...3e6297a. Read the comment docs.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}

impl PendingOutboundPayment {
fn remove(&mut self, session_priv: &[u8; 32]) -> bool {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Heh, match the hashset api, slick, i like it.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}
} else {
// XXX they could retry with a bogus amt/hash/secret/payment_id here and we wouldn't catch it atm
// should we keep payments in pending_outbound_payments until they succeed/expire/manually removed?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hmm, I was kinda figuring we'd require users just call send_payment again, though I admit it would be kinda slick to let them just call the same method here. I guess we could do something like time out pending all-paths-failed payments after, eg, 3 blocks or so? Do you have an opinion @jkczyz?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah, I figured once a payment has failed (and thus ChannelManager has been cleaned up), retrying would just involve calling send_payment again as is currently done in #1059. So the retry interface would be specific to retrying a path failure for MPP.

Originally, I hoped it could be a single interface across any send/retry scenario. See conversation here: #1053 (comment). But that seemed to not be ideal.

If we could have a single call for any retry scenario, that would be nice. It mostly just prevents us from needing to switch on all_paths_failed.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Yea, I was thinking we'd have separate interfaces, but maybe the memory usage is not so bad? Like, we'd have a bunch of memory used for failed payments, but we could time-box it. For high-volume scenarios it could be a real concern, but we'd clean up any memory (a) after the payment succeeds, even across a different path, or (b) after some time. Maybe we can figure out how to address the DoS later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We could parameterize send_payment further by the invoice expiry, and remove pending outbounds at min(invoice_expiry, 3 blocks) maybe?

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Well we either have to handle it here or in #1059, both for 0.0.102. I suppose we can punt "tightly limit expiry time" to a later release, even if we do expire here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Right, my point was its probably ~the same amount of code to handle switching between retry_payment and send_payment in #1059 as it is to just call retry_payment instead of send_payment and not remove the payment entry until a payment succeeds in this PR :)

@valentinewallacevalentinewallaceSep 27, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

> not remove the payment entry until a payment succeeds in this PR :)
Hmm, so when I keep failed payments, then retry a payment with all_paths_failed, it fails due to we didn't have a corresponding inbound payment (on the receiver end). Gotta make it symmetrical (i.e. keep failed payments on receiver end as well), I suppose?
Actually, this seems like it could be an issue for #1059 as well iiuc

EDIT: disregard, should never retry if rejected_by_dest anyway

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Naming looks good.

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines -5265 to +5414
(1, pending_outbound_payments, required),
(1, pending_outbound_payments_compat_2, required),
(3, pending_outbound_payments, required),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Will changing the order break the format?

@valentinewallacevalentinewallaceSep 28, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

IIUC, if e.g. in 0.0.102 we change the hashmap serialization format that corresponds to the 1 tlv type here, 0.0.101 clients will fail to deserialize it (hope that answers)

@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 4 times, most recently from e5654b8 to c4ac620CompareSeptember 28, 2021 01:43
@valentinewallace
valentinewallace marked this pull request as ready for review September 28, 2021 22:32

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks good!

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Leftover from previous PR Jeff feedback.
Useful in upcoming commits as we'll expose this to users for payment retries
Used in upcoming commits for retries
We want to reuse send_payment internal functions for retries,
so some need to now be parameterized by PaymentId to avoid
generating a new PaymentId on retry
Retrying a partial payment means send_payment_internal needs to be parameterized
by a total payment amount, else 'HTLC values do not match' errors
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 58afd58 to 977dbf8CompareSeptember 28, 2021 23:55
@TheBlueMattTheBlueMatt added this to the 0.0.102 milestone Sep 29, 2021
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/functional_tests.rs
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 98a225e to 8460a97CompareSeptember 29, 2021 23:47
Comment threadlightning/src/ln/channelmanager.rs Outdated

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM module some minor comments

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
This is because we want the ability to retry completely failed
payments.
Upcoming commits will remove these payments on timeout to prevent
DoS issues
Also test that this removal allows retrying single-path payments
@TheBlueMatt
TheBlueMatt merged commit 7aa2cac into lightningdevkit:mainSep 30, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@TheBlueMatt@arik-so@jkczyz
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Payment Retries in ChannelManager by valentinewallace · Pull Request #1096 · lightningdevkit/rust-lightning · GitHub
Skip to content

Payment Retries in ChannelManager - #1096

Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries
Sep 30, 2021
Merged

Payment Retries in ChannelManager#1096
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries

Conversation

@valentinewallace

@valentinewallacevalentinewallace commented Sep 24, 2021

Copy link
Copy Markdown
Contributor

Seeking concept ACKs on the new pending_outbound_payments format/new enum @jkczyz@TheBlueMatt

Also left a comment on an open question about retrying payments that have been completely removed.

TODOs

  • test retrying a completely failed payment
  • check total_msat is sane on retry
  • test retrying w/ bad payment_hash, amt, etc
  • impl expiring outbound payments

@codecov

codecovBot commented Sep 24, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1096 (3e6297a) into main (5811f5b) will increase coverage by 0.41%.
The diff coverage is 96.27%.

Impacted file tree graph

@@ Coverage Diff @@## main #1096 +/- ##
==========================================
+ Coverage 90.73% 91.14% +0.41% 
==========================================
Files 65 65 Lines 34318 37177 +2859 ==========================================
+ Hits 31137 33884 +2747 - Misses 3181 3293 +112 
Impacted FilesCoverage Δ
lightning/src/ln/channelmanager.rs87.28% <93.75%> (+2.35%)⬆️
lightning/src/ln/functional_tests.rs97.41% <98.66%> (-0.04%)⬇️
lightning/src/ln/channel.rs91.48% <100.00%> (+2.83%)⬆️
lightning/src/chain/mod.rs55.55% <0.00%> (-3.27%)⬇️
lightning-block-sync/src/lib.rs93.49% <0.00%> (-1.69%)⬇️
lightning/src/ln/script.rs93.06% <0.00%> (-0.69%)⬇️
lightning-net-tokio/src/lib.rs76.69% <0.00%> (-0.59%)⬇️
lightning/src/util/ser_macros.rs86.51% <0.00%> (-0.33%)⬇️
lightning-block-sync/src/http.rs93.30% <0.00%> (-0.22%)⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5811f5b...3e6297a. Read the comment docs.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}

impl PendingOutboundPayment {
fn remove(&mut self, session_priv: &[u8; 32]) -> bool {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Heh, match the hashset api, slick, i like it.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}
} else {
// XXX they could retry with a bogus amt/hash/secret/payment_id here and we wouldn't catch it atm
// should we keep payments in pending_outbound_payments until they succeed/expire/manually removed?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hmm, I was kinda figuring we'd require users just call send_payment again, though I admit it would be kinda slick to let them just call the same method here. I guess we could do something like time out pending all-paths-failed payments after, eg, 3 blocks or so? Do you have an opinion @jkczyz?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah, I figured once a payment has failed (and thus ChannelManager has been cleaned up), retrying would just involve calling send_payment again as is currently done in #1059. So the retry interface would be specific to retrying a path failure for MPP.

Originally, I hoped it could be a single interface across any send/retry scenario. See conversation here: #1053 (comment). But that seemed to not be ideal.

If we could have a single call for any retry scenario, that would be nice. It mostly just prevents us from needing to switch on all_paths_failed.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Yea, I was thinking we'd have separate interfaces, but maybe the memory usage is not so bad? Like, we'd have a bunch of memory used for failed payments, but we could time-box it. For high-volume scenarios it could be a real concern, but we'd clean up any memory (a) after the payment succeeds, even across a different path, or (b) after some time. Maybe we can figure out how to address the DoS later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We could parameterize send_payment further by the invoice expiry, and remove pending outbounds at min(invoice_expiry, 3 blocks) maybe?

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Well we either have to handle it here or in #1059, both for 0.0.102. I suppose we can punt "tightly limit expiry time" to a later release, even if we do expire here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Right, my point was its probably ~the same amount of code to handle switching between retry_payment and send_payment in #1059 as it is to just call retry_payment instead of send_payment and not remove the payment entry until a payment succeeds in this PR :)

@valentinewallacevalentinewallaceSep 27, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

> not remove the payment entry until a payment succeeds in this PR :)
Hmm, so when I keep failed payments, then retry a payment with all_paths_failed, it fails due to we didn't have a corresponding inbound payment (on the receiver end). Gotta make it symmetrical (i.e. keep failed payments on receiver end as well), I suppose?
Actually, this seems like it could be an issue for #1059 as well iiuc

EDIT: disregard, should never retry if rejected_by_dest anyway

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Naming looks good.

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines -5265 to +5414
(1, pending_outbound_payments, required),
(1, pending_outbound_payments_compat_2, required),
(3, pending_outbound_payments, required),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Will changing the order break the format?

@valentinewallacevalentinewallaceSep 28, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

IIUC, if e.g. in 0.0.102 we change the hashmap serialization format that corresponds to the 1 tlv type here, 0.0.101 clients will fail to deserialize it (hope that answers)

@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 4 times, most recently from e5654b8 to c4ac620CompareSeptember 28, 2021 01:43
@valentinewallace
valentinewallace marked this pull request as ready for review September 28, 2021 22:32

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks good!

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Leftover from previous PR Jeff feedback.
Useful in upcoming commits as we'll expose this to users for payment retries
Used in upcoming commits for retries
We want to reuse send_payment internal functions for retries,
so some need to now be parameterized by PaymentId to avoid
generating a new PaymentId on retry
Retrying a partial payment means send_payment_internal needs to be parameterized
by a total payment amount, else 'HTLC values do not match' errors
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 58afd58 to 977dbf8CompareSeptember 28, 2021 23:55
@TheBlueMattTheBlueMatt added this to the 0.0.102 milestone Sep 29, 2021
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/functional_tests.rs
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 98a225e to 8460a97CompareSeptember 29, 2021 23:47
Comment threadlightning/src/ln/channelmanager.rs Outdated

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM module some minor comments

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
This is because we want the ability to retry completely failed
payments.
Upcoming commits will remove these payments on timeout to prevent
DoS issues
Also test that this removal allows retrying single-path payments
@TheBlueMatt
TheBlueMatt merged commit 7aa2cac into lightningdevkit:mainSep 30, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@TheBlueMatt@arik-so@jkczyz
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Payment Retries in ChannelManager by valentinewallace · Pull Request #1096 · lightningdevkit/rust-lightning · GitHub
Skip to content

Payment Retries in ChannelManager - #1096

Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries
Sep 30, 2021
Merged

Payment Retries in ChannelManager#1096
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries

Conversation

@valentinewallace

@valentinewallacevalentinewallace commented Sep 24, 2021

Copy link
Copy Markdown
Contributor

Seeking concept ACKs on the new pending_outbound_payments format/new enum @jkczyz@TheBlueMatt

Also left a comment on an open question about retrying payments that have been completely removed.

TODOs

  • test retrying a completely failed payment
  • check total_msat is sane on retry
  • test retrying w/ bad payment_hash, amt, etc
  • impl expiring outbound payments

@codecov

codecovBot commented Sep 24, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1096 (3e6297a) into main (5811f5b) will increase coverage by 0.41%.
The diff coverage is 96.27%.

Impacted file tree graph

@@ Coverage Diff @@## main #1096 +/- ##
==========================================
+ Coverage 90.73% 91.14% +0.41% 
==========================================
Files 65 65 Lines 34318 37177 +2859 ==========================================
+ Hits 31137 33884 +2747 - Misses 3181 3293 +112 
Impacted FilesCoverage Δ
lightning/src/ln/channelmanager.rs87.28% <93.75%> (+2.35%)⬆️
lightning/src/ln/functional_tests.rs97.41% <98.66%> (-0.04%)⬇️
lightning/src/ln/channel.rs91.48% <100.00%> (+2.83%)⬆️
lightning/src/chain/mod.rs55.55% <0.00%> (-3.27%)⬇️
lightning-block-sync/src/lib.rs93.49% <0.00%> (-1.69%)⬇️
lightning/src/ln/script.rs93.06% <0.00%> (-0.69%)⬇️
lightning-net-tokio/src/lib.rs76.69% <0.00%> (-0.59%)⬇️
lightning/src/util/ser_macros.rs86.51% <0.00%> (-0.33%)⬇️
lightning-block-sync/src/http.rs93.30% <0.00%> (-0.22%)⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5811f5b...3e6297a. Read the comment docs.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}

impl PendingOutboundPayment {
fn remove(&mut self, session_priv: &[u8; 32]) -> bool {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Heh, match the hashset api, slick, i like it.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}
} else {
// XXX they could retry with a bogus amt/hash/secret/payment_id here and we wouldn't catch it atm
// should we keep payments in pending_outbound_payments until they succeed/expire/manually removed?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hmm, I was kinda figuring we'd require users just call send_payment again, though I admit it would be kinda slick to let them just call the same method here. I guess we could do something like time out pending all-paths-failed payments after, eg, 3 blocks or so? Do you have an opinion @jkczyz?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah, I figured once a payment has failed (and thus ChannelManager has been cleaned up), retrying would just involve calling send_payment again as is currently done in #1059. So the retry interface would be specific to retrying a path failure for MPP.

Originally, I hoped it could be a single interface across any send/retry scenario. See conversation here: #1053 (comment). But that seemed to not be ideal.

If we could have a single call for any retry scenario, that would be nice. It mostly just prevents us from needing to switch on all_paths_failed.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Yea, I was thinking we'd have separate interfaces, but maybe the memory usage is not so bad? Like, we'd have a bunch of memory used for failed payments, but we could time-box it. For high-volume scenarios it could be a real concern, but we'd clean up any memory (a) after the payment succeeds, even across a different path, or (b) after some time. Maybe we can figure out how to address the DoS later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We could parameterize send_payment further by the invoice expiry, and remove pending outbounds at min(invoice_expiry, 3 blocks) maybe?

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Well we either have to handle it here or in #1059, both for 0.0.102. I suppose we can punt "tightly limit expiry time" to a later release, even if we do expire here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Right, my point was its probably ~the same amount of code to handle switching between retry_payment and send_payment in #1059 as it is to just call retry_payment instead of send_payment and not remove the payment entry until a payment succeeds in this PR :)

@valentinewallacevalentinewallaceSep 27, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

> not remove the payment entry until a payment succeeds in this PR :)
Hmm, so when I keep failed payments, then retry a payment with all_paths_failed, it fails due to we didn't have a corresponding inbound payment (on the receiver end). Gotta make it symmetrical (i.e. keep failed payments on receiver end as well), I suppose?
Actually, this seems like it could be an issue for #1059 as well iiuc

EDIT: disregard, should never retry if rejected_by_dest anyway

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Naming looks good.

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines -5265 to +5414
(1, pending_outbound_payments, required),
(1, pending_outbound_payments_compat_2, required),
(3, pending_outbound_payments, required),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Will changing the order break the format?

@valentinewallacevalentinewallaceSep 28, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

IIUC, if e.g. in 0.0.102 we change the hashmap serialization format that corresponds to the 1 tlv type here, 0.0.101 clients will fail to deserialize it (hope that answers)

@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 4 times, most recently from e5654b8 to c4ac620CompareSeptember 28, 2021 01:43
@valentinewallace
valentinewallace marked this pull request as ready for review September 28, 2021 22:32

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks good!

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Leftover from previous PR Jeff feedback.
Useful in upcoming commits as we'll expose this to users for payment retries
Used in upcoming commits for retries
We want to reuse send_payment internal functions for retries,
so some need to now be parameterized by PaymentId to avoid
generating a new PaymentId on retry
Retrying a partial payment means send_payment_internal needs to be parameterized
by a total payment amount, else 'HTLC values do not match' errors
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 58afd58 to 977dbf8CompareSeptember 28, 2021 23:55
@TheBlueMattTheBlueMatt added this to the 0.0.102 milestone Sep 29, 2021
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/functional_tests.rs
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 98a225e to 8460a97CompareSeptember 29, 2021 23:47
Comment threadlightning/src/ln/channelmanager.rs Outdated

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM module some minor comments

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
This is because we want the ability to retry completely failed
payments.
Upcoming commits will remove these payments on timeout to prevent
DoS issues
Also test that this removal allows retrying single-path payments
@TheBlueMatt
TheBlueMatt merged commit 7aa2cac into lightningdevkit:mainSep 30, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

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

Payment Retries in ChannelManager - #1096

Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries
Sep 30, 2021
Merged

Payment Retries in ChannelManager#1096
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
valentinewallace:2021-09-mpp-retries

Conversation

@valentinewallace

@valentinewallacevalentinewallace commented Sep 24, 2021

Copy link
Copy Markdown
Contributor

Seeking concept ACKs on the new pending_outbound_payments format/new enum @jkczyz@TheBlueMatt

Also left a comment on an open question about retrying payments that have been completely removed.

TODOs

  • test retrying a completely failed payment
  • check total_msat is sane on retry
  • test retrying w/ bad payment_hash, amt, etc
  • impl expiring outbound payments

@codecov

codecovBot commented Sep 24, 2021

Copy link
Copy Markdown

Codecov Report

Merging #1096 (3e6297a) into main (5811f5b) will increase coverage by 0.41%.
The diff coverage is 96.27%.

Impacted file tree graph

@@ Coverage Diff @@## main #1096 +/- ##
==========================================
+ Coverage 90.73% 91.14% +0.41% 
==========================================
Files 65 65 Lines 34318 37177 +2859 ==========================================
+ Hits 31137 33884 +2747 - Misses 3181 3293 +112 
Impacted FilesCoverage Δ
lightning/src/ln/channelmanager.rs87.28% <93.75%> (+2.35%)⬆️
lightning/src/ln/functional_tests.rs97.41% <98.66%> (-0.04%)⬇️
lightning/src/ln/channel.rs91.48% <100.00%> (+2.83%)⬆️
lightning/src/chain/mod.rs55.55% <0.00%> (-3.27%)⬇️
lightning-block-sync/src/lib.rs93.49% <0.00%> (-1.69%)⬇️
lightning/src/ln/script.rs93.06% <0.00%> (-0.69%)⬇️
lightning-net-tokio/src/lib.rs76.69% <0.00%> (-0.59%)⬇️
lightning/src/util/ser_macros.rs86.51% <0.00%> (-0.33%)⬇️
lightning-block-sync/src/http.rs93.30% <0.00%> (-0.22%)⬇️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5811f5b...3e6297a. Read the comment docs.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}

impl PendingOutboundPayment {
fn remove(&mut self, session_priv: &[u8; 32]) -> bool {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Heh, match the hashset api, slick, i like it.

Comment threadlightning/src/ln/channelmanager.rs Outdated
}
} else {
// XXX they could retry with a bogus amt/hash/secret/payment_id here and we wouldn't catch it atm
// should we keep payments in pending_outbound_payments until they succeed/expire/manually removed?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hmm, I was kinda figuring we'd require users just call send_payment again, though I admit it would be kinda slick to let them just call the same method here. I guess we could do something like time out pending all-paths-failed payments after, eg, 3 blocks or so? Do you have an opinion @jkczyz?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yeah, I figured once a payment has failed (and thus ChannelManager has been cleaned up), retrying would just involve calling send_payment again as is currently done in #1059. So the retry interface would be specific to retrying a path failure for MPP.

Originally, I hoped it could be a single interface across any send/retry scenario. See conversation here: #1053 (comment). But that seemed to not be ideal.

If we could have a single call for any retry scenario, that would be nice. It mostly just prevents us from needing to switch on all_paths_failed.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Yea, I was thinking we'd have separate interfaces, but maybe the memory usage is not so bad? Like, we'd have a bunch of memory used for failed payments, but we could time-box it. For high-volume scenarios it could be a real concern, but we'd clean up any memory (a) after the payment succeeds, even across a different path, or (b) after some time. Maybe we can figure out how to address the DoS later?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We could parameterize send_payment further by the invoice expiry, and remove pending outbounds at min(invoice_expiry, 3 blocks) maybe?

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

In any case, given this week's a bit busy, I'm in favor of punting complete payment retries to follow-up

Well we either have to handle it here or in #1059, both for 0.0.102. I suppose we can punt "tightly limit expiry time" to a later release, even if we do expire here?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Oh, I meant punt complete payment retries via the retry_payment API. I think #1059 already does complete payment retries, just via send_payment

Right, my point was its probably ~the same amount of code to handle switching between retry_payment and send_payment in #1059 as it is to just call retry_payment instead of send_payment and not remove the payment entry until a payment succeeds in this PR :)

@valentinewallacevalentinewallaceSep 27, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

> not remove the payment entry until a payment succeeds in this PR :)
Hmm, so when I keep failed payments, then retry a payment with all_paths_failed, it fails due to we didn't have a corresponding inbound payment (on the receiver end). Gotta make it symmetrical (i.e. keep failed payments on receiver end as well), I suppose?
Actually, this seems like it could be an issue for #1059 as well iiuc

EDIT: disregard, should never retry if rejected_by_dest anyway

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Naming looks good.

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines -5265 to +5414
(1, pending_outbound_payments, required),
(1, pending_outbound_payments_compat_2, required),
(3, pending_outbound_payments, required),

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Will changing the order break the format?

@valentinewallacevalentinewallaceSep 28, 2021

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

IIUC, if e.g. in 0.0.102 we change the hashmap serialization format that corresponds to the 1 tlv type here, 0.0.101 clients will fail to deserialize it (hope that answers)

@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 4 times, most recently from e5654b8 to c4ac620CompareSeptember 28, 2021 01:43
@valentinewallace
valentinewallace marked this pull request as ready for review September 28, 2021 22:32

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks good!

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Leftover from previous PR Jeff feedback.
Useful in upcoming commits as we'll expose this to users for payment retries
Used in upcoming commits for retries
We want to reuse send_payment internal functions for retries,
so some need to now be parameterized by PaymentId to avoid
generating a new PaymentId on retry
Retrying a partial payment means send_payment_internal needs to be parameterized
by a total payment amount, else 'HTLC values do not match' errors
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 58afd58 to 977dbf8CompareSeptember 28, 2021 23:55
@TheBlueMattTheBlueMatt added this to the 0.0.102 milestone Sep 29, 2021
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/functional_tests.rs
@valentinewallace
valentinewallaceforce-pushed the 2021-09-mpp-retries branch 2 times, most recently from 98a225e to 8460a97CompareSeptember 29, 2021 23:47
Comment threadlightning/src/ln/channelmanager.rs Outdated

@jkczyzjkczyz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM module some minor comments

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
This is because we want the ability to retry completely failed
payments.
Upcoming commits will remove these payments on timeout to prevent
DoS issues
Also test that this removal allows retrying single-path payments
@TheBlueMatt
TheBlueMatt merged commit 7aa2cac into lightningdevkit:mainSep 30, 2021
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@valentinewallace@TheBlueMatt@arik-so@jkczyz