applesauce-wallet 0.0.0-next-20250311171842 → 0.0.0-next-20250311195656

package/dist/actions/wallet.d.ts

@@ -1,3 +1,8 @@
 import { Action } from "applesauce-actions";
 /** An action that creates a new 17375 wallet event and 375 wallet backup */
 export declare function CreateWallet(mints: string[], privateKey?: Uint8Array): Action;
+/** Unlocks the wallet event and optionally the tokens and history events */
+export declare function UnlockWallet(unlock?: {
+    history?: boolean;
+    tokens?: boolean;
+}): Action;

package/dist/actions/wallet.js

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

package/dist/blueprints/history.d.ts

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

package/dist/blueprints/history.js

@@ -0,0 +1,11 @@
+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, 
+    // set the encrypted tags on the event
+    setHistoryContent(content), 
+    // set the public redeemed tags
+    setHistoryRedeemed(redeemed));
+}

package/dist/blueprints/index.d.ts

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

package/dist/blueprints/index.js

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

package/dist/blueprints/tokens.d.ts

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

package/dist/blueprints/tokens.js

@@ -0,0 +1,11 @@
+import { EventFactory } from "applesauce-factory";
+import { WALLET_TOKEN_KIND } from "../helpers/tokens.js";
+import { setTokenContent } from "../operations/event/tokens.js";
+/**
+ * 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 function WalletTokenBlueprint(token, del = []) {
+    return (ctx) => EventFactory.runProcess({ kind: WALLET_TOKEN_KIND }, ctx, setTokenContent(token, del));
+}

package/dist/helpers/history.d.ts

@@ -1,9 +1,10 @@
 import { HiddenContentSigner } from "applesauce-core/helpers";
 import { NostrEvent } from "nostr-tools";
 export declare const WALLET_HISTORY_KIND = 7376;
-export type HistoryDetails = {
+export type HistoryDirection = "in" | "out";
+export type HistoryContent = {
     /** The direction of the transaction, in = received, out = sent */
-    direction: "in" | "out";
+    direction: HistoryDirection;
     /** The amount of the transaction */
     amount: number;
     /** An array of token event ids created */
@@ -13,12 +14,12 @@ export type HistoryDetails = {
     /** The fee paid */
     fee?: number;
 };
-export declare const HistoryDetailsSymbol: unique symbol;
+export declare const HistoryContentSymbol: unique symbol;
 /** returns an array of redeemed event ids in a history event */
 export declare function getHistoryRedeemed(history: NostrEvent): string[];
-/** Checks if the history details are locked */
-export declare function isHistoryDetailsLocked(history: NostrEvent): boolean;
-/** Returns the parsed details of a 7376 history event */
-export declare function getHistoryDetails(history: NostrEvent): HistoryDetails;
+/** Checks if the history contents are locked */
+export declare function isHistoryContentLocked(history: NostrEvent): boolean;
+/** Returns the parsed content of a 7376 history event */
+export declare function getHistoryContent(history: NostrEvent): HistoryContent;
 /** Decrypts a wallet history event */
-export declare function unlockHistoryDetails(history: NostrEvent, signer: HiddenContentSigner): Promise<HistoryDetails>;
+export declare function unlockHistoryContent(history: NostrEvent, signer: HiddenContentSigner): Promise<HistoryContent>;

package/dist/helpers/history.js

@@ -1,17 +1,17 @@
 import { getHiddenTags, getOrComputeCachedValue, isETag, isHiddenTagsLocked, unlockHiddenTags, } from "applesauce-core/helpers";
 export const WALLET_HISTORY_KIND = 7376;
-export const HistoryDetailsSymbol = Symbol.for("history-details");
+export const HistoryContentSymbol = Symbol.for("history-content");
 /** returns an array of redeemed event ids in a history event */
 export function getHistoryRedeemed(history) {
     return history.tags.filter((t) => isETag(t) && t[3] === "redeemed").map((t) => t[1]);
 }
