aljaz/nutshell
1
0
Fork 0
mirror of https://github.com/aljazceru/nutshell.git synced 2025-12-20 18:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: mint and melt quote expiry time (#453)

Browse Source
This commit is contained in:
thesimplekid
2024-03-14 11:17:42 +00:00
committed by GitHub
parent f4777aad3e
commit 6cb967fc02
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cashu/mint/ledger.py
View File

@@ -343,6 +343,10 @@ class Ledger(LedgerVerification, LedgerSpendingConditions):
# get invoice expiry time # get invoice expiry time
invoice_obj = bolt11.decode(invoice_response.payment_request) invoice_obj = bolt11.decode(invoice_response.payment_request)
expiry = None
if invoice_obj.expiry is not None:
expiry = invoice_obj.date + invoice_obj.expiry
quote = MintQuote( quote = MintQuote(
quote=random_hash(), quote=random_hash(),
method=method.name, method=method.name,
@@ -353,7 +357,7 @@ class Ledger(LedgerVerification, LedgerSpendingConditions):
issued=False, issued=False,
paid=False, paid=False,
created_time=int(time.time()), created_time=int(time.time()),
expiry=invoice_obj.expiry, expiry=expiry,
) )
await self.crud.store_mint_quote( await self.crud.store_mint_quote(
quote=quote, quote=quote,
@@ -499,6 +503,10 @@ class Ledger(LedgerVerification, LedgerSpendingConditions):
melt_quote.request melt_quote.request
) )
assert payment_quote.checking_id, "quote has no checking id" assert payment_quote.checking_id, "quote has no checking id"
expiry = None
if invoice_obj.expiry is not None:
expiry = invoice_obj.date + invoice_obj.expiry
quote = MeltQuote( quote = MeltQuote(
quote=random_hash(), quote=random_hash(),
@@ -510,7 +518,7 @@ class Ledger(LedgerVerification, LedgerSpendingConditions):
paid=False, paid=False,
fee_reserve=payment_quote.fee.to(unit).amount, fee_reserve=payment_quote.fee.to(unit).amount,
created_time=int(time.time()), created_time=int(time.time()),
expiry=invoice_obj.expiry, expiry=expiry,
) )
await self.crud.store_melt_quote(quote=quote, db=self.db) await self.crud.store_melt_quote(quote=quote, db=self.db)
return PostMeltQuoteResponse( return PostMeltQuoteResponse(

14
tests/test_mint_api.py
View File

@@ -183,7 +183,12 @@ async def test_mint_quote(ledger: Ledger):
assert result["request"] assert result["request"]
invoice = bolt11.decode(result["request"]) invoice = bolt11.decode(result["request"])
assert invoice.amount_msat == 100 * 1000 assert invoice.amount_msat == 100 * 1000
assert result["expiry"] == invoice.expiry
expiry = None
if invoice.expiry is not None:
expiry = invoice.date + invoice.expiry
assert result["expiry"] == expiry
# get mint quote again from api # get mint quote again from api
response = httpx.get( response = httpx.get(
@@ -246,7 +251,12 @@ async def test_melt_quote_internal(ledger: Ledger, wallet: Wallet):
# TODO: internal invoice, fee should be 0 # TODO: internal invoice, fee should be 0
assert result["fee_reserve"] == 0 assert result["fee_reserve"] == 0
invoice_obj = bolt11.decode(request) invoice_obj = bolt11.decode(request)
assert result["expiry"] == invoice_obj.expiry
expiry = None
if invoice_obj.expiry is not None:
expiry = invoice_obj.date + invoice_obj.expiry
assert result["expiry"] == expiry
# get melt quote again from api # get melt quote again from api
response = httpx.get( response = httpx.get(