Skip to content

Offer in EUR for test #813

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

Draft
wants to merge 1 commit into
base: offer-fiat-raw
Choose a base branch
from
+8 −11
Draft

Offer in EUR for test #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion modules/core/src/commonMain/kotlin/fr/acinq/lightning/NodeParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ data class NodeParams(
fun randomOffer(trampolineNodeId: PublicKey, amount: MilliSatoshi?, description: String?): Pair<OfferTypes.Offer, PrivateKey> {
// We generate a random nonce to ensure that this offer is unique.
val nonce = randomBytes32()
return OfferManager.deterministicOffer(chainHash, nodePrivateKey, trampolineNodeId, amount, description, nonce)
return OfferManager.deterministicOffer(chainHash, nodePrivateKey, trampolineNodeId, amount?.toLong(), description, nonce)
}

}
12 changes: 4 additions & 8 deletions modules/core/src/commonMain/kotlin/fr/acinq/lightning/payment/OfferManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import fr.acinq.lightning.message.OnionMessages.buildMessage
import fr.acinq.lightning.utils.currentTimestampMillis
import fr.acinq.lightning.utils.toByteVector
import fr.acinq.lightning.wire.*
import fr.acinq.lightning.wire.OfferTypes.OfferAmount
import kotlinx.coroutines.flow.MutableSharedFlow

sealed class OnionMessageAction {
Expand Down Expand Up @@ -232,7 +233,7 @@ class OfferManager(val nodeParams: NodeParams, val walletParams: WalletParams, v
private fun isOurOffer(offer: OfferTypes.Offer, pathId: ByteVector?, blindedPrivateKey: PrivateKey): Boolean = when {
pathId != null && pathId.size() != 32 -> false
else -> {
val expected = deterministicOffer(nodeParams.chainHash, nodeParams.nodePrivateKey, walletParams.trampolineNode.id, offer.amountMsat, offer.description, pathId?.let { ByteVector32(it) })
val expected = deterministicOffer(nodeParams.chainHash, nodeParams.nodePrivateKey, walletParams.trampolineNode.id, offer.records.get<OfferAmount>()?.amount, offer.description, pathId?.let { ByteVector32(it) })
expected == Pair(offer, blindedPrivateKey)
}
}
Expand All @@ -246,7 +247,7 @@ class OfferManager(val nodeParams: NodeParams, val walletParams: WalletParams, v
chainHash: BlockHash,
nodePrivateKey: PrivateKey,
trampolineNodeId: PublicKey,
amount: MilliSatoshi?,
amount: Long?,
description: String?,
pathId: ByteVector32?,
): Pair<OfferTypes.Offer, PrivateKey> {
Expand All @@ -255,15 +256,10 @@ class OfferManager(val nodeParams: NodeParams, val walletParams: WalletParams, v
// - the offer parameters (amount, description and pathId)
// - our trampoline node, which is used as an introduction node for the offer's blinded path
// - our private key, which ensures that nobody else can generate the same path key secret
val tweak = when {
amount == null && description == null && pathId == null -> "bolt 12 default offer".encodeToByteArray().byteVector()
else -> {
val tweak =
"bolt 12 deterministic offer".encodeToByteArray().byteVector() +
Crypto.sha256("offer amount".encodeToByteArray() + (amount?.let { Pack.writeInt64BE(it.msat) } ?: ByteArray(0))) +
Crypto.sha256("offer description".encodeToByteArray() + (description?.encodeToByteArray() ?: ByteArray(0))) +
Crypto.sha256("offer path_id".encodeToByteArray().byteVector() + (pathId ?: ByteVector.empty))
}
}
val sessionKey = PrivateKey(Crypto.sha256(tweak + trampolineNodeId.value + nodePrivateKey.value).byteVector32())
return OfferTypes.Offer.createBlindedOffer(chainHash, nodePrivateKey, trampolineNodeId, amount, description, Features.empty, sessionKey, pathId)
}
Expand Down
5 changes: 3 additions & 2 deletions modules/core/src/commonMain/kotlin/fr/acinq/lightning/wire/OfferTypes.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ object OfferTypes {
chainHash: BlockHash,
nodePrivateKey: PrivateKey,
trampolineNodeId: PublicKey,
amount: MilliSatoshi?,
amount: Long?,
description: String?,
features: Features,
blindedPathSessionKey: PrivateKey,
Expand All @@ -811,7 +811,8 @@ object OfferTypes {
)
val tlvs = setOfNotNull(
if (chainHash != Block.LivenetGenesisBlock.hash) OfferChains(listOf(chainHash)) else null,
amount?.let { OfferAmount(it.toLong()) },
amount?.let { OfferAmount(it) },
amount?.let { OfferCurrency("EUR") },
description?.let { OfferDescription(it) },
features.bolt12Features().let { if (it != Features.empty) OfferFeatures(it.toByteArray().toByteVector()) else null },
// Note that we don't include an offer_node_id since we're using a blinded path.
Expand Down
Loading