diff --git a/README.md b/README.md index 9d3ded0..c59af4e 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ cashu info Returns: ```bash -Version: 0.5.0 +Version: 0.5.1 Debug: False Cashu dir: /home/user/.cashu Wallet: wallet diff --git a/cashu/core/settings.py b/cashu/core/settings.py index 22c60c4..1e86a4c 100644 --- a/cashu/core/settings.py +++ b/cashu/core/settings.py @@ -53,4 +53,4 @@ LNBITS_ENDPOINT = env.str("LNBITS_ENDPOINT", default=None) LNBITS_KEY = env.str("LNBITS_KEY", default=None) MAX_ORDER = 64 -VERSION = "0.5.0" +VERSION = "0.5.1" diff --git a/cashu/wallet/cli.py b/cashu/wallet/cli.py index b620529..09ff7d9 100755 --- a/cashu/wallet/cli.py +++ b/cashu/wallet/cli.py @@ -73,10 +73,15 @@ def cli(ctx, host: str, walletname: str): wallet = Wallet(ctx.obj["HOST"], os.path.join(CASHU_DIR, walletname)) if TOR and not TorProxy().check_platform(): - print( - "WARNING: Your settings say TOR=true but the built-in Tor bundle is not supported on your system. Your IP will be visible to the mint! Please install Tor manually and set TOR=false and SOCKS_HOST=localhost and SOCKS_PORT=9050 in your Cashu config (recommended) or turn off Tor altogether by setting TOR=false (not recommended)." - ) - print("") + error_str = "Your settings say TOR=true but the built-in Tor bundle is not supported on your system. Please install Tor manually and set TOR=false and SOCKS_HOST=localhost and SOCKS_PORT=9050 in your Cashu config (recommended) or turn off Tor by setting TOR=false (not recommended). Cashu will not work until you edit your config file accordingly." + error_str += "\n\n" + if ENV_FILE: + error_str += f"Edit your Cashu config file here: {ENV_FILE}" + else: + error_str += ( + f"Ceate a new Cashu config file here: {os.path.join(CASHU_DIR, '.env')}" + ) + raise Exception(error_str) ctx.obj["WALLET"] = wallet asyncio.run(init_wallet(wallet)) diff --git a/pyproject.toml b/pyproject.toml index 9281125..a57eeb8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "cashu" -version = "0.5.0" +version = "0.5.1" description = "Ecash wallet and mint." authors = ["calle "] license = "MIT" diff --git a/setup.py b/setup.py index ee31f5f..001c906 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ entry_points = {"console_scripts": ["cashu = cashu.wallet.cli:cli"]} setuptools.setup( name="cashu", - version="0.5.0", + version="0.5.1", description="Ecash wallet and mint with Bitcoin Lightning support", long_description=long_description, long_description_content_type="text/markdown", diff --git a/tests/test_crypto.py b/tests/test_crypto.py index 820457b..e5e2ef5 100644 --- a/tests/test_crypto.py +++ b/tests/test_crypto.py @@ -42,14 +42,19 @@ def test_hash_to_curve_iteration(): def test_step1(): """""" B_, blinding_factor = step1_alice( - "test_message", blinding_factor=b"00000000000000000000000000000001" # 32 bytes + "test_message", + blinding_factor=bytes.fromhex( + "0000000000000000000000000000000000000000000000000000000000000001" + ), # 32 bytes ) assert ( B_.serialize().hex() - == "0243379106c73dfc635cd1422f406e83fbfa25be83bb3620aefc08f2b89d02d777" + == "02a9acc1e48c25eeeb9289b5031cc57da9fe72f3fe2861d264bdc074209b107ba2" + ) + assert blinding_factor.private_key == bytes.fromhex( + "0000000000000000000000000000000000000000000000000000000000000001" ) - assert blinding_factor.private_key == b"00000000000000000000000000000001" def test_step2(): @@ -76,7 +81,7 @@ def test_step3(): # C = C_ - A.mult(r) C_ = PublicKey( bytes.fromhex( - "02b15f14ae9259c101cdbc437e8877b1ca5d4af3a0c0684866b38d8c8d0b6f6374" + "02a9acc1e48c25eeeb9289b5031cc57da9fe72f3fe2861d264bdc074209b107ba2" ), raw=True, ) @@ -97,5 +102,5 @@ def test_step3(): assert ( C.serialize().hex() - == "03398f7153b381ce54d57962a5e03ce0a4f3b79755e882c972b788e8488e59b0c9" + == "03c724d7e6a5443b39ac8acf11f40420adc4f99a02e7cc1b57703d9391f6d129cd" )