Clarify default relay fee change (#1673)

Clarify why we don't actively update channel relay fees when the default values change in eclair.conf. It would override manual changes made via the API which is bad.
ACINQ · Jan 20, 2021 · 34e901d · 34e901d
1 parent 54ca292
commit 34e901d
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/eclair-core/src/main/scala/fr/acinq/eclair/channel/Channel.scala b/eclair-core/src/main/scala/fr/acinq/eclair/channel/Channel.scala
@@ -247,8 +247,19 @@ class Channel(val nodeParams: NodeParams, val wallet: EclairWallet, remoteNodeId
           context.system.eventStream.publish(ShortChannelIdAssigned(self, normal.channelId, normal.channelUpdate.shortChannelId, None))
 
           // we rebuild a new channel_update with values from the configuration because they may have changed while eclair was down
-          val candidateChannelUpdate = Announcements.makeChannelUpdate(nodeParams.chainHash, nodeParams.privateKey, remoteNodeId, normal.channelUpdate.shortChannelId, nodeParams.expiryDelta,
-            normal.commitments.remoteParams.htlcMinimum, normal.channelUpdate.feeBaseMsat, normal.channelUpdate.feeProportionalMillionths, normal.commitments.capacity.toMilliSatoshi, enable = Announcements.isEnabled(normal.channelUpdate.channelFlags))
+          // NB: we don't update the routing fees, because we don't want to overwrite manual changes made with CMD_UPDATE_RELAY_FEE
+          // Since CMD_UPDATE_RELAY_FEE is handled even when being offline, that's the preferred solution to update routing fees
+          val candidateChannelUpdate = Announcements.makeChannelUpdate(
+            nodeParams.chainHash,
+            nodeParams.privateKey,
+            remoteNodeId,
+            normal.channelUpdate.shortChannelId,
+            nodeParams.expiryDelta,
+            normal.commitments.remoteParams.htlcMinimum,
+            normal.channelUpdate.feeBaseMsat,
+            normal.channelUpdate.feeProportionalMillionths,
+            normal.commitments.capacity.toMilliSatoshi,
+            enable = Announcements.isEnabled(normal.channelUpdate.channelFlags))
           val channelUpdate1 = if (Announcements.areSame(candidateChannelUpdate, normal.channelUpdate)) {
             // if there was no configuration change we keep the existing channel update
             normal.channelUpdate