applesauce-wallet 0.12.0 → 2.0.0

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/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/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/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/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/{queries → models}/wallet.d.ts

@@ -1,4 +1,4 @@
-import { Query } from "applesauce-core";
+import { Model } from "applesauce-core";
 import { NostrEvent } from "nostr-tools";
 export type WalletInfo = {
     locked: true;
@@ -9,5 +9,5 @@ export type WalletInfo = {
     privateKey?: Uint8Array;
     mints: string[];
 };
-/** A query to get the state of a NIP-60 wallet */
-export declare function WalletQuery(pubkey: string): Query<WalletInfo | undefined>;
+/** 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.12.0",
+  "version": "2.0.0",
   "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,18 +80,18 @@
     "@cashu/cashu-ts": "2.0.0-rc1",
     "@gandlaf21/bc-ur": "^1.1.12",
     "@noble/hashes": "^1.7.1",
-    "applesauce-actions": "^0.12.0",
-    "applesauce-core": "^0.12.0",
-    "applesauce-factory": "^0.12.0",
-    "nostr-tools": "^2.10.4",
+    "applesauce-actions": "^2.0.0",
+    "applesauce-core": "^2.0.0",
+    "applesauce-factory": "^2.0.0",
+    "nostr-tools": "^2.13",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
     "@types/debug": "^4.1.12",
-    "applesauce-signers": "^0.12.0",
-    "typescript": "^5.7.3",
-    "vitest": "^3.0.5"
+    "applesauce-signers": "^2.0.0",
+    "typescript": "^5.8.3",
+    "vitest": "^3.2.3"
   },
   "funding": {
     "type": "lightning",

package/dist/__tests__/fake-user.d.ts

@@ -1,10 +0,0 @@
-import { SimpleSigner } from "applesauce-signers/signers/simple-signer";
-import type { NostrEvent } from "nostr-tools";
-export declare class FakeUser extends SimpleSigner {
-    pubkey: string;
-    event(data?: Partial<NostrEvent>): NostrEvent;
-    note(content?: string, extra?: Partial<NostrEvent>): import("nostr-tools").Event;
-    profile(profile: any, extra?: Partial<NostrEvent>): import("nostr-tools").Event;
-    contacts(pubkeys?: string[]): import("nostr-tools").Event;
-    list(tags?: string[][], extra?: Partial<NostrEvent>): import("nostr-tools").Event;
-}

package/dist/__tests__/fake-user.js

@@ -1,31 +0,0 @@
-import { unixNow } from "applesauce-core/helpers";
-import { SimpleSigner } from "applesauce-signers/signers/simple-signer";
-import { finalizeEvent, getPublicKey, kinds } from "nostr-tools";
-export class FakeUser extends SimpleSigner {
-    pubkey = getPublicKey(this.key);
-    event(data) {
-        return finalizeEvent({
-            kind: data?.kind ?? kinds.ShortTextNote,
-            content: data?.content || "",
-            created_at: data?.created_at ?? unixNow(),
-            tags: data?.tags || [],
-        }, this.key);
-    }
-    note(content = "Hello World", extra) {
-        return this.event({ kind: kinds.ShortTextNote, content, ...extra });
-    }
-    profile(profile, extra) {
-        return this.event({ kind: kinds.Metadata, content: JSON.stringify({ ...profile }), ...extra });
-    }
-    contacts(pubkeys = []) {
-        return this.event({ kind: kinds.Contacts, tags: pubkeys.map((p) => ["p", p]) });
-    }
-    list(tags = [], extra) {
-        return this.event({
-            kind: kinds.Bookmarksets,
-            content: "",
-            tags: [["d", String(Math.round(Math.random() * 10000))], ...tags],
-            ...extra,
-        });
-    }
-}

package/dist/actions/__tests__/tokens.test.d.ts

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

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

@@ -1,139 +0,0 @@
-import { describe, it, expect, beforeEach, vitest } from "vitest";
-import { EventStore } from "applesauce-core";
-import { EventFactory } from "applesauce-factory";
-import { ActionHub } from "applesauce-actions";
-import { CheckStateEnum } from "@cashu/cashu-ts";
-import { subscribeSpyTo } from "@hirez_io/observer-spy";
-import { FakeUser } from "../../__tests__/fake-user.js";
-import { ConsolidateTokens } from "../tokens.js";
-import { WalletTokenBlueprint } from "../../blueprints/tokens.js";
-import { unlockTokenContent, WALLET_TOKEN_KIND } from "../../helpers/tokens.js";
-// Update the mock to allow controlling the states
-const mockCheckProofsStates = vitest.fn();
-vitest.mock("@cashu/cashu-ts", () => ({
-    CashuMint: vitest.fn(),
-    CashuWallet: vitest.fn().mockImplementation(() => ({
-        checkProofsStates: mockCheckProofsStates,
-    })),
-    CheckStateEnum: { UNSPENT: "UNSPENT", SPENT: "SPENT" },
-}));
-const user = new FakeUser();
-const testMint = "https://mint.test.com";
-let events;
-let factory;
-let hub;
-beforeEach(() => {
-    events = new EventStore();
-    factory = new EventFactory({ signer: user });
-    hub = new ActionHub(events, factory);
-    // Reset the mock before each test
-    mockCheckProofsStates.mockReset();
-});
-describe("ConsolidateTokens", () => {
-    it("should combine multiple token events into a single event", async () => {
-        // Set all proofs to be unspent
-        mockCheckProofsStates.mockResolvedValue([{ state: CheckStateEnum.UNSPENT }, { state: CheckStateEnum.UNSPENT }]);
-        // Create two token events with different proofs
-        const token1 = await factory.sign(await factory.create(WalletTokenBlueprint, {
-            mint: testMint,
-            proofs: [{ amount: 10, secret: "secret1", C: "C", id: "id" }],
-        }));
-        const token2 = await factory.sign(await factory.create(WalletTokenBlueprint, {
-            mint: testMint,
-            proofs: [{ amount: 20, secret: "secret2", C: "C", id: "id" }],
-        }));
-        // Add tokens to event store
-        events.add(token1);
-        events.add(token2);
-        // Run consolidate action
-        const spy = subscribeSpyTo(hub.exec(ConsolidateTokens));
-        await spy.onComplete();
-        // First event should be the new consolidated token
-        expect(spy.getValueAt(0).kind).toBe(WALLET_TOKEN_KIND);
-        // Extract token content and verify proofs were combined
-        const content = await unlockTokenContent(spy.getValueAt(0), user);
-        expect(content.proofs).toHaveLength(2);
-        expect(content.proofs).toEqual(expect.arrayContaining([
-            expect.objectContaining({ amount: 10, secret: "secret1" }),
-            expect.objectContaining({ amount: 20, secret: "secret2" }),
-        ]));
-        expect(content.mint).toBe(testMint);
-    });
-    it("should handle duplicate proofs", async () => {
-        // Set all proofs to be unspent
-        mockCheckProofsStates.mockResolvedValue([{ state: CheckStateEnum.UNSPENT }, { state: CheckStateEnum.UNSPENT }]);
-        // Create two token events with different proofs
-        const token1 = await factory.sign(await factory.create(WalletTokenBlueprint, {
-            mint: testMint,
-            proofs: [{ amount: 10, secret: "secret1", C: "C", id: "id" }],
-        }));
-        const token2 = await factory.sign(await factory.create(WalletTokenBlueprint, {
-            mint: testMint,
-            proofs: [
-                { amount: 20, secret: "secret2", C: "C", id: "id" },
-                { amount: 10, secret: "secret1", C: "C", id: "id" },
-            ],
-        }));
-        // Add tokens to event store
-        events.add(token1);
-        events.add(token2);
-        // Run consolidate action
-        const spy = subscribeSpyTo(hub.exec(ConsolidateTokens));
-        await spy.onComplete();
-        // First event should be the new consolidated token
-        expect(spy.getValueAt(0).kind).toBe(WALLET_TOKEN_KIND);
-        // Extract token content and verify proofs were combined
-        const content = await unlockTokenContent(spy.getValueAt(0), user);
-        expect(content.proofs).toHaveLength(2);
-        expect(content.proofs).toEqual(expect.arrayContaining([
-            expect.objectContaining({ amount: 10, secret: "secret1" }),
-            expect.objectContaining({ amount: 20, secret: "secret2" }),
-        ]));
-        expect(content.mint).toBe(testMint);
-    });
-    it("should filter out spent proofs", async () => {
-        // Create token events with multiple proofs
-        const token1 = await factory.sign(await factory.create(WalletTokenBlueprint, {
-            mint: testMint,
-            proofs: [
-                { amount: 10, secret: "secret1", C: "C", id: "id" },
-                { amount: 20, secret: "secret2", C: "C", id: "id" },
-            ],
-        }, []));
-        const token2 = await factory.sign(await factory.create(WalletTokenBlueprint, {
-            mint: testMint,
-            proofs: [
-                { amount: 30, secret: "secret3", C: "C", id: "id" },
-                { amount: 40, secret: "secret4", C: "C", id: "id" },
-            ],
-        }, []));
-        // Add tokens to event store
-        events.add(token1);
-        events.add(token2);
-        // Mock some proofs as spent
-        mockCheckProofsStates.mockResolvedValue([
-            { state: CheckStateEnum.UNSPENT }, // secret1
-            { state: CheckStateEnum.SPENT }, // secret2
-            { state: CheckStateEnum.SPENT }, // secret3
-            { state: CheckStateEnum.UNSPENT }, // secret4
-        ]);
-        // Run consolidate action
-        const spy = subscribeSpyTo(hub.exec(ConsolidateTokens));
-        await spy.onComplete();
-        // Verify the consolidated token only contains unspent proofs
-        const content = await unlockTokenContent(spy.getValueAt(0), user);
-        expect(content.proofs).toHaveLength(2);
-        expect(content.proofs).toEqual(expect.arrayContaining([
-            expect.objectContaining({ amount: 10, secret: "secret1" }),
-            expect.objectContaining({ amount: 40, secret: "secret4" }),
-        ]));
-        expect(content.mint).toBe(testMint);
-        // Verify checkProofsStates was called with all proofs
-        expect(mockCheckProofsStates).toHaveBeenCalledWith(expect.arrayContaining([
-            expect.objectContaining({ amount: 10, secret: "secret1" }),
-            expect.objectContaining({ amount: 20, secret: "secret2" }),
-            expect.objectContaining({ amount: 30, secret: "secret3" }),
-            expect.objectContaining({ amount: 40, secret: "secret4" }),
-        ]));
-    });
-});

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

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

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

@@ -1,56 +0,0 @@
-import { describe, it, expect, beforeEach, vitest } from "vitest";
-import { unlockHiddenTags } from "applesauce-core/helpers";
-import { lastValueFrom } from "rxjs";
-import { generateSecretKey } from "nostr-tools";
-import { EventStore } from "applesauce-core";
-import { EventFactory } from "applesauce-factory";
-import { ActionHub } from "applesauce-actions";
-import { bytesToHex } from "@noble/hashes/utils";
-import { FakeUser } from "../../__tests__/fake-user.js";
-import { WalletAddPrivateKey, CreateWallet } from "../wallet.js";
-import { getWalletPrivateKey, unlockWallet, WALLET_BACKUP_KIND } from "../../helpers/wallet.js";
-import { WalletBlueprint } from "../../blueprints/wallet.js";
-const user = new FakeUser();
-let events;
-let factory;
-let publish;
-let hub;
-beforeEach(() => {
-    events = new EventStore();
-    factory = new EventFactory({ signer: user });
-    publish = vitest.fn().mockResolvedValue(undefined);
-    hub = new ActionHub(events, factory, publish);
-});
-describe("CreateWallet", () => {
-    it("should publish a wallet backup event", async () => {
-        await hub.run(CreateWallet, ["https://mint.money.com"]);
-        expect(publish).toHaveBeenCalledWith(expect.objectContaining({ kind: WALLET_BACKUP_KIND }));
-    });
-    it("should publish a wallet event with mints", async () => {
-        const event = await lastValueFrom(hub.exec(CreateWallet, ["https://mint.money.com"]));
-        const hiddenTags = await unlockHiddenTags(event, user);
-        // the second call should be the wallet event
-        expect(hiddenTags).toEqual(expect.arrayContaining([["mint", "https://mint.money.com"]]));
-    });
-});
-describe("WalletAddPrivateKey", () => {
-    it("should add a private key to an existing wallet event without a private key", async () => {
-        const walletEvent = await factory.sign(await factory.create(WalletBlueprint, ["https://mint.money.com"]));
-        await events.add(walletEvent);
-        const privateKey = generateSecretKey();
-        const updatedWallet = await lastValueFrom(hub.exec(WalletAddPrivateKey, privateKey));
-        await unlockWallet(updatedWallet, user);
-        const key = getWalletPrivateKey(updatedWallet);
-        expect(key).toBeDefined();
-        expect(bytesToHex(key)).toEqual(bytesToHex(privateKey));
-    });
-    it("should throw an error if a wallet event already has a private key", async () => {
-        const walletEvent = await factory.sign(await factory.create(WalletBlueprint, ["https://mint.money.com"], generateSecretKey()));
-        await events.add(walletEvent);
-        await expect(hub.run(WalletAddPrivateKey, generateSecretKey())).rejects.toThrow("Wallet already has a private key");
-    });
-    it("should throw an error if the wallet event does not exist", async () => {
-        const privateKey = generateSecretKey();
-        await expect(hub.run(WalletAddPrivateKey, privateKey)).rejects.toThrow("Wallet does not exist");
-    });
-});

package/dist/helpers/__tests__/animated-qr.test.d.ts

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

package/dist/helpers/__tests__/animated-qr.test.js

@@ -1,44 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { getDecodedToken } from "@cashu/cashu-ts";
-import { lastValueFrom, map, take, timer } from "rxjs";
-import { subscribeSpyTo } from "@hirez_io/observer-spy";
-import { receiveAnimated, sendAnimated } from "../animated-qr.js";
-const tokenStr = "cashuBo2FteBtodHRwczovL3Rlc3RudXQuY2FzaHUuc3BhY2VhdWNzYXRhdIGiYWlIAJofKTJT5B5hcIOkYWEQYXN4QDA2M2VlYjgwZDZjODM4NWU4NzYwODVhN2E4NzdkOTkyY2U4N2QwNTRmY2RjYzNiODMwMzhjOWY3MmNmMDY1ZGVhY1ghAynsxZ-OuZfZDcqYTLPYfCqHO7jkGjn97aolgtSYhYykYWSjYWVYIGbp_9B9aztSlZxz7g6Tqx5M_1PuFzJCVEMOVd8XAF8wYXNYINTOU77ODcj28v04pq7ektdf6sq2XuxvMjVE0wK6jFolYXJYIM_gZnUGT5jDOyZiQ-2vG9zYnuWaY8vPoWGe_3sXvrvbpGFhBGFzeEA0MWMwZDk1YTU5ZjkxNTdlYTc5NTJlNGFlMzYzYTI3NTMxNTllNmQ1NGJiNzExMTg5ZDk5YjU1MmYzYjIzZTJiYWNYIQM-49gen_1nPchxbaAiKprVr78VmMRVpHH_Tu9P8TO5mGFko2FlWCB9j7rlpdBH_m7tNYnLpzPhn-nGmS1CcbUfnPzjxy6G92FzWCDdsby7fGM5324T5UEoV858YWzZ9MCY59KgKP362fJDfmFyWCDL73v4FRo7iMe83bfMuEy3RJPtC1Vr1jdOpw2-x-7EAaRhYQFhc3hANjRhZDI3NmExOGNmNDhiMDZmYjdiMGYwOWFiMTU4ZTA0ZmM0NmIxYzA4YzMyNjJlODUxNzZkYTMzMTgyYzQ3YWFjWCECMDpCbNbrgA9FcQEIYxobU7ik_pTl8sByPqHDmkY4azxhZKNhZVggqHGaff9M270EU8LGxRpG_G4rn2bMgjyk3hFFg78ZXRVhc1ggP6DsNsWykwKE94yZF23gpCyapcoqh6DDZdVu0lKn2Z5hclggmPKig-lObsuxi_1XCm7_Y_tqaCcqEDz8eCwVhJ8gq9M";
-const token = getDecodedToken(tokenStr);
-describe("sendAnimated", () => {
-    it("should loop", async () => {
-        const qr$ = sendAnimated(token, { interval: 0 });
-        const spy = subscribeSpyTo(qr$);
-        // wait 100ms
-        await lastValueFrom(timer(100));
-        // should not have competed
-        expect(spy.receivedComplete()).toBeFalsy();
-        spy.unsubscribe();
-    });
-    it("should emit parts", async () => {
-        const qr$ = sendAnimated(token, { interval: 0 }).pipe(take(6));
-        const spy = subscribeSpyTo(qr$);
-        // wait 100ms
-        await lastValueFrom(qr$);
-        // should not have competed
-        expect(spy.getValues()).toEqual(Array(6)
-            .fill(0)
-            .map((_, i) => expect.stringContaining(`ur:bytes/${i + 1}-6/`)));
-    });
-});
-describe("receiveAnimated", () => {
-    it("should decode animated qr", async () => {
-        const qr$ = sendAnimated(token, { interval: 0 }).pipe(receiveAnimated, map((part) => (typeof part === "string" ? getDecodedToken(part) : part)));
-        const spy = subscribeSpyTo(qr$);
-        await lastValueFrom(qr$);
-        expect(spy.getValues()).toEqual([
-            expect.any(Number),
-            expect.any(Number),
-            expect.any(Number),
-            expect.any(Number),
-            expect.any(Number),
-            expect.any(Number),
-            token,
-        ]);
-    });
-});

package/dist/helpers/__tests__/tokens.test.d.ts

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

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

@@ -1,127 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { EventFactory } from "applesauce-factory";
-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", () => {
-    it("should select old tokens first", async () => {
-        const a = await user.signEvent(await factory.create(WalletTokenBlueprint, {
-            mint: "https://money.com",
-            proofs: [{ secret: "A", C: "A", id: "A", amount: 100 }],
-        }));
-        await unlockTokenContent(a, user);
-        const bDraft = await factory.create(WalletTokenBlueprint, {
-            mint: "https://money.com",
-            proofs: [{ secret: "B", C: "B", id: "B", amount: 50 }],
-        });
-        bDraft.created_at -= 60 * 60 * 7;
-        const b = await user.signEvent(bDraft);
-        await unlockTokenContent(b, user);
-        expect(dumbTokenSelection([a, b], 40).events).toEqual([b]);
-    });
-    it("should select enough tokens to total min amount", async () => {
-        const a = await user.signEvent(await factory.create(WalletTokenBlueprint, {
-            mint: "https://money.com",
-            proofs: [{ secret: "A", C: "A", id: "A", amount: 100 }],
-        }));
-        await unlockTokenContent(a, user);
-        const bDraft = await factory.create(WalletTokenBlueprint, {
-            mint: "https://money.com",
-            proofs: [{ secret: "B", C: "B", id: "B", amount: 50 }],
-        });
-        bDraft.created_at -= 60 * 60 * 7;
-        const b = await user.signEvent(bDraft);
-        await unlockTokenContent(b, user);
-        expect(dumbTokenSelection([a, b], 120).events).toEqual(expect.arrayContaining([a, b]));
-    });
-    it("should throw if not enough funds", async () => {
-        const a = await user.signEvent(await factory.create(WalletTokenBlueprint, {
-            mint: "https://money.com",
-            proofs: [{ secret: "A", C: "A", id: "A", amount: 100 }],
-        }));
-        await unlockTokenContent(a, user);
-        expect(() => dumbTokenSelection([a], 120)).toThrow();
-    });
-    it("should ignore locked tokens", async () => {
-        const a = await user.signEvent(await factory.create(WalletTokenBlueprint, {
-            mint: "https://money.com",
-            proofs: [{ secret: "A", C: "A", id: "A", amount: 100 }],
-        }));
-        await unlockTokenContent(a, user);
-        const bDraft = await factory.create(WalletTokenBlueprint, {
-            mint: "https://money.com",
-            proofs: [{ secret: "B", C: "B", id: "B", amount: 50 }],
-        });
-        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);
-        expect(dumbTokenSelection([a, b], 20).events).toEqual([a]);
-    });
-    it("should ignore duplicate proofs", async () => {
-        const a = await user.signEvent(await factory.create(WalletTokenBlueprint, {
-            mint: "https://money.com",
-            proofs: [{ secret: "A", C: "A", id: "A", amount: 100 }],
-        }));
-        // create a second event with the same proofs
-        const b = await user.signEvent(await factory.create(WalletTokenBlueprint, {
-            mint: "https://money.com",
-            proofs: [{ secret: "A", C: "A", id: "A", amount: 100 }],
-        }));
-        expect(() => dumbTokenSelection([a, b], 150)).toThrow();
-    });
-    it("should include duplicate token events and ignore duplicate proofs", async () => {
-        const A = { secret: "A", C: "A", id: "A", amount: 100 };
-        const a = await user.signEvent({
-            ...(await factory.create(WalletTokenBlueprint, {
-                mint: "https://money.com",
-                proofs: [A],
-            })),
-            // make event older
-            created_at: unixNow() - 100,
-        });
-        // create a second event with the same proofs
-        const a2 = await user.signEvent({
-            ...(await factory.create(WalletTokenBlueprint, {
-                mint: "https://money.com",
-                proofs: [A],
-            })),
-            // make event older
-            created_at: a.created_at - 200,
-        });
-        const B = { secret: "B", C: "B", id: "B", amount: 50 };
-        const b = await user.signEvent(await factory.create(WalletTokenBlueprint, {
-            mint: "https://money.com",
-            proofs: [B],
-        }));
-        const result = dumbTokenSelection([a, a2, b], 150);
-        expect(result.events.map((e) => e.id)).toEqual(expect.arrayContaining([a.id, a2.id, b.id]));
-        expect(result.proofs).toEqual([A, B]);
-    });
-});
-describe("encodeTokenToEmoji", () => {
-    it("should encode token into emoji string", () => {
-        const token = "cashuBo2FteBtodHRwczovL3Rlc3RudXQuY2FzaHUuc3BhY2VhdWNzYXRhdIGiYWlIAJofKTJT5B5hcIGkYWEBYXN4QDdlZDBkMzk3NGQ5ZWM2OTc2YTAzYmZmYjdkMTA4NzIzZTBiMDRjMzRhNDc3MjlmNjMwOGJlODc3OTA2NTY0NDVhY1ghA36iYyOHCe4CnTxzORbcXFVeAbkMUFE6FqPWInujnAOcYWSjYWVYIJmHRwCQ0Uopkd3P5xb0MdcWQEaZz9hXWtcn-FMhZj8LYXNYIF4X9ybXxg5Pp0KSowfu4y_Aovo9iy3TXlLSaKyVJzz2YXJYIC_UFkoC5U9BpSgBTGUQgsjfz_emv5xykDiavZUfRN8E";
-        expect(encodeTokenToEmoji(token).length).toBeGreaterThan(token.length);
-    });
-});
-const emoji = "🥜󠅓󠅑󠅣󠅘󠅥󠄲󠅟󠄢󠄶󠅤󠅕󠄲󠅤󠅟󠅔󠄸󠅂󠅧󠅓󠅪󠅟󠅦󠄼󠄣󠅂󠅜󠅓󠄣󠅂󠅥󠅔󠅈󠅁󠅥󠅉󠄢󠄶󠅪󠅑󠄸󠅅󠅥󠅓󠄣󠄲󠅘󠅉󠄢󠅆󠅘󠅔󠅇󠄾󠅪󠅉󠅈󠅂󠅘󠅔󠄹󠄷󠅙󠅉󠅇󠅜󠄹󠄱󠄺󠅟󠅖󠄻󠅄󠄺󠅄󠄥󠄲󠄥󠅘󠅓󠄹󠄷󠅛󠅉󠅇󠄵󠄲󠅉󠅈󠄾󠄤󠅁󠄴󠅔󠅜󠅊󠄴󠄲󠅛󠄽󠅪󠅛󠄣󠄾󠄷󠅁󠄥󠅊󠅇󠄽󠄢󠄿󠅄󠅓󠄢󠅉󠅄󠄱󠅪󠅉󠅝󠅊󠅝󠅉󠅚󠅔󠅛󠄽󠅄󠄱󠄤󠄾󠅪󠄹󠅪󠅊󠅄󠄲󠅙󠄽󠄴󠅂󠅚󠄽󠅪󠅂󠅘󠄾󠄴󠅓󠄣󠄽󠅚󠅜󠅝󠄾󠅚󠄽󠅧󠄿󠄷󠄺󠅜󠄿󠄴󠅓󠄣󠄿󠅄󠄱󠄢󠄾󠅄󠅉󠄠󠄾󠄴󠅆󠅘󠅉󠄡󠅗󠅘󠄱󠄣󠄦󠅙󠅉󠅩󠄿󠄸󠄳󠅕󠄤󠄳󠅞󠅄󠅨󠅪󠄿󠅂󠅒󠅓󠅈󠄶󠅆󠅕󠄱󠅒󠅛󠄽󠅅󠄶󠄵󠄦󠄶󠅡󠅀󠅇󠄹󠅞󠅥󠅚󠅞󠄱󠄿󠅓󠅉󠅇󠅃󠅚󠅉󠅇󠅆󠅉󠄹󠄺󠅝󠄸󠅂󠅧󠄳󠅁󠄠󠅅󠅟󠅠󠅛󠅔󠄣󠅀󠄥󠅨󠅒󠄠󠄽󠅔󠅓󠅇󠅁󠄵󠅑󠅊󠅪󠄩󠅘󠅈󠅇󠅤󠅓󠅞󠄝󠄶󠄽󠅘󠅊󠅚󠄨󠄼󠅉󠅈󠄾󠅉󠄹󠄶󠄤󠅈󠄩󠅩󠅒󠅈󠅨󠅗󠄥󠅀󠅠󠄠󠄻󠅃󠅟󠅧󠅖󠅥󠄤󠅩󠅏󠄱󠅟󠅦󠅟󠄩󠅙󠅩󠄣󠅄󠅈󠅜󠄼󠅃󠅑󠄻󠅩󠅆󠄺󠅪󠅪󠄢󠅉󠅈󠄺󠅉󠄹󠄳󠅏󠅅󠄶󠅛󠅟󠄳󠄥󠅅󠄩󠄲󠅠󠅃󠅗󠄲󠅄󠄷󠅅󠅁󠅗󠅣󠅚󠅖󠅪󠅏󠅕󠅝󠅦󠄥󠅨󠅩󠅛󠄴󠅙󠅑󠅦󠅊󠅅󠅖󠅂󠄾󠄨󠄵";
-describe("decodeTokenFromEmojiString", () => {
-    it("should decode single emoji", () => {
-        expect(decodeTokenFromEmojiString(emoji)).toEqual(expect.objectContaining({
-            mint: "https://testnut.cashu.space",
-            proofs: [expect.any(Object)],
-            unit: "sat",
-        }));
-    });
-    it("should decode an emoji in text", () => {
-        expect(decodeTokenFromEmojiString("the money is in the emoji, " + emoji + " you can redeem it using cashu.me")).toEqual(expect.objectContaining({
-            mint: "https://testnut.cashu.space",
-            proofs: [expect.any(Object)],
-            unit: "sat",
-        }));
-    });
-});

package/dist/operations/event/__tests__/wallet.test.d.ts

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

package/dist/operations/event/__tests__/wallet.test.js

@@ -1,25 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { setWalletBackupContent } from "../wallet.js";
-import { EventFactory } from "applesauce-factory";
-import { generateSecretKey } from "nostr-tools";
-import { unixNow } from "applesauce-core/helpers";
-import { WALLET_BACKUP_KIND } from "../../../helpers/wallet.js";
-import { FakeUser } from "../../../__tests__/fake-user.js";
-import { WalletBlueprint } from "../../../blueprints/wallet.js";
-const user = new FakeUser();
-const factory = new EventFactory({ signer: user });
-describe("setWalletBackupContent", () => {
-    it("should throw if kind is not wallet kind", async () => {
-        const note = user.note();
-        await expect(setWalletBackupContent(note)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, factory.context)).rejects.toThrow();
-    });
-    it("should throw if pubkey does not match", async () => {
-        const wallet = await factory.sign(await factory.create(WalletBlueprint, [], generateSecretKey()));
-        const user2 = new FakeUser();
-        await expect(setWalletBackupContent(wallet)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, { signer: user2 })).rejects.toThrow();
-    });
-    it("should copy the content of the wallet event", async () => {
-        const wallet = await factory.sign(await factory.create(WalletBlueprint, [], generateSecretKey()));
-        expect(await setWalletBackupContent(wallet)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, factory.context)).toEqual(expect.objectContaining({ content: wallet.content }));
-    });
-});

package/dist/operations/tag/__tests__/wallet.test.d.ts

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

package/dist/operations/tag/__tests__/wallet.test.js

@@ -1,16 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { setMintTags } from "../wallet.js";
-describe("setMintTags", () => {
-    it("should replace existing mint tags", () => {
-        expect(setMintTags(["https://mint.com"])([["mint", "https://other.mint.com"]], {})).toEqual(expect.arrayContaining([["mint", "https://mint.com"]]));
-    });
-    it("should ignore other tags", () => {
-        expect(setMintTags(["https://mint.com"])([
-            ["mint", "https://other.mint.com"],
-            ["privkey", "00000000"],
-        ], {})).toEqual(expect.arrayContaining([
-            ["mint", "https://mint.com"],
-            ["privkey", "00000000"],
-        ]));
-    });
-});

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

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

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

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

package/dist/queries/history.d.ts

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

package/dist/queries/history.js

@@ -1,27 +0,0 @@
-import { combineLatest, filter, map, scan, startWith } from "rxjs";
-import { getHistoryRedeemed, isHistoryContentLocked, WALLET_HISTORY_KIND } from "../helpers/history.js";
-/** Query that returns an array of redeemed event ids for a wallet */
-export function WalletRedeemedQuery(pubkey) {
-    return {
-        key: pubkey,
-        run: (events) => events
-            .filters({ kinds: [WALLET_HISTORY_KIND], authors: [pubkey] })
-            .pipe(scan((ids, history) => [...ids, ...getHistoryRedeemed(history)], [])),
-    };
-}
-/** A query that returns a timeline of wallet history events */
-export function WalletHistoryQuery(pubkey, locked) {
-    return {
-        key: pubkey,
-        run: (events) => {
-            const updates = events.updates.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/queries/tokens.d.ts

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

package/dist/queries/tokens.js

@@ -1,64 +0,0 @@
-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 query that subscribes to all token events for a wallet, passing locked will filter by token locked status */
-export function WalletTokensQuery(pubkey, locked) {
-    return {
-        key: pubkey + locked,
-        run: (events) => {
-            const updates = events.updates.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 query that returns the visible balance of a wallet for each mint */
-export function WalletBalanceQuery(pubkey) {
-    return {
-        key: pubkey,
-        run: (events) => {
-            const updates = events.updates.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/queries/wallet.js

@@ -1,21 +0,0 @@
-import { filter, map, merge } from "rxjs";
-import { getWalletMints, getWalletPrivateKey, isWalletLocked, WALLET_KIND } from "../helpers/wallet.js";
-/** A query to get the state of a NIP-60 wallet */
-export function WalletQuery(pubkey) {
-    return {
-        key: pubkey,
-        run: (events) => merge(
-        // get the latest replaceable event
-        events.replaceable(WALLET_KIND, pubkey), 
-        // and listen for any updates to matching events
-        events.updates.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 };
-        })),
-    };
-}