applesauce-wallet 0.0.0-next-20250310121307 → 0.0.0-next-20250310173615

package/dist/helpers/history.d.ts

@@ -12,6 +12,8 @@ export type HistoryDetails = {
 export declare const HistoryDetailsSymbol: 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;
 /** Decrypts a wallet history event */

package/dist/helpers/history.js

@@ -1,10 +1,14 @@
-import { getHiddenTags, getOrComputeCachedValue, isETag, unlockHiddenTags, } from "applesauce-core/helpers";
+import { getHiddenTags, getOrComputeCachedValue, isETag, isHiddenTagsLocked, unlockHiddenTags, } from "applesauce-core/helpers";
 export const WALLET_HISTORY_KIND = 7376;
 export const HistoryDetailsSymbol = Symbol.for("history-details");
 /** 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) {
+    return isHiddenTagsLocked(history);
+}
 /** Returns the parsed details of a 7376 history event */
 export function getHistoryDetails(history) {
     return getOrComputeCachedValue(history, HistoryDetailsSymbol, () => {

package/dist/queries/history.d.ts

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

@@ -1,5 +1,5 @@
-import { getHistoryRedeemed, WALLET_HISTORY_KIND } from "../helpers/history.js";
-import { scan } from "rxjs";
+import { getHistoryRedeemed, isHistoryDetailsLocked, 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) {
     return {
@@ -9,3 +9,19 @@ export function WalletRedeemedQuery(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) => isHistoryDetailsLocked(entry) === locked);
+            }));
+        },
+    };
+}

package/dist/queries/tokens.d.ts

@@ -1,6 +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[]>;
+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,18 +1,44 @@
-import { combineLatest, filter, map } from "rxjs";
+import { combineLatest, filter, map, startWith } from "rxjs";
 import { getTokenDetails, isTokenDetailsLocked, 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;
+        // skip if token is locked
+        if (isTokenDetailsLocked(token))
+            return false;
+        else {
+            // add ids to deleted array
+            const details = getTokenDetails(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));
+            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]) => {
-                if (locked !== undefined)
-                    return tokens.filter((t) => isTokenDetailsLocked(t) === locked);
-                else
+            return combineLatest([updates, timeline]).pipe(
+            // filter out locked tokens
+            map(([_, tokens]) => {
+                if (locked === undefined)
                     return tokens;
-            }));
+                else
+                    return tokens.filter((t) => isTokenDetailsLocked(t) === locked);
+            }), 
+            // remove deleted events
+            map(filterDeleted));
         },
     };
 }
@@ -21,30 +47,17 @@ export function WalletBalanceQuery(pubkey) {
     return {
         key: pubkey,
         run: (events) => {
-            const updates = events.updates.pipe(filter((e) => e.kind === WALLET_TOKEN_KIND && e.pubkey === pubkey));
+            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]) => {
-                const deleted = new Set();
-                return (tokens
-                    // count the tokens from newest to oldest (so del gets applied correctly)
-                    .reverse()
-                    .reduce((totals, token) => {
-                    // skip this event if it a newer event says its deleted
-                    if (deleted.has(token.id))
-                        return totals;
-                    // skip if token is locked
-                    if (isTokenDetailsLocked(token))
-                        return totals;
-                    const details = getTokenDetails(token);
-                    if (!details)
-                        return totals;
-                    // add deleted ids
-                    for (const id of details.del)
-                        deleted.add(id);
-                    const total = details.proofs.reduce((t, p) => t + p.amount, 0);
-                    return { ...totals, [details.mint]: (totals[details.mint] ?? 0) + total };
-                }, {}));
-            }));
+            return combineLatest([updates, timeline]).pipe(map(([_, tokens]) => tokens), 
+            // filter out deleted tokens
+            map(filterDeleted), 
+            // map tokens to totals
+            map((tokens) => tokens.reduce((totals, token) => {
+                const details = getTokenDetails(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.js

@@ -8,7 +8,7 @@ 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))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet",
-  "version": "0.0.0-next-20250310121307",
+  "version": "0.0.0-next-20250310173615",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -42,7 +42,7 @@
     }
   },
   "dependencies": {
-    "applesauce-core": "0.0.0-next-20250310121307",
+    "applesauce-core": "0.0.0-next-20250310173615",
     "nostr-tools": "^2.10.4",
     "rxjs": "^7.8.1"
   },