applesauce-wallet 0.0.0-next-20250313125308 → 0.0.0-next-20250313145241

package/dist/actions/tokens.d.ts

@@ -6,7 +6,7 @@ import { NostrEvent } from "nostr-tools";
  * @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;
+export declare function ReceiveToken(token: Token, redeemed?: string[], fee?: number): Action;
 /** An action that deletes old tokens and creates a new one but does not add a history event */
 export declare function RolloverTokens(tokens: NostrEvent[], token: Token): Action;
 /** An action that deletes old token events and adds a spend history item */

package/dist/actions/tokens.js

@@ -7,11 +7,11 @@ import { WalletHistoryBlueprint } from "../blueprints/history.js";
  * @param token the cashu token to add
  * @param redeemed an array of nutzap event ids to mark as redeemed
  */
-export function ReceiveToken(token, redeemed) {
+export function ReceiveToken(token, redeemed, fee) {
     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 ?? []));
+        const history = await factory.sign(await factory.create(WalletHistoryBlueprint, { direction: "in", amount, mint: token.mint, created: [tokenEvent.id], fee }, redeemed ?? []));
         await publish("Save tokens", tokenEvent);
         await publish("Save transaction", history);
     };

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

@@ -22,7 +22,7 @@ describe("dumbTokenSelection", () => {
         await unlockTokenContent(b, user);
         expect(dumbTokenSelection([a, b], 40)).toEqual([b]);
     });
