applesauce-wallet 0.0.0-next-20250311170821 → 0.0.0-next-20250311175838

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/helpers/history.d.ts

@@ -1,7 +1,7 @@
 import { HiddenContentSigner } from "applesauce-core/helpers";
 import { NostrEvent } from "nostr-tools";
 export declare const WALLET_HISTORY_KIND = 7376;
-export type HistoryDetails = {
+export type HistoryContent = {
     /** The direction of the transaction, in = received, out = sent */
     direction: "in" | "out";
     /** The amount of the transaction */
@@ -13,12 +13,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 */
@@ -14,10 +14,10 @@ export type TokenDetails = {
     /** 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");
@@ -18,12 +18,12 @@ export function getTokenDetails(token) {
     });
 }
 /** 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/helpers/wallet.d.ts

@@ -11,4 +11,4 @@ export declare function unlockWallet(wallet: NostrEvent, signer: HiddenContentSi
 /** Returns the wallets mints */
 export declare function getWalletMints(wallet: NostrEvent): string[];
 /** Returns the wallets private key as a string */
-export declare function getWalletPrivateKey(wallet: NostrEvent): string;
+export declare function getWalletPrivateKey(wallet: NostrEvent): Uint8Array;

package/dist/helpers/wallet.js

@@ -1,3 +1,4 @@
+import { hexToBytes } from "@noble/hashes/utils";
 import { getHiddenTags, getOrComputeCachedValue, isHiddenTagsLocked, unlockHiddenTags, } from "applesauce-core/helpers";
 export const WALLET_KIND = 17375;
 export const WALLET_BACKUP_KIND = 375;
@@ -29,6 +30,6 @@ export function getWalletPrivateKey(wallet) {
         const key = tags.find((t) => t[0] === "privkey" && t[1])?.[1];
         if (!key)
             throw new Error("Wallet missing private key");
-        return key;
+        return hexToBytes(key);
     });
 }

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/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

@@ -12,10 +12,10 @@ export function WalletQuery(pubkey) {
             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.0.0-next-20250311170821",
+  "version": "0.0.0-next-20250311175838",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -78,16 +78,16 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.7.1",
-    "applesauce-actions": "0.0.0-next-20250311170821",
-    "applesauce-core": "0.0.0-next-20250311170821",
-    "applesauce-factory": "0.0.0-next-20250311170821",
+    "applesauce-actions": "0.0.0-next-20250311175838",
+    "applesauce-core": "0.0.0-next-20250311175838",
+    "applesauce-factory": "0.0.0-next-20250311175838",
     "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-20250311170821",
+    "applesauce-signers": "0.0.0-next-20250311175838",
     "typescript": "^5.7.3",
     "vitest": "^3.0.5"
   },