-/** Checks if the history details are locked */
-export function isHistoryDetailsLocked(history) {
+/** Checks if the history contents are locked */
+export function isHistoryContentLocked(history) {
     return isHiddenTagsLocked(history);
 }
-/** Returns the parsed details of a 7376 history event */
-export function getHistoryDetails(history) {
-    return getOrComputeCachedValue(history, HistoryDetailsSymbol, () => {
+/** Returns the parsed content of a 7376 history event */
+export function getHistoryContent(history) {
+    return getOrComputeCachedValue(history, HistoryContentSymbol, () => {
         const tags = getHiddenTags(history);
         if (!tags)
             throw new Error("History event is locked");
@@ -32,7 +32,7 @@ export function getHistoryDetails(history) {
     });
 }
 /** Decrypts a wallet history event */
-export async function unlockHistoryDetails(history, signer) {
+export async function unlockHistoryContent(history, signer) {
     await unlockHiddenTags(history, signer);
-    return getHistoryDetails(history);
+    return getHistoryContent(history);
 }

package/dist/helpers/tokens.d.ts

@@ -1,7 +1,7 @@
 import { HiddenContentSigner } from "applesauce-core/helpers";
 import { NostrEvent } from "nostr-tools";
 export declare const WALLET_TOKEN_KIND = 7375;
-export type TokenDetails = {
+export type TokenContent = {
     /** Cashu mint for the proofs */
     mint: string;
     /** Cashu proofs */
@@ -11,13 +11,15 @@ export type TokenDetails = {
         C: string;
         id: string;
     }[];
+    /** The cashu unit */
+    unit?: string;
     /** tokens that were destroyed in the creation of this token (helps on wallet state transitions) */
     del: string[];
 };
-export declare const TokenDetailsSymbol: unique symbol;
+export declare const TokenContentSymbol: unique symbol;
 /** Returns the decrypted and parsed details of a 7375 token event */
-export declare function getTokenDetails(token: NostrEvent): TokenDetails;
+export declare function getTokenContent(token: NostrEvent): TokenContent;
 /** Returns if token details are locked */
-export declare function isTokenDetailsLocked(token: NostrEvent): boolean;
+export declare function isTokenContentLocked(token: NostrEvent): boolean;
 /** Decrypts a k:7375 token event */
-export declare function unlockTokenDetails(token: NostrEvent, signer: HiddenContentSigner): Promise<TokenDetails>;
+export declare function unlockTokenContent(token: NostrEvent, signer: HiddenContentSigner): Promise<TokenContent>;

package/dist/helpers/tokens.js

@@ -1,9 +1,9 @@
 import { getHiddenContent, getOrComputeCachedValue, isHiddenContentLocked, unlockHiddenContent, } from "applesauce-core/helpers";
 export const WALLET_TOKEN_KIND = 7375;
-export const TokenDetailsSymbol = Symbol.for("token-details");
+export const TokenContentSymbol = Symbol.for("token-content");
 /** Returns the decrypted and parsed details of a 7375 token event */
-export function getTokenDetails(token) {
-    return getOrComputeCachedValue(token, TokenDetailsSymbol, () => {
+export function getTokenContent(token) {
+    return getOrComputeCachedValue(token, TokenContentSymbol, () => {
         const plaintext = getHiddenContent(token);
         if (!plaintext)
             throw new Error("Token is locked");
@@ -11,19 +11,19 @@ export function getTokenDetails(token) {
         if (!details.mint)
             throw new Error("Token missing mint");
         if (!details.proofs)
-            details.proofs = [];
+            throw new Error("Token missing proofs");
         if (!details.del)
             details.del = [];
         return details;
     });
 }
 /** Returns if token details are locked */
-export function isTokenDetailsLocked(token) {
+export function isTokenContentLocked(token) {
     return isHiddenContentLocked(token);
 }
 /** Decrypts a k:7375 token event */
-export async function unlockTokenDetails(token, signer) {
+export async function unlockTokenContent(token, signer) {
     if (isHiddenContentLocked(token))
         await unlockHiddenContent(token, signer);
-    return getTokenDetails(token);
+    return getTokenContent(token);
 }

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

@@ -0,0 +1,7 @@
+import { EventOperation } from "applesauce-factory";
+import { HistoryContent } from "../../helpers/history.js";
+import { EventPointer } from "nostr-tools/nip19";
+/** Sets the encrypted tags of a wallet history event */
+export declare function setHistoryContent(content: HistoryContent): EventOperation;
+/** Sets the "redeemed" tags on a wallet history event */
+export declare function setHistoryRedeemed(redeemed: (string | EventPointer)[]): EventOperation;

package/dist/operations/event/history.js

@@ -0,0 +1,19 @@
+import { modifyHiddenTags, modifyPublicTags } from "applesauce-factory/operations/event";
+import { includeHistoryCreatedTags, includeHistoryRedeemedTags, setHistoryAmountTag, setHistoryDirectionTag, setHistoryFeeTag, setHistoryMintTag, } from "../tag/history.js";
+/** Sets the encrypted tags of a wallet history event */
+export function setHistoryContent(content) {
+    const operations = [
+        setHistoryDirectionTag(content.direction),
+        setHistoryAmountTag(content.amount),
+        includeHistoryCreatedTags(content.created),
+    ];
+    if (content.fee !== undefined)
+        operations.push(setHistoryFeeTag(content.fee));
+    if (content.mint !== undefined)
+        operations.push(setHistoryMintTag(content.mint));
+    return modifyHiddenTags(...operations);
+}
+/** Sets the "redeemed" tags on a wallet history event */
+export function setHistoryRedeemed(redeemed) {
+    return modifyPublicTags(includeHistoryRedeemedTags(redeemed));
+}

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

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

package/dist/operations/event/index.js

@@ -1 +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,20 @@
+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");
+        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/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

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

package/dist/operations/tag/index.js

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

package/dist/queries/history.js

@@ -1,4 +1,4 @@
-import { getHistoryRedeemed, isHistoryDetailsLocked, WALLET_HISTORY_KIND } from "../helpers/history.js";
+import { getHistoryRedeemed, isHistoryContentLocked, WALLET_HISTORY_KIND } from "../helpers/history.js";
 import { combineLatest, filter, map, scan, startWith } from "rxjs";
 /** Query that returns an array of redeemed event ids for a wallet */
 export function WalletRedeemedQuery(pubkey) {
@@ -20,7 +20,7 @@ export function WalletHistoryQuery(pubkey, locked) {
                 if (locked === undefined)
                     return history;
                 else
-                    return history.filter((entry) => isHistoryDetailsLocked(entry) === locked);
+                    return history.filter((entry) => isHistoryContentLocked(entry) === locked);
             }));
         },
     };

package/dist/queries/tokens.js

@@ -1,5 +1,5 @@
 import { combineLatest, filter, map, startWith } from "rxjs";
-import { getTokenDetails, isTokenDetailsLocked, WALLET_TOKEN_KIND } from "../helpers/tokens.js";
+import { getTokenContent, isTokenContentLocked, WALLET_TOKEN_KIND } from "../helpers/tokens.js";
 /** removes deleted events from sorted array */
 function filterDeleted(tokens) {
     const deleted = new Set();
@@ -10,11 +10,11 @@ function filterDeleted(tokens) {
         if (deleted.has(token.id))
             return false;
         // skip if token is locked
-        if (isTokenDetailsLocked(token))
+        if (isTokenContentLocked(token))
             return false;
         else {
             // add ids to deleted array
-            const details = getTokenDetails(token);
+            const details = getTokenContent(token);
             for (const id of details.del)
                 deleted.add(id);
         }
@@ -35,7 +35,7 @@ export function WalletTokensQuery(pubkey, locked) {
                 if (locked === undefined)
                     return tokens;
                 else
-                    return tokens.filter((t) => isTokenDetailsLocked(t) === locked);
+                    return tokens.filter((t) => isTokenContentLocked(t) === locked);
             }), 
             // remove deleted events
             map(filterDeleted));
@@ -54,7 +54,7 @@ export function WalletBalanceQuery(pubkey) {
             map(filterDeleted), 
             // map tokens to totals
             map((tokens) => tokens.reduce((totals, token) => {
-                const details = getTokenDetails(token);
+                const details = getTokenContent(token);
                 const total = details.proofs.reduce((t, p) => t + p.amount, 0);
                 return { ...totals, [details.mint]: (totals[details.mint] ?? 0) + total };
             }, {})));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet",
-  "version": "0.0.0-next-20250311171842",
+  "version": "0.0.0-next-20250311195656",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -77,17 +77,18 @@
     }
   },
   "dependencies": {
+    "@cashu/cashu-ts": "2.0.0-rc1",
     "@noble/hashes": "^1.7.1",
-    "applesauce-actions": "0.0.0-next-20250311171842",
-    "applesauce-core": "0.0.0-next-20250311171842",
-    "applesauce-factory": "0.0.0-next-20250311171842",
+    "applesauce-actions": "0.0.0-next-20250311195656",
+    "applesauce-core": "0.0.0-next-20250311195656",
+    "applesauce-factory": "0.0.0-next-20250311195656",
     "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-20250311171842",
+    "applesauce-signers": "0.0.0-next-20250311195656",
     "typescript": "^5.7.3",
     "vitest": "^3.0.5"
   },