applesauce-wallet 0.0.0-next-20250522030625 → 0.0.0-next-20250606170247

package/README.md

@@ -1,3 +1,3 @@
 # Applesauce Wallet
 
-The `applesauce-wallet` package is a package of helpers, queries, blueprints and other useful stuff for [NIP-60](https://github.com/nostr-protocol/nips/blob/master/60.md) wallets and [NIP-61](https://github.com/nostr-protocol/nips/blob/master/61.md) nutzaps
+The `applesauce-wallet` package is a package of helpers, models, blueprints and other useful stuff for [NIP-60](https://github.com/nostr-protocol/nips/blob/master/60.md) wallets and [NIP-61](https://github.com/nostr-protocol/nips/blob/master/61.md) nutzaps

package/dist/__tests__/exports.test.js

@@ -8,7 +8,7 @@ describe("exports", () => {
         "Blueprints",
         "EventOperations",
         "Helpers",
-        "Queries",
+        "Models",
         "TagOperations",
       ]
     `);

package/dist/actions/tokens.js

@@ -66,7 +66,7 @@ export function CompleteSpend(spent, change) {
 /** Combines all unlocked token events into a single event per mint */
 export function ConsolidateTokens(opts) {
     return async function* ({ events, factory, self }) {
-        const tokens = Array.from(events.getAll({ kinds: [WALLET_TOKEN_KIND], authors: [self] })).filter((token) => {
+        const tokens = Array.from(events.getByFilters({ kinds: [WALLET_TOKEN_KIND], authors: [self] })).filter((token) => {
             if (isTokenContentLocked(token)) {
                 if (opts?.ignoreLocked)
                     return false;

package/dist/blueprints/history.d.ts

@@ -1,5 +1,4 @@
 import { EventPointer } from "nostr-tools/nip19";
 import { HistoryContent } from "../helpers/history.js";
-import { EventBlueprint } from "applesauce-factory";
 /** A blueprint that creates a wallet history event */
-export declare function WalletHistoryBlueprint(content: HistoryContent, redeemed: (string | EventPointer)[]): EventBlueprint;
+export declare function WalletHistoryBlueprint(content: HistoryContent, redeemed: (string | EventPointer)[]): import("applesauce-factory").EventBlueprint;

package/dist/blueprints/history.js

@@ -1,9 +1,9 @@
+import { blueprint } from "applesauce-factory";
 import { WALLET_HISTORY_KIND } from "../helpers/history.js";
-import { EventFactory } from "applesauce-factory";
 import { setHistoryContent, setHistoryRedeemed } from "../operations/event/history.js";
 /** A blueprint that creates a wallet history event */
 export function WalletHistoryBlueprint(content, redeemed) {
-    return (ctx) => EventFactory.runProcess({ kind: WALLET_HISTORY_KIND }, ctx, 
+    return blueprint(WALLET_HISTORY_KIND, 
     // set the encrypted tags on the event
     setHistoryContent(content), 
     // set the public redeemed tags

package/dist/blueprints/tokens.d.ts

@@ -1,8 +1,7 @@
 import { Token } from "@cashu/cashu-ts";
-import { EventBlueprint } from "applesauce-factory";
 /**
  * A blueprint for a wallet token event, takes a cashu token and previous deleted token event ids
  * @param token the cashu token to store
  * @param [del=[]] an array of previous token event ids that are deleted
  */
-export declare function WalletTokenBlueprint(token: Token, del?: string[]): EventBlueprint;
+export declare function WalletTokenBlueprint(token: Token, del?: string[]): import("applesauce-factory").EventBlueprint;

package/dist/blueprints/tokens.js

@@ -1,4 +1,4 @@
-import { EventFactory } from "applesauce-factory";
+import { blueprint } from "applesauce-factory";
 import { WALLET_TOKEN_KIND } from "../helpers/tokens.js";
 import { setTokenContent } from "../operations/event/tokens.js";
 /**
@@ -7,5 +7,5 @@ import { setTokenContent } from "../operations/event/tokens.js";
  * @param [del=[]] an array of previous token event ids that are deleted
  */
 export function WalletTokenBlueprint(token, del = []) {
-    return (ctx) => EventFactory.runProcess({ kind: WALLET_TOKEN_KIND }, ctx, setTokenContent(token, del));
+    return blueprint(WALLET_TOKEN_KIND, setTokenContent(token, del));
 }

package/dist/blueprints/wallet.d.ts

@@ -1,6 +1,5 @@
-import { EventBlueprint } from "applesauce-factory";
 import { NostrEvent } from "nostr-tools";
 /** A blueprint to create a new 17375 wallet */
-export declare function WalletBlueprint(mints: string[], privateKey?: Uint8Array): EventBlueprint;
+export declare function WalletBlueprint(mints: string[], privateKey?: Uint8Array): import("applesauce-factory").EventBlueprint;
 /** A blueprint that creates a new 375 wallet backup event */
-export declare function WalletBackupBlueprint(wallet: NostrEvent): EventBlueprint;
+export declare function WalletBackupBlueprint(wallet: NostrEvent): import("applesauce-factory").EventBlueprint;

package/dist/blueprints/wallet.js

@@ -1,13 +1,13 @@
-import { EventFactory } from "applesauce-factory";
+import { blueprint } from "applesauce-factory";
 import { modifyHiddenTags } from "applesauce-factory/operations/event";
 import { WALLET_BACKUP_KIND, WALLET_KIND } from "../helpers/wallet.js";
 import { setWalletBackupContent } from "../operations/event/wallet.js";
 import { setMintTags, setPrivateKeyTag } from "../operations/tag/wallet.js";
 /** A blueprint to create a new 17375 wallet */
 export function WalletBlueprint(mints, privateKey) {
-    return (ctx) => EventFactory.runProcess({ kind: WALLET_KIND }, ctx, modifyHiddenTags(privateKey ? setPrivateKeyTag(privateKey) : undefined, setMintTags(mints)));
+    return blueprint(WALLET_KIND, modifyHiddenTags(privateKey ? setPrivateKeyTag(privateKey) : undefined, setMintTags(mints)));
 }
 /** A blueprint that creates a new 375 wallet backup event */
 export function WalletBackupBlueprint(wallet) {
-    return (ctx) => EventFactory.runProcess({ kind: WALLET_BACKUP_KIND }, ctx, setWalletBackupContent(wallet));
+    return blueprint(WALLET_BACKUP_KIND, setWalletBackupContent(wallet));
 }

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

@@ -1,9 +1,9 @@
 import { describe, expect, it } from "vitest";
 import { EventFactory } from "applesauce-factory";
+import { EncryptedContentSymbol, unixNow } from "applesauce-core/helpers";
 import { FakeUser } from "../../__tests__/fake-user.js";
 import { WalletTokenBlueprint } from "../../blueprints/tokens.js";
 import { decodeTokenFromEmojiString, dumbTokenSelection, encodeTokenToEmoji, unlockTokenContent } from "../tokens.js";
-import { HiddenContentSymbol, unixNow } from "applesauce-core/helpers";
 const user = new FakeUser();
 const factory = new EventFactory({ signer: user });
 describe("dumbTokenSelection", () => {
@@ -58,7 +58,7 @@ describe("dumbTokenSelection", () => {
         bDraft.created_at -= 60 * 60 * 7;
         const b = await user.signEvent(bDraft);
         // manually remove the hidden content to lock it again
-        Reflect.deleteProperty(b, HiddenContentSymbol);
+        Reflect.deleteProperty(b, EncryptedContentSymbol);
         expect(dumbTokenSelection([a, b], 20).events).toEqual([a]);
     });
     it("should ignore duplicate proofs", async () => {

package/dist/helpers/history.js

@@ -1,5 +1,7 @@
-import { getHiddenTags, getOrComputeCachedValue, isETag, isHiddenContentLocked, isHiddenTagsLocked, lockHiddenTags, unlockHiddenTags, } from "applesauce-core/helpers";
+import { getHiddenTags, getOrComputeCachedValue, isETag, isHiddenContentLocked, isHiddenTagsLocked, lockHiddenTags, setHiddenTagsEncryptionMethod, unlockHiddenTags, } from "applesauce-core/helpers";
 export const WALLET_HISTORY_KIND = 7376;
+// Enable hidden content for wallet history kind
+setHiddenTagsEncryptionMethod(WALLET_HISTORY_KIND, "nip44");
 export const HistoryContentSymbol = Symbol.for("history-content");
 /** returns an array of redeemed event ids in a history event */
 export function getHistoryRedeemed(history) {

package/dist/helpers/tokens.d.ts

@@ -1,11 +1,11 @@
 import { Proof, Token } from "@cashu/cashu-ts";
 import { HiddenContentSigner } from "applesauce-core/helpers";
 import { NostrEvent } from "nostr-tools";
+export declare const WALLET_TOKEN_KIND = 7375;
 /** Internal method for creating a unique id for each proof */
 export declare function getProofUID(proof: Proof): string;
 /** Internal method to filter out duplicate proofs */
 export declare function ignoreDuplicateProofs(seen?: Set<string>): (proof: Proof) => boolean;
-export declare const WALLET_TOKEN_KIND = 7375;
 export type TokenContent = {
     /** Cashu mint for the proofs */
     mint: string;

package/dist/helpers/tokens.js

@@ -1,5 +1,8 @@
 import { getDecodedToken, getEncodedToken } from "@cashu/cashu-ts";
-import { getHiddenContent, getOrComputeCachedValue, isHiddenContentLocked, isHiddenTagsLocked, lockHiddenContent, unlockHiddenContent, } from "applesauce-core/helpers";
+import { getHiddenContent, getOrComputeCachedValue, isHiddenContentLocked, isHiddenTagsLocked, lockHiddenContent, setHiddenContentEncryptionMethod, unlockHiddenContent, } from "applesauce-core/helpers";
+export const WALLET_TOKEN_KIND = 7375;
+// Enable hidden content for wallet token kind
+setHiddenContentEncryptionMethod(WALLET_TOKEN_KIND, "nip44");
 /** Internal method for creating a unique id for each proof */
 export function getProofUID(proof) {
     return proof.id + proof.amount + proof.C + proof.secret;
@@ -16,7 +19,6 @@ export function ignoreDuplicateProofs(seen = new Set()) {
         }
     };
 }
-export const WALLET_TOKEN_KIND = 7375;
 export const TokenContentSymbol = Symbol.for("token-content");
 /**
  * Returns the decrypted and parsed details of a 7375 token event

package/dist/helpers/wallet.js

@@ -1,7 +1,10 @@
 import { hexToBytes } from "@noble/hashes/utils";
-import { getHiddenTags, getOrComputeCachedValue, isHiddenTagsLocked, lockHiddenTags, unlockHiddenTags, } from "applesauce-core/helpers";
+import { getHiddenTags, getOrComputeCachedValue, isHiddenTagsLocked, lockHiddenTags, setHiddenTagsEncryptionMethod, unlockHiddenTags, } from "applesauce-core/helpers";
 export const WALLET_KIND = 17375;
 export const WALLET_BACKUP_KIND = 375;
+// Enable hidden content for wallet kinds
+setHiddenTagsEncryptionMethod(WALLET_KIND, "nip44");
+setHiddenTagsEncryptionMethod(WALLET_BACKUP_KIND, "nip44");
 export const WalletPrivateKeySymbol = Symbol.for("wallet-private-key");
 export const WalletMintsSymbol = Symbol.for("wallet-mints");
 /** Returns if a wallet is locked */

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * as Actions from "./actions/index.js";
 export * as Blueprints from "./blueprints/index.js";
 export * as Helpers from "./helpers/index.js";
-export * as Queries from "./queries/index.js";
+export * as Models from "./models/index.js";
 export * from "./operations/index.js";

package/dist/index.js

@@ -1,5 +1,5 @@
 export * as Actions from "./actions/index.js";
 export * as Blueprints from "./blueprints/index.js";
 export * as Helpers from "./helpers/index.js";
-export * as Queries from "./queries/index.js";
+export * as Models from "./models/index.js";
 export * from "./operations/index.js";

package/dist/models/__tests__/exports.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/models/__tests__/exports.test.js

@@ -0,0 +1,15 @@
+import { describe, expect, it } from "vitest";
+import * as exports from "../index.js";
+describe("exports", () => {
+    it("should export the expected functions", () => {
+        expect(Object.keys(exports).sort()).toMatchInlineSnapshot(`
+      [
+        "WalletBalanceModel",
+        "WalletHistoryModel",
+        "WalletModel",
+        "WalletRedeemedModel",
+        "WalletTokensModel",
+      ]
+    `);
+    });
+});

package/dist/models/__tests__/wallet.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/models/__tests__/wallet.test.js

@@ -0,0 +1,28 @@
+import { subscribeSpyTo } from "@hirez_io/observer-spy";
+import { EventStore } from "applesauce-core";
+import { EventFactory } from "applesauce-factory";
+import { generateSecretKey } from "nostr-tools";
+import { beforeEach, describe, expect, it } from "vitest";
+import { FakeUser } from "../../__tests__/fake-user.js";
+import { WalletBlueprint } from "../../blueprints/wallet.js";
+import { lockWallet, unlockWallet } from "../../helpers/wallet.js";
+import { WalletModel } from "../wallet.js";
+const user = new FakeUser();
+const factory = new EventFactory({ signer: user });
+let eventStore;
+beforeEach(() => {
+    eventStore = new EventStore();
+});
+describe("WalletModel", () => {
+    it("it should update when event is unlocked", async () => {
+        const wallet = await user.signEvent(await factory.create(WalletBlueprint, [], generateSecretKey()));
+        lockWallet(wallet);
+        eventStore.add(wallet);
+        const spy = subscribeSpyTo(eventStore.model(WalletModel, await user.getPublicKey()));
+        await unlockWallet(wallet, user);
+        expect(spy.getValues()).toEqual([
+            expect.objectContaining({ locked: true }),
+            expect.objectContaining({ locked: false }),
+        ]);
+    });
+});

package/dist/models/history.d.ts

@@ -0,0 +1,6 @@
+import { Model } from "applesauce-core";
+import { NostrEvent } from "nostr-tools";
+/** A model that returns an array of redeemed event ids for a wallet */
+export declare function WalletRedeemedModel(pubkey: string): Model<string[]>;
+/** A model that returns a timeline of wallet history events */
+export declare function WalletHistoryModel(pubkey: string, locked?: boolean | undefined): Model<NostrEvent[]>;

package/dist/models/history.js

@@ -0,0 +1,21 @@
+import { combineLatest, filter, map, scan, startWith } from "rxjs";
+import { getHistoryRedeemed, isHistoryContentLocked, WALLET_HISTORY_KIND } from "../helpers/history.js";
+/** A model that returns an array of redeemed event ids for a wallet */
+export function WalletRedeemedModel(pubkey) {
+    return (events) => events
+        .filters({ kinds: [WALLET_HISTORY_KIND], authors: [pubkey] })
+        .pipe(scan((ids, history) => [...ids, ...getHistoryRedeemed(history)], []));
+}
+/** A model that returns a timeline of wallet history events */
+export function WalletHistoryModel(pubkey, locked) {
+    return (events) => {
+        const updates = events.update$.pipe(filter((e) => e.kind === WALLET_HISTORY_KIND && e.pubkey === pubkey), startWith(undefined));
+        const timeline = events.timeline({ kinds: [WALLET_HISTORY_KIND], authors: [pubkey] });
+        return combineLatest([updates, timeline]).pipe(map(([_, history]) => {
+            if (locked === undefined)
+                return history;
+            else
+                return history.filter((entry) => isHistoryContentLocked(entry) === locked);
+        }));
+    };
+}

package/dist/models/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./wallet.js";
+export * from "./history.js";
+export * from "./tokens.js";

package/dist/models/index.js

@@ -0,0 +1,3 @@
+export * from "./wallet.js";
+export * from "./history.js";
+export * from "./tokens.js";

package/dist/models/tokens.d.ts

@@ -0,0 +1,6 @@
+import { Model } from "applesauce-core";
+import { NostrEvent } from "nostr-tools";
+/** A model that subscribes to all token events for a wallet, passing locked will filter by token locked status */
+export declare function WalletTokensModel(pubkey: string, locked?: boolean | undefined): Model<NostrEvent[]>;
+/** A model that returns the visible balance of a wallet for each mint */
+export declare function WalletBalanceModel(pubkey: string): Model<Record<string, number>>;

package/dist/models/tokens.js

@@ -0,0 +1,58 @@
+import { combineLatest, filter, map, startWith } from "rxjs";
+import { getTokenContent, ignoreDuplicateProofs, isTokenContentLocked, WALLET_TOKEN_KIND } from "../helpers/tokens.js";
+/** removes deleted events from sorted array */
+function filterDeleted(tokens) {
+    const deleted = new Set();
+    return Array.from(tokens)
+        .reverse()
+        .filter((token) => {
+        // skip this event if it a newer event says its deleted
+        if (deleted.has(token.id))
+            return false;
+        // add ids to deleted array
+        if (!isTokenContentLocked(token)) {
+            const details = getTokenContent(token);
+            for (const id of details.del)
+                deleted.add(id);
+        }
+        return true;
+    })
+        .reverse();
+}
+/** A model that subscribes to all token events for a wallet, passing locked will filter by token locked status */
+export function WalletTokensModel(pubkey, locked) {
+    return (events) => {
+        const updates = events.update$.pipe(filter((e) => e.kind === WALLET_TOKEN_KIND && e.pubkey === pubkey), startWith(undefined));
+        const timeline = events.timeline({ kinds: [WALLET_TOKEN_KIND], authors: [pubkey] });
+        return combineLatest([updates, timeline]).pipe(
+        // filter out locked tokens
+        map(([_, tokens]) => {
+            if (locked === undefined)
+                return tokens;
+            else
+                return tokens.filter((t) => isTokenContentLocked(t) === locked);
+        }), 
+        // remove deleted events
+        map(filterDeleted));
+    };
+}
+/** A model that returns the visible balance of a wallet for each mint */
+export function WalletBalanceModel(pubkey) {
+    return (events) => {
+        const updates = events.update$.pipe(filter((e) => e.kind === WALLET_TOKEN_KIND && e.pubkey === pubkey), startWith(undefined));
+        const timeline = events.timeline({ kinds: [WALLET_TOKEN_KIND], authors: [pubkey] });
+        return combineLatest([updates, timeline]).pipe(map(([_, tokens]) => tokens.filter((t) => !isTokenContentLocked(t))), 
+        // filter out deleted tokens
+        map(filterDeleted), 
+        // map tokens to totals
+        map((tokens) => {
+            // ignore duplicate proofs
+            const seen = new Set();
+            return tokens.reduce((totals, token) => {
+                const details = getTokenContent(token);
+                const total = details.proofs.filter(ignoreDuplicateProofs(seen)).reduce((t, p) => t + p.amount, 0);
+                return { ...totals, [details.mint]: (totals[details.mint] ?? 0) + total };
+            }, {});
+        }));
+    };
+}

package/dist/models/wallet.d.ts

@@ -0,0 +1,13 @@
+import { Model } from "applesauce-core";
+import { NostrEvent } from "nostr-tools";
+export type WalletInfo = {
+    locked: true;
+    event: NostrEvent;
+} | {
+    locked: false;
+    event: NostrEvent;
+    privateKey?: Uint8Array;
+    mints: string[];
+};
+/** A model to get the state of a NIP-60 wallet */
+export declare function WalletModel(pubkey: string): Model<WalletInfo | undefined>;

package/dist/models/wallet.js

@@ -0,0 +1,18 @@
+import { filter, map, merge } from "rxjs";
+import { getWalletMints, getWalletPrivateKey, isWalletLocked, WALLET_KIND } from "../helpers/wallet.js";
+/** A model to get the state of a NIP-60 wallet */
+export function WalletModel(pubkey) {
+    return (events) => merge(
+    // get the latest replaceable event
+    events.replaceable(WALLET_KIND, pubkey), 
+    // and listen for any updates to matching events
+    events.update$.pipe(filter((e) => e.kind === WALLET_KIND && e.pubkey === pubkey))).pipe(map((wallet) => {
+        if (!wallet)
+            return;
+        if (isWalletLocked(wallet))
+            return { locked: true, event: wallet };
+        const mints = getWalletMints(wallet);
+        const privateKey = getWalletPrivateKey(wallet);
+        return { locked: false, mints, privateKey, event: wallet };
+    }));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet",
-  "version": "0.0.0-next-20250522030625",
+  "version": "0.0.0-next-20250606170247",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -30,15 +30,15 @@
       "require": "./dist/helpers/*.js",
       "types": "./dist/helpers/*.d.ts"
     },
-    "./queries": {
-      "import": "./dist/queries/index.js",
-      "require": "./dist/queries/index.js",
-      "types": "./dist/queries/index.d.ts"
+    "./models": {
+      "import": "./dist/models/index.js",
+      "require": "./dist/models/index.js",
+      "types": "./dist/models/index.d.ts"
     },
-    "./queries/*": {
-      "import": "./dist/queries/*.js",
-      "require": "./dist/queries/*.js",
-      "types": "./dist/queries/*.d.ts"
+    "./models/*": {
+      "import": "./dist/models/*.js",
+      "require": "./dist/models/*.js",
+      "types": "./dist/models/*.d.ts"
     },
     "./blueprints": {
       "import": "./dist/blueprints/index.js",
@@ -80,16 +80,16 @@
     "@cashu/cashu-ts": "2.0.0-rc1",
     "@gandlaf21/bc-ur": "^1.1.12",
     "@noble/hashes": "^1.7.1",
-    "applesauce-actions": "0.0.0-next-20250522030625",
-    "applesauce-core": "0.0.0-next-20250522030625",
-    "applesauce-factory": "0.0.0-next-20250522030625",
+    "applesauce-actions": "0.0.0-next-20250606170247",
+    "applesauce-core": "0.0.0-next-20250606170247",
+    "applesauce-factory": "0.0.0-next-20250606170247",
     "nostr-tools": "^2.13",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
     "@types/debug": "^4.1.12",
-    "applesauce-signers": "0.0.0-next-20250522030625",
+    "applesauce-signers": "0.0.0-next-20250606170247",
     "typescript": "^5.8.3",
     "vitest": "^3.1.1"
   },