Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trampoline fast fail #1727

Merged
merged 9 commits into from
Mar 10, 2021
Merged

Trampoline fast fail #1727

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
38f94ef
Add `replyToCommand` method, use it in Channel
akumaigorodski Nov 13, 2020
b3ff039
Merge remote-tracking branch 'origin/master'
akumaigorodski Dec 29, 2020
b96f3e0
Fix Channel
akumaigorodski Dec 29, 2020
529bdf7
Merge remote-tracking branch 'upstream/master'
akumaigorodski Jan 12, 2021
4b75166
Merge remote-tracking branch 'upstream/master'
akumaigorodski Jan 22, 2021
639fd54
Merge remote-tracking branch 'upstream/master'
akumaigorodski Feb 12, 2021
3b4e8bd
Merge remote-tracking branch 'upstream/master'
akumaigorodski Mar 9, 2021
4f20e4d
Fail trampoline relay right away if `outgoingCltv` is below chain height
akumaigorodski Mar 9, 2021
8a5e7a4
Fixes
akumaigorodski Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions eclair-core/src/main/scala/fr/acinq/eclair/payment/relay/NodeRelay.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ object NodeRelay {
Some(TrampolineFeeInsufficient)
} else if (upstream.expiryIn - payloadOut.outgoingCltv < nodeParams.expiryDelta) {
Some(TrampolineExpiryTooSoon)
} else if (CltvExpiry(nodeParams.currentBlockHeight) > payloadOut.outgoingCltv) {
Some(IncorrectOrUnknownPaymentDetails(upstream.adds.head.amountMsat, nodeParams.currentBlockHeight))
} else {
None
}
Expand Down
15 changes: 15 additions & 0 deletions eclair-core/src/test/scala/fr/acinq/eclair/payment/relay/NodeRelayerSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,21 @@ class NodeRelayerSpec extends ScalaTestWithActorTestKit(ConfigFactory.load("appl
register.expectNoMessage(100 millis)
}

test("fail to relay when final expiry is below chain height") { f =>
import f._

val expiryIn = CltvExpiry(500000)
val expiryOut = CltvExpiry(300000) // not ok (chain heigh = 400000)
val p = createValidIncomingPacket(2000000 msat, 2000000 msat, expiryIn, 1000000 msat, expiryOut)
nodeRelayer ! NodeRelay.Relay(p)

val fwd = register.expectMessageType[Register.Forward[CMD_FAIL_HTLC]]
assert(fwd.channelId === p.add.channelId)
assert(fwd.message === CMD_FAIL_HTLC(p.add.id, Right(IncorrectOrUnknownPaymentDetails(2000000 msat, 400000)), commit = true))

register.expectNoMessage(100 millis)
}

test("fail to relay when expiry is too soon (multi-part)") { f =>
import f._

Expand Down