From 542f4c714193b9a5e011658fa658911a51a08902 Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Tue, 27 Dec 2022 15:39:06 +0100 Subject: [PATCH] nostr relay setting --- cashu/core/settings.py | 6 ++++-- cashu/wallet/cli.py | 6 ++++-- cashu/wallet/wallet_live/.DS_Store | Bin 6148 -> 0 bytes cashu/wallet/wallet_live/.placeholder | 0 cashu/wallet/wallet_live/wallet.sqlite3 | Bin 36864 -> 0 bytes 5 files changed, 8 insertions(+), 4 deletions(-) delete mode 100644 cashu/wallet/wallet_live/.DS_Store delete mode 100644 cashu/wallet/wallet_live/.placeholder delete mode 100644 cashu/wallet/wallet_live/wallet.sqlite3 diff --git a/cashu/core/settings.py b/cashu/core/settings.py index 5865f51..e22b118 100644 --- a/cashu/core/settings.py +++ b/cashu/core/settings.py @@ -7,9 +7,10 @@ from environs import Env # type: ignore env = Env() -ENV_FILE = os.path.join(str(Path.home()), ".cashu", ".env") +# env file: default to current dir, else home dir +ENV_FILE = os.path.join(os.getcwd(), ".env") if not os.path.isfile(ENV_FILE): - ENV_FILE = os.path.join(os.getcwd(), ".env") + ENV_FILE = os.path.join(str(Path.home()), ".cashu", ".env") if os.path.isfile(ENV_FILE): env.read_env(ENV_FILE) else: @@ -53,6 +54,7 @@ LNBITS_ENDPOINT = env.str("LNBITS_ENDPOINT", default=None) LNBITS_KEY = env.str("LNBITS_KEY", default=None) NOSTR_PRIVATE_KEY = env.str("NOSTR_PRIVATE_KEY", default=None) +NOSTR_RELAYS = env.list("NOSTR_RELAYS", default=["wss://nostr-pub.wellorder.net"]) MAX_ORDER = 64 VERSION = "0.7.0" diff --git a/cashu/wallet/cli.py b/cashu/wallet/cli.py index 93f6b6d..2330200 100644 --- a/cashu/wallet/cli.py +++ b/cashu/wallet/cli.py @@ -29,6 +29,7 @@ from cashu.core.settings import ( LIGHTNING, MINT_URL, NOSTR_PRIVATE_KEY, + NOSTR_RELAYS, SOCKS_HOST, SOCKS_PORT, TOR, @@ -551,7 +552,7 @@ async def nsend(ctx, amount: int, pubkey: str, verbose: bool, yes: bool): ) # we only use ephemeral private keys for sending - client = NostrClient() + client = NostrClient(relays=NOSTR_RELAYS) if verbose: print(f"Your ephemeral nostr private key: {client.private_key.hex()}") await asyncio.sleep(1) @@ -577,7 +578,7 @@ async def nreceive(ctx, verbose: bool): "Warning: No nostr private key set! You don't have NOSTR_PRIVATE_KEY set in your .env file. I will create a random private key for this session but I will not remember it." ) print("") - client = NostrClient(privatekey_hex=NOSTR_PRIVATE_KEY) + client = NostrClient(privatekey_hex=NOSTR_PRIVATE_KEY, relays=NOSTR_RELAYS) print(f"Your nostr public key: {client.public_key.hex()}") if verbose: print(f"Your nostr private key (do not share!): {client.private_key.hex()}") @@ -646,6 +647,7 @@ async def info(ctx): if NOSTR_PRIVATE_KEY: client = NostrClient(privatekey_hex=NOSTR_PRIVATE_KEY, connect=False) print(f"Nostr public key: {client.public_key.hex()}") + print(f"Nostr relays: {NOSTR_RELAYS}") if SOCKS_HOST: print(f"Socks proxy: {SOCKS_HOST}:{SOCKS_PORT}") print(f"Mint URL: {ctx.obj['HOST']}") diff --git a/cashu/wallet/wallet_live/.DS_Store b/cashu/wallet/wallet_live/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 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 k0+;Xa-`2E`e^hn*zTW@8Z+~!fc5m