clean up for merge

This commit is contained in:
callebtc 2022-11-24 15:17:20 +01:00
parent 9fdbaf92f6
commit 930ebfd6cc
3 changed files with 2 additions and 289 deletions

View file

@ -122,7 +122,7 @@
:options="g.user.walletOptions"
label="Cashu wallet *"
></q-select>
<q-toggle
<!-- <q-toggle
v-model="toggleAdvanced"
label="Show advanced options"
></q-toggle>
@ -179,7 +179,7 @@
label="Coins that 'exist' in mint (optional)"
placeholder="∞"
></q-input>
</div>
</div> -->
<div class="row q-mt-md">
<q-btn
unelevated

View file

@ -8,7 +8,6 @@ from starlette.responses import HTMLResponse
from lnbits.core.models import User
from lnbits.decorators import check_user_exists
from lnbits.settings import LNBITS_CUSTOM_LOGO, LNBITS_SITE_TITLE
from . import cashu_ext, cashu_renderer
from .crud import get_cashu
@ -23,11 +22,6 @@ async def index(request: Request, user: User = Depends(check_user_exists)):
)
# @cashu_ext.get("/wallet")
# async def wallet(request: Request):
# return cashu_renderer().TemplateResponse("cashu/wallet.html", {"request": request})
@cashu_ext.get("/wallet")
async def wallet(request: Request, mint_id: str):
return cashu_renderer().TemplateResponse(

View file

@ -374,284 +374,3 @@ async def split(
frst_promises, scnd_promises = split_return
resp = PostSplitResponse(fst=frst_promises, snd=scnd_promises)
return resp
# @cashu_ext.post("/api/v1s/upodatekeys", status_code=HTTPStatus.CREATED)
# async def api_cashu_update_keys(
# data: Cashu, wallet: WalletTypeInfo = Depends(get_key_type)
# ):
# cashu = await get_cashu(data.id)
# cashu = await create_cashu(wallet_id=wallet.wallet.id, data=data)
# logger.debug(cashu)
# return cashu.dict()
# ########################################
# #################????###################
# ########################################
# @cashu_ext.post("/api/v1s/{cashu_id}/invoices", status_code=HTTPStatus.CREATED)
# async def api_cashu_create_invoice(
# amount: int = Query(..., ge=1), tipAmount: int = None, cashu_id: str = None
# ):
# cashu = await get_cashu(cashu_id)
# if not cashu:
# raise HTTPException(
# status_code=HTTPStatus.NOT_FOUND, detail="TPoS does not exist."
# )
# if tipAmount:
# amount += tipAmount
# try:
# payment_hash, payment_request = await create_invoice(
# wallet_id=cashu.wallet,
# amount=amount,
# memo=f"{cashu.name}",
# extra={"tag": "cashu", "tipAmount": tipAmount, "cashuId": cashu_id},
# )
# except Exception as e:
# raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))
# return {"payment_hash": payment_hash, "payment_request": payment_request}
# @cashu_ext.post(
# "/api/v1s/{cashu_id}/invoices/{payment_request}/pay",
# status_code=HTTPStatus.OK,
# )
# async def api_cashu_pay_invoice(
# lnurl_data: PayLnurlWData, payment_request: str = None, cashu_id: str = None
# ):
# cashu = await get_cashu(cashu_id)
# if not cashu:
# raise HTTPException(
# status_code=HTTPStatus.NOT_FOUND, detail="TPoS does not exist."
# )
# lnurl = (
# lnurl_data.lnurl.replace("lnurlw://", "")
# .replace("lightning://", "")
# .replace("LIGHTNING://", "")
# .replace("lightning:", "")
# .replace("LIGHTNING:", "")
# )
# if lnurl.lower().startswith("lnurl"):
# lnurl = decode_lnurl(lnurl)
# else:
# lnurl = "https://" + lnurl
# async with httpx.AsyncClient() as client:
# try:
# r = await client.get(lnurl, follow_redirects=True)
# if r.is_error:
# lnurl_response = {"success": False, "detail": "Error loading"}
# else:
# resp = r.json()
# if resp["tag"] != "withdrawRequest":
# lnurl_response = {"success": False, "detail": "Wrong tag type"}
# else:
# r2 = await client.get(
# resp["callback"],
# follow_redirects=True,
# params={
# "k1": resp["k1"],
# "pr": payment_request,
# },
# )
# resp2 = r2.json()
# if r2.is_error:
# lnurl_response = {
# "success": False,
# "detail": "Error loading callback",
# }
# elif resp2["status"] == "ERROR":
# lnurl_response = {"success": False, "detail": resp2["reason"]}
# else:
# lnurl_response = {"success": True, "detail": resp2}
# except (httpx.ConnectError, httpx.RequestError):
# lnurl_response = {"success": False, "detail": "Unexpected error occurred"}
# return lnurl_response
# @cashu_ext.get(
# "/api/v1s/{cashu_id}/invoices/{payment_hash}", status_code=HTTPStatus.OK
# )
# async def api_cashu_check_invoice(cashu_id: str, payment_hash: str):
# cashu = await get_cashu(cashu_id)
# if not cashu:
# raise HTTPException(
# status_code=HTTPStatus.NOT_FOUND, detail="TPoS does not exist."
# )
# try:
# status = await api_payment(payment_hash)
# except Exception as exc:
# logger.error(exc)
# return {"paid": False}
# return status
# ########################################
# #################MINT###################
# ########################################
# # @cashu_ext.get("/api/v1/{cashu_id}/keys", status_code=HTTPStatus.OK)
# # async def keys(cashu_id: str = Query(False)):
# # """Get the public keys of the mint"""
# # mint = await get_cashu(cashu_id)
# # if mint is None:
# # raise HTTPException(
# # status_code=HTTPStatus.NOT_FOUND, detail="Mint does not exist."
# # )
# # return get_pubkeys(mint.prvkey)
# @cashu_ext.get("/api/v1/{cashu_id}/mint")
# async def mint_pay_request(amount: int = 0, cashu_id: str = Query(None)):
# """Request minting of tokens. Server responds with a Lightning invoice."""
# cashu = await get_cashu(cashu_id)
# if cashu is None:
# raise HTTPException(
# status_code=HTTPStatus.NOT_FOUND, detail="Mint does not exist."
# )
# try:
# payment_hash, payment_request = await create_invoice(
# wallet_id=cashu.wallet,
# amount=amount,
# memo=f"{cashu.name}",
# extra={"tag": "cashu"},
# )
# invoice = Invoice(
# amount=amount, pr=payment_request, hash=payment_hash, issued=False
# )
# await store_lightning_invoice(cashu_id, invoice)
# except Exception as e:
# logger.error(e)
# raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))
# return {"pr": payment_request, "hash": payment_hash}
# @cashu_ext.post("/api/v1/{cashu_id}/mint")
# async def mint_coins(
# data: MintPayloads,
# cashu_id: str = Query(None),
# payment_hash: Union[str, None] = None,
# ):
# """
# Requests the minting of tokens belonging to a paid payment request.
# Call this endpoint after `GET /mint`.
# """
# cashu: Cashu = await get_cashu(cashu_id)
# if cashu is None:
# raise HTTPException(
# status_code=HTTPStatus.NOT_FOUND, detail="Mint does not exist."
# )
# invoice: Invoice = (
# None
# if payment_hash == None
# else await get_lightning_invoice(cashu_id, payment_hash)
# )
# if invoice is None:
# raise HTTPException(
# status_code=HTTPStatus.NOT_FOUND, detail="Mint does not have this invoice."
# )
# if invoice.issued == True:
# raise HTTPException(
# status_code=HTTPStatus.PAYMENT_REQUIRED,
# detail="Tokens already issued for this invoice.",
# )
# total_requested = sum([bm.amount for bm in data.blinded_messages])
# if total_requested > invoice.amount:
# raise HTTPException(
# status_code=HTTPStatus.PAYMENT_REQUIRED,
# detail=f"Requested amount too high: {total_requested}. Invoice amount: {invoice.amount}",
# )
# status: PaymentStatus = await check_transaction_status(cashu.wallet, payment_hash)
# # todo: revert to: status.paid != True:
# if status.paid != True:
# raise HTTPException(
# status_code=HTTPStatus.PAYMENT_REQUIRED, detail="Invoice not paid."
# )
# try:
# await update_lightning_invoice(cashu_id, payment_hash, True)
# amounts = []
# B_s = []
# for payload in data.blinded_messages:
# amounts.append(payload.amount)
# B_s.append(PublicKey(bytes.fromhex(payload.B_), raw=True))
# promises = await generate_promises(cashu.prvkey, amounts, B_s)
# for amount, B_, p in zip(amounts, B_s, promises):
# await store_promise(amount, B_.serialize().hex(), p.C_, cashu_id)
# return promises
# except Exception as e:
# logger.error(e)
# raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))
# @cashu_ext.post("/api/v1/{cashu_id}/melt")
# async def melt_coins(payload: MeltPayload, cashu_id: str = Query(None)):
# """Invalidates proofs and pays a Lightning invoice."""
# cashu: Cashu = await get_cashu(cashu_id)
# if cashu is None:
# raise HTTPException(
# status_code=HTTPStatus.NOT_FOUND, detail="Mint does not exist."
# )
# try:
# ok, preimage = await melt(cashu, payload.proofs, payload.invoice)
# return {"paid": ok, "preimage": preimage}
# except Exception as e:
# logger.error(e)
# raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(e))
# @cashu_ext.post("/api/v1/{cashu_id}/check")
# async def check_spendable_coins(payload: CheckPayload, cashu_id: str = Query(None)):
# return await check_spendable(payload.proofs, cashu_id)
# @cashu_ext.post("/api/v1/{cashu_id}/split")
# async def split_proofs(payload: SplitRequest, cashu_id: str = Query(None)):
# """
# Requetst a set of tokens with amount "total" to be split into two
# newly minted sets with amount "split" and "total-split".
# """
# print("### RECEIVE")
# print("payload", json.dumps(payload, default=vars))
# cashu: Cashu = await get_cashu(cashu_id)
# if cashu is None:
# raise HTTPException(
# status_code=HTTPStatus.NOT_FOUND, detail="Mint does not exist."
# )
# proofs = payload.proofs
# amount = payload.amount
# outputs = payload.outputs.blinded_messages if payload.outputs else None
# try:
# split_return = await split(cashu, proofs, amount, outputs)
# except Exception as exc:
# raise CashuError(error=str(exc))
# if not split_return:
# return {"error": "there was a problem with the split."}
# frst_promises, scnd_promises = split_return
# resp = PostSplitResponse(fst=frst_promises, snd=scnd_promises)
# print("### resp", json.dumps(resp, default=vars))
# return resp
##################################################################
##################################################################
# CASHU LIB
##################################################################