applesauce-wallet 0.12.0 → 1.0.0

package/dist/queries/history.js

@@ -2,26 +2,20 @@ 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)], [])),
-    };
+    return (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);
-            }));
-        },
+    return (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/tokens.js

@@ -21,44 +21,38 @@ function filterDeleted(tokens) {
 }
 /** 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));
-        },
+    return (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 };
-                }, {});
-            }));
-        },
+    return (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.js

@@ -2,20 +2,17 @@ import { filter, map, merge } from "rxjs";
 import { getWalletMints, getWalletPrivateKey, isWalletLocked, WALLET_KIND } from "../helpers/wallet.js";
 /** A query to get the state of a NIP-60 wallet */
 export function WalletQuery(pubkey) {
-    return {
-        key: pubkey,
-        run: (events) => merge(
-        // get the latest replaceable event
-        events.replaceable(WALLET_KIND, pubkey), 
-        // and listen for any updates to matching events
-        events.updates.pipe(filter((e) => e.kind === WALLET_KIND && e.pubkey === pubkey))).pipe(map((wallet) => {
-            if (!wallet)
-                return;
-            if (isWalletLocked(wallet))
-                return { locked: true, event: wallet };
-            const mints = getWalletMints(wallet);
-            const privateKey = getWalletPrivateKey(wallet);
-            return { locked: false, mints, privateKey, event: wallet };
-        })),
-    };
+    return (events) => merge(
+    // get the latest replaceable event
+    events.replaceable(WALLET_KIND, pubkey), 
+    // and listen for any updates to matching events
+    events.updates.pipe(filter((e) => e.kind === WALLET_KIND && e.pubkey === pubkey))).pipe(map((wallet) => {
+        if (!wallet)
+            return;
+        if (isWalletLocked(wallet))
+            return { locked: true, event: wallet };
+        const mints = getWalletMints(wallet);
+        const privateKey = getWalletPrivateKey(wallet);
+        return { locked: false, mints, privateKey, event: wallet };
+    }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet",
-  "version": "0.12.0",
+  "version": "1.0.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -80,18 +80,18 @@
     "@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",
+    "applesauce-actions": "^1.0.0",
+    "applesauce-core": "^1.0.0",
+    "applesauce-factory": "^1.0.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"
+    "applesauce-signers": "^1.0.0",
+    "typescript": "^5.8.3",
+    "vitest": "^3.1.1"
   },
   "funding": {
     "type": "lightning",