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

Always re-send ChannelUpdate to private channels #1317

Merged
merged 10 commits into from
Feb 12, 2020
Merged

Always re-send ChannelUpdate to private channels #1317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0292fb5
Correctly decode requests without multipliers
May 30, 2019
35a08bb
Merge remote-tracking branch 'upstream/master'
Jun 26, 2019
c2b6aa8
Merge remote-tracking branch 'upstream/master'
Jul 12, 2019
1b44069
Merge remote-tracking branch 'upstream/master'
akumaigorodski Dec 23, 2019
06670a2
Merge remote-tracking branch 'upstream/master'
akumaigorodski Dec 24, 2019
b3e4b3a
Merge remote-tracking branch 'upstream/master'
akumaigorodski Feb 3, 2020
5452cc6
Always send ChannelUpdate for unannounced channels
akumaigorodski Feb 11, 2020
cefd915
Fixes
akumaigorodski Feb 11, 2020
73b38e4
Re-send ChannelUpdate when feerate changes
akumaigorodski Feb 11, 2020
2f83761
Change re-send logic
akumaigorodski Feb 11, 2020
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
10 changes: 7 additions & 3 deletions eclair-core/src/main/scala/fr/acinq/eclair/channel/Channel.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1680,11 +1680,15 @@ class Channel(val nodeParams: NodeParams, val wallet: EclairWallet, remoteNodeId

// if channel is private, we send the channel_update directly to remote
// they need it "to learn the other end's forwarding parameters" (BOLT 7)
(stateData, nextStateData) match {
case (d1: DATA_NORMAL, d2: DATA_NORMAL) if !d1.commitments.announceChannel && !d1.buried && d2.buried =>
(state, nextState, stateData, nextStateData) match {
case (_, _, d1: DATA_NORMAL, d2: DATA_NORMAL) if !d1.commitments.announceChannel && !d1.buried && d2.buried =>
// for a private channel, when the tx was just buried we need to send the channel_update to our peer (even if it didn't change)
forwarder ! d2.channelUpdate
case (d1: DATA_NORMAL, d2: DATA_NORMAL) if !d1.commitments.announceChannel && d1.channelUpdate != d2.channelUpdate && d2.buried =>
case (OFFLINE, NORMAL, d1: DATA_NORMAL, d2: DATA_NORMAL) if !d1.commitments.announceChannel && d2.buried =>
// otherwise if we're coming back online, we rebroadcast the latest channel_update
// this makes sure that if the channel_update was missed, we have a chance to re-send it
forwarder ! d2.channelUpdate
case (_, _, d1: DATA_NORMAL, d2: DATA_NORMAL) if !d1.commitments.announceChannel && d1.channelUpdate != d2.channelUpdate && d2.buried =>
// otherwise, we only send it when it is different, and tx is already buried
forwarder ! d2.channelUpdate
case _ => ()
Expand Down
6 changes: 2 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 @@ -2384,7 +2384,7 @@ class NormalStateSpec extends TestkitBaseClass with StateTestsHelperMethods {
val sender = TestProbe()
sender.send(alice, WatchEventConfirmed(BITCOIN_FUNDING_DEEPLYBURIED, 400000, 42, null))
val update1a = alice2bob.expectMsgType[ChannelUpdate]
assert(Announcements.isEnabled(update1a.channelFlags) == true)
assert(Announcements.isEnabled(update1a.channelFlags))

// actual test starts here
sender.send(alice, INPUT_DISCONNECTED)
Expand All @@ -2409,9 +2409,7 @@ class NormalStateSpec extends TestkitBaseClass with StateTestsHelperMethods {
sender.send(alice, INPUT_DISCONNECTED)
assert(relayerA.expectMsgType[Status.Failure].cause.asInstanceOf[AddHtlcFailed].paymentHash === htlc1.paymentHash)
assert(relayerA.expectMsgType[Status.Failure].cause.asInstanceOf[AddHtlcFailed].paymentHash === htlc2.paymentHash)
val update2a = alice2bob.expectMsgType[ChannelUpdate]
assert(channelUpdateListener.expectMsgType[LocalChannelUpdate].channelUpdate === update2a)
assert(!Announcements.isEnabled(update2a.channelFlags))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like this was catching a superfluous ChannelUpdate on entering into OFFLINE state, it's not sent now.

assert(!Announcements.isEnabled(channelUpdateListener.expectMsgType[LocalChannelUpdate].channelUpdate.channelFlags))
awaitCond(alice.stateName == OFFLINE)
}

Expand Down