mirror of
https://github.com/aljazceru/nutshell.git
synced 2025-12-20 10:34:20 +01:00
Nutshell cleanup wishlist (#332)
* fix keys * fix tests * backwards compatible api upgrade * upgrade seems to work * fix tests * add deprecated api functions * add more tests of backwards compat * add test serialization for nut00 * remove a redundant test * move mint and melt to new api * mypy works * CI: mypy --check-untyped-defs * add deprecated router * add hints and remove logs * fix tests * cleanup * use new mint and melt endpoints * tests passing? * fix mypy * make format * make format * make format * commit * errors gone * save * adjust the API * store quotes in db * make mypy happy * add fakewallet settings * remove LIGHTNING=True and pass quote id for melt * format * tests passing * add CoreLightningRestWallet * add macaroon loader * add correct config * preimage -> proof * move wallet.status() to cli.helpers.print_status() * remove statuses from tests * remove * make format * Use httpx in deprecated wallet * fix cln interface * create invoice before quote * internal transactions and deprecated api testing * fix tests * add deprecated API tests * fastapi type hints break things * fix duplicate wallet error * make format * update poetry in CI to 1.7.1 * precommit restore * remove bolt11 * oops * default poetry * store fee reserve for melt quotes and refactor melt() * works? * make format * test * finally * fix deprecated models * rename v1 endpoints to bolt11 * raise restore and check to v1, bump version to 0.15.0 * add version byte to keyset id * remove redundant fields in json * checks * generate bip32 keyset wip * migrate old keysets * load duplicate keys * duplicate old keysets * revert router changes * add deprecated /check and /restore endpoints * try except invalidate * parse unit from derivation path, adjust keyset id calculation with bytes * remove keyest id from functions again and rely on self.keyset_id * mosts tests work * mint loads multiple derivation paths * make format * properly print units * fix tests * wallet works with multiple units * add strike wallet and choose backend dynamically * fix mypy * add get_payment_quote to lightning backends * make format * fix startup * fix lnbitswallet * fix tests * LightningWallet -> LightningBackend * remove comments * make format * remove msat conversion * add Amount type * fix regtest * use melt_quote as argument for pay_invoice * test old api * fees in sats * fix deprecated fees * fixes * print balance correctly * internally index keyset response by int * add pydantic validation to input models * add timestamps to mint db * store timestamps for invoices, promises, proofs_used * fix wallet migration * rotate keys correctly for testing * remove print * update latest keyset * fix tests * fix test * make format * make format with correct black version * remove nsat and cheese * test against deprecated mint * fix tests? * actually use env var * mint run with env vars * moar test * cleanup * simplify tests, load all keys * try out testing with internal invoices * fix internal melt test * fix test * deprecated checkfees expects appropriate fees * adjust comment * drop lightning table * split migration for testing for now, remove it later * remove unused lightning table * skip_private_key -> skip_db_read * throw error on migration error * reorder * fix migrations * fix lnbits fee return value negative * fix typo * comments * add type * make format * split must use correct amount * fix tests * test deprecated api with internal/external melts * do not split if not necessary * refactor * fix test * make format with new black * cleanup and add comments * add quote state check endpoints * fix deprecated wallet response * split -> swap endpoint * make format * add expiry to quotes, get quote endpoints, and adjust to nut review comments * allow overpayment of melt * add lightning wallet tests * commiting to save * fix tests a bit * make format * remove comments * get mint info * check_spendable default False, and return payment quote checking id * make format * bump version in pyproject * update to /v1/checkstate * make format * fix mint api checks * return witness on /v1/checkstate * no failfast * try fail-fast: false in ci.yaml * fix db lookup * clean up literals
This commit is contained in:
callebtc
@@ -92,7 +92,9 @@ async def pay(
|
||||
if mint:
|
||||
wallet = await mint_wallet(mint)
|
||||
payment_response = await wallet.pay_invoice(bolt11)
|
||||
return payment_response
|
||||
ret = PaymentResponse(**payment_response.dict())
|
||||
ret.fee = None # TODO: we can't return an Amount object, overwriting
|
||||
return ret
|
||||
|
||||
|
||||
@router.get(
|
||||
@@ -162,10 +164,8 @@ async def lightning_balance() -> StatusResponse:
|
||||
try:
|
||||
await wallet.load_proofs(reload=True)
|
||||
except Exception as exc:
|
||||
return StatusResponse(error_message=str(exc), balance_msat=0)
|
||||
return StatusResponse(
|
||||
error_message=None, balance_msat=wallet.available_balance * 1000
|
||||
)
|
||||
return StatusResponse(error_message=str(exc), balance=0)
|
||||
return StatusResponse(error_message=None, balance=wallet.available_balance * 1000)
|
||||
|
||||
|
||||
@router.post(
|
||||
@@ -179,8 +179,6 @@ async def swap(
|
||||
outgoing_mint: str = Query(default=..., description="URL of outgoing mint"),
|
||||
incoming_mint: str = Query(default=..., description="URL of incoming mint"),
|
||||
):
|
||||
if not settings.lightning:
|
||||
raise Exception("lightning not supported")
|
||||
incoming_wallet = await mint_wallet(incoming_mint)
|
||||
outgoing_wallet = await mint_wallet(outgoing_mint)
|
||||
if incoming_wallet.url == outgoing_wallet.url:
|
||||
@@ -191,17 +189,17 @@ async def swap(
|
||||
|
||||
# pay invoice from outgoing mint
|
||||
await outgoing_wallet.load_proofs(reload=True)
|
||||
total_amount, fee_reserve_sat = await outgoing_wallet.get_pay_amount_with_fees(
|
||||
invoice.bolt11
|
||||
)
|
||||
assert total_amount > 0, "amount must be positive"
|
||||
quote = await outgoing_wallet.get_pay_amount_with_fees(invoice.bolt11)
|
||||
total_amount = quote.amount + quote.fee_reserve
|
||||
if outgoing_wallet.available_balance < total_amount:
|
||||
raise Exception("balance too low")
|
||||
|
||||
_, send_proofs = await outgoing_wallet.split_to_send(
|
||||
outgoing_wallet.proofs, total_amount, set_reserved=True
|
||||
)
|
||||
await outgoing_wallet.pay_lightning(send_proofs, invoice.bolt11, fee_reserve_sat)
|
||||
await outgoing_wallet.pay_lightning(
|
||||
send_proofs, invoice.bolt11, quote.fee_reserve, quote.quote
|
||||
)
|
||||
|
||||
# mint token in incoming mint
|
||||
await incoming_wallet.mint(amount, id=invoice.id)
|
||||
@@ -325,9 +323,9 @@ async def burn(
|
||||
proofs = tokenObj.get_proofs()
|
||||
|
||||
if delete:
|
||||
await wallet.invalidate(proofs, check_spendable=False)
|
||||
else:
|
||||
await wallet.invalidate(proofs)
|
||||
else:
|
||||
await wallet.invalidate(proofs, check_spendable=True)
|
||||
return BurnResponse(balance=wallet.available_balance)
|
||||
|
||||
|
||||
@@ -361,17 +359,15 @@ async def pending(
|
||||
reserved_date = datetime.utcfromtimestamp(
|
||||
int(grouped_proofs[0].time_reserved) # type: ignore
|
||||
).strftime("%Y-%m-%d %H:%M:%S")
|
||||
result.update(
|
||||
{
|
||||
f"{i}": {
|
||||
"amount": sum_proofs(grouped_proofs),
|
||||
"time": reserved_date,
|
||||
"ID": key,
|
||||
"token": token,
|
||||
"mint": mint,
|
||||
}
|
||||
result.update({
|
||||
f"{i}": {
|
||||
"amount": sum_proofs(grouped_proofs),
|
||||
"time": reserved_date,
|
||||
"ID": key,
|
||||
"token": token,
|
||||
"mint": mint,
|
||||
}
|
||||
)
|
||||
})
|
||||
return PendingResponse(pending_token=result)
|
||||
|
||||
|
||||
@@ -416,22 +412,20 @@ async def wallets():
|
||||
if w == wallet.name:
|
||||
active_wallet = True
|
||||
if active_wallet:
|
||||
result.update(
|
||||
{
|
||||
f"{w}": {
|
||||
"balance": sum_proofs(wallet.proofs),
|
||||
"available": sum_proofs(
|
||||
[p for p in wallet.proofs if not p.reserved]
|
||||
),
|
||||
}
|
||||
result.update({
|
||||
f"{w}": {
|
||||
"balance": sum_proofs(wallet.proofs),
|
||||
"available": sum_proofs([
|
||||
p for p in wallet.proofs if not p.reserved
|
||||
]),
|
||||
}
|
||||
)
|
||||
})
|
||||
except Exception:
|
||||
pass
|
||||
return WalletsResponse(wallets=result)
|
||||
|
||||
|
||||
@router.post("/restore", name="Restore wallet", response_model=RestoreResponse)
|
||||
@router.post("/v1/restore", name="Restore wallet", response_model=RestoreResponse)
|
||||
async def restore(
|
||||
to: int = Query(default=..., description="Counter to which restore the wallet"),
|
||||
):
|
||||
@@ -439,8 +433,7 @@ async def restore(
|
||||
raise Exception("Counter must be positive")
|
||||
await wallet.load_mint()
|
||||
await wallet.restore_promises_from_to(0, to)
|
||||
await wallet.invalidate(wallet.proofs)
|
||||
wallet.status()
|
||||
await wallet.invalidate(wallet.proofs, check_spendable=True)
|
||||
return RestoreResponse(balance=wallet.available_balance)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user