diff --git a/cashu/wallet/cli/cli.py b/cashu/wallet/cli/cli.py index a098b85..61e4fcd 100644 --- a/cashu/wallet/cli/cli.py +++ b/cashu/wallet/cli/cli.py @@ -67,7 +67,7 @@ def cli(ctx: Context, host: str, walletname: str): ctx.obj["HOST"], os.path.join(settings.cashu_dir, walletname), name=walletname ) ctx.obj["WALLET"] = wallet - asyncio.run(init_wallet(wallet)) + asyncio.run(init_wallet(ctx.obj["WALLET"])) # MUTLIMINT: Select a wallet # only if a command is one of a subset that needs to specify a mint host @@ -75,7 +75,6 @@ def cli(ctx: Context, host: str, walletname: str): if ctx.invoked_subcommand not in ["send", "invoice", "pay"] or host: return # else: we ask the user to select one - ctx.obj["WALLET"] = wallet # set a wallet for get_mint_wallet in the next step ctx.obj["WALLET"] = asyncio.run( get_mint_wallet(ctx) ) # select a specific wallet by CLI input diff --git a/cashu/wallet/cli/cli_helpers.py b/cashu/wallet/cli/cli_helpers.py index 66243ca..263a3a7 100644 --- a/cashu/wallet/cli/cli_helpers.py +++ b/cashu/wallet/cli/cli_helpers.py @@ -30,8 +30,10 @@ async def get_mint_wallet(ctx: Context): wallet: Wallet = ctx.obj["WALLET"] mint_balances = await wallet.balance_per_minturl() - # if we have balances on more than one mint, we ask the user to select one - if len(mint_balances) > 1: + if ctx.obj["HOST"] not in mint_balances: + mint_url = wallet.url + elif len(mint_balances) > 1: + # if we have balances on more than one mint, we ask the user to select one await print_mint_balances(wallet, show_mints=True) url_max = max(mint_balances, key=lambda v: mint_balances[v]["available"]) diff --git a/cashu/wallet/nostr.py b/cashu/wallet/nostr.py index bcffafb..b2260cc 100644 --- a/cashu/wallet/nostr.py +++ b/cashu/wallet/nostr.py @@ -9,7 +9,6 @@ from ..core.settings import settings from ..nostr.nostr.client.client import NostrClient from ..nostr.nostr.event import Event from ..nostr.nostr.key import PublicKey -from .cli.cli_helpers import get_mint_wallet from .crud import get_nostr_last_check_timestamp, set_nostr_last_check_timestamp from .helpers import receive from .wallet import Wallet