mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2024-11-20 02:27:32 +01:00
Code Issues Projects Releases Wiki Activity

Re-send ChannelUpdate on reconnection (fixes 8afc00d) (#1342)

Browse Source 
Previous implementation in #1317 wasn't working because in a bug in the
transition. Added a test and fixed it.

Co-authored-by: Bastien Teinturier <31281497+t-bast@users.noreply.github.com>
This commit is contained in:
Pierre-Marie Padiou 2020-03-11 15:02:03 +01:00 committed by GitHub
parent 65371cd03b
commit b5bd2f074a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eclair-core/src/main/scala/fr/acinq/eclair/channel/Channel.scala
View File

@ -1681,7 +1681,7 @@ class Channel(val nodeParams: NodeParams, val wallet: EclairWallet, remoteNodeId
case (_, _, d1: DATA_NORMAL, d2: DATA_NORMAL) if !d1.commitments.announceChannel && !d1.buried && d2.buried => 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) // 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 forwarder ! d2.channelUpdate
case (OFFLINE, NORMAL, d1: DATA_NORMAL, d2: DATA_NORMAL) if !d1.commitments.announceChannel && d2.buried => case (SYNCING, 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 // 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 // this makes sure that if the channel_update was missed, we have a chance to re-send it
forwarder ! d2.channelUpdate forwarder ! d2.channelUpdate

65
eclair-core/src/test/scala/fr/acinq/eclair/channel/states/e/OfflineStateSpec.scala
View File

@ -534,4 +534,69 @@ class OfflineStateSpec extends TestkitBaseClass with StateTestsHelperMethods {
sender.send(bob, CurrentFeerates(highFeerate)) sender.send(bob, CurrentFeerates(highFeerate))
bob2blockchain.expectMsg(PublishAsap(bobCommitTx)) bob2blockchain.expectMsg(PublishAsap(bobCommitTx))
} }
test("re-send channel_update at reconnection for private channels") { f =>
import f._
val sender = TestProbe()
// we simulate a disconnection / reconnection
sender.send(alice, INPUT_DISCONNECTED)
sender.send(bob, INPUT_DISCONNECTED)
awaitCond(alice.stateName == OFFLINE)
awaitCond(bob.stateName == OFFLINE)
sender.send(alice, INPUT_RECONNECTED(alice2bob.ref, aliceInit, bobInit))
sender.send(bob, INPUT_RECONNECTED(bob2alice.ref, bobInit, aliceInit))
alice2bob.expectMsgType[ChannelReestablish]
bob2alice.expectMsgType[ChannelReestablish]
bob2alice.forward(alice)
alice2bob.forward(bob)
// at this point the channel isn't deeply buried: channel_update isn't sent again
alice2bob.expectMsgType[FundingLocked]
bob2alice.expectMsgType[FundingLocked]
alice2bob.expectNoMsg()
bob2alice.expectNoMsg()
// we make the peers exchange a few messages
addHtlc(250000000 msat, alice, bob, alice2bob, bob2alice)
crossSign(alice, bob, alice2bob, bob2alice)
// we simulate a disconnection / reconnection
sender.send(alice, INPUT_DISCONNECTED)
sender.send(bob, INPUT_DISCONNECTED)
awaitCond(alice.stateName == OFFLINE)
awaitCond(bob.stateName == OFFLINE)
sender.send(alice, INPUT_RECONNECTED(alice2bob.ref, aliceInit, bobInit))
sender.send(bob, INPUT_RECONNECTED(bob2alice.ref, bobInit, aliceInit))
alice2bob.expectMsgType[ChannelReestablish]
bob2alice.expectMsgType[ChannelReestablish]
bob2alice.forward(alice)
alice2bob.forward(bob)
// at this point the channel still isn't deeply buried: channel_update isn't sent again
alice2bob.expectNoMsg()
bob2alice.expectNoMsg()
// funding tx gets 6 confirmations, channel is private so there is no announcement sigs
sender.send(alice, WatchEventConfirmed(BITCOIN_FUNDING_DEEPLYBURIED, 400000, 42, null))
sender.send(bob, WatchEventConfirmed(BITCOIN_FUNDING_DEEPLYBURIED, 400000, 42, null))
alice2bob.expectMsgType[ChannelUpdate]
bob2alice.expectMsgType[ChannelUpdate]
// we get disconnected again
sender.send(alice, INPUT_DISCONNECTED)
sender.send(bob, INPUT_DISCONNECTED)
awaitCond(alice.stateName == OFFLINE)
awaitCond(bob.stateName == OFFLINE)
sender.send(alice, INPUT_RECONNECTED(alice2bob.ref, aliceInit, bobInit))
sender.send(bob, INPUT_RECONNECTED(bob2alice.ref, bobInit, aliceInit))
alice2bob.expectMsgType[ChannelReestablish]
bob2alice.expectMsgType[ChannelReestablish]
bob2alice.forward(alice)
alice2bob.forward(bob)
// this time peers re-send their channel_update
alice2bob.expectMsgType[ChannelUpdate]
bob2alice.expectMsgType[ChannelUpdate]
}
} }