Skip to content

Ensure htlc_maximum_msat is at least htlc_minimum_msat #3117

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
thomash-acinq merged 1 commit into from
Jun 24, 2025
Merged

Ensure htlc_maximum_msat is at least htlc_minimum_msat #3117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion eclair-core/src/main/scala/fr/acinq/eclair/channel/Helpers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ object Helpers {
}
for (balanceThreshold <- nodeParams.channelConf.balanceThresholds) {
if (commitments.availableBalanceForSend <= balanceThreshold.available) {
return balanceThreshold.maxHtlcAmount.toMilliSatoshi.max(commitments.params.remoteParams.htlcMinimum).min(commitments.params.maxHtlcAmount)
return balanceThreshold.maxHtlcAmount.toMilliSatoshi.max(commitments.params.remoteParams.htlcMinimum.max(commitments.params.localParams.htlcMinimum)).min(commitments.params.maxHtlcAmount)
}
}
commitments.params.maxHtlcAmount
Expand Down
10 changes: 6 additions & 4 deletions eclair-core/src/test/scala/fr/acinq/eclair/channel/states/e/NormalStateSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,9 @@ class NormalStateSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with
}
assert(alice.stateData.asInstanceOf[DATA_NORMAL].channelUpdate.channelFlags.isEnabled)
inside(bobListener.expectMsgType[LocalChannelUpdate]) { lcu =>
assert(lcu.channelUpdate.htlcMaximumMsat == 0.msat)
assert(lcu.commitments.params.localParams.htlcMinimum == 1000.msat)
assert(lcu.commitments.params.remoteParams.htlcMinimum == 0.msat)
assert(lcu.channelUpdate.htlcMaximumMsat == 1000.msat)
assert(lcu.channelUpdate.shortChannelId.isInstanceOf[RealShortChannelId])
assert(lcu.channelUpdate.channelFlags.isEnabled)
}
Expand All @@ -960,7 +962,7 @@ class NormalStateSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with
aliceListener.expectNoMessage(100 millis)
bobListener.expectNoMessage(100 millis)
assert(alice.stateData.asInstanceOf[DATA_NORMAL].channelUpdate.htlcMaximumMsat == 500_000_000.msat)
assert(bob.stateData.asInstanceOf[DATA_NORMAL].channelUpdate.htlcMaximumMsat == 0.msat)
assert(bob.stateData.asInstanceOf[DATA_NORMAL].channelUpdate.htlcMaximumMsat == 1000.msat)

// Alice sends more funds, reaching Bob's third balance bucket and causing him to update his htlc_maximum_msat.
val (p2, htlc2) = addHtlc(2_000_000 msat, alice, bob, alice2bob, bob2alice)
Expand All @@ -981,8 +983,8 @@ class NormalStateSpec extends TestKitBaseClass with FixtureAnyFunSuiteLike with
crossSign(alice, bob, alice2bob, bob2alice)
assert(alice.stateData.asInstanceOf[DATA_NORMAL].commitments.latest.localCommit.spec.toLocal == 989_500_000.msat)
assert(bob.stateData.asInstanceOf[DATA_NORMAL].commitments.latest.localCommit.spec.toLocal == 10_500_000.msat)
assert(bobListener.expectMsgType[LocalChannelUpdate].channelUpdate.htlcMaximumMsat == 0.msat)
awaitCond(bob.stateData.asInstanceOf[DATA_NORMAL].channelUpdate.htlcMaximumMsat == 0.msat)
assert(bobListener.expectMsgType[LocalChannelUpdate].channelUpdate.htlcMaximumMsat == 1000.msat)
awaitCond(bob.stateData.asInstanceOf[DATA_NORMAL].channelUpdate.htlcMaximumMsat == 1000.msat)
aliceListener.expectNoMessage(100 millis)
assert(alice.stateData.asInstanceOf[DATA_NORMAL].channelUpdate.htlcMaximumMsat == 500_000_000.msat)

Expand Down