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
@@ -4,11 +4,62 @@ import click
|
||||
from click import Context
|
||||
from loguru import logger
|
||||
|
||||
from ...core.base import Unit
|
||||
from ...core.settings import settings
|
||||
from ...wallet.crud import get_keyset
|
||||
from ...wallet.crud import get_keysets
|
||||
from ...wallet.wallet import Wallet as Wallet
|
||||
|
||||
|
||||
def print_balance(ctx: Context):
|
||||
wallet: Wallet = ctx.obj["WALLET"]
|
||||
print(f"Balance: {wallet.unit.str(wallet.available_balance)}")
|
||||
|
||||
|
||||
async def get_unit_wallet(ctx: Context, force_select: bool = False):
|
||||
"""Helper function that asks the user for an input to select which unit they want to load.
|
||||
|
||||
Args:
|
||||
ctx (Context): Context
|
||||
force_select (bool, optional): Force the user to select a unit. Defaults to False.
|
||||
"""
|
||||
wallet: Wallet = ctx.obj["WALLET"]
|
||||
await wallet.load_proofs(reload=True, unit=False)
|
||||
# show balances per unit
|
||||
unit_balances = wallet.balance_per_unit()
|
||||
if ctx.obj["UNIT"] in [u.name for u in unit_balances] and not force_select:
|
||||
wallet.unit = Unit[ctx.obj["UNIT"]]
|
||||
elif len(unit_balances) > 1 and not ctx.obj["UNIT"]:
|
||||
print(f"You have balances in {len(unit_balances)} units:")
|
||||
print("")
|
||||
for i, (k, v) in enumerate(unit_balances.items()):
|
||||
unit = k
|
||||
print(f"Unit {i+1} ({unit}) – Balance: {unit.str(int(v['available']))}")
|
||||
print("")
|
||||
unit_nr_str = input(
|
||||
f"Select unit [1-{len(unit_balances)}] or "
|
||||
f"press enter for your default '{Unit[settings.wallet_unit]}': "
|
||||
)
|
||||
if not unit_nr_str: # default unit
|
||||
unit = Unit[settings.wallet_unit]
|
||||
elif unit_nr_str.isdigit() and int(unit_nr_str) <= len(
|
||||
unit_balances
|
||||
): # specific unit
|
||||
unit = list(unit_balances.keys())[int(unit_nr_str) - 1]
|
||||
else:
|
||||
raise Exception("invalid input.")
|
||||
|
||||
print(f"Selected unit: {unit}")
|
||||
print("")
|
||||
# load this unit into a wallet
|
||||
wallet.unit = unit
|
||||
elif len(unit_balances) == 1 and not ctx.obj["UNIT"]:
|
||||
wallet.unit = list(unit_balances.keys())[0]
|
||||
elif ctx.obj["UNIT"]:
|
||||
wallet.unit = Unit[ctx.obj["UNIT"]]
|
||||
settings.wallet_unit = wallet.unit.name
|
||||
return wallet
|
||||
|
||||
|
||||
async def get_mint_wallet(ctx: Context, force_select: bool = False):
|
||||
"""
|
||||
Helper function that asks the user for an input to select which mint they want to load.
|
||||
@@ -56,19 +107,19 @@ async def get_mint_wallet(ctx: Context, force_select: bool = False):
|
||||
return mint_wallet
|
||||
|
||||
|
||||
async def print_mint_balances(wallet, show_mints=False):
|
||||
async def print_mint_balances(wallet: Wallet, show_mints: bool = False):
|
||||
"""
|
||||
Helper function that prints the balances for each mint URL that we have tokens from.
|
||||
"""
|
||||
# get balances per mint
|
||||
mint_balances = await wallet.balance_per_minturl()
|
||||
|
||||
mint_balances = await wallet.balance_per_minturl(unit=wallet.unit)
|
||||
# if we have a balance on a non-default mint, we show its URL
|
||||
keysets = [k for k, v in wallet.balance_per_keyset().items()]
|
||||
for k in keysets:
|
||||
ks = await get_keyset(id=str(k), db=wallet.db)
|
||||
if ks and ks.mint_url != wallet.url:
|
||||
show_mints = True
|
||||
keysets_local = await get_keysets(id=str(k), db=wallet.db)
|
||||
for kl in keysets_local:
|
||||
if kl and kl.mint_url != wallet.url:
|
||||
show_mints = True
|
||||
|
||||
# or we have a balance on more than one mint
|
||||
# show balances per mint
|
||||
@@ -76,9 +127,10 @@ async def print_mint_balances(wallet, show_mints=False):
|
||||
print(f"You have balances in {len(mint_balances)} mints:")
|
||||
print("")
|
||||
for i, (k, v) in enumerate(mint_balances.items()):
|
||||
unit = Unit[str(v["unit"])]
|
||||
print(
|
||||
f"Mint {i+1}: Balance: {v['available']} sat (pending:"
|
||||
f" {v['balance']-v['available']} sat) URL: {k}"
|
||||
f"Mint {i+1}: Balance: {unit.str(int(v['available']))} (pending:"
|
||||
f" {unit.str(int(v['balance'])-int(v['available']))}) URL: {k}"
|
||||
)
|
||||
print("")
|
||||
|
||||
@@ -93,7 +145,7 @@ async def verify_mint(mint_wallet: Wallet, url: str):
|
||||
# dummy Wallet to check the database later
|
||||
# mint_wallet = Wallet(url, os.path.join(settings.cashu_dir, ctx.obj["WALLET_NAME"]))
|
||||
# we check the db whether we know this mint already and ask the user if not
|
||||
mint_keysets = await get_keyset(mint_url=url, db=mint_wallet.db)
|
||||
mint_keysets = await get_keysets(mint_url=url, db=mint_wallet.db)
|
||||
if mint_keysets is None:
|
||||
# we encountered a new mint and ask for a user confirmation
|
||||
print("")
|
||||
@@ -107,4 +159,4 @@ async def verify_mint(mint_wallet: Wallet, url: str):
|
||||
default=True,
|
||||
)
|
||||
else:
|
||||
logger.debug(f"We know keyset {mint_keysets.id} already")
|
||||
logger.debug(f"We know mint {url} already")
|
||||
|
||||
Reference in New Issue
Block a user