routstrd 0.4.11 → 0.4.12

package/src/daemon/wallet/auto-refill.ts

@@ -4,7 +4,7 @@
 //
 // Uses applesauce-wallet-connect (same approach as nwc_integration/pay_invoice.mts).
 
-import type { CocodClient } from "./cocod-client";
+import type { WalletClient } from "./wallet-client";
 import type { WalletConnect } from "applesauce-wallet-connect";
 import { logger } from "../../utils/logger";
 
@@ -33,10 +33,19 @@ function isFatalError(message: string): boolean {
 }
 
 export function startAutoRefillLoop(
-  cocod: CocodClient,
+  walletClient: WalletClient,
   getWallet: () => WalletConnect | undefined,
   getConfig: () => AutoRefillConfig | undefined,
   intervalMs: number = 5000,
+  payInvoice: (
+    invoice: string,
+  ) => Promise<{ preimage?: string; fees_paid?: number }> = (invoice) => {
+    const wallet = getWallet();
+    if (!wallet?.service) {
+      return Promise.reject(new Error("NWC not connected"));
+    }
+    return wallet.payInvoice(invoice);
+  },
 ): () => void {
   let lastRefillAt = 0;
   let lastAttemptAt = 0; // tracks last attempt (success or failure) for backoff
@@ -79,7 +88,7 @@ export function startAutoRefillLoop(
     checkInProgress = true;
 
     try {
-      const balances = await cocod.getBalances();
+      const balances = await walletClient.getBalances();
       const totalBalance = Object.values(balances).reduce<number>(
         (sum, b) => sum + (typeof b === "number" ? b : 0),
         0,
@@ -94,17 +103,20 @@ export function startAutoRefillLoop(
         `[auto-refill] Balance ${totalBalance} sats < threshold ${config.threshold}. Refilling ${config.amount} sats...`,
       );
 
-      const mintUrl = await cocod.getDefaultMint();
+      const mintUrl = await walletClient.getDefaultMint();
       if (!mintUrl) {
         logger.error("[auto-refill] No default mint configured");
         return;
       }
 
-      // Step 1: Create a BOLT-11 invoice via cocod to fund the Cashu wallet
+      // Step 1: Create a BOLT-11 invoice via the wallet to fund the Cashu wallet
       logger.log(
         `[auto-refill] Creating BOLT-11 invoice for ${config.amount} sats via ${mintUrl}...`,
       );
-      const { invoice } = await cocod.receiveBolt11(config.amount, mintUrl);
+      const { invoice } = await walletClient.receiveBolt11(
+        config.amount,
+        mintUrl,
+      );
 
       // Step 2: Pay the invoice via NWC (applesauce)
       logger.log(`[auto-refill] Paying invoice via NWC...`);
@@ -113,10 +125,10 @@ export function startAutoRefillLoop(
         logger.log("[auto-refill] Wallet disconnected during refill check");
         return;
       }
-      const payment = await currentWallet.payInvoice(invoice);
+      const payment = await payInvoice(invoice);
 
       // Step 3: The Cashu mint should automatically detect the paid invoice
-      // and issue tokens. We don't need to explicitly mint here; cocod
+      // and issue tokens. We don't need to explicitly mint here; the wallet
       // handles this on its end when the mint sees the payment.
       const preimage = payment.preimage;
       if (preimage) {

package/src/daemon/wallet/cleanup.ts

@@ -64,8 +64,8 @@ export interface CleanupSelection<
  *   can have happened before expiry while the daemon was down, leaving no
  *   local observation. Callers that fail quotes automatically at startup must
  *   therefore confirm UNPAID with the mint first (see
- *   settleExpiredMintQuotes in coco-client.ts); only the explicit,
- *   user-invoked cleanup command may fail candidates purely locally.
+ *   failExpiredMintQuoteIfUnpaid in coco-client.ts). Explicit cleanup follows
+ *   the same rule unless the operator opts into unsafe `--force` behaviour.
  * - Pending sends are reclaimed (rolled back) only when they are older than
  *   `minAgeMs`, so we never roll back a token that a receiver might still
  *   legitimately claim.
@@ -102,3 +102,17 @@ export function selectCleanupOperations<
 
   return { mintsToFail, sendsToReclaim, meltsToCancel };
 }
+
+/** Keep a local-only dry-run preview distinct from mint-confirmed outcomes. */
+export function summarizeMintCleanup(input: {
+  dryRun: boolean;
+  candidates: number;
+  failed: number;
+  leftForRecovery: number;
+}) {
+  return {
+    mintQuoteCandidates: input.candidates,
+    failedMintQuotes: input.dryRun ? 0 : input.failed,
+    leftForRecovery: input.dryRun ? 0 : input.leftForRecovery,
+  };
+}