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

Allow receiving non-standard payments (#1326)

Browse Source
This commit is contained in:
Bastien Teinturier 2020-02-18 17:02:20 +01:00 committed by GitHub
parent 4579462dfc
commit 1e12f6d105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ import akka.actor.{ActorContext, ActorRef, PoisonPill, Status}
import akka.event.{DiagnosticLoggingAdapter, LoggingAdapter} import akka.event.{DiagnosticLoggingAdapter, LoggingAdapter}
import fr.acinq.bitcoin.{ByteVector32, Crypto} import fr.acinq.bitcoin.{ByteVector32, Crypto}
import fr.acinq.eclair.channel.{CMD_FAIL_HTLC, CMD_FULFILL_HTLC, Channel} import fr.acinq.eclair.channel.{CMD_FAIL_HTLC, CMD_FULFILL_HTLC, Channel}
import fr.acinq.eclair.db.{IncomingPayment, IncomingPaymentStatus, IncomingPaymentsDb} import fr.acinq.eclair.db.{IncomingPayment, IncomingPaymentStatus, IncomingPaymentsDb, PaymentType}
import fr.acinq.eclair.payment.PaymentRequest.ExtraHop import fr.acinq.eclair.payment.PaymentRequest.ExtraHop
import fr.acinq.eclair.payment.relay.CommandBuffer import fr.acinq.eclair.payment.relay.CommandBuffer
import fr.acinq.eclair.payment.{IncomingPacket, PaymentReceived, PaymentRequest} import fr.acinq.eclair.payment.{IncomingPacket, PaymentReceived, PaymentRequest}
@ -54,7 +54,7 @@ class MultiPartHandler(nodeParams: NodeParams, db: IncomingPaymentsDb, commandBu
def onSuccess(paymentReceived: PaymentReceived)(implicit log: LoggingAdapter): Unit = () def onSuccess(paymentReceived: PaymentReceived)(implicit log: LoggingAdapter): Unit = ()
override def handle(implicit ctx: ActorContext, log: DiagnosticLoggingAdapter): Receive = { override def handle(implicit ctx: ActorContext, log: DiagnosticLoggingAdapter): Receive = {
case ReceivePayment(amount_opt, desc, expirySeconds_opt, extraHops, fallbackAddress_opt, paymentPreimage_opt) => case ReceivePayment(amount_opt, desc, expirySeconds_opt, extraHops, fallbackAddress_opt, paymentPreimage_opt, paymentType) =>
Try { Try {
val paymentPreimage = paymentPreimage_opt.getOrElse(randomBytes32) val paymentPreimage = paymentPreimage_opt.getOrElse(randomBytes32)
val paymentHash = Crypto.sha256(paymentPreimage) val paymentHash = Crypto.sha256(paymentPreimage)
@ -70,7 +70,7 @@ class MultiPartHandler(nodeParams: NodeParams, db: IncomingPaymentsDb, commandBu
} }
val paymentRequest = PaymentRequest(nodeParams.chainHash, amount_opt, paymentHash, nodeParams.privateKey, desc, fallbackAddress_opt, expirySeconds = Some(expirySeconds), extraHops = extraHops, features = features) val paymentRequest = PaymentRequest(nodeParams.chainHash, amount_opt, paymentHash, nodeParams.privateKey, desc, fallbackAddress_opt, expirySeconds = Some(expirySeconds), extraHops = extraHops, features = features)
log.debug(s"generated payment request={} from amount={}", PaymentRequest.write(paymentRequest), amount_opt) log.debug(s"generated payment request={} from amount={}", PaymentRequest.write(paymentRequest), amount_opt)
db.addIncomingPayment(paymentRequest, paymentPreimage) db.addIncomingPayment(paymentRequest, paymentPreimage, paymentType)
paymentRequest paymentRequest
} match { } match {
case Success(paymentRequest) => ctx.sender ! paymentRequest case Success(paymentRequest) => ctx.sender ! paymentRequest
@ -169,7 +169,8 @@ object MultiPartHandler {
expirySeconds_opt: Option[Long] = None, expirySeconds_opt: Option[Long] = None,
extraHops: List[List[ExtraHop]] = Nil, extraHops: List[List[ExtraHop]] = Nil,
fallbackAddress: Option[String] = None, fallbackAddress: Option[String] = None,
paymentPreimage: Option[ByteVector32] = None) paymentPreimage: Option[ByteVector32] = None,
paymentType: String = PaymentType.Standard)
private def validatePaymentStatus(payment: IncomingPacket.FinalPacket, record: IncomingPayment)(implicit log: LoggingAdapter): Boolean = { private def validatePaymentStatus(payment: IncomingPacket.FinalPacket, record: IncomingPayment)(implicit log: LoggingAdapter): Boolean = {
if (record.status.isInstanceOf[IncomingPaymentStatus.Received]) { if (record.status.isInstanceOf[IncomingPaymentStatus.Received]) {