aljaz/nutshell
1
0
Fork 0
mirror of https://github.com/aljazceru/nutshell.git synced 2026-02-05 00:34:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from motorina0/minor_improvments

Browse Source 
Minor improvements
This commit is contained in:
calle
2022-10-07 22:48:35 +02:00
committed by GitHub
parent 01b201d245 2877e55838
commit 5d95045906
5 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env.example
View File

@@ -4,6 +4,7 @@ CASHU_DIR=~/.cashu
# WALLET
# MINT_URL=https://localhost:3338
MINT_HOST=127.0.0.1
MINT_PORT=3338

10
cashu/core/settings.py
View File

@@ -34,13 +34,15 @@ MINT_PRIVATE_KEY = env.str("MINT_PRIVATE_KEY", default=None)
MINT_SERVER_HOST = env.str("MINT_SERVER_HOST", default="127.0.0.1")
MINT_SERVER_PORT = env.int("MINT_SERVER_PORT", default=3338)
MINT_URL = env.str("MINT_URL", default=None)
MINT_HOST = env.str("MINT_HOST", default="8333.space")
MINT_PORT = env.int("MINT_PORT", default=3338)
if MINT_HOST in ["localhost", "127.0.0.1"]:
MINT_URL = f"http://{MINT_HOST}:{MINT_PORT}"
else:
MINT_URL = f"https://{MINT_HOST}:{MINT_PORT}"
if not MINT_URL:
if MINT_HOST in ["localhost", "127.0.0.1"]:
MINT_URL = f"http://{MINT_HOST}:{MINT_PORT}"
else:
MINT_URL = f"https://{MINT_HOST}:{MINT_PORT}"
LNBITS_ENDPOINT = env.str("LNBITS_ENDPOINT", default=None)
LNBITS_KEY = env.str("LNBITS_KEY", default=None)

11
cashu/mint/ledger.py
View File

@@ -187,11 +187,14 @@ class Ledger:
)
return payment_request, checking_id
async def _check_lightning_invoice(self, payment_hash: str):
async def _check_lightning_invoice(self, amounts, payment_hash: str):
"""Checks with the Lightning backend whether an invoice with this payment_hash was paid."""
invoice: Invoice = await get_lightning_invoice(payment_hash, db=self.db)
if invoice.issued:
raise Exception("tokens already issued for this invoice.")
total_requested = sum([amount for amount in amounts])
if total_requested > invoice.amount:
raise Exception(f"Requested amount too high: {total_requested}. Invoice amount: {invoice.amount}")
status = await WALLET.get_invoice_status(payment_hash)
if status.paid:
await update_lightning_invoice(payment_hash, issued=True, db=self.db)
@@ -237,9 +240,9 @@ class Ledger:
# check if lightning invoice was paid
if LIGHTNING:
try:
paid = await self._check_lightning_invoice(payment_hash)
except:
raise Exception("could not check invoice.")
paid = await self._check_lightning_invoice(amounts, payment_hash)
except Exception as e:
raise Exception("could not check invoice: " + str(e))
if not paid:
raise Exception("Lightning invoice not paid yet.")

5
cashu/wallet/cli.py
View File

@@ -104,12 +104,13 @@ async def mint(ctx, amount: int, hash: str):
time.sleep(3)
try:
await wallet.mint(amount, r["hash"])
paid = True
print("Invoice paid.")
except Exception as e:
print(str(e))
if str(e) == "Error: Lightning invoice not paid yet.":
print(".", end="", flush=True)
continue
paid = True
print(" Invoice paid.")
elif amount and hash:
await wallet.mint(amount, hash)
wallet.status()

42
cashu/wallet/wallet.py
View File

@@ -45,10 +45,12 @@ class LedgerAPI:
@staticmethod
def _get_keys(url):
resp = requests.get(url + "/keys").json()
resp = requests.get(url + "/keys")
resp.raise_for_status()
data = resp.json()
return {
int(amt): PublicKey(bytes.fromhex(val), raw=True)
for amt, val in resp.items()
for amt, val in data.items()
}
@staticmethod
@@ -88,6 +90,7 @@ class LedgerAPI:
def request_mint(self, amount):
"""Requests a mint from the server and returns Lightning invoice."""
r = requests.get(self.url + "/mint", params={"amount": amount})
r.raise_for_status()
return r.json()
@staticmethod
@@ -130,13 +133,11 @@ class LedgerAPI:
json=payloads.dict(),
params={"payment_hash": payment_hash},
)
resp.raise_for_status()
try:
promises_list = resp.json()
except:
if resp.status_code >= 300:
raise Exception(f"Error: {f'mint returned {resp.status_code}'}")
else:
raise Exception("Unkown mint error.")
raise Exception("Unkown mint error.")
if "error" in promises_list:
raise Exception("Error: {}".format(promises_list["error"]))
@@ -180,14 +181,11 @@ class LedgerAPI:
self.url + "/split",
json=split_payload.dict(),
)
resp.raise_for_status()
try:
promises_dict = resp.json()
except:
if resp.status_code >= 300:
raise Exception(f"Error: {f'mint returned {resp.status_code}'}")
else:
raise Exception("Unkown mint error.")
raise Exception("Unkown mint error.")
if "error" in promises_dict:
raise Exception("Mint Error: {}".format(promises_dict["error"]))
promises_fst = [BlindedSignature.from_dict(p) for p in promises_dict["fst"]]
@@ -204,28 +202,36 @@ class LedgerAPI:
async def check_spendable(self, proofs: List[Proof]):
payload = CheckRequest(proofs=proofs)
return_dict = requests.post(
resp = requests.post(
self.url + "/check",
json=payload.dict(),
).json()
)
resp.raise_for_status()
return_dict = resp.json()
return return_dict
async def check_fees(self, payment_request: str):
"""Checks whether the Lightning payment is internal."""
payload = CheckFeesRequest(pr=payment_request)
return_dict = requests.post(
resp = requests.post(
self.url + "/checkfees",
json=payload.dict(),
).json()
)
resp.raise_for_status()
return_dict = resp.json()
return return_dict
async def pay_lightning(self, proofs: List[Proof], invoice: str):
payload = MeltRequest(proofs=proofs, invoice=invoice)
return_dict = requests.post(
resp = requests.post(
self.url + "/melt",
json=payload.dict(),
).json()
)
resp.raise_for_status()
return_dict = resp.json()
return return_dict