Do not retry sending if payment gets confirmed on chain #1799
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
t-bast
reviewed
May 14, 2021
| private def isFinalRecipientFailure(pf: PaymentFailed, d: PaymentProgress): Boolean = pf.failures.collectFirst { | ||
| /** When we receive an error from the final recipient or payment gets confirmed on chain, we should fail the whole payment, it's useless to retry. */ | ||
| private def doNotRetry(pf: PaymentFailed, d: PaymentProgress): Boolean = pf.failures.collectFirst { | ||
| case LocalFailure(_, _: HtlcsTimedoutDownstream | _: HtlcOverriddenByLocalCommit) => true |
There was a problem hiding this comment.
This is HtlcsWillTimeoutUpstream as well.
You should probably create a dedicated method isOnChainFail(f: PaymentFailure).
There was a problem hiding this comment.
Seems I'd have to do exactly the same matching in a new method, what about keeping as is but expanding each case: 776d9df#diff-f28a1f15ee9515a9b2bb404c65cb4a01415b12d264f509420bdfb1251fd49afbR382-R388 ?
eclair-core/src/main/scala/fr/acinq/eclair/payment/send/MultiPartPaymentLifecycle.scala
Outdated
Show resolved
Hide resolved
eclair-core/src/main/scala/fr/acinq/eclair/payment/send/MultiPartPaymentLifecycle.scala
Outdated
Show resolved
Hide resolved
eclair-core/src/test/scala/fr/acinq/eclair/payment/MultiPartPaymentLifecycleSpec.scala
Outdated
Show resolved
Hide resolved
Codecov Report
@@ Coverage Diff @@
## master #1799 +/- ##
==========================================
- Coverage 89.34% 89.33% -0.01%
==========================================
Files 144 143 -1
Lines 10934 10934
Branches 458 464 +6
==========================================
- Hits 9769 9768 -1
- Misses 1165 1166 +1
|
t-bast
approved these changes
May 17, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a case where
MultiPartPaymentLifecyclekeeps retrying a payment even after it got confirmed on chain. Doing so is harmless but meaningless.