aiolabs/lnbits
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1235 from motorina0/fix_wallet_deleted_for_charge

Browse source 
fix: onchain wallet deleted for charge
This commit is contained in:
calle 2022-12-26 11:54:16 +01:00 • committed by GitHub
commit b655b9959d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lnbits/extensions/satspay/crud.py
View file

@ -24,6 +24,8 @@ async def create_charge(user: str, data: CreateCharge) -> Charges:
{"mempool_endpoint": config.mempool_endpoint, "network": config.network} {"mempool_endpoint": config.mempool_endpoint, "network": config.network}
) )
onchain = await get_fresh_address(data.onchainwallet) onchain = await get_fresh_address(data.onchainwallet)
if not onchain:
raise Exception(f"Wallet '{data.onchainwallet}' can no longer be accessed.")
onchainaddress = onchain.address onchainaddress = onchain.address
else: else:
onchainaddress = None onchainaddress = None

6
lnbits/extensions/satspay/views_api.py
View file

@ -37,6 +37,7 @@ from .models import CreateCharge, SatsPayThemes
async def api_charge_create( async def api_charge_create(
data: CreateCharge, wallet: WalletTypeInfo = Depends(require_invoice_key) data: CreateCharge, wallet: WalletTypeInfo = Depends(require_invoice_key)
): ):
try:
charge = await create_charge(user=wallet.wallet.user, data=data) charge = await create_charge(user=wallet.wallet.user, data=data)
return { return {
**charge.dict(), **charge.dict(),
@ -44,6 +45,11 @@ async def api_charge_create(
**{"time_left": charge.time_left}, **{"time_left": charge.time_left},
**{"paid": charge.paid}, **{"paid": charge.paid},
} }
except Exception as ex:
logger.debug(f"Satspay error: {str}")
raise HTTPException(
status_code=HTTPStatus.INTERNAL_SERVER_ERROR, detail=str(ex)
)
@satspay_ext.put("/api/v1/charge/{charge_id}") @satspay_ext.put("/api/v1/charge/{charge_id}")