applesauce-wallet 0.0.0-next-20250313155042 → 0.0.0-next-20250314133024

package/dist/actions/__tests__/wallet.test.js

@@ -6,6 +6,7 @@ import { FakeUser } from "../../__tests__/fake-user.js";
 import { CreateWallet } from "../wallet.js";
 import { WALLET_BACKUP_KIND } from "../../helpers/wallet.js";
 import { unlockHiddenTags } from "applesauce-core/helpers";
+import { lastValueFrom } from "rxjs";
 const user = new FakeUser();
 let events;
 let factory;
@@ -20,13 +21,11 @@ beforeEach(() => {
 describe("CreateWallet", () => {
     it("should publish a wallet backup event", async () => {
         await hub.run(CreateWallet, ["https://mint.money.com"]);
-        expect(publish).toHaveBeenCalledWith(expect.any(String), expect.objectContaining({ kind: WALLET_BACKUP_KIND }));
+        expect(publish).toHaveBeenCalledWith(expect.objectContaining({ kind: WALLET_BACKUP_KIND }));
     });
     it("should publish a wallet event with mints", async () => {
-        await hub.run(CreateWallet, ["https://mint.money.com"]);
-        // @ts-expect-error
-        const walletEvent = publish.mock.calls[1][1];
-        const hiddenTags = await unlockHiddenTags(walletEvent, user);
+        const event = await lastValueFrom(hub.exec(CreateWallet, ["https://mint.money.com"]));
+        const hiddenTags = await unlockHiddenTags(event, user);
         // the second call should be the wallet event
         expect(hiddenTags).toEqual(expect.arrayContaining([["mint", "https://mint.money.com"]]));
     });

package/dist/actions/tokens.js

@@ -8,17 +8,17 @@ import { WalletHistoryBlueprint } from "../blueprints/history.js";
  * @param redeemed an array of nutzap event ids to mark as redeemed
  */
 export function ReceiveToken(token, redeemed, fee) {
-    return async ({ factory, publish }) => {
+    return async function* ({ factory }) {
         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], fee }, redeemed ?? []));
-        await publish("Save tokens", tokenEvent);
-        await publish("Save transaction", history);
+        yield tokenEvent;
+        yield history;
     };
 }
 /** An action that deletes old tokens and creates a new one but does not add a history event */
 export function RolloverTokens(tokens, token) {
-    return async ({ factory, publish }) => {
+    return async function* ({ factory }) {
         // create a delete event for old tokens
         const deleteDraft = await factory.create(DeleteBlueprint, tokens);
         // create a new token event
@@ -27,13 +27,13 @@ export function RolloverTokens(tokens, token) {
         const signedDelete = await factory.sign(deleteDraft);
         const signedToken = await factory.sign(tokenDraft);
         // publish events
-        await publish("Delete old tokens", signedDelete);
-        await publish("Save new token", signedToken);
+        yield signedDelete;
+        yield signedToken;
     };
 }
 /** An action that deletes old token events and adds a spend history item */
 export function CompleteSpend(spent, change) {
-    return async ({ factory, publish }) => {
+    return async function* ({ factory }) {
         if (spent.length === 0)
             throw new Error("Cant complete spent with no token events");
         if (spent.some((s) => isTokenContentLocked(s)))
@@ -56,9 +56,9 @@ export function CompleteSpend(spent, change) {
         // sign history
         const signedHistory = await factory.sign(history);
         // publish events
-        await publish("Delete old tokens", signedDelete);
+        yield signedDelete;
         if (signedToken)
-            await publish("Save change", signedToken);
-        await publish("Save transaction", signedHistory);
+            yield signedToken;
+        yield signedHistory;
     };
 }

package/dist/actions/wallet.js

@@ -5,19 +5,20 @@ import { isTokenContentLocked, unlockTokenContent, WALLET_TOKEN_KIND } from "../
 import { isHistoryContentLocked, 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 }) => {
+    return async function* ({ events, factory, self }) {
         const existing = events.getReplaceable(WALLET_KIND, self);
         if (existing)
             throw new Error("Wallet already exists");
         const wallet = await factory.sign(await factory.create(WalletBlueprint, privateKey, mints));
         const backup = await factory.sign(await factory.create(WalletBackupBlueprint, wallet));
-        await publish("Wallet backup", backup);
-        await publish("Create wallet", wallet);
+        // publish the backup first
+        yield backup;
+        yield wallet;
     };
 }
 /** Unlocks the wallet event and optionally the tokens and history events */
 export function UnlockWallet(unlock) {
-    return async ({ events, self, factory }) => {
+    return async function* ({ events, self, factory }) {
         const signer = factory.context.signer;
         if (!signer)
             throw new Error("Missing signer");

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

@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";
 import { EventFactory } from "applesauce-factory";
 import { FakeUser } from "../../__tests__/fake-user.js";
 import { WalletTokenBlueprint } from "../../blueprints/tokens.js";
-import { dumbTokenSelection, unlockTokenContent } from "../tokens.js";
+import { decodeTokenFromEmojiString, dumbTokenSelection, encodeTokenToEmoji, unlockTokenContent } from "../tokens.js";
 import { HiddenContentSymbol } from "applesauce-core/helpers";
 const user = new FakeUser();
 const factory = new EventFactory({ signer: user });
@@ -62,3 +62,26 @@ describe("dumbTokenSelection", () => {
         expect(dumbTokenSelection([a, b], 20)).toEqual([a]);
     });
 });
+describe("encodeTokenToEmoji", () => {
+    it("should encode token into emoji string", () => {
+        const token = "cashuBo2FteBtodHRwczovL3Rlc3RudXQuY2FzaHUuc3BhY2VhdWNzYXRhdIGiYWlIAJofKTJT5B5hcIGkYWEBYXN4QDdlZDBkMzk3NGQ5ZWM2OTc2YTAzYmZmYjdkMTA4NzIzZTBiMDRjMzRhNDc3MjlmNjMwOGJlODc3OTA2NTY0NDVhY1ghA36iYyOHCe4CnTxzORbcXFVeAbkMUFE6FqPWInujnAOcYWSjYWVYIJmHRwCQ0Uopkd3P5xb0MdcWQEaZz9hXWtcn-FMhZj8LYXNYIF4X9ybXxg5Pp0KSowfu4y_Aovo9iy3TXlLSaKyVJzz2YXJYIC_UFkoC5U9BpSgBTGUQgsjfz_emv5xykDiavZUfRN8E";
+        expect(encodeTokenToEmoji(token).length).toBeGreaterThan(token.length);
+    });
+});
+const emoji = "🥜󠅓󠅑󠅣󠅘󠅥󠄲󠅟󠄢󠄶󠅤󠅕󠄲󠅤󠅟󠅔󠄸󠅂󠅧󠅓󠅪󠅟󠅦󠄼󠄣󠅂󠅜󠅓󠄣󠅂󠅥󠅔󠅈󠅁󠅥󠅉󠄢󠄶󠅪󠅑󠄸󠅅󠅥󠅓󠄣󠄲󠅘󠅉󠄢󠅆󠅘󠅔󠅇󠄾󠅪󠅉󠅈󠅂󠅘󠅔󠄹󠄷󠅙󠅉󠅇󠅜󠄹󠄱󠄺󠅟󠅖󠄻󠅄󠄺󠅄󠄥󠄲󠄥󠅘󠅓󠄹󠄷󠅛󠅉󠅇󠄵󠄲󠅉󠅈󠄾󠄤󠅁󠄴󠅔󠅜󠅊󠄴󠄲󠅛󠄽󠅪󠅛󠄣󠄾󠄷󠅁󠄥󠅊󠅇󠄽󠄢󠄿󠅄󠅓󠄢󠅉󠅄󠄱󠅪󠅉󠅝󠅊󠅝󠅉󠅚󠅔󠅛󠄽󠅄󠄱󠄤󠄾󠅪󠄹󠅪󠅊󠅄󠄲󠅙󠄽󠄴󠅂󠅚󠄽󠅪󠅂󠅘󠄾󠄴󠅓󠄣󠄽󠅚󠅜󠅝󠄾󠅚󠄽󠅧󠄿󠄷󠄺󠅜󠄿󠄴󠅓󠄣󠄿󠅄󠄱󠄢󠄾󠅄󠅉󠄠󠄾󠄴󠅆󠅘󠅉󠄡󠅗󠅘󠄱󠄣󠄦󠅙󠅉󠅩󠄿󠄸󠄳󠅕󠄤󠄳󠅞󠅄󠅨󠅪󠄿󠅂󠅒󠅓󠅈󠄶󠅆󠅕󠄱󠅒󠅛󠄽󠅅󠄶󠄵󠄦󠄶󠅡󠅀󠅇󠄹󠅞󠅥󠅚󠅞󠄱󠄿󠅓󠅉󠅇󠅃󠅚󠅉󠅇󠅆󠅉󠄹󠄺󠅝󠄸󠅂󠅧󠄳󠅁󠄠󠅅󠅟󠅠󠅛󠅔󠄣󠅀󠄥󠅨󠅒󠄠󠄽󠅔󠅓󠅇󠅁󠄵󠅑󠅊󠅪󠄩󠅘󠅈󠅇󠅤󠅓󠅞󠄝󠄶󠄽󠅘󠅊󠅚󠄨󠄼󠅉󠅈󠄾󠅉󠄹󠄶󠄤󠅈󠄩󠅩󠅒󠅈󠅨󠅗󠄥󠅀󠅠󠄠󠄻󠅃󠅟󠅧󠅖󠅥󠄤󠅩󠅏󠄱󠅟󠅦󠅟󠄩󠅙󠅩󠄣󠅄󠅈󠅜󠄼󠅃󠅑󠄻󠅩󠅆󠄺󠅪󠅪󠄢󠅉󠅈󠄺󠅉󠄹󠄳󠅏󠅅󠄶󠅛󠅟󠄳󠄥󠅅󠄩󠄲󠅠󠅃󠅗󠄲󠅄󠄷󠅅󠅁󠅗󠅣󠅚󠅖󠅪󠅏󠅕󠅝󠅦󠄥󠅨󠅩󠅛󠄴󠅙󠅑󠅦󠅊󠅅󠅖󠅂󠄾󠄨󠄵";
+describe("decodeTokenFromEmojiString", () => {
+    it("should decode single emoji", () => {
+        expect(decodeTokenFromEmojiString(emoji)).toEqual(expect.objectContaining({
+            mint: "https://testnut.cashu.space",
+            proofs: [expect.any(Object)],
+            unit: "sat",
+        }));
+    });
+    it("should decode an emoji in text", () => {
+        expect(decodeTokenFromEmojiString("the money is in the emoji, " + emoji + " you can redeem it using cashu.me")).toEqual(expect.objectContaining({
+            mint: "https://testnut.cashu.space",
+            proofs: [expect.any(Object)],
+            unit: "sat",
+        }));
+    });
+});

package/dist/helpers/history.d.ts

@@ -23,3 +23,4 @@ export declare function isHistoryContentLocked(history: NostrEvent): boolean;
 export declare function getHistoryContent(history: NostrEvent): HistoryContent | undefined;
 /** Decrypts a wallet history event */
 export declare function unlockHistoryContent(history: NostrEvent, signer: HiddenContentSigner): Promise<HistoryContent>;
+export declare function lockHistoryContent(history: NostrEvent): void;

package/dist/helpers/history.js

@@ -1,4 +1,4 @@
-import { getHiddenTags, getOrComputeCachedValue, isETag, isHiddenContentLocked, isHiddenTagsLocked, unlockHiddenTags, } from "applesauce-core/helpers";
+import { getHiddenTags, getOrComputeCachedValue, isETag, isHiddenContentLocked, isHiddenTagsLocked, lockHiddenTags, 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 */
@@ -39,3 +39,7 @@ export async function unlockHistoryContent(history, signer) {
         await unlockHiddenTags(history, signer);
     return getHistoryContent(history);
 }
+export function lockHistoryContent(history) {
+    Reflect.deleteProperty(history, HistoryContentSymbol);
+    lockHiddenTags(history);
+}

package/dist/helpers/tokens.d.ts

@@ -1,3 +1,4 @@
+import { Token } from "@cashu/cashu-ts";
 import { HiddenContentSigner } from "applesauce-core/helpers";
 import { NostrEvent } from "nostr-tools";
 export declare const WALLET_TOKEN_KIND = 7375;
@@ -27,6 +28,8 @@ export declare function getTokenContent(token: NostrEvent): TokenContent | undef
 export declare function isTokenContentLocked(token: NostrEvent): boolean;
 /** Decrypts a k:7375 token event */
 export declare function unlockTokenContent(token: NostrEvent, signer: HiddenContentSigner): Promise<TokenContent>;
+/** Removes the unencrypted hidden content */
+export declare function lockTokenContent(token: NostrEvent): void;
 /** Gets the totaled amount of proofs in a token event */
 export declare function getTokenProofsTotal(token: NostrEvent): number | undefined;
 /**
@@ -34,3 +37,13 @@ export declare function getTokenProofsTotal(token: NostrEvent): number | undefin
  * @throws
  */
 export declare function dumbTokenSelection(tokens: NostrEvent[], minAmount: number, mint?: string): import("nostr-tools").Event[];
+/**
+ * Returns a decoded cashu token inside an unicode emoji
+ * @see https://github.com/cashubtc/cashu.me/blob/1194a7b9ee2f43305e38304de7bef8839601ff4d/src/components/ReceiveTokenDialog.vue#L387
+ */
+export declare function decodeTokenFromEmojiString(str: string): Token | undefined;
+/**
+ * Encodes a token into an emoji char
+ * @see https://github.com/cashubtc/cashu.me/blob/1194a7b9ee2f43305e38304de7bef8839601ff4d/src/components/SendTokenDialog.vue#L710
+ */
+export declare function encodeTokenToEmoji(token: Token | string, emoji?: string): string;

package/dist/helpers/tokens.js

@@ -1,4 +1,5 @@
-import { getHiddenContent, getOrComputeCachedValue, isHiddenContentLocked, isHiddenTagsLocked, unlockHiddenContent, } from "applesauce-core/helpers";
+import { getDecodedToken, getEncodedToken } from "@cashu/cashu-ts";
+import { getHiddenContent, getOrComputeCachedValue, isHiddenContentLocked, isHiddenTagsLocked, lockHiddenContent, 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");
@@ -33,6 +34,12 @@ export async function unlockTokenContent(token, signer) {
         await unlockHiddenContent(token, signer);
     return getTokenContent(token);
 }
+/** Removes the unencrypted hidden content */
+export function lockTokenContent(token) {
+    Reflect.deleteProperty(token, TokenContentSymbol);
+    Reflect.deleteProperty(token, TokenProofsTotalSymbol);
+    lockHiddenContent(token);
+}
 /** Gets the totaled amount of proofs in a token event */
 export function getTokenProofsTotal(token) {
     if (isTokenContentLocked(token))
@@ -65,3 +72,72 @@ export function dumbTokenSelection(tokens, minAmount, mint) {
     }
     return selected;
 }
+/**
+ * Returns a decoded cashu token inside an unicode emoji
+ * @see https://github.com/cashubtc/cashu.me/blob/1194a7b9ee2f43305e38304de7bef8839601ff4d/src/components/ReceiveTokenDialog.vue#L387
+ */
+export function decodeTokenFromEmojiString(str) {
+    try {
+        let decoded = [];
+        const chars = Array.from(str);
+        if (!chars.length)
+            return undefined;
+        const fromVariationSelector = function (char) {
+            const codePoint = char.codePointAt(0);
+            if (codePoint === undefined)
+                return null;
+            // Handle Variation Selectors (VS1-VS16): U+FE00 to U+FE0F
+            if (codePoint >= 0xfe00 && codePoint <= 0xfe0f) {
+                // Maps FE00->0, FE01->1, ..., FE0F->15
+                const byteValue = codePoint - 0xfe00;
+                return String.fromCharCode(byteValue);
+            }
+            // Handle Variation Selectors Supplement (VS17-VS256): U+E0100 to U+E01EF
+            if (codePoint >= 0xe0100 && codePoint <= 0xe01ef) {
+                // Maps E0100->16, E0101->17, ..., E01EF->255
+                const byteValue = codePoint - 0xe0100 + 16;
+                return String.fromCharCode(byteValue);
+            }
+            // No Variation Selector
+            return null;
+        };
+        // Check all input chars for peanut data
+        for (const char of chars) {
+            let byte = fromVariationSelector(char);
+            if (byte === null && decoded.length > 0) {
+                break;
+            }
+            else if (byte === null) {
+                continue;
+            }
+            decoded.push(byte); // got some
+        }
+        // Switch out token if we found peanut data
+        let decodedString = decoded.join("");
+        return getDecodedToken(decodedString);
+    }
+    catch (error) {
+        return undefined;
+    }
+}
+/**
+ * Encodes a token into an emoji char
+ * @see https://github.com/cashubtc/cashu.me/blob/1194a7b9ee2f43305e38304de7bef8839601ff4d/src/components/SendTokenDialog.vue#L710
+ */
+export function encodeTokenToEmoji(token, emoji = "🥜") {
+    return (emoji +
+        Array.from(typeof token === "string" ? token : getEncodedToken(token))
+            .map((char) => {
+            const byteValue = char.charCodeAt(0);
+            // For byte values 0-15, use Variation Selectors (VS1-VS16): U+FE00 to U+FE0F
+            if (byteValue >= 0 && byteValue <= 15) {
+                return String.fromCodePoint(0xfe00 + byteValue);
+            }
+            // For byte values 16-255, use Variation Selectors Supplement (VS17-VS256): U+E0100 to U+E01EF
+            if (byteValue >= 16 && byteValue <= 255) {
+                return String.fromCodePoint(0xe0100 + (byteValue - 16));
+            }
+            return "";
+        })
+            .join(""));
+}

package/dist/helpers/wallet.d.ts

@@ -8,6 +8,7 @@ export declare const WalletMintsSymbol: unique symbol;
 export declare function isWalletLocked(wallet: NostrEvent): boolean;
 /** Unlocks a wallet and returns the hidden tags */
 export declare function unlockWallet(wallet: NostrEvent, signer: HiddenContentSigner): Promise<string[][]>;
+export declare function lockWallet(wallet: NostrEvent): void;
 /** Returns the wallets mints */
 export declare function getWalletMints(wallet: NostrEvent): string[];
 /** Returns the wallets private key as a string */

package/dist/helpers/wallet.js

@@ -1,5 +1,5 @@
 import { hexToBytes } from "@noble/hashes/utils";
-import { getHiddenTags, getOrComputeCachedValue, isHiddenTagsLocked, unlockHiddenTags, } from "applesauce-core/helpers";
+import { getHiddenTags, getOrComputeCachedValue, isHiddenTagsLocked, lockHiddenTags, unlockHiddenTags, } from "applesauce-core/helpers";
 export const WALLET_KIND = 17375;
 export const WALLET_BACKUP_KIND = 375;
 export const WalletPrivateKeySymbol = Symbol.for("wallet-private-key");
@@ -12,6 +12,11 @@ export function isWalletLocked(wallet) {
 export async function unlockWallet(wallet, signer) {
     return await unlockHiddenTags(wallet, signer);
 }
+export function lockWallet(wallet) {
+    Reflect.deleteProperty(wallet, WalletPrivateKeySymbol);
+    Reflect.deleteProperty(wallet, WalletMintsSymbol);
+    lockHiddenTags(wallet);
+}
 /** Returns the wallets mints */
 export function getWalletMints(wallet) {
     return getOrComputeCachedValue(wallet, WalletMintsSymbol, () => {

package/dist/queries/__tests__/wallet.test.js

@@ -6,7 +6,7 @@ import { subscribeSpyTo } from "@hirez_io/observer-spy";
 import { FakeUser } from "../../__tests__/fake-user.js";
 import { WalletBlueprint } from "../../blueprints/wallet.js";
 import { WalletQuery } from "../wallet.js";
-import { unlockWallet } from "../../helpers/wallet.js";
+import { lockWallet, unlockWallet } from "../../helpers/wallet.js";
 const user = new FakeUser();
 const factory = new EventFactory({ signer: user });
 let events;
@@ -18,6 +18,7 @@ beforeEach(() => {
 describe("WalletQuery", () => {
     it("it should update when event is unlocked", async () => {
         const wallet = await user.signEvent(await factory.create(WalletBlueprint, generateSecretKey(), []));
+        lockWallet(wallet);
         events.add(wallet);
         const spy = subscribeSpyTo(queries.createQuery(WalletQuery, await user.getPublicKey()));
         await unlockWallet(wallet, user);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet",
-  "version": "0.0.0-next-20250313155042",
+  "version": "0.0.0-next-20250314133024",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -80,16 +80,16 @@
     "@cashu/cashu-ts": "2.0.0-rc1",
     "@gandlaf21/bc-ur": "^1.1.12",
     "@noble/hashes": "^1.7.1",
-    "applesauce-actions": "0.0.0-next-20250313155042",
-    "applesauce-core": "0.0.0-next-20250313155042",
-    "applesauce-factory": "0.0.0-next-20250313155042",
+    "applesauce-actions": "0.0.0-next-20250314133024",
+    "applesauce-core": "0.0.0-next-20250314133024",
+    "applesauce-factory": "0.0.0-next-20250314133024",
     "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-20250313155042",
+    "applesauce-signers": "0.0.0-next-20250314133024",
     "typescript": "^5.7.3",
     "vitest": "^3.0.5"
   },