applesauce-wallet 0.11.0 → 0.12.0

package/dist/operations/event/index.d.ts

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

package/dist/operations/event/index.js

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

package/dist/operations/event/tokens.d.ts

@@ -0,0 +1,4 @@
+import { Token } from "@cashu/cashu-ts";
+import { EventOperation } from "applesauce-factory";
+/** Sets the content of a 7375 token event */
+export declare function setTokenContent(token: Token, del?: string[]): EventOperation;

package/dist/operations/event/tokens.js

@@ -0,0 +1,24 @@
+import { EventContentEncryptionMethod } from "applesauce-core/helpers";
+import { setEncryptedContent } from "applesauce-factory/operations/event";
+/** Sets the content of a 7375 token event */
+export function setTokenContent(token, del = []) {
+    return async (draft, ctx) => {
+        if (!ctx.signer)
+            throw new Error(`Missing signer`);
+        const pubkey = await ctx.signer.getPublicKey();
+        const method = EventContentEncryptionMethod[draft.kind];
+        if (!method)
+            throw new Error("Failed to find encryption method");
+        if (!token.mint)
+            throw new Error("Token mint is required");
+        if (!token.proofs || token.proofs.length === 0)
+            throw new Error("Token proofs are required");
+        const content = {
+            mint: token.mint,
+            proofs: token.proofs,
+            unit: token.unit,
+            del,
+        };
+        return await setEncryptedContent(pubkey, JSON.stringify(content), method)(draft, ctx);
+    };
+}

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

@@ -0,0 +1,4 @@
+import { EventOperation } from "applesauce-factory";
+import { NostrEvent } from "nostr-tools";
+/** Sets the content of a kind 375 wallet backup event */
+export declare function setWalletBackupContent(wallet: NostrEvent): EventOperation;

package/dist/operations/event/wallet.js

@@ -0,0 +1,14 @@
+import { WALLET_KIND } from "../../helpers/wallet.js";
+/** Sets the content of a kind 375 wallet backup event */
+export function setWalletBackupContent(wallet) {
+    return async (draft, ctx) => {
+        if (wallet.kind !== WALLET_KIND)
+            throw new Error(`Cant create a wallet backup from kind ${wallet.kind}`);
+        if (!wallet.content)
+            throw new Error("Wallet missing content");
+        const pubkey = await ctx.signer?.getPublicKey();
+        if (wallet.pubkey !== pubkey)
+            throw new Error("Wallet pubkey dose not match signer pubkey");
+        return { ...draft, content: wallet.content };
+    };
+}

package/dist/operations/index.d.ts

@@ -0,0 +1,2 @@
+export * as TagOperations from "./tag/index.js";
+export * as EventOperations from "./event/wallet.js";

package/dist/operations/index.js

@@ -0,0 +1,2 @@
+export * as TagOperations from "./tag/index.js";
+export * as EventOperations from "./event/wallet.js";

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

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

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

@@ -0,0 +1,16 @@
+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/operations/tag/history.d.ts

@@ -0,0 +1,14 @@
+import { TagOperation } from "applesauce-factory";
+import { EventPointer } from "nostr-tools/nip19";
+import { HistoryDirection } from "../../helpers/history.js";
+/** Sets the "direction" tag on wallet history tags */
+export declare function setHistoryDirectionTag(direction: HistoryDirection): TagOperation;
+/** Sets the "amount" tag on wallet history tags */
+export declare function setHistoryAmountTag(amount: number): TagOperation;
+/** Sets the "fee" tag in wallet history tags */
+export declare function setHistoryFeeTag(fee: number): TagOperation;
+export declare function setHistoryMintTag(mint: string): TagOperation;
+/** Includes "created" "e" tags in wallet history tags */
+export declare function includeHistoryCreatedTags(created: (string | EventPointer)[]): TagOperation;
+/** Includes the "redeemed" tags in wallet history tags */
+export declare function includeHistoryRedeemedTags(redeemed: (string | EventPointer)[]): TagOperation;

package/dist/operations/tag/history.js

@@ -0,0 +1,34 @@
+import { ensureMarkedEventPointerTag, ensureSingletonTag } from "applesauce-factory/helpers";
+/** Sets the "direction" tag on wallet history tags */
+export function setHistoryDirectionTag(direction) {
+    return (tags) => ensureSingletonTag(tags, ["direction", direction], true);
+}
+/** Sets the "amount" tag on wallet history tags */
+export function setHistoryAmountTag(amount) {
+    return (tags) => ensureSingletonTag(tags, ["amount", String(amount)], true);
+}
+/** Sets the "fee" tag in wallet history tags */
+export function setHistoryFeeTag(fee) {
+    return (tags) => ensureSingletonTag(tags, ["fee", String(fee)], true);
+}
+export function setHistoryMintTag(mint) {
+    return (tags) => ensureSingletonTag(tags, ["mint", mint], true);
+}
+/** Includes "created" "e" tags in wallet history tags */
+export function includeHistoryCreatedTags(created) {
+    return (tags) => {
+        for (const id of created) {
+            tags = ensureMarkedEventPointerTag(tags, typeof id === "string" ? { id } : id, "created");
+        }
+        return tags;
+    };
+}
+/** Includes the "redeemed" tags in wallet history tags */
+export function includeHistoryRedeemedTags(redeemed) {
+    return (tags) => {
+        for (const id of redeemed) {
+            tags = ensureMarkedEventPointerTag(tags, typeof id === "string" ? { id } : id, "redeemed");
+        }
+        return tags;
+    };
+}

