aiolabs/lightning-pub
2
0
Fork 0
Code Issues 9 Pull requests 4 Projects Releases Packages Wiki Activity Actions

Merge pull request #759 from shocknet/fix-pending

Browse source 
pending payment from hash
This commit is contained in:
Justin (shocknet) 2024-10-01 11:04:44 -04:00 • committed by GitHub
commit 1e1ed47e62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/services/lnd/lnd.ts
View file

@ -14,7 +14,7 @@ import { AddInvoiceReq } from './addInvoiceReq.js';
import { PayInvoiceReq } from './payInvoiceReq.js'; import { PayInvoiceReq } from './payInvoiceReq.js';
import { SendCoinsReq } from './sendCoinsReq.js'; import { SendCoinsReq } from './sendCoinsReq.js';
import { LndSettings, AddressPaidCb, InvoicePaidCb, NodeInfo, Invoice, DecodedInvoice, PaidInvoice, NewBlockCb, HtlcCb, BalanceInfo } from './settings.js'; import { LndSettings, AddressPaidCb, InvoicePaidCb, NodeInfo, Invoice, DecodedInvoice, PaidInvoice, NewBlockCb, HtlcCb, BalanceInfo } from './settings.js';
import { getLogger } from '../helpers/logger.js'; import { ERROR, getLogger } from '../helpers/logger.js';
import { HtlcEvent_EventType } from '../../../proto/lnd/router.js'; import { HtlcEvent_EventType } from '../../../proto/lnd/router.js';
import { LiquidityProvider, LiquidityRequest } from '../main/liquidityProvider.js'; import { LiquidityProvider, LiquidityRequest } from '../main/liquidityProvider.js';
import { Utils } from '../helpers/utilsWrapper.js'; import { Utils } from '../helpers/utilsWrapper.js';
@ -464,6 +464,25 @@ export default class {
return res.response return res.response
} }
async GetPaymentFromHash(paymentHash: string): Promise<Payment | null> {
const abortController = new AbortController()
const stream = this.router.trackPaymentV2({
paymentHash: Buffer.from(paymentHash, 'hex'),
noInflightUpdates: false
}, { abort: abortController.signal })
return new Promise((res, rej) => {
stream.responses.onError(error => {
this.log(ERROR, "error with trackPaymentV2", error.message)
rej(null)
})
stream.responses.onMessage(payment => {
abortController.abort()
res(payment)
})
})
}
async ListPeers() { async ListPeers() {
const res = await this.lightning.listPeers({ latestError: true }, DeadLineMetadata()) const res = await this.lightning.listPeers({ latestError: true }, DeadLineMetadata())
return res.response return res.response

23
src/services/main/paymentManager.ts
View file

@ -6,7 +6,7 @@ import { MainSettings } from './settings.js'
import { InboundOptionals, defaultInvoiceExpiry } from '../storage/paymentStorage.js' import { InboundOptionals, defaultInvoiceExpiry } from '../storage/paymentStorage.js'
import LND from '../lnd/lnd.js' import LND from '../lnd/lnd.js'
import { Application } from '../storage/entity/Application.js' import { Application } from '../storage/entity/Application.js'
import { getLogger, PubLogger } from '../helpers/logger.js' import { ERROR, getLogger, PubLogger } from '../helpers/logger.js'
import { UserReceivingAddress } from '../storage/entity/UserReceivingAddress.js' import { UserReceivingAddress } from '../storage/entity/UserReceivingAddress.js'
import { AddressPaidCb, InvoicePaidCb, PaidInvoice } from '../lnd/settings.js' import { AddressPaidCb, InvoicePaidCb, PaidInvoice } from '../lnd/settings.js'
import { UserReceivingInvoice, ZapInfo } from '../storage/entity/UserReceivingInvoice.js' import { UserReceivingInvoice, ZapInfo } from '../storage/entity/UserReceivingInvoice.js'
@ -124,23 +124,10 @@ export default class {
} }
checkPendingLndPayment = async (log: PubLogger, p: UserInvoicePayment) => { checkPendingLndPayment = async (log: PubLogger, p: UserInvoicePayment) => {
if (p.paymentIndex === 0 || p.paymentIndex === -1) { const decoded = await this.lnd.DecodeInvoice(p.invoice)
log("found a pending payment with no payment index, skipping", p.serial_id) const payment = await this.lnd.GetPaymentFromHash(decoded.paymentHash)
//const fullAmount = p.paid_amount + p.service_fees + p.routing_fees if (!payment || payment.paymentHash !== decoded.paymentHash) {
//log("found a pending payment with no payment index, refunding", fullAmount, "sats to user", p.user.user_id) log(ERROR, "lnd payment not found for pending payment hash ", decoded.paymentHash)
//await this.storage.txQueue.PushToQueue({
// dbTx: true, description: "refund failed pending payment", exec: async tx => {
// await this.storage.userStorage.IncrementUserBalance(p.user.user_id, fullAmount, "payment_refund:" + p.invoice, tx)
// await this.storage.paymentStorage.UpdateExternalPayment(p.serial_id, 0, 0, false)
// }
//})
return
}
console.log({ p })
const paymentRes = await this.lnd.GetPayment(p.paymentIndex)
const payment = paymentRes.payments[0]
if (!payment || Number(payment.paymentIndex) !== p.paymentIndex) {
log("lnd payment not found for pending payment", p.serial_id, "with index", p.paymentIndex)
return return
} }