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

improved autosign

Browse source
This commit is contained in:
pm47 2016-08-19 19:51:52 +02:00
parent 0cf389091f
commit 5951a5e1e5
3 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
eclair-demo/src/main/scala/fr/acinq/eclair/channel/Channel.scala
View file

@ -32,6 +32,8 @@ class Channel(val them: ActorRef, val blockchain: ActorRef, paymentHandler: Acto
context.system.eventStream.publish(ChannelCreated(self, params, theirNodeId))
import ExecutionContext.Implicits.global
params.anchorAmount match {
case None =>
them ! open_channel(params.delay, Helpers.revocationHash(params.shaSeed, 0), Helpers.revocationHash(params.shaSeed, 1), params.commitPubKey, params.finalPubKey, WONT_CREATE_ANCHOR, Some(params.minDepth), params.initialFeeRate)
@ -251,8 +253,6 @@ class Channel(val them: ActorRef, val blockchain: ActorRef, paymentHandler: Acto
case Event(open_complete(blockid_opt), d: DATA_NORMAL) =>
Register.create_alias(theirNodeId, d.commitments.anchorId)
IRCRouter.register(theirNodeId, d.commitments.anchorId)
import ExecutionContext.Implicits.global
d.commitments.ourParams.autoSignInterval.map(interval => context.system.scheduler.schedule(interval, interval, self, CMD_SIGN))
goto(NORMAL)
case Event((BITCOIN_ANCHOR_SPENT, tx: Transaction), d: DATA_NORMAL) if tx.txid == d.commitments.theirCommit.txid =>
@ -272,8 +272,6 @@ class Channel(val them: ActorRef, val blockchain: ActorRef, paymentHandler: Acto
case Event(open_complete(blockid_opt), d: DATA_NORMAL) =>
Register.create_alias(theirNodeId, d.commitments.anchorId)
IRCRouter.register(theirNodeId, d.commitments.anchorId)
import ExecutionContext.Implicits.global
d.commitments.ourParams.autoSignInterval.map(interval => context.system.scheduler.schedule(interval, interval, self, CMD_SIGN))
goto(NORMAL)
case Event((BITCOIN_ANCHOR_SPENT, _), d: DATA_NORMAL) => handleInformationLeak(d)
@ -309,7 +307,9 @@ class Channel(val them: ActorRef, val blockchain: ActorRef, paymentHandler: Acto
case Event(add@update_add_htlc(htlcId, amount, rHash, expiry, nodeIds), d@DATA_NORMAL(commitments, _, _)) =>
Try(Commitments.receiveAdd(commitments, add)) match {
case Success(commitments1) => stay using d.copy(commitments = commitments1)
case Success(commitments1) =>
commitments1.ourParams.autoSignInterval.map(interval => context.system.scheduler.scheduleOnce(interval, self, CMD_SIGN))
stay using d.copy(commitments = commitments1)
case Failure(cause) => handleUnicloseError(cause, d)
}
@ -325,6 +325,7 @@ class Channel(val them: ActorRef, val blockchain: ActorRef, paymentHandler: Acto
Try(Commitments.receiveFulfill(d.commitments, fulfill)) match {
case Success(commitments1) =>
propagateDownstream(Right(fulfill), downstreams)
commitments1.ourParams.autoSignInterval.map(interval => context.system.scheduler.scheduleOnce(interval, self, CMD_SIGN))
stay using d.copy(commitments = commitments1, downstreams = downstreams - id)
case Failure(cause) => handleUnicloseError(cause, d)
}
@ -341,6 +342,7 @@ class Channel(val them: ActorRef, val blockchain: ActorRef, paymentHandler: Acto
Try(Commitments.receiveFail(d.commitments, fail)) match {
case Success(commitments1) =>
propagateDownstream(Left(fail), downstreams)
commitments1.ourParams.autoSignInterval.map(interval => context.system.scheduler.scheduleOnce(interval, self, CMD_SIGN))
stay using d.copy(commitments = commitments1, downstreams = downstreams - id)
case Failure(cause) => handleUnicloseError(cause, d)
}
@ -352,6 +354,11 @@ class Channel(val them: ActorRef, val blockchain: ActorRef, paymentHandler: Acto
context.system.scheduler.scheduleOnce(100 milliseconds, self, CMD_SIGN)
stay
case Event(CMD_SIGN, d: DATA_NORMAL) if !Commitments.weHaveChanges(d.commitments) =>
// nothing to sign, just ignoring
log.info("ignoring CMD_SIGN (nothing to sign)")
stay()
case Event(CMD_SIGN, d: DATA_NORMAL) =>
Try(Commitments.sendCommit(d.commitments)) match {
case Success((commitments1, commit)) => handleCommandSuccess(sender, commit, d.copy(commitments = commitments1))
@ -465,6 +472,11 @@ class Channel(val them: ActorRef, val blockchain: ActorRef, paymentHandler: Acto
context.system.scheduler.scheduleOnce(100 milliseconds, self, CMD_SIGN)
stay
case Event(CMD_SIGN, d: DATA_CLEARING) if !Commitments.weHaveChanges(d.commitments) =>
// nothing to sign, just ignoring
log.info("ignoring CMD_SIGN (nothing to sign)")
stay()
case Event(CMD_SIGN, d: DATA_CLEARING) =>
Try(Commitments.sendCommit(d.commitments)) match {
case Success((commitments1, commit)) => handleCommandSuccess(sender, commit, d.copy(commitments = commitments1))
@ -663,15 +675,11 @@ class Channel(val them: ActorRef, val blockchain: ActorRef, paymentHandler: Acto
log.warning(s"couldn't resolve downstream node, htlc #$id will timeout", t)
}
case None =>
// TODO
//import scala.concurrent.duration._
//import ExecutionContext.Implicits.global
//context.system.scheduler.scheduleOnce(300 milliseconds, self, CMD_SIGN)
log.info(s"we were the origin payer for htlc #$id")
}
}
def handleCommandSuccess(sender: ActorRef, change: Change, newData: Data) = {
def handleCommandSuccess(sender: ActorRef, change: Change, newData: HasCommitments) = {
them ! change
sender ! "ok"
stay using newData

3
eclair-demo/src/test/scala/fr/acinq/eclair/channel/simulator/states/e/NormalStateSpec.scala
View file

@ -205,7 +205,8 @@ class NormalStateSpec extends TestKit(ActorSystem("test")) with fixture.FunSuite
within(30 seconds) {
val sender = TestProbe()
sender.send(alice, CMD_SIGN)
sender.expectMsg("cannot sign when there are no changes")
sender.expectNoMsg() // just ignored
//sender.expectMsg("cannot sign when there are no changes")
}
}

3
eclair-demo/src/test/scala/fr/acinq/eclair/channel/simulator/states/f/ClearingStateSpec.scala
View file

@ -231,7 +231,8 @@ class ClearingStateSpec extends TestKit(ActorSystem("test")) with fixture.FunSui
within(30 seconds) {
val sender = TestProbe()
sender.send(alice, CMD_SIGN)
sender.expectMsg("cannot sign when there are no changes")
sender.expectNoMsg() // just ignored
//sender.expectMsg("cannot sign when there are no changes")
}
}