mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-02-22 14:22:39 +01:00
Code Issues Projects Releases Wiki Activity

restore watches on re-connection

Browse source
This commit is contained in:
sstone 2017-02-26 20:29:34 +01:00
parent 967404a82d
commit 2a3d96b745
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
eclair-node/src/main/scala/fr/acinq/eclair/channel/Channel.scala
View file

@ -127,6 +127,11 @@ class Channel(val r: ActorRef, val blockchain: ActorRef, router: ActorRef, relay
blockchain ! WatchSpent(self, d.commitments.commitInput.outPoint.txid, d.commitments.commitInput.outPoint.index.toInt, BITCOIN_FUNDING_SPENT) // TODO: should we wait for an acknowledgment from the watcher? blockchain ! WatchSpent(self, d.commitments.commitInput.outPoint.txid, d.commitments.commitInput.outPoint.index.toInt, BITCOIN_FUNDING_SPENT) // TODO: should we wait for an acknowledgment from the watcher?
context.system.eventStream.publish(ChannelCreated(d.channelId, context.parent, self, d.commitments.localParams, remoteNodeId, Some(d.commitments))) context.system.eventStream.publish(ChannelCreated(d.channelId, context.parent, self, d.commitments.localParams, remoteNodeId, Some(d.commitments)))
Register.createAlias(remoteNodeId, d.commitments.channelId) Register.createAlias(remoteNodeId, d.commitments.channelId)
d match {
case closing: DATA_CLOSING if closing.remoteCommitPublished.isDefined =>
handleRemoteSpentCurrent(closing.remoteCommitPublished.get.commitTx, closing)
case _ => ()
}
case _ => () case _ => ()
} }
@ -818,14 +823,16 @@ class Channel(val r: ActorRef, val blockchain: ActorRef, router: ActorRef, relay
remote ! d.lastSent remote ! d.lastSent
goto(WAIT_FOR_FUNDING_SIGNED) goto(WAIT_FOR_FUNDING_SIGNED)
case Event(INPUT_RECONNECTED(r), DATA_WAIT_FOR_FUNDING_CONFIRMED(_, _, _, _, Left(fundingCreated))) => case Event(INPUT_RECONNECTED(r), DATA_WAIT_FOR_FUNDING_CONFIRMED(_, params, commitments, _, Left(fundingCreated))) =>
remote = r remote = r
remote ! fundingCreated remote ! fundingCreated
blockchain ! WatchConfirmed(self, commitments.commitInput.outPoint.txid, params.minimumDepth, BITCOIN_FUNDING_DEPTHOK)
goto(WAIT_FOR_FUNDING_CONFIRMED) goto(WAIT_FOR_FUNDING_CONFIRMED)
case Event(INPUT_RECONNECTED(r), DATA_WAIT_FOR_FUNDING_CONFIRMED(_, _, _, _, Right(fundingSigned))) => case Event(INPUT_RECONNECTED(r), DATA_WAIT_FOR_FUNDING_CONFIRMED(_, params, commitments, _, Right(fundingSigned))) =>
remote = r remote = r
remote ! fundingSigned remote ! fundingSigned
blockchain ! WatchConfirmed(self, commitments.commitInput.outPoint.txid, params.minimumDepth, BITCOIN_FUNDING_DEPTHOK)
goto(WAIT_FOR_FUNDING_CONFIRMED) goto(WAIT_FOR_FUNDING_CONFIRMED)
case Event(INPUT_RECONNECTED(r), d: DATA_WAIT_FOR_FUNDING_LOCKED) => case Event(INPUT_RECONNECTED(r), d: DATA_WAIT_FOR_FUNDING_LOCKED) =>
@ -949,7 +956,12 @@ class Channel(val r: ActorRef, val blockchain: ActorRef, router: ActorRef, relay
val currentMessages = from.commitments.unackedMessages val currentMessages = from.commitments.unackedMessages
val diff = nextMessages.filterNot(c => currentMessages.contains(c)) val diff = nextMessages.filterNot(c => currentMessages.contains(c))
// we only send newly added unacked messages // we only send newly added unacked messages
diff.map(msg => remote ! msg) if (remote != null) diff.map(msg => remote ! msg)
case (_, to: HasCommitments) =>
val nextChannelId = to.channelId
channelDb.put(nextChannelId, ChannelRecord(nextChannelId, ChannelState(remoteNodeId, currentState, nextStateData)))
case _ => () case _ => ()
} }
} }