-    it("should enough tokens to total min amount", async () => {
+    it("should select 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 }],
@@ -45,13 +45,20 @@ describe("dumbTokenSelection", () => {
         await unlockTokenContent(a, user);
         expect(() => dumbTokenSelection([a], 120)).toThrow();
     });
-    it("should throw if tokens are locked", async () => {
+    it("should ignore locked tokens", 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);
         // manually remove the hidden content to lock it again
-        Reflect.deleteProperty(a, HiddenContentSymbol);
-        expect(() => dumbTokenSelection([a], 20)).toThrow();
+        Reflect.deleteProperty(b, HiddenContentSymbol);
+        expect(dumbTokenSelection([a, b], 20)).toEqual([a]);
     });
 });

package/dist/helpers/history.d.ts

@@ -20,6 +20,6 @@ export declare function getHistoryRedeemed(history: NostrEvent): string[];
 /** 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;
+export declare function getHistoryContent(history: NostrEvent): HistoryContent | undefined;
 /** Decrypts a wallet history event */
 export declare function unlockHistoryContent(history: NostrEvent, signer: HiddenContentSigner): Promise<HistoryContent>;

package/dist/helpers/history.js

@@ -1,4 +1,4 @@
-import { getHiddenTags, getOrComputeCachedValue, isETag, isHiddenTagsLocked, unlockHiddenTags, } from "applesauce-core/helpers";
+import { getHiddenTags, getOrComputeCachedValue, isETag, isHiddenContentLocked, isHiddenTagsLocked, unlockHiddenTags, } from "applesauce-core/helpers";
 export const WALLET_HISTORY_KIND = 7376;
 export const HistoryContentSymbol = Symbol.for("history-content");
 /** returns an array of redeemed event ids in a history event */
@@ -11,6 +11,8 @@ export function isHistoryContentLocked(history) {
 }
 /** Returns the parsed content of a 7376 history event */
 export function getHistoryContent(history) {
+    if (isHistoryContentLocked(history))
+        return undefined;
     return getOrComputeCachedValue(history, HistoryContentSymbol, () => {
         const tags = getHiddenTags(history);
         if (!tags)
@@ -33,6 +35,7 @@ export function getHistoryContent(history) {
 }
 /** Decrypts a wallet history event */
 export async function unlockHistoryContent(history, signer) {
-    await unlockHiddenTags(history, signer);
+    if (isHiddenContentLocked(history))
+        await unlockHiddenTags(history, signer);
     return getHistoryContent(history);
 }

package/dist/helpers/tokens.d.ts

@@ -22,15 +22,15 @@ 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;
+export declare function getTokenContent(token: NostrEvent): TokenContent | undefined;
 /** 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;
+export declare function getTokenProofsTotal(token: NostrEvent): number | undefined;
 /**
  * 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[];
+export declare function dumbTokenSelection(tokens: NostrEvent[], minAmount: number, mint?: string): import("nostr-tools").Event[];

package/dist/helpers/tokens.js

@@ -1,4 +1,4 @@
-import { getHiddenContent, getOrComputeCachedValue, isHiddenContentLocked, unlockHiddenContent, } from "applesauce-core/helpers";
+import { getHiddenContent, getOrComputeCachedValue, isHiddenContentLocked, isHiddenTagsLocked, unlockHiddenContent, } from "applesauce-core/helpers";
 export const WALLET_TOKEN_KIND = 7375;
 export const TokenContentSymbol = Symbol.for("token-content");
 export const TokenProofsTotalSymbol = Symbol.for("token-proofs-total");
@@ -7,6 +7,8 @@ export const TokenProofsTotalSymbol = Symbol.for("token-proofs-total");
  * @throws
  */
 export function getTokenContent(token) {
+    if (isHiddenTagsLocked(token))
+        return undefined;
     return getOrComputeCachedValue(token, TokenContentSymbol, () => {
         const plaintext = getHiddenContent(token);
         if (!plaintext)
@@ -33,6 +35,8 @@ export async function unlockTokenContent(token, signer) {
 }
 /** Gets the totaled amount of proofs in a token event */
 export function getTokenProofsTotal(token) {
+    if (isTokenContentLocked(token))
+        return undefined;
     return getOrComputeCachedValue(token, TokenProofsTotalSymbol, () => {
         const content = getTokenContent(token);
         return content.proofs.reduce((t, p) => t + p.amount, 0);
@@ -42,14 +46,14 @@ export function getTokenProofsTotal(token) {
  * 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);
+export function dumbTokenSelection(tokens, minAmount, mint) {
+    // sort newest to oldest
+    const sorted = tokens
+        .filter((token) => !isTokenContentLocked(token) && (mint ? getTokenContent(token).mint === mint : true))
+        .sort((a, b) => b.created_at - a.created_at);
+    const total = sorted.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) {

package/dist/queries/history.js

@@ -1,5 +1,5 @@
-import { getHistoryRedeemed, isHistoryContentLocked, WALLET_HISTORY_KIND } from "../helpers/history.js";
 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 {

package/dist/queries/tokens.js

@@ -46,7 +46,7 @@ export function WalletBalanceQuery(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), 
+            return combineLatest([updates, timeline]).pipe(map(([_, tokens]) => tokens.filter((t) => !isTokenContentLocked(t))), 
             // filter out deleted tokens
             map(filterDeleted), 
             // map tokens to totals

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet",
-  "version": "0.0.0-next-20250313125308",
+  "version": "0.0.0-next-20250313145241",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -80,9 +80,9 @@
     "@cashu/cashu-ts": "2.0.0-rc1",
     "@gandlaf21/bc-ur": "^1.1.12",
     "@noble/hashes": "^1.7.1",
-    "applesauce-actions": "0.0.0-next-20250313125308",
-    "applesauce-core": "0.0.0-next-20250313125308",
-    "applesauce-factory": "0.0.0-next-20250313125308",
+    "applesauce-actions": "0.0.0-next-20250313145241",
+    "applesauce-core": "0.0.0-next-20250313145241",
+    "applesauce-factory": "0.0.0-next-20250313145241",
     "buffer": "^6.0.3",
     "nostr-tools": "^2.10.4",
     "rxjs": "^7.8.1"
@@ -90,7 +90,7 @@
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
     "@types/debug": "^4.1.12",
-    "applesauce-signers": "0.0.0-next-20250313125308",
+    "applesauce-signers": "0.0.0-next-20250313145241",
     "typescript": "^5.7.3",
     "vitest": "^3.0.5"
   },