Wallet: fix secret derivation & new CLI command cashu selfpay

cashu/wallet/cli/cli.py

@@ -809,3 +809,30 @@ async def restore(ctx: Context, to: int, batch: int):
     await wallet.restore_wallet_from_mnemonic(mnemonic, to=to, batch=batch)
     await wallet.load_proofs()
     wallet.status()
+
+
+@cli.command("selfpay", help="Refresh tokens.")
+# @click.option("--all", default=False, is_flag=True, help="Execute on all available mints.")
+@click.pass_context
+@coro
+async def selfpay(ctx: Context, all: bool = False):
+    wallet = await get_mint_wallet(ctx, force_select=True)
+    await wallet.load_mint()
+
+    # get balance on this mint
+    mint_balance_dict = await wallet.balance_per_minturl()
+    mint_balance = mint_balance_dict[wallet.url]["available"]
+    # send balance once to mark as reserved
+    await wallet.split_to_send(wallet.proofs, mint_balance, None, set_reserved=True)
+    # load all reserved proofs (including the one we just sent)
+    reserved_proofs = await get_reserved_proofs(wallet.db)
+    if not len(reserved_proofs):
+        print("No balance on this mint.")
+        return
+
+    token = await wallet.serialize_proofs(reserved_proofs)
+    print(f"Selfpay token for mint {wallet.url}:")
+    print("")
+    print(token)
+    tokenObj = TokenV3.deserialize(token)
+    await receive(wallet, tokenObj)

cashu/wallet/cli/cli_helpers.py

@@ -46,12 +46,11 @@ async def get_mint_wallet(ctx: Context, force_select: bool = False):
         mint_url = wallet.url
 
     # load this mint_url into a wallet
-    mint_wallet = Wallet(
+    mint_wallet = await Wallet.with_db(
         mint_url,
         os.path.join(settings.cashu_dir, ctx.obj["WALLET_NAME"]),
         name=wallet.name,
     )
-    # await mint_wallet.load_mint()
     await mint_wallet.load_proofs(reload=True)
 
     return mint_wallet

cashu/wallet/secrets.py

@@ -163,7 +163,7 @@ async def generate_n_secrets(
             await self.generate_determinstic_secret(s) for s in secret_counters
         ]
         # secrets are supplied as str
-        secrets = [hashlib.sha256(s[0]).hexdigest() for s in secrets_rs_derivationpaths]
+        secrets = [s[0].hex() for s in secrets_rs_derivationpaths]
         # rs are supplied as PrivateKey
         rs = [PrivateKey(privkey=s[1], raw=True) for s in secrets_rs_derivationpaths]
 
@@ -194,7 +194,7 @@ async def generate_secrets_from_to(
             await self.generate_determinstic_secret(s) for s in secret_counters
         ]
         # secrets are supplied as str
-        secrets = [hashlib.sha256(s[0]).hexdigest() for s in secrets_rs_derivationpaths]
+        secrets = [s[0].hex() for s in secrets_rs_derivationpaths]
         # rs are supplied as PrivateKey
         rs = [PrivateKey(privkey=s[1], raw=True) for s in secrets_rs_derivationpaths]
         derivation_paths = [s[2] for s in secrets_rs_derivationpaths]

cashu/wallet/wallet.py

@@ -1368,7 +1368,7 @@ async def restore_promises(
             outputs (List[BlindedMessage]): Outputs for which we request promises
             secrets (List[str]): Secrets generated for the outputs
             rs (List[PrivateKey]): Random blinding factors generated for the outputs
-            derivation_paths (List[str]): Derivation paths for the secrets
+            derivation_paths (List[str]): Derivation paths used for the secrets necessary to unblind the promises
 
         Returns:
             List[Proof]: List of restored proofs

tests/test_cli.py

@@ -284,3 +284,14 @@ def test_pending(cli_prefix):
     assert result.exception is None
     print(result.output)
     assert result.exit_code == 0
+
+
+def test_selfpay(cli_prefix):
+    runner = CliRunner()
+    result = runner.invoke(
+        cli,
+        [*cli_prefix, "selfpay"],
+    )
+    assert result.exception is None
+    print(result.output)
+    assert result.exit_code == 0