Skip to content

Commit eeb4df8

Browse files
committed
WIP: first round-trip completed
1 parent f4ecc80 commit eeb4df8

3 files changed

Lines changed: 9 additions & 23 deletions

File tree

phoenix-ios/phoenix-ios/officers/BusinessManager.swift

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -797,19 +797,11 @@ class BusinessManager {
797797
return
798798
}
799799

800-
// let paymentId = Lightning_kmpUUID.companion.randomUUID()
801-
// do {
802-
// try await peer.betterPayOffer(
803-
// paymentId: paymentId,
804-
// amount: cardRequest.amount,
805-
// offer: cardRequest.offer,
806-
// payerKey: Lightning_randomKey(),
807-
// payerNote: nil,
808-
// fetchInvoiceTimeoutInSeconds: 30
809-
// )
810-
// } catch {
811-
// log.error("peer.payOffer(): error: \(error)")
812-
// }
800+
do {
801+
try await peer.payUnsolicitedInvoice(invoice: cardRequest.invoice)
802+
} catch {
803+
log.error("peer.payOffer(): error: \(error)")
804+
}
813805
}
814806
}
815807
}

phoenix-ios/phoenix-ios/views/receive/LightningDualView.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1517,12 +1517,6 @@ struct LightningDualView: View {
15171517

15181518
Task { @MainActor in
15191519
do {
1520-
// let tuple: KotlinPair<Lightning_kmpOfferTypesOffer, Bitcoin_kmpByteVector32> =
1521-
// try await peer.requestCardPayment(
1522-
// amount: msat,
1523-
// cardHolderOffer: bolt12Offer.offer,
1524-
// cardParams: cardParams
1525-
// )
15261520
let tuple: KotlinPair<Lightning_kmpBolt12Invoice, Bitcoin_kmpByteVector32> =
15271521
try await peer.requestCardPayment2(
15281522
amount: msat,

phoenix-shared/src/commonMain/kotlin/fr.acinq.phoenix/managers/SendManager.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ class SendManager(
202202
invoice: Bolt11Invoice
203203
): BadRequestReason? {
204204

205-
val actualChain = invoice.chain
206-
if (chain != actualChain) {
205+
val invoiceChain = invoice.chain
206+
if (chain != invoiceChain) {
207207
return BadRequestReason.ChainMismatch(expected = chain)
208208
}
209209

@@ -218,8 +218,8 @@ class SendManager(
218218
invoice: Bolt12Invoice
219219
): BadRequestReason? {
220220

221-
val actualChain = invoice.chain
222-
if (chain != actualChain) {
221+
val invoiceChainHash = invoice.chain
222+
if (chain.chainHash != invoiceChainHash) {
223223
return BadRequestReason.ChainMismatch(expected = chain)
224224
}
225225

0 commit comments

Comments
 (0)