Skip to content

Various refactoring for trampoline blinded paths #2952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
t-bast merged 7 commits into from
Nov 29, 2024
Merged

Various refactoring for trampoline blinded paths #2952

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b48f85
Fix offer description documentation
t-bast Nov 29, 2024
7bdac7c
Relax `payment_constraints` requirement in final blinded payload
t-bast Nov 29, 2024
0540b1f
Allow omitting `total_amount` in blinded payments
t-bast Nov 29, 2024
ab897e4
Refactor `decryptEncryptedRecipientData`
t-bast Nov 29, 2024
7ad996c
Use relay methods in `PaymentOnion.IntermediatePayload.NodeRelay`
t-bast Nov 29, 2024
67c55e4
Leftovers from `path_key` renaming
t-bast Nov 29, 2024
1b88ebb
Reject offers with currency
t-bast Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions eclair-core/src/main/scala/fr/acinq/eclair/wire/protocol/OfferTypes.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ object OfferTypes {
// Invoice request TLVs are in the range [0, 159] or [1000000000, 2999999999].
tlv.tag <= UInt64(159) || (tlv.tag >= UInt64(1000000000) && tlv.tag <= UInt64(2999999999L))

def filterOfferFields(tlvs: TlvStream[InvoiceRequestTlv]): TlvStream[OfferTlv] =
private def filterOfferFields(tlvs: TlvStream[InvoiceRequestTlv]): TlvStream[OfferTlv] =
TlvStream[OfferTlv](tlvs.records.collect { case tlv: OfferTlv => tlv }, tlvs.unknown.filter(isOfferTlv))

def filterInvoiceRequestFields(tlvs: TlvStream[InvoiceTlv]): TlvStream[InvoiceRequestTlv] =
Expand All @@ -238,11 +238,7 @@ object OfferTypes {
case class Offer(records: TlvStream[OfferTlv]) {
val chains: Seq[BlockHash] = records.get[OfferChains].map(_.chains).getOrElse(Seq(Block.LivenetGenesisBlock.hash))
val metadata: Option[ByteVector] = records.get[OfferMetadata].map(_.data)
val currency: Option[String] = records.get[OfferCurrency].map(_.iso4217)
val amount: Option[MilliSatoshi] = currency match {
case Some(_) => None // TODO: add exchange rates
case None => records.get[OfferAmount].map(_.amount)
}
val amount: Option[MilliSatoshi] = records.get[OfferAmount].map(_.amount)
Comment thread
t-bast marked this conversation as resolved.
val description: Option[String] = records.get[OfferDescription].map(_.description)
val features: Features[Bolt12Feature] = records.get[OfferFeatures].map(_.features.bolt12Features()).getOrElse(Features.empty)
val expiry: Option[TimestampSecond] = records.get[OfferAbsoluteExpiry].map(_.absoluteExpiry)
Expand All @@ -267,11 +263,11 @@ object OfferTypes {
val hrp = "lno"

/**
* @param amount_opt amount if it can be determined at offer creation time.
* @param description description of the offer.
* @param nodeId the nodeId to use for this offer, which should be different from our public nodeId if we're hiding behind a blinded route.
* @param features invoice features.
* @param chain chain on which the offer is valid.
* @param amount_opt amount if it can be determined at offer creation time.
* @param description_opt description of the offer (optional if the offer doesn't include an amount).
* @param nodeId the nodeId to use for this offer, which should be different from our public nodeId if we're hiding behind a blinded route.
* @param features invoice features.
* @param chain chain on which the offer is valid.
*/
def apply(amount_opt: Option[MilliSatoshi],
description_opt: Option[String],
Expand Down