From da2d0032917ba5aeb5320edfbc40df82adb25508 Mon Sep 17 00:00:00 2001
From: calle <93376500+callebtc@users.noreply.github.com>
Date: Sat, 25 Feb 2023 13:23:33 +0100
Subject: [PATCH] fix manifest (#111)

---
 MANIFEST.in                |   6 +++++-
 cashu/nostr                |   2 +-
 cashu/tor/bundle/.DS_Store | Bin 6148 -> 0 bytes
 cashu/wallet/cli/nostr.py  |   2 +-
 setup.py                   |   4 ++--
 5 files changed, 9 insertions(+), 5 deletions(-)
 delete mode 100755 cashu/tor/bundle/.DS_Store

diff --git a/MANIFEST.in b/MANIFEST.in
index 7f6abad..02050c7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,6 @@
 include requirements.txt
-recursive-include cashu/tor *
\ No newline at end of file
+recursive-include cashu/tor *
+recursive-include cashu/wallet *
+exclude tests/*
+global-exclude *.py[cod]
+prune tests */__pycache__/*
\ No newline at end of file
diff --git a/cashu/nostr b/cashu/nostr
index 59ddc1b..880dd11 160000
--- a/cashu/nostr
+++ b/cashu/nostr
@@ -1 +1 @@
-Subproject commit 59ddc1b5e0cccb0038a064683c7ec10839fad76b
+Subproject commit 880dd1183a03d0aa42e66ce418b782b06d8ce519
diff --git a/cashu/tor/bundle/.DS_Store b/cashu/tor/bundle/.DS_Store
deleted file mode 100755
index 6c7df3599302ce99a5ee193d11df1806c308c8f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~J!%6%427R!7lt%jx|}8l$PET#pTHN0iNTHIKp?5-=z02Syh$CF@C4EuX;$p+
zSM00+*zWWE3`_tvbXPoin3*wO;SDFeejPt<*Z13n6|Vvh5i?_D!fd~`B_bdKA|L`H
zAOZ^_kf%5{j|+MxJ&Fj3z%mH<_o2~Ud+A7xPX|Mc0Ms?hVO+;7L2X{3_R^8c3e9SI
zuxhm!L%bgC)K=H^(vh0&uo^zB?rc8A&@9_wjS0<qh=K@+z>L5u^U2Tu1O2!8f7YT@
z1VrGU5wP|CxZm-m>TLb-dR~92s;>u~8kaNN{RA-aqj*aX<9_o6wU>@mR%rSW2n-4$
I@TUa60V5g_dH?_b

diff --git a/cashu/wallet/cli/nostr.py b/cashu/wallet/cli/nostr.py
index 5d23854..597377d 100644
--- a/cashu/wallet/cli/nostr.py
+++ b/cashu/wallet/cli/nostr.py
@@ -75,7 +75,7 @@ async def send_nostr(ctx: Context, amount: int, pubkey: str, verbose: bool, yes:
             default=True,
         )
 
-    client = NostrClient(private_key=NOSTR_PRIVATE_KEY, relays=NOSTR_RELAYS)
+    client = NostrClient(private_key=NOSTR_PRIVATE_KEY or "", relays=NOSTR_RELAYS)
     if verbose and not NOSTR_PRIVATE_KEY:
         # we generated a random key if none was present
         print(f"Your nostr private key: {client.private_key.bech32()}")
diff --git a/setup.py b/setup.py
index edb0b3e..e135275 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ with open(path.join(this_directory, "README.md"), encoding="utf-8") as f:
 with open("requirements.txt") as f:
     requirements = f.read().splitlines()
 
-entry_points = {"console_scripts": ["cashu = cashu.wallet.cli:cli"]}
+entry_points = {"console_scripts": ["cashu = cashu.wallet.cli.cli:cli"]}
 
 setuptools.setup(
     name="cashu",
@@ -21,7 +21,7 @@ setuptools.setup(
     author="Calle",
     author_email="calle@protonmail.com",
     license="MIT",
-    packages=setuptools.find_packages(),
+    packages=setuptools.find_namespace_packages(),
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",