Improve NodeRelayer errors #1261
Merged
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
Codecov Report
@@ Coverage Diff @@
## master #1261 +/- ##
==========================================
+ Coverage 77.08% 77.14% +0.06%
==========================================
Files 142 142
Lines 9892 9925 +33
Branches 394 396 +2
==========================================
+ Hits 7625 7657 +32
- Misses 2267 2268 +1
|
dpad85
reviewed
Dec 19, 2019
eclair-core/src/main/scala/fr/acinq/eclair/payment/relay/NodeRelayer.scala
Show resolved
Hide resolved
pm47
reviewed
Jan 8, 2020
eclair-core/src/main/scala/fr/acinq/eclair/payment/relay/NodeRelayer.scala
Outdated
Show resolved
Hide resolved
eclair-core/src/main/scala/fr/acinq/eclair/payment/relay/NodeRelayer.scala
Outdated
Show resolved
Hide resolved
eclair-core/src/main/scala/fr/acinq/eclair/payment/relay/NodeRelayer.scala
Show resolved
Hide resolved
We add new errors that let senders know they need to raise the trampoline fee/ctlv. When the error is downstream, we select the best error to forward.
When receiving a fee/cltv error, we should retry with a different fee/cltv. This process is currently quite manual: the sender decides upfront on each attempt's fee/cltv.
t-bast
force-pushed
the
trampoline-errors
branch
from
2b4b916 to
dc8459e
Compare
|
I added the sender-side in |
t-bast
commented
Jan 9, 2020
| @@ -72,7 +72,7 @@ class PaymentLifecycle(nodeParams: NodeParams, cfg: SendPaymentConfig, router: A | |||
| router ! FinalizeRoute(c.hops) | |||
| if (cfg.storeInDb) { | |||
| val targetNodeId = cfg.trampolineData.map(_.paymentRequest.nodeId).getOrElse(cfg.targetNodeId) | |||
| val finalAmount = c.finalPayload.amount - cfg.trampolineData.map(_.trampolineFees).getOrElse(0 msat) | |||
| val finalAmount = c.finalPayload.amount - cfg.trampolineData.map(_.trampolineAttempts.headOption.map(_._1).getOrElse(0 msat)).getOrElse(0 msat) | |||
There was a problem hiding this comment.
Please ignore this hack. This is because we haven't update the DB schema yet and we needed to take trampoline fees into account in a hackish way. This will be fixed in the next trampoline PR which update the DB schema to clean things up.
pm47
reviewed
Jan 20, 2020
eclair-core/src/main/scala/fr/acinq/eclair/payment/send/PaymentInitiator.scala
Outdated
Show resolved
Hide resolved
eclair-core/src/main/scala/fr/acinq/eclair/payment/send/PaymentInitiator.scala
Show resolved
Hide resolved
dpad85
reviewed
Jan 21, 2020
eclair-core/src/main/scala/fr/acinq/eclair/payment/send/PaymentInitiator.scala
Outdated
Show resolved
Hide resolved
pm47
previously approved these changes
Jan 21, 2020
pm47
approved these changes
Jan 21, 2020
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.
We add new errors that let senders know they need to raise the trampoline fee/ctlv.
When the error is downstream, we select the best error to forward.