applesauce-wallet 0.0.0-next-20250312162115 → 0.0.0-next-20250312201602

package/dist/actions/tokens.d.ts

@@ -7,5 +7,7 @@ import { NostrEvent } from "nostr-tools";
  * @param redeemed an array of nutzap event ids to mark as redeemed
  */
 export declare function ReceiveToken(token: Token, redeemed?: string[]): Action;
+/** An action that deletes old tokens and creates a new one but does not add a history event */
+export declare function RolloverTokens(tokens: NostrEvent[], token: Token): Action;
 /** An action that deletes old token events and adds a spend history item */
 export declare function CompleteSpend(spent: NostrEvent[], change: Token): Action;

package/dist/actions/tokens.js

@@ -16,6 +16,21 @@ export function ReceiveToken(token, redeemed) {
         await publish("Save transaction", history);
     };
 }
+/** An action that deletes old tokens and creates a new one but does not add a history event */
+export function RolloverTokens(tokens, token) {
+    return async ({ factory, publish }) => {
+        // create a delete event for old tokens
+        const deleteDraft = await factory.create(DeleteBlueprint, tokens);
+        // create a new token event
+        const tokenDraft = await factory.create(WalletTokenBlueprint, token, tokens.map((e) => e.id));
+        // sign events
+        const signedDelete = await factory.sign(deleteDraft);
+        const signedToken = await factory.sign(tokenDraft);
+        // publish events
+        await publish("Delete old tokens", signedDelete);
+        await publish("Save new token", signedToken);
+    };
+}
 /** An action that deletes old token events and adds a spend history item */
 export function CompleteSpend(spent, change) {
     return async ({ factory, publish }) => {

package/dist/actions/wallet.js

@@ -1,8 +1,8 @@
 import { generateSecretKey } from "nostr-tools";
 import { isWalletLocked, unlockWallet, WALLET_KIND } from "../helpers/wallet.js";
 import { WalletBackupBlueprint, WalletBlueprint } from "../blueprints/wallet.js";
-import { unlockTokenContent, WALLET_TOKEN_KIND } from "../helpers/tokens.js";
-import { unlockHistoryContent, WALLET_HISTORY_KIND } from "../helpers/history.js";
+import { isTokenContentLocked, unlockTokenContent, WALLET_TOKEN_KIND } from "../helpers/tokens.js";
+import { isHistoryContentLocked, unlockHistoryContent, WALLET_HISTORY_KIND } from "../helpers/history.js";
 /** An action that creates a new 17375 wallet event and 375 wallet backup */
 export function CreateWallet(mints, privateKey = generateSecretKey()) {
     return async ({ events, factory, self, publish }) => {
@@ -24,17 +24,19 @@ export function UnlockWallet(unlock) {
         const wallet = events.getReplaceable(WALLET_KIND, self);
         if (!wallet)
             throw new Error("Wallet does not exist");
-        if (!isWalletLocked(wallet))
+        if (isWalletLocked(wallet))
             await unlockWallet(wallet, signer);
         if (unlock?.tokens) {
             const tokens = events.getTimeline({ kinds: [WALLET_TOKEN_KIND], authors: [self] });
             for (const token of tokens)
-                await unlockTokenContent(token, signer);
+                if (isTokenContentLocked(token))
+                    await unlockTokenContent(token, signer);
         }
         if (unlock?.history) {
             const history = events.getTimeline({ kinds: [WALLET_HISTORY_KIND], authors: [self] });
             for (const entry of history)
-                await unlockHistoryContent(entry, signer);
+                if (isHistoryContentLocked(entry))
+                    await unlockHistoryContent(entry, signer);
         }
     };
 }

package/dist/helpers/__tests__/tokens.test.js

@@ -3,6 +3,7 @@ import { EventFactory } from "applesauce-factory";
 import { FakeUser } from "../../__tests__/fake-user.js";
 import { WalletTokenBlueprint } from "../../blueprints/tokens.js";
 import { dumbTokenSelection, unlockTokenContent } from "../tokens.js";
+import { HiddenContentSymbol } from "applesauce-core/helpers";
 const user = new FakeUser();
 const factory = new EventFactory({ signer: user });
 describe("dumbTokenSelection", () => {
@@ -49,6 +50,8 @@ describe("dumbTokenSelection", () => {
             mint: "https://money.com",
             proofs: [{ secret: "A", C: "A", id: "A", amount: 100 }],
         }));
+        // manually remove the hidden content to lock it again
+        Reflect.deleteProperty(a, HiddenContentSymbol);
         expect(() => dumbTokenSelection([a], 20)).toThrow();
     });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet",
-  "version": "0.0.0-next-20250312162115",
+  "version": "0.0.0-next-20250312201602",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -79,16 +79,16 @@
   "dependencies": {
     "@cashu/cashu-ts": "2.0.0-rc1",
     "@noble/hashes": "^1.7.1",
-    "applesauce-actions": "0.0.0-next-20250312162115",
-    "applesauce-core": "0.0.0-next-20250312162115",
-    "applesauce-factory": "0.0.0-next-20250312162115",
+    "applesauce-actions": "0.0.0-next-20250312201602",
+    "applesauce-core": "0.0.0-next-20250312201602",
+    "applesauce-factory": "0.0.0-next-20250312201602",
     "nostr-tools": "^2.10.4",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
     "@types/debug": "^4.1.12",
-    "applesauce-signers": "0.0.0-next-20250312162115",
+    "applesauce-signers": "0.0.0-next-20250312201602",
     "typescript": "^5.7.3",
     "vitest": "^3.0.5"
   },