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

Merge pull request #874 from shocknet/swap-fixes

Browse source 
swap fixes
This commit is contained in:
Justin (shocknet) 2026-02-05 14:25:08 -05:00 • committed by GitHub
commit c1bcda5654
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/services/main/adminManager.ts
View file

@ -272,11 +272,11 @@ export class AdminManager {
} }
async PayAdminInvoiceSwap(req: Types.PayAdminInvoiceSwapRequest): Promise<Types.AdminInvoiceSwapResponse> { async PayAdminInvoiceSwap(req: Types.PayAdminInvoiceSwapRequest): Promise<Types.AdminInvoiceSwapResponse> {
const txId = await new Promise<string>(res => { const resolvedTxId = await new Promise<string>(res => {
this.swaps.PayInvoiceSwap("admin", req.swap_operation_id, req.sat_per_v_byte, async (addr, amt) => { this.swaps.PayInvoiceSwap("admin", req.swap_operation_id, req.sat_per_v_byte, async (addr, amt) => {
const tx = await this.lnd.PayAddress(addr, amt, req.sat_per_v_byte, "", { useProvider: false, from: 'system' }) const tx = await this.lnd.PayAddress(addr, amt, req.sat_per_v_byte, "", { useProvider: false, from: 'system' })
this.log("paid admin invoice swap", { swapOpId: req.swap_operation_id, txId: tx.txid }) this.log("paid admin invoice swap", { swapOpId: req.swap_operation_id, txId: tx.txid })
await this.storage.metricsStorage.AddRootOperation("chain_payment", txId, amt) await this.storage.metricsStorage.AddRootOperation("chain_payment", tx.txid, amt)
// Fetch the full transaction hex for potential refunds // Fetch the full transaction hex for potential refunds
let lockupTxHex: string | undefined let lockupTxHex: string | undefined
@ -287,13 +287,13 @@ export class AdminManager {
this.log("Warning: Could not fetch transaction hex for refund purposes:", err.message) this.log("Warning: Could not fetch transaction hex for refund purposes:", err.message)
} }
await this.storage.paymentStorage.SetInvoiceSwapTxId(req.swap_operation_id, txId, lockupTxHex) await this.storage.paymentStorage.SetInvoiceSwapTxId(req.swap_operation_id, tx.txid, lockupTxHex)
this.log("saved admin swap txid", { swapOpId: req.swap_operation_id, txId }) this.log("saved admin swap txid", { swapOpId: req.swap_operation_id, txId: tx.txid })
res(tx.txid) res(tx.txid)
return { txId: tx.txid } return { txId: tx.txid }
}) })
}) })
return { tx_id: txId } return { tx_id: resolvedTxId }
} }
async RefundAdminInvoiceSwap(req: Types.RefundAdminInvoiceSwapRequest): Promise<Types.AdminInvoiceSwapResponse> { async RefundAdminInvoiceSwap(req: Types.RefundAdminInvoiceSwapRequest): Promise<Types.AdminInvoiceSwapResponse> {

4
src/services/storage/paymentStorage.ts
View file

@ -494,7 +494,7 @@ export default class {
} }
async DeleteExpiredTransactionSwaps(currentHeight: number, txId?: string) { async DeleteExpiredTransactionSwaps(currentHeight: number, txId?: string) {
return this.dbs.Delete<TransactionSwap>('TransactionSwap', { timeout_block_height: LessThan(currentHeight) }, txId) return this.dbs.Delete<TransactionSwap>('TransactionSwap', { timeout_block_height: LessThan(currentHeight), used: false }, txId)
} }
async ListPendingTransactionSwaps(appUserId: string, txId?: string) { async ListPendingTransactionSwaps(appUserId: string, txId?: string) {
@ -561,7 +561,7 @@ export default class {
} }
async DeleteExpiredInvoiceSwaps(currentHeight: number, txId?: string) { async DeleteExpiredInvoiceSwaps(currentHeight: number, txId?: string) {
return this.dbs.Delete<InvoiceSwap>('InvoiceSwap', { timeout_block_height: LessThan(currentHeight) }, txId) return this.dbs.Delete<InvoiceSwap>('InvoiceSwap', { timeout_block_height: LessThan(currentHeight), used: false, tx_id: "" }, txId)
} }
async ListCompletedInvoiceSwaps(appUserId: string, txId?: string) { async ListCompletedInvoiceSwaps(appUserId: string, txId?: string) {