invoice requests must have an amount

Author: thomash-acinq

eclair-core/src/main/scala/fr/acinq/eclair/payment/Bolt12Invoice.scala

@@ -60,7 +60,7 @@ case class Bolt12Invoice(records: TlvStream[InvoiceTlv]) extends Invoice {
       Left("Wrong node id")
     } else if (isExpired()) {
       Left("Invoice expired")
-    } else if (!request.amount.forall(_ == amount)) {
+    } else if (request.amount != amount) {
       Left("Incompatible amount")
     } else if (!Features.areCompatible(request.features, features.bolt12Features())) {
       Left("Incompatible features")
@@ -106,8 +106,7 @@ object Bolt12Invoice {
             paths: Seq[PaymentBlindedRoute],
             additionalTlvs: Set[InvoiceTlv] = Set.empty,
             customTlvs: Set[GenericTlv] = Set.empty): Bolt12Invoice = {
-    require(request.amount.nonEmpty || request.offer.amount.nonEmpty)
-    val amount = request.amount.orElse(request.offer.amount.map(_ * request.quantity)).get
+    val amount = request.amount
     val tlvs: Set[InvoiceTlv] = removeSignature(request.records).records ++ Set(
       Some(InvoicePaths(paths.map(_.route))),
       Some(InvoiceBlindedPay(paths.map(_.paymentInfo))),

eclair-core/src/main/scala/fr/acinq/eclair/payment/offer/DefaultOfferHandler.scala

@@ -34,7 +34,7 @@ object DefaultOfferHandler {
     Behaviors.setup(context =>
       Behaviors.receiveMessage {
         case OfferManager.HandleInvoiceRequest(replyTo, invoiceRequest) =>
-          val amount = invoiceRequest.amount.getOrElse(10_000_000 msat)
+          val amount = invoiceRequest.amount
           invoiceRequest.offer.contactInfos.head match {
             case OfferTypes.RecipientNodeId(_) =>
               val route = InvoiceRequestActor.Route(Nil, nodeParams.channelConf.maxExpiryDelta)

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

@@ -292,9 +292,7 @@ object MultiPartHandler {
                                  paymentPreimage: ByteVector32,
                                  additionalTlvs: Set[InvoiceTlv] = Set.empty,
                                  customTlvs: Set[GenericTlv] = Set.empty) extends ReceivePayment {
-    require(invoiceRequest.offer.amount.nonEmpty || invoiceRequest.amount.nonEmpty, "an amount must be specified in the offer or in the invoice request")
-
-    val amount = invoiceRequest.amount.orElse(invoiceRequest.offer.amount.map(_ * invoiceRequest.quantity)).get
+    val amount = invoiceRequest.amount
   }
 
   object CreateInvoiceActor {

eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/OfferTypes.scala

@@ -347,22 +347,18 @@ object OfferTypes {
 
     val metadata: ByteVector = records.get[InvoiceRequestMetadata].get.data
     val chain: BlockHash = records.get[InvoiceRequestChain].map(_.hash).getOrElse(Block.LivenetGenesisBlock.hash)
-    val amount: Option[MilliSatoshi] = records.get[InvoiceRequestAmount].map(_.amount)
+    private val amount_opt: Option[MilliSatoshi] = records.get[InvoiceRequestAmount].map(_.amount)
     val features: Features[Bolt12Feature] = records.get[InvoiceRequestFeatures].map(_.features.bolt12Features()).getOrElse(Features.empty)
     val quantity_opt: Option[Long] = records.get[InvoiceRequestQuantity].map(_.quantity)
     val quantity: Long = quantity_opt.getOrElse(1)
+    private val baseInvoiceAmount_opt = offer.amount.map(_ * quantity)
+    val amount: MilliSatoshi = amount_opt.orElse(baseInvoiceAmount_opt).get
     val payerId: PublicKey = records.get[InvoiceRequestPayerId].get.publicKey
     val payerNote: Option[String] = records.get[InvoiceRequestPayerNote].map(_.note)
     private val signature: ByteVector64 = records.get[Signature].get.signature
 
     def isValid: Boolean = {
-      val amountOk = offer.amount match {
-        case Some(offerAmount) =>
-          val baseInvoiceAmount = offerAmount * quantity
-          amount.forall(baseInvoiceAmount <= _)
-        case None => amount.nonEmpty
-      }
-      amountOk &&
+      amount_opt.forall(a => baseInvoiceAmount_opt.forall(b => a >= b)) &&
         offer.chains.contains(chain) &&
         offer.quantityMax.forall(max => quantity_opt.nonEmpty && quantity <= max) &&
         quantity_opt.forall(_ => offer.quantityMax.nonEmpty) &&
@@ -426,6 +422,7 @@ object OfferTypes {
         _ -> ()
       )
       if (records.get[InvoiceRequestMetadata].isEmpty) return Left(MissingRequiredTlv(UInt64(0)))
+      if (records.get[InvoiceRequestAmount].isEmpty && records.get[OfferAmount].isEmpty) return Left(MissingRequiredTlv(UInt64(82)))
       if (records.get[InvoiceRequestPayerId].isEmpty) return Left(MissingRequiredTlv(UInt64(88)))
       if (records.get[Signature].isEmpty) return Left(MissingRequiredTlv(UInt64(240)))
       if (records.unknown.exists(!isInvoiceRequestTlv(_))) return Left(ForbiddenTlv(records.unknown.find(!isInvoiceRequestTlv(_)).get.tag))