applesauce-wallet 0.0.0-next-20250312113207 → 0.0.0-next-20250312162115

package/dist/actions/index.d.ts

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

package/dist/actions/index.js

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

package/dist/actions/tokens.d.ts

@@ -0,0 +1,11 @@
+import { Token } from "@cashu/cashu-ts";
+import { Action } from "applesauce-actions";
+import { NostrEvent } from "nostr-tools";
+/**
+ * Adds a cashu token to the wallet and marks a list of nutzaps as redeemed
+ * @param token the cashu token to add
+ * @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 token events and adds a spend history item */
+export declare function CompleteSpend(spent: NostrEvent[], change: Token): Action;

package/dist/actions/tokens.js

@@ -0,0 +1,49 @@
+import { DeleteBlueprint } from "applesauce-factory/blueprints";
+import { getTokenContent, isTokenContentLocked } from "../helpers/tokens.js";
+import { WalletTokenBlueprint } from "../blueprints/tokens.js";
+import { WalletHistoryBlueprint } from "../blueprints/history.js";
+/**
+ * Adds a cashu token to the wallet and marks a list of nutzaps as redeemed
+ * @param token the cashu token to add
+ * @param redeemed an array of nutzap event ids to mark as redeemed
+ */
+export function ReceiveToken(token, redeemed) {
+    return async ({ factory, publish }) => {
+        const amount = token.proofs.reduce((t, p) => t + p.amount, 0);
+        const tokenEvent = await factory.sign(await factory.create(WalletTokenBlueprint, token, []));
+        const history = await factory.sign(await factory.create(WalletHistoryBlueprint, { direction: "in", amount, mint: token.mint, created: [tokenEvent.id] }, redeemed ?? []));
+        await publish("Save tokens", tokenEvent);
+        await publish("Save transaction", history);
+    };
+}
+/** An action that deletes old token events and adds a spend history item */
+export function CompleteSpend(spent, change) {
+    return async ({ factory, publish }) => {
+        if (spent.length === 0)
+            throw new Error("Cant complete spent with no token events");
+        if (spent.some((s) => isTokenContentLocked(s)))
+            throw new Error("Cant complete spend with locked tokens");
+        // create the nip-09 delete event for previous events
+        const deleteDraft = await factory.create(DeleteBlueprint, spent);
+        const changeAmount = change.proofs.reduce((t, p) => t + p.amount, 0);
+        // create a new token event if needed
+        const changeDraft = changeAmount > 0
+            ? await factory.create(WalletTokenBlueprint, change, spent.map((e) => e.id))
+            : undefined;
+        const total = spent.reduce((total, token) => total + getTokenContent(token).proofs.reduce((t, p) => t + p.amount, 0), 0);
+        // calculate the amount that was spent
+        const diff = total - changeAmount;
+        // sign delete and token
+        const signedDelete = await factory.sign(deleteDraft);
+        const signedToken = changeDraft && (await factory.sign(changeDraft));
+        // create a history entry
+        const history = await factory.create(WalletHistoryBlueprint, { direction: "out", mint: change.mint, amount: diff, created: signedToken ? [signedToken.id] : [] }, []);
+        // sign history
+        const signedHistory = await factory.sign(history);
+        // publish events
+        await publish("Delete old tokens", signedDelete);
+        if (signedToken)
+            await publish("Save change", signedToken);
+        await publish("Save transaction", signedHistory);
+    };
+}

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

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

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

@@ -0,0 +1,54 @@
+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 { dumbTokenSelection, unlockTokenContent } from "../tokens.js";
+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)).toEqual([b]);
+    });
+    it("should 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)).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 throw if tokens are locked", async () => {
+        const a = await user.signEvent(await factory.create(WalletTokenBlueprint, {
+            mint: "https://money.com",
+            proofs: [{ secret: "A", C: "A", id: "A", amount: 100 }],
+        }));
+        expect(() => dumbTokenSelection([a], 20)).toThrow();
+    });
+});

