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

Extended doHandle to other messages in MultiPartHandler (#1226)

Browse Source
This commit is contained in:
Pierre-Marie Padiou 2019-11-29 17:03:26 +01:00 committed by GitHub
parent d1342eb072
commit b5f993c1ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eclair-core/src/main/scala/fr/acinq/eclair/payment/receive/MultiPartHandler.scala
View File

@ -43,10 +43,10 @@ class MultiPartHandler(nodeParams: NodeParams, db: IncomingPaymentsDb, commandBu
private var pendingPayments: Map[ByteVector32, (ByteVector32, ActorRef)] = Map.empty private var pendingPayments: Map[ByteVector32, (ByteVector32, ActorRef)] = Map.empty
/** /**
* Can be overridden for a more fine-grained control of whether or not to handle this payload. * Can be overridden for a more fine-grained control of whether or not to handle this payment hash.
* If the call returns false, then the pattern matching will fail and the payload will be passed to other handlers. * If the call returns false, then the pattern matching will fail and the payload will be passed to other handlers.
*/ */
def doHandle(p: IncomingPacket.FinalPacket): Boolean = true def doHandle(paymentHash: ByteVector32): Boolean = true
/** /**
* Can be overridden to do custom processing on successfully received payments. * Can be overridden to do custom processing on successfully received payments.
@ -76,7 +76,7 @@ class MultiPartHandler(nodeParams: NodeParams, db: IncomingPaymentsDb, commandBu
case Failure(exception) => ctx.sender ! Status.Failure(exception) case Failure(exception) => ctx.sender ! Status.Failure(exception)
} }
case p: IncomingPacket.FinalPacket if doHandle(p) => db.getIncomingPayment(p.add.paymentHash) match { case p: IncomingPacket.FinalPacket if doHandle(p.add.paymentHash) => db.getIncomingPayment(p.add.paymentHash) match {
case Some(record) => validatePayment(p, record, nodeParams.currentBlockHeight) match { case Some(record) => validatePayment(p, record, nodeParams.currentBlockHeight) match {
case Some(cmdFail) => case Some(cmdFail) =>
commandBuffer ! CommandBuffer.CommandSend(p.add.channelId, p.add.id, cmdFail) commandBuffer ! CommandBuffer.CommandSend(p.add.channelId, p.add.id, cmdFail)
@ -96,13 +96,13 @@ class MultiPartHandler(nodeParams: NodeParams, db: IncomingPaymentsDb, commandBu
commandBuffer ! CommandBuffer.CommandSend(p.add.channelId, p.add.id, cmdFail) commandBuffer ! CommandBuffer.CommandSend(p.add.channelId, p.add.id, cmdFail)
} }
case MultiPartPaymentFSM.MultiPartHtlcFailed(paymentHash, failure, parts) => case MultiPartPaymentFSM.MultiPartHtlcFailed(paymentHash, failure, parts) if doHandle(paymentHash) =>
log.warning(s"payment with paymentHash=$paymentHash paidAmount=${parts.map(_.payment.amount).sum} failed ($failure)") log.warning(s"payment with paymentHash=$paymentHash paidAmount=${parts.map(_.payment.amount).sum} failed ($failure)")
pendingPayments.get(paymentHash).foreach { case (_, handler: ActorRef) => handler ! PoisonPill } pendingPayments.get(paymentHash).foreach { case (_, handler: ActorRef) => handler ! PoisonPill }
parts.foreach(p => commandBuffer ! CommandBuffer.CommandSend(p.payment.fromChannelId, p.htlcId, CMD_FAIL_HTLC(p.htlcId, Right(failure), commit = true))) parts.foreach(p => commandBuffer ! CommandBuffer.CommandSend(p.payment.fromChannelId, p.htlcId, CMD_FAIL_HTLC(p.htlcId, Right(failure), commit = true)))
pendingPayments = pendingPayments - paymentHash pendingPayments = pendingPayments - paymentHash
case MultiPartPaymentFSM.MultiPartHtlcSucceeded(paymentHash, parts) => case MultiPartPaymentFSM.MultiPartHtlcSucceeded(paymentHash, parts) if doHandle(paymentHash) =>
val received = PaymentReceived(paymentHash, parts.map(_.payment)) val received = PaymentReceived(paymentHash, parts.map(_.payment))
log.info(s"received complete payment for paymentHash=$paymentHash amount=${received.amount}") log.info(s"received complete payment for paymentHash=$paymentHash amount=${received.amount}")
// The first thing we do is store the payment. This allows us to reconcile pending HTLCs after a restart. // The first thing we do is store the payment. This allows us to reconcile pending HTLCs after a restart.
@ -116,7 +116,7 @@ class MultiPartHandler(nodeParams: NodeParams, db: IncomingPaymentsDb, commandBu
pendingPayments = pendingPayments - paymentHash pendingPayments = pendingPayments - paymentHash
onSuccess(received) onSuccess(received)
case MultiPartPaymentFSM.ExtraHtlcReceived(paymentHash, p, failure) => failure match { case MultiPartPaymentFSM.ExtraHtlcReceived(paymentHash, p, failure) if doHandle(paymentHash) => failure match {
case Some(failure) => commandBuffer ! CommandBuffer.CommandSend(p.payment.fromChannelId, p.htlcId, CMD_FAIL_HTLC(p.htlcId, Right(failure), commit = true)) case Some(failure) => commandBuffer ! CommandBuffer.CommandSend(p.payment.fromChannelId, p.htlcId, CMD_FAIL_HTLC(p.htlcId, Right(failure), commit = true))
// NB: this case shouldn't happen unless the sender violated the spec, so it's ok that we take a slightly more // NB: this case shouldn't happen unless the sender violated the spec, so it's ok that we take a slightly more
// expensive code path by fetching the preimage from DB. // expensive code path by fetching the preimage from DB.