package/dist/operations/tag/index.d.ts

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

package/dist/operations/tag/index.js

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

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

@@ -0,0 +1,5 @@
+import { TagOperation } from "applesauce-factory";
+/** Sets the "mint" tags in a wallet event */
+export declare function setMintTags(mints: string[]): TagOperation;
+/** Sets the "privkey" tag on a wallet event */
+export declare function setPrivateKeyTag(privateKey: Uint8Array): TagOperation;

package/dist/operations/tag/wallet.js

@@ -0,0 +1,15 @@
+import { bytesToHex } from "@noble/hashes/utils";
+import { ensureSingletonTag } from "applesauce-factory/helpers";
+/** Sets the "mint" tags in a wallet event */
+export function setMintTags(mints) {
+    return (tags) => [
+        // remove all existing mint tags
+        ...tags.filter((t) => t[0] !== "mint"),
+        // add new mint tags
+        ...mints.map((mint) => ["mint", mint]),
+    ];
+}
+/** Sets the "privkey" tag on a wallet event */
+export function setPrivateKeyTag(privateKey) {
+    return (tags) => ensureSingletonTag(tags, ["privkey", bytesToHex(privateKey)], true);
+}

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

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

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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,27 @@
+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/index.d.ts

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

package/dist/queries/index.js

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

package/dist/queries/tokens.d.ts

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,64 @@
+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.d.ts

@@ -1,9 +1,12 @@
 import { Query } from "applesauce-core";
+import { NostrEvent } from "nostr-tools";
 export type WalletInfo = {
     locked: true;
+    event: NostrEvent;
 } | {
     locked: false;
-    privateKey: string;
+    event: NostrEvent;
+    privateKey?: Uint8Array;
     mints: string[];
 };
 /** A query to get the state of a NIP-60 wallet */

package/dist/queries/wallet.js

@@ -8,14 +8,14 @@ export function WalletQuery(pubkey) {
         // get the latest replaceable event
         events.replaceable(WALLET_KIND, pubkey), 
         // and listen for any updates to matching events
-        events.database.updated.pipe(filter((e) => e.kind === WALLET_KIND && e.pubkey === pubkey))).pipe(map((wallet) => {
+        events.updates.pipe(filter((e) => e.kind === WALLET_KIND && e.pubkey === pubkey))).pipe(map((wallet) => {
             if (!wallet)
                 return;
             if (isWalletLocked(wallet))
-                return { locked: true };
+                return { locked: true, event: wallet };
             const mints = getWalletMints(wallet);
             const privateKey = getWalletPrivateKey(wallet);
-            return { locked: false, mints, privateKey };
+            return { locked: false, mints, privateKey, event: wallet };
         })),
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -39,16 +39,57 @@
       "import": "./dist/queries/*.js",
       "require": "./dist/queries/*.js",
       "types": "./dist/queries/*.d.ts"
+    },
+    "./blueprints": {
+      "import": "./dist/blueprints/index.js",
+      "require": "./dist/blueprints/index.js",
+      "types": "./dist/blueprints/index.d.ts"
+    },
+    "./blueprints/*": {
+      "import": "./dist/blueprints/*.js",
+      "require": "./dist/blueprints/*.js",
+      "types": "./dist/blueprints/*.d.ts"
+    },
+    "./operations": {
+      "import": "./dist/operations/index.js",
+      "require": "./dist/operations/index.js",
+      "types": "./dist/operations/index.d.ts"
+    },
+    "./operations/tag/*": {
+      "import": "./dist/operations/tag/*.js",
+      "require": "./dist/operations/tag/*.js",
+      "types": "./dist/operations/tag/*.d.ts"
+    },
+    "./operations/event/*": {
+      "import": "./dist/operations/event/*.js",
+      "require": "./dist/operations/event/*.js",
+      "types": "./dist/operations/event/*.d.ts"
+    },
+    "./actions": {
+      "import": "./dist/actions/index.js",
+      "require": "./dist/actions/index.js",
+      "types": "./dist/actions/index.d.ts"
+    },
+    "./actions/*": {
+      "import": "./dist/actions/*.js",
+      "require": "./dist/actions/*.js",
+      "types": "./dist/actions/*.d.ts"
     }
   },
   "dependencies": {
-    "applesauce-core": "^0.11.0",
+    "@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",
     "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"
   },