highperfocused/lnbits
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits.git synced 2025-09-17 19:12:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix lndgrpc preimage (#998)

Browse Source
This commit is contained in:
calle
2022-09-22 11:15:28 +03:00
committed by GitHub
parent 3fe33a0be8
commit b0bedd53df
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lnbits/core/services.py
View File

@@ -223,8 +223,8 @@ async def pay_invoice(
logger.debug(f"deleting temporary payment {temp_id}") logger.debug(f"deleting temporary payment {temp_id}")
await delete_wallet_payment(temp_id, wallet_id, conn=conn) await delete_wallet_payment(temp_id, wallet_id, conn=conn)
raise PaymentFailure( raise PaymentFailure(
f"payment failed: {payment.error_message}" f"Payment failed: {payment.error_message}"
or "payment failed, but backend didn't give us an error message" or "Payment failed, but backend didn't give us an error message."
) )
else: else:
logger.warning( logger.warning(

41
lnbits/wallets/lndgrpc.py
View File

@@ -198,16 +198,29 @@ class LndWallet(Wallet):
3: False, # FAILED 3: False, # FAILED
} }
failure_reasons = {
0: "No error given.",
1: "Payment timed out.",
2: "No route to destination.",
3: "Error.",
4: "Incorrect payment details.",
5: "Insufficient balance.",
}
fee_msat = None fee_msat = None
preimage = None preimage = None
checking_id = resp.payment_hash error_message = None
checking_id = None
if resp.status: # SUCCEEDED if statuses[resp.status] == True: # SUCCEEDED
fee_msat = -resp.htlcs[-1].route.total_fees_msat fee_msat = -resp.htlcs[-1].route.total_fees_msat
preimage = bytes_to_hex(resp.payment_preimage) preimage = resp.payment_preimage
checking_id = resp.payment_hash
elif statuses[resp.status] == False:
error_message = failure_reasons[resp.failure_reason]
return PaymentResponse( return PaymentResponse(
statuses[resp.status], checking_id, fee_msat, preimage, None statuses[resp.status], checking_id, fee_msat, preimage, error_message
) )
async def get_invoice_status(self, checking_id: str) -> PaymentStatus: async def get_invoice_status(self, checking_id: str) -> PaymentStatus:
@@ -245,23 +258,29 @@ class LndWallet(Wallet):
router.TrackPaymentRequest(payment_hash=r_hash) router.TrackPaymentRequest(payment_hash=r_hash)
) )
# HTLCAttempt.HTLCStatus: # # HTLCAttempt.HTLCStatus:
# https://github.com/lightningnetwork/lnd/blob/master/lnrpc/lightning.proto#L3641 # # https://github.com/lightningnetwork/lnd/blob/master/lnrpc/lightning.proto#L3641
# htlc_statuses = {
# 0: None, # IN_FLIGHT
# 1: True, # "SUCCEEDED"
# 2: False, # "FAILED"
# }
statuses = { statuses = {
0: None, # IN_FLIGHT 0: None, # NON_EXISTENT
1: True, # "SUCCEEDED" 1: None, # IN_FLIGHT
2: False, # "FAILED" 2: True, # SUCCEEDED
3: False, # FAILED
} }
try: try:
async for payment in resp: async for payment in resp:
if statuses[payment.htlcs[-1].status]: if len(payment.htlcs) and statuses[payment.status]:
return PaymentStatus( return PaymentStatus(
True, True,
-payment.htlcs[-1].route.total_fees_msat, -payment.htlcs[-1].route.total_fees_msat,
bytes_to_hex(payment.htlcs[-1].preimage), bytes_to_hex(payment.htlcs[-1].preimage),
) )
return PaymentStatus(statuses[payment.htlcs[-1].status]) return PaymentStatus(statuses[payment.status])
except: # most likely the payment wasn't found except: # most likely the payment wasn't found
return PaymentStatus(None) return PaymentStatus(None)