highperfocused/nostrdvm
1
0
Fork 0
mirror of https://github.com/believethehype/nostrdvm.git synced 2025-11-18 22:06:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check lnaddress if lnbits is not set to always create bolt11

Browse Source
This commit is contained in:
Believethehype
2024-01-06 17:47:22 +01:00
parent 175e544c8d
commit 32537623e9
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nostr_dvm/dvm.py
View File

@@ -18,7 +18,7 @@ from nostr_dvm.utils.mediasource_utils import input_data_file_duration
from nostr_dvm.utils.nostr_utils import get_event_by_id, get_referenced_event_by_id, send_event, check_and_decrypt_tags from nostr_dvm.utils.nostr_utils import get_event_by_id, get_referenced_event_by_id, send_event, check_and_decrypt_tags
from nostr_dvm.utils.output_utils import build_status_reaction from nostr_dvm.utils.output_utils import build_status_reaction
from nostr_dvm.utils.zap_utils import check_bolt11_ln_bits_is_paid, create_bolt11_ln_bits, parse_zap_event_tags, \ from nostr_dvm.utils.zap_utils import check_bolt11_ln_bits_is_paid, create_bolt11_ln_bits, parse_zap_event_tags, \
parse_amount_from_bolt11_invoice, zaprequest, pay_bolt11_ln_bits parse_amount_from_bolt11_invoice, zaprequest, pay_bolt11_ln_bits, create_bolt11_lud16
from nostr_dvm.utils.cashu_utils import redeem_cashu from nostr_dvm.utils.cashu_utils import redeem_cashu
use_logger = False use_logger = False
@@ -419,10 +419,23 @@ class DVM:
expires = original_event.created_at().as_secs() + (60 * 60 * 24) expires = original_event.created_at().as_secs() + (60 * 60 * 24)
if status == "payment-required" or (status == "processing" and not is_paid): if status == "payment-required" or (status == "processing" and not is_paid):
if dvm_config.LNBITS_INVOICE_KEY != "": if dvm_config.LNBITS_INVOICE_KEY != "":
if dvm_config.LNBITS_INVOICE_KEY != "": 

try: try:
bolt11, payment_hash = create_bolt11_ln_bits(amount, dvm_config) bolt11, payment_hash = create_bolt11_ln_bits(amount,dvm_config)
except Exception as e: except Exception as e:
print(e) print(e)
try:
bolt11, payment_hash = create_bolt11_lud16(dvm_config.LN_ADDRESS,
amount)
except Exception as e:
print(e)
bolt11 = None
elif dvm_config.LN_ADDRESS != "":
try:
bolt11, payment_hash = create_bolt11_lud16(dvm_config.LN_ADDRESS, amount)
except Exception as e:
print(e)
bolt11 = None
if not any(x.event == original_event for x in self.job_list): if not any(x.event == original_event for x in self.job_list):
self.job_list.append( self.job_list.append(

2
nostr_dvm/utils/zap_utils.py
View File

@@ -181,7 +181,7 @@ def pay_bolt11_ln_bits(bolt11: str, config):
return "Error" return "Error"
except Exception as e: except Exception as e:
print("LNBITS: " + str(e)) print("LNBITS: " + str(e))
return None, None return "Error"
# DECRYPT ZAPS # DECRYPT ZAPS