package/dist/helpers/tokens.d.ts

@@ -17,9 +17,20 @@ export type TokenContent = {
     del: string[];
 };
 export declare const TokenContentSymbol: unique symbol;
-/** Returns the decrypted and parsed details of a 7375 token event */
+export declare const TokenProofsTotalSymbol: unique symbol;
+/**
+ * Returns the decrypted and parsed details of a 7375 token event
+ * @throws
+ */
 export declare function getTokenContent(token: NostrEvent): TokenContent;
 /** Returns if token details are locked */
 export declare function isTokenContentLocked(token: NostrEvent): boolean;
 /** Decrypts a k:7375 token event */
 export declare function unlockTokenContent(token: NostrEvent, signer: HiddenContentSigner): Promise<TokenContent>;
+/** Gets the totaled amount of proofs in a token event */
+export declare function getTokenProofsTotal(token: NostrEvent): number;
+/**
+ * Selects oldest tokens that total up to more than the min amount
+ * @throws
+ */
+export declare function dumbTokenSelection(tokens: NostrEvent[], minAmount: number): import("nostr-tools").Event[];

package/dist/helpers/tokens.js

@@ -1,7 +1,11 @@
 import { getHiddenContent, getOrComputeCachedValue, isHiddenContentLocked, unlockHiddenContent, } from "applesauce-core/helpers";
 export const WALLET_TOKEN_KIND = 7375;
 export const TokenContentSymbol = Symbol.for("token-content");
-/** Returns the decrypted and parsed details of a 7375 token event */
+export const TokenProofsTotalSymbol = Symbol.for("token-proofs-total");
+/**
+ * Returns the decrypted and parsed details of a 7375 token event
+ * @throws
+ */
 export function getTokenContent(token) {
     return getOrComputeCachedValue(token, TokenContentSymbol, () => {
         const plaintext = getHiddenContent(token);
@@ -27,3 +31,33 @@ export async function unlockTokenContent(token, signer) {
         await unlockHiddenContent(token, signer);
     return getTokenContent(token);
 }
+/** Gets the totaled amount of proofs in a token event */
+export function getTokenProofsTotal(token) {
+    return getOrComputeCachedValue(token, TokenProofsTotalSymbol, () => {
+        const content = getTokenContent(token);
+        return content.proofs.reduce((t, p) => t + p.amount, 0);
+    });
+}
+/**
+ * Selects oldest tokens that total up to more than the min amount
+ * @throws
+ */
+export function dumbTokenSelection(tokens, minAmount) {
+    if (tokens.some((t) => isTokenContentLocked(t)))
+        throw new Error("All tokens must be unlocked");
+    const total = tokens.reduce((t, token) => t + getTokenProofsTotal(token), 0);
+    if (total < minAmount)
+        throw new Error("Insufficient funds");
+    // sort newest to oldest
+    const sorted = Array.from(tokens).sort((a, b) => b.created_at - a.created_at);
+    let amount = 0;
+    const selected = [];
+    while (amount < minAmount) {
+        const token = sorted.pop();
+        if (!token)
+            throw new Error("Ran out of tokens");
+        selected.push(token);
+        amount += getTokenProofsTotal(token);
+    }
+    return selected;
+}

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

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

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

@@ -0,0 +1,29 @@
+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 { 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(), []));
+        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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet",
-  "version": "0.0.0-next-20250312113207",
+  "version": "0.0.0-next-20250312162115",
   "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-20250312113207",
-    "applesauce-core": "0.0.0-next-20250312113207",
-    "applesauce-factory": "0.0.0-next-20250312113207",
+    "applesauce-actions": "0.0.0-next-20250312162115",
+    "applesauce-core": "0.0.0-next-20250312162115",
+    "applesauce-factory": "0.0.0-next-20250312162115",
     "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-20250312113207",
+    "applesauce-signers": "0.0.0-next-20250312162115",
     "typescript": "^5.7.3",
     "vitest": "^3.0.5"
   },