From 352d053fbe4ec4cf8727f2aec06177dd21dcb446 Mon Sep 17 00:00:00 2001 From: Altbierjupp Date: Fri, 21 Oct 2022 17:12:10 +0200 Subject: [PATCH 1/8] Adjust some help for CLI --- README.md | 3 +-- cashu/wallet/cli.py | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 2299159..6d51457 100644 --- a/README.md +++ b/README.md @@ -90,8 +90,7 @@ vim .env To use the wallet with the [public test mint](#test-instance), you need to change the appropriate entries in the `.env` file. #### Test instance -*Warning: this instance is just for demonstration only. Currently, only Lightning deposits work but not withdrawals. The server could vanish at any moment so consider any Satoshis you deposit a donation. I will add Lightning withdrawals soon so unless someone comes up with a huge inflation bug, you might be able to claim them back at a later point in time.* - +*Warning: this instance is just for demonstration only. The server could vanish at any moment so consider any Satoshis you deposit a donation. You can withdraw you funds with the function [cashu pay.](#pay-a-lightning-invoice)* Change the appropriate `.env` file settings to ```bash diff --git a/cashu/wallet/cli.py b/cashu/wallet/cli.py index 683959a..d033b8e 100755 --- a/cashu/wallet/cli.py +++ b/cashu/wallet/cli.py @@ -74,7 +74,7 @@ def coro(f): return wrapper -@cli.command("invoice", help="Create Lighting invoice.") +@cli.command("invoice", help="Generate a BOLT11 Lightning invoice to fund your Cashu wallet.") @click.argument("amount", type=int) @click.option("--hash", default="", help="Hash of the paid invoice.", type=str) @click.pass_context @@ -120,7 +120,7 @@ async def invoice(ctx, amount: int, hash: str): return -@cli.command("pay", help="Pay Lightning invoice.") +@cli.command("pay", help="Pay a Lightning invoice to send you tokens from the mint into the Lightning Network.") @click.argument("invoice", type=str) @click.option( "--yes", "-y", default=False, is_flag=True, help="Skip confirmation.", type=bool @@ -220,7 +220,8 @@ async def receive(ctx, coin: str, lock: str): wallet.status() -@cli.command("burn", help="Burn spent coins.") +@cli.command("burn", help="Burn spent coins. After spednding some coins you need to burn them to prevent the wallet to do a double spent." + "This will be blocked by the mint, cause it holds the info about all spent coins .") @click.argument("coin", required=False, type=str) @click.option("--all", "-a", default=False, is_flag=True, help="Burn all spent coins.") @click.option( @@ -250,7 +251,8 @@ async def burn(ctx, coin: str, all: bool, force: bool): wallet.status() -@cli.command("pending", help="Show pending coins.") +@cli.command("pending", help="Show pending coins. This shows all the coins that was already used to send but not claimed yet by the receiver." + "If you want to cancel the send ,you can claim the cains again with the receive command") @click.pass_context @coro async def pending(ctx): From 58297bcfbf7ec851d6471ed67f259155af762e08 Mon Sep 17 00:00:00 2001 From: Altbierjupp Date: Fri, 21 Oct 2022 17:14:41 +0200 Subject: [PATCH 2/8] Update cli.py --- cashu/wallet/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cashu/wallet/cli.py b/cashu/wallet/cli.py index d033b8e..a94f201 100755 --- a/cashu/wallet/cli.py +++ b/cashu/wallet/cli.py @@ -220,7 +220,7 @@ async def receive(ctx, coin: str, lock: str): wallet.status() -@cli.command("burn", help="Burn spent coins. After spednding some coins you need to burn them to prevent the wallet to do a double spent." +@cli.command("burn", help="Burn spent coins. After spending some coins you need to burn them to prevent the wallet to do a double spent." "This will be blocked by the mint, cause it holds the info about all spent coins .") @click.argument("coin", required=False, type=str) @click.option("--all", "-a", default=False, is_flag=True, help="Burn all spent coins.") From e15f535d8023c6178a7d8d36bec6596d50f13765 Mon Sep 17 00:00:00 2001 From: Altbierjupp Date: Fri, 21 Oct 2022 17:17:29 +0200 Subject: [PATCH 3/8] Update cli.py --- cashu/wallet/cli.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cashu/wallet/cli.py b/cashu/wallet/cli.py index a94f201..cc7378c 100755 --- a/cashu/wallet/cli.py +++ b/cashu/wallet/cli.py @@ -120,7 +120,7 @@ async def invoice(ctx, amount: int, hash: str): return -@cli.command("pay", help="Pay a Lightning invoice to send you tokens from the mint into the Lightning Network.") +@cli.command("pay", help="Pay a Lightning invoice to send you tokens from the mint back into the Lightning Network.") @click.argument("invoice", type=str) @click.option( "--yes", "-y", default=False, is_flag=True, help="Skip confirmation.", type=bool @@ -221,7 +221,7 @@ async def receive(ctx, coin: str, lock: str): @cli.command("burn", help="Burn spent coins. After spending some coins you need to burn them to prevent the wallet to do a double spent." - "This will be blocked by the mint, cause it holds the info about all spent coins .") + "This will be blocked by the mint, cause it holds the info about all spent coins.") @click.argument("coin", required=False, type=str) @click.option("--all", "-a", default=False, is_flag=True, help="Burn all spent coins.") @click.option( @@ -251,8 +251,8 @@ async def burn(ctx, coin: str, all: bool, force: bool): wallet.status() -@cli.command("pending", help="Show pending coins. This shows all the coins that was already used to send but not claimed yet by the receiver." - "If you want to cancel the send ,you can claim the cains again with the receive command") +@cli.command("pending", help="Show pending coins. This shows all the coins that was already used to send, but not claimed yet by the receiver." + "If you want to cancel the send, you can claim the coins again with the receive command.") @click.pass_context @coro async def pending(ctx): From 9d4bf18296e90d40532e295eba098f2055fa4362 Mon Sep 17 00:00:00 2001 From: Thorsten <91003647+Altbierjupp@users.noreply.github.com> Date: Sun, 23 Oct 2022 20:15:31 +0200 Subject: [PATCH 4/8] Update README.md Co-authored-by: calle <93376500+callebtc@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71d5a7e..5ef12a1 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ vim .env To use the wallet with the [public test mint](#test-instance), you need to change the appropriate entries in the `.env` file. #### Test instance -*Warning: this instance is just for demonstration only. The server could vanish at any moment so consider any Satoshis you deposit a donation. You can withdraw you funds with the function [cashu pay.](#pay-a-lightning-invoice)* +*Warning: this instance is just for demonstration only. The server could vanish at any moment so consider any Satoshis you deposit a donation. You can withdraw you funds with the command [cashu pay](#pay-a-lightning-invoice).* Change the appropriate `.env` file settings to ```bash From 045045313eb708b5a0da06033eaa3567bb1a209d Mon Sep 17 00:00:00 2001 From: Altbierjupp Date: Tue, 25 Oct 2022 09:04:11 +0200 Subject: [PATCH 5/8] remove changes in CLI --- cashu/wallet/cli.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/cashu/wallet/cli.py b/cashu/wallet/cli.py index cc7378c..4a6b6ef 100755 --- a/cashu/wallet/cli.py +++ b/cashu/wallet/cli.py @@ -74,7 +74,7 @@ def coro(f): return wrapper -@cli.command("invoice", help="Generate a BOLT11 Lightning invoice to fund your Cashu wallet.") +@cli.command("invoice", help="Create Lighting invoice.") @click.argument("amount", type=int) @click.option("--hash", default="", help="Hash of the paid invoice.", type=str) @click.pass_context @@ -120,7 +120,11 @@ async def invoice(ctx, amount: int, hash: str): return +<<<<<<< HEAD @cli.command("pay", help="Pay a Lightning invoice to send you tokens from the mint back into the Lightning Network.") +======= +@cli.command("pay", help="Pay Lightning invoice.") +>>>>>>> parent of 352d053 (Adjust some help for CLI) @click.argument("invoice", type=str) @click.option( "--yes", "-y", default=False, is_flag=True, help="Skip confirmation.", type=bool @@ -220,8 +224,12 @@ async def receive(ctx, coin: str, lock: str): wallet.status() +<<<<<<< HEAD @cli.command("burn", help="Burn spent coins. After spending some coins you need to burn them to prevent the wallet to do a double spent." "This will be blocked by the mint, cause it holds the info about all spent coins.") +======= +@cli.command("burn", help="Burn spent coins.") +>>>>>>> parent of 352d053 (Adjust some help for CLI) @click.argument("coin", required=False, type=str) @click.option("--all", "-a", default=False, is_flag=True, help="Burn all spent coins.") @click.option( @@ -251,8 +259,12 @@ async def burn(ctx, coin: str, all: bool, force: bool): wallet.status() +<<<<<<< HEAD @cli.command("pending", help="Show pending coins. This shows all the coins that was already used to send, but not claimed yet by the receiver." "If you want to cancel the send, you can claim the coins again with the receive command.") +======= +@cli.command("pending", help="Show pending coins.") +>>>>>>> parent of 352d053 (Adjust some help for CLI) @click.pass_context @coro async def pending(ctx): From 0c6888254c633e5de1402472bde1366cd989f479 Mon Sep 17 00:00:00 2001 From: Altbierjupp Date: Tue, 25 Oct 2022 09:06:17 +0200 Subject: [PATCH 6/8] remove changes in CLI --- cashu/wallet/cli.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/cashu/wallet/cli.py b/cashu/wallet/cli.py index 4a6b6ef..001bb4e 100755 --- a/cashu/wallet/cli.py +++ b/cashu/wallet/cli.py @@ -120,11 +120,7 @@ async def invoice(ctx, amount: int, hash: str): return -<<<<<<< HEAD -@cli.command("pay", help="Pay a Lightning invoice to send you tokens from the mint back into the Lightning Network.") -======= @cli.command("pay", help="Pay Lightning invoice.") ->>>>>>> parent of 352d053 (Adjust some help for CLI) @click.argument("invoice", type=str) @click.option( "--yes", "-y", default=False, is_flag=True, help="Skip confirmation.", type=bool @@ -224,12 +220,7 @@ async def receive(ctx, coin: str, lock: str): wallet.status() -<<<<<<< HEAD -@cli.command("burn", help="Burn spent coins. After spending some coins you need to burn them to prevent the wallet to do a double spent." - "This will be blocked by the mint, cause it holds the info about all spent coins.") -======= @cli.command("burn", help="Burn spent coins.") ->>>>>>> parent of 352d053 (Adjust some help for CLI) @click.argument("coin", required=False, type=str) @click.option("--all", "-a", default=False, is_flag=True, help="Burn all spent coins.") @click.option( @@ -258,13 +249,7 @@ async def burn(ctx, coin: str, all: bool, force: bool): await wallet.invalidate(proofs) wallet.status() - -<<<<<<< HEAD -@cli.command("pending", help="Show pending coins. This shows all the coins that was already used to send, but not claimed yet by the receiver." - "If you want to cancel the send, you can claim the coins again with the receive command.") -======= @cli.command("pending", help="Show pending coins.") ->>>>>>> parent of 352d053 (Adjust some help for CLI) @click.pass_context @coro async def pending(ctx): From 4d478752ca2c56e007dbfffc2b8160b4a36780e5 Mon Sep 17 00:00:00 2001 From: calle <93376500+callebtc@users.noreply.github.com> Date: Sat, 26 Nov 2022 01:59:58 +0100 Subject: [PATCH 7/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5ef12a1..03487a3 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ vim .env To use the wallet with the [public test mint](#test-instance), you need to change the appropriate entries in the `.env` file. #### Test instance -*Warning: this instance is just for demonstration only. The server could vanish at any moment so consider any Satoshis you deposit a donation. You can withdraw you funds with the command [cashu pay](#pay-a-lightning-invoice).* +*Warning: this instance is just for demonstration only. The server could vanish at any moment so consider any Satoshis you deposit a donation.* Change the appropriate `.env` file settings to ```bash From 7a489c656a8def8a875f5b638f426788ec198cc5 Mon Sep 17 00:00:00 2001 From: calle <93376500+callebtc@users.noreply.github.com> Date: Sat, 26 Nov 2022 02:01:06 +0100 Subject: [PATCH 8/8] Update cashu/wallet/cli.py --- cashu/wallet/cli.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cashu/wallet/cli.py b/cashu/wallet/cli.py index 617eec8..09ff7d9 100644 --- a/cashu/wallet/cli.py +++ b/cashu/wallet/cli.py @@ -284,7 +284,6 @@ async def burn(ctx, token: str, all: bool, force: bool): wallet.status() - @cli.command("pending", help="Show pending tokens.") @click.pass_context @coro