applesauce-wallet 0.0.0-next-20250313104750 → 0.0.0-next-20250313135311

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__/animated-qr.test.js

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { getDecodedToken } from "@cashu/cashu-ts";
-import { lastValueFrom, take, timer } from "rxjs";
+import { lastValueFrom, map, take, timer } from "rxjs";
 import { subscribeSpyTo } from "@hirez_io/observer-spy";
 import { receiveAnimated, sendAnimated } from "../animated-qr.js";
 const tokenStr = "cashuBo2FteBtodHRwczovL3Rlc3RudXQuY2FzaHUuc3BhY2VhdWNzYXRhdIGiYWlIAJofKTJT5B5hcIOkYWEQYXN4QDA2M2VlYjgwZDZjODM4NWU4NzYwODVhN2E4NzdkOTkyY2U4N2QwNTRmY2RjYzNiODMwMzhjOWY3MmNmMDY1ZGVhY1ghAynsxZ-OuZfZDcqYTLPYfCqHO7jkGjn97aolgtSYhYykYWSjYWVYIGbp_9B9aztSlZxz7g6Tqx5M_1PuFzJCVEMOVd8XAF8wYXNYINTOU77ODcj28v04pq7ektdf6sq2XuxvMjVE0wK6jFolYXJYIM_gZnUGT5jDOyZiQ-2vG9zYnuWaY8vPoWGe_3sXvrvbpGFhBGFzeEA0MWMwZDk1YTU5ZjkxNTdlYTc5NTJlNGFlMzYzYTI3NTMxNTllNmQ1NGJiNzExMTg5ZDk5YjU1MmYzYjIzZTJiYWNYIQM-49gen_1nPchxbaAiKprVr78VmMRVpHH_Tu9P8TO5mGFko2FlWCB9j7rlpdBH_m7tNYnLpzPhn-nGmS1CcbUfnPzjxy6G92FzWCDdsby7fGM5324T5UEoV858YWzZ9MCY59KgKP362fJDfmFyWCDL73v4FRo7iMe83bfMuEy3RJPtC1Vr1jdOpw2-x-7EAaRhYQFhc3hANjRhZDI3NmExOGNmNDhiMDZmYjdiMGYwOWFiMTU4ZTA0ZmM0NmIxYzA4YzMyNjJlODUxNzZkYTMzMTgyYzQ3YWFjWCECMDpCbNbrgA9FcQEIYxobU7ik_pTl8sByPqHDmkY4azxhZKNhZVggqHGaff9M270EU8LGxRpG_G4rn2bMgjyk3hFFg78ZXRVhc1ggP6DsNsWykwKE94yZF23gpCyapcoqh6DDZdVu0lKn2Z5hclggmPKig-lObsuxi_1XCm7_Y_tqaCcqEDz8eCwVhJ8gq9M";
@@ -28,7 +28,7 @@ describe("sendAnimated", () => {
 });
 describe("receiveAnimated", () => {
     it("should decode animated qr", async () => {
-        const qr$ = sendAnimated(token, { interval: 0 }).pipe(receiveAnimated);
+        const qr$ = sendAnimated(token, { interval: 0 }).pipe(receiveAnimated, map((part) => (typeof part === "string" ? getDecodedToken(part) : part)));
         const spy = subscribeSpyTo(qr$);
         await lastValueFrom(qr$);
         expect(spy.getValues()).toEqual([

package/dist/helpers/animated-qr.d.ts

@@ -27,4 +27,4 @@ export type SendAnimatedOptions = {
 /** Creates an observable that iterates through a multi-part animated qr code */
 export declare function sendAnimated(token: Token | string, options?: SendAnimatedOptions): Observable<string>;
 /** Creates an observable that completes with decoded token */
-export declare function receiveAnimated(input: Observable<string>): Observable<Token | number>;
+export declare function receiveAnimated(input: Observable<string>): Observable<string | number>;

package/dist/helpers/animated-qr.js

@@ -1,4 +1,4 @@
-import { getDecodedToken, getEncodedTokenV4 } from "@cashu/cashu-ts";
+import { getEncodedTokenV4 } from "@cashu/cashu-ts";
 import { UR, URDecoder, UREncoder } from "@gandlaf21/bc-ur/dist/lib/es6/index.js";
 import { defer, filter, interval, map, Observable, shareReplay } from "rxjs";
 /** Preset speeds for the animated qr code */
@@ -62,16 +62,9 @@ export function receiveAnimated(input) {
     // convert to lower case
     map((str) => str.toLowerCase()), 
     // filter out non UR parts
-    filter((str) => str.startsWith("ur:")), 
+    filter((str) => str.startsWith("ur:bytes")), 
     // decode UR and complete
     urDecoder(), 
-    // decode cashu token
-    map((part) => {
-        if (typeof part === "string")
-            return getDecodedToken(part);
-        else
-            return part;
-    }), 
     // only run one decoder
     shareReplay(1));
 }

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-20250313104750",
+  "version": "0.0.0-next-20250313135311",
   "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-20250313104750",
-    "applesauce-core": "0.0.0-next-20250313104750",
-    "applesauce-factory": "0.0.0-next-20250313104750",
+    "applesauce-actions": "0.0.0-next-20250313135311",
+    "applesauce-core": "0.0.0-next-20250313135311",
+    "applesauce-factory": "0.0.0-next-20250313135311",
     "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-20250313104750",
+    "applesauce-signers": "0.0.0-next-20250313135311",
     "typescript": "^5.7.3",
     "vitest": "^3.0.5"
   },