Stop persisting raw Cashu proofs in localStorage

components/cart-invoice-card.tsx

@@ -61,6 +61,7 @@ import {
   generateKeys,
   getLocalStorageData,
   publishProofEvent,
+  setLocalCashuTokens,
 } from "@/utils/nostr/nostr-helper-functions";
 import { LightningAddress } from "@getalby/lightning-tools";
 import QRCode from "qrcode";
@@ -2410,7 +2411,7 @@ export default function CartInvoiceCard({
       } else {
         proofArray = [...remainingProofs];
       }
-      localStorage.setItem("tokens", JSON.stringify(proofArray));
+      setLocalCashuTokens(proofArray);
       localStorage.setItem(
         "history",
         JSON.stringify([

components/product-invoice-card.tsx

@@ -51,6 +51,7 @@ import {
   getLocalStorageData,
   publishProofEvent,
   generateKeys,
+  setLocalCashuTokens,
 } from "@/utils/nostr/nostr-helper-functions";
 import { LightningAddress } from "@getalby/lightning-tools";
 import QRCode from "qrcode";
@@ -1941,7 +1942,7 @@ export default function ProductInvoiceCard({
       } else {
         proofArray = [...remainingProofs];
       }
-      localStorage.setItem("tokens", JSON.stringify(proofArray));
+      setLocalCashuTokens(proofArray);
       localStorage.setItem(
         "history",
         JSON.stringify([

components/utility-components/claim-button.tsx

@@ -16,10 +16,13 @@ import {
 import { useTheme } from "next-themes";
 import { ProfileMapContext, ChatsContext } from "../../utils/context/context";
 import {
+  clearPendingIncomingProofs,
   generateKeys,
   getLocalStorageData,
   publishProofEvent,
   publishWalletEvent,
+  setLocalCashuTokens,
+  stagePendingIncomingProofs,
   constructGiftWrappedEvent,
   constructMessageSeal,
   constructMessageGiftWrap,
@@ -196,16 +199,14 @@ export default function ClaimButton({ token }: { token: string }) {
           setIsRedeeming(false);
           return;
         }
-        await publishProofEvent(
-          nostr!,
+        const pendingProofId = await stagePendingIncomingProofs(
           signer!,
           tokenMint,
           uniqueProofs,
-          "in",
           tokenAmount.toString()
         );
         const tokenArray = [...tokens, ...uniqueProofs];
-        localStorage.setItem("tokens", JSON.stringify(tokenArray));
+        setLocalCashuTokens(tokenArray);
         if (!mints.includes(tokenMint)) {
           const updatedMints = [...mints, tokenMint];
           localStorage.setItem("mints", JSON.stringify(updatedMints));
@@ -228,6 +229,17 @@ export default function ClaimButton({ token }: { token: string }) {
             ...history,
           ])
         );
+        const publishSucceeded = await publishProofEvent(
+          nostr!,
+          signer!,
+          tokenMint,
+          uniqueProofs,
+          "in",
+          tokenAmount.toString()
+        );
+        if (publishSucceeded) {
+          clearPendingIncomingProofs([pendingProofId]);
+        }
       } else {
         setIsSpent(true);
         setIsRedeeming(false);

components/utility-components/mint-recovery-boot.tsx

@@ -10,8 +10,11 @@ import {
   getPendingMintQuotes,
 } from "@/utils/cashu/pending-mint-operations";
 import {
+  clearPendingIncomingProofs,
   getLocalStorageData,
   publishProofEvent,
+  setLocalCashuTokens,
+  stagePendingIncomingProofs,
 } from "@/utils/nostr/nostr-helper-functions";
 import {
   NostrContext,
@@ -60,8 +63,14 @@ export function MintRecoveryBoot(): null {
           onProofsClaimed: async (quote: PendingMintQuote, proofs: Proof[]) => {
             if (cancelled) return;
             const { tokens, history } = getLocalStorageData();
+            const pendingProofId = await stagePendingIncomingProofs(
+              signer,
+              quote.mintUrl,
+              proofs,
+              quote.amount.toString()
+            );
             const proofArray = [...tokens, ...proofs];
-            window.localStorage.setItem("tokens", JSON.stringify(proofArray));
+            setLocalCashuTokens(proofArray);
             window.localStorage.setItem(
               "history",
               JSON.stringify([
@@ -73,14 +82,17 @@ export function MintRecoveryBoot(): null {
                 ...history,
               ])
             );
-            await publishProofEvent(
+            const publishSucceeded = await publishProofEvent(
               nostr,
               signer,
               quote.mintUrl,
               proofs,
               "in",
               quote.amount.toString()
             );
+            if (publishSucceeded) {
+              clearPendingIncomingProofs([pendingProofId]);
+            }
           },
         });
 

components/wallet/mint-button.tsx

@@ -22,8 +22,11 @@ import {
 } from "@heroui/react";
 import { SHOPSTRBUTTONCLASSNAMES } from "@/utils/STATIC-VARIABLES";
 import {
+  clearPendingIncomingProofs,
   getLocalStorageData,
   publishProofEvent,
+  setLocalCashuTokens,
+  stagePendingIncomingProofs,
 } from "@/utils/nostr/nostr-helper-functions";
 import { Mint as CashuMint, Wallet as CashuWallet } from "@cashu/cashu-ts";
 import QRCode from "qrcode";
@@ -207,8 +210,14 @@ const MintButton = () => {
           { maxAttempts: 5, perAttemptTimeoutMs: 15000, totalTimeoutMs: 60000 }
         );
         if (proofs && proofs.length > 0) {
+          const pendingProofId = await stagePendingIncomingProofs(
+            signer!,
+            mints[0]!,
+            proofs,
+            numSats.toString()
+          );
           const proofArray = [...tokens, ...proofs];
-          localStorage.setItem("tokens", JSON.stringify(proofArray));
+          setLocalCashuTokens(proofArray);
           localStorage.setItem(
             "history",
             JSON.stringify([
@@ -220,15 +229,18 @@ const MintButton = () => {
               ...history,
             ])
           );
-          await publishProofEvent(
+          markMintQuoteClaimed(hash);
+          const publishSucceeded = await publishProofEvent(
             nostr!,
             signer!,
             mints[0]!,
             proofs,
             "in",
             numSats.toString()
           );
-          markMintQuoteClaimed(hash);
+          if (publishSucceeded) {
+            clearPendingIncomingProofs([pendingProofId]);
+          }
           setPaymentConfirmed(true);
           setQrCodeUrl(null);
           setTimeout(() => {

components/wallet/pay-button.tsx

@@ -20,6 +20,7 @@ import {
 import {
   getLocalStorageData,
   publishProofEvent,
+  setLocalCashuTokens,
 } from "@/utils/nostr/nostr-helper-functions";
 import { SHOPSTRBUTTONCLASSNAMES } from "@/utils/STATIC-VARIABLES";
 import {
@@ -169,7 +170,7 @@ const PayButton = () => {
             ) || !send.some((s) => s.secret === p.secret)
         ) as Proof[];
         const quarantineProofArray = [...remainingProofsAfterMelt, ...keep];
-        localStorage.setItem("tokens", JSON.stringify(quarantineProofArray));
+        setLocalCashuTokens(quarantineProofArray);
         throw new Error(meltOutcome.errorMessage ?? "Melt outcome ambiguous");
       }
       const changeProofs = [...keep, ...meltOutcome.changeProofs];
@@ -190,7 +191,7 @@ const PayButton = () => {
       } else {
         proofArray = [...remainingProofs];
       }
-      localStorage.setItem("tokens", JSON.stringify(proofArray));
+      setLocalCashuTokens(proofArray);
       const filteredTokenAmount = filteredProofs.reduce(
         (acc, token: Proof) => acc + token.amount.toNumber(),
         0

components/wallet/receive-button.tsx

@@ -17,9 +17,12 @@ import {
 } from "@heroui/react";
 import { SHOPSTRBUTTONCLASSNAMES } from "@/utils/STATIC-VARIABLES";
 import {
+  clearPendingIncomingProofs,
   getLocalStorageData,
   publishProofEvent,
   publishWalletEvent,
+  setLocalCashuTokens,
+  stagePendingIncomingProofs,
 } from "@/utils/nostr/nostr-helper-functions";
 import {
   Mint as CashuMint,
@@ -89,19 +92,25 @@ const ReceiveButton = () => {
           setIsDuplicateToken(true);
           return;
         }
+        const transactionAmount = tokenProofs.reduce(
+          (acc, token: Proof) => acc + token.amount.toNumber(),
+          0
+        );
+        const pendingProofId = await stagePendingIncomingProofs(
+          signer!,
+          tokenMint,
+          uniqueProofs,
+          transactionAmount.toString()
+        );
         const tokenArray = [...tokens, ...uniqueProofs];
-        localStorage.setItem("tokens", JSON.stringify(tokenArray));
+        setLocalCashuTokens(tokenArray);
         if (!mints.includes(tokenMint)) {
           const updatedMints = [...mints, tokenMint];
           localStorage.setItem("mints", JSON.stringify(updatedMints));
           await publishWalletEvent(nostr!, signer!);
         }
         setIsClaimed(true);
         handleToggleReceiveModal();
-        const transactionAmount = tokenProofs.reduce(
-          (acc, token: Proof) => acc + token.amount.toNumber(),
-          0
-        );
         localStorage.setItem(
           "history",
           JSON.stringify([
@@ -113,14 +122,17 @@ const ReceiveButton = () => {
             ...history,
           ])
         );
-        await publishProofEvent(
+        const publishSucceeded = await publishProofEvent(
           nostr!,
           signer!,
           tokenMint,
           uniqueProofs,
           "in",
           transactionAmount.toString()
         );
+        if (publishSucceeded) {
+          clearPendingIncomingProofs([pendingProofId]);
+        }
       } else {
         setIsSpent(true);
       }

components/wallet/send-button.tsx

@@ -25,6 +25,7 @@ import { SHOPSTRBUTTONCLASSNAMES } from "@/utils/STATIC-VARIABLES";
 import {
   getLocalStorageData,
   publishProofEvent,
+  setLocalCashuTokens,
 } from "@/utils/nostr/nostr-helper-functions";
 import {
   Mint as CashuMint,
@@ -147,7 +148,7 @@ const SendButton = () => {
       } else {
         proofArray = [...remainingProofs];
       }
-      localStorage.setItem("tokens", JSON.stringify(proofArray));
+      setLocalCashuTokens(proofArray);
       localStorage.setItem(
         "history",
         JSON.stringify([

pages/_app.tsx

@@ -29,6 +29,7 @@ import {
   getLocalStorageData,
   getDefaultRelays,
   LogOut,
+  setLocalCashuTokens,
 } from "@/utils/nostr/nostr-helper-functions";
 import { createNip98AuthorizationHeader } from "@/utils/nostr/nip98-auth";
 import { HeroUIProvider } from "@heroui/react";
@@ -763,15 +764,15 @@ function Shopstr({ props }: { props: AppProps }) {
           );
         }
 
-        if (walletResult?.cashuMints?.length && walletResult.cashuProofs) {
+        if (walletResult?.cashuProofs) {
+          setLocalCashuTokens(walletResult.cashuProofs);
+        }
+
+        if (walletResult?.cashuMints?.length) {
           localStorage.setItem(
             "mints",
             JSON.stringify(walletResult.cashuMints)
           );
-          localStorage.setItem(
-            "tokens",
-            JSON.stringify(walletResult.cashuProofs)
-          );
         }
 
         await runTask("retrying relay publishes", async () => {