applesauce-wallet 0.0.0-next-20250315140539 → 0.12.0

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

@@ -1,12 +1,15 @@
 import { describe, it, expect, beforeEach, vitest } from "vitest";
+import { unlockHiddenTags } from "applesauce-core/helpers";
+import { lastValueFrom } from "rxjs";
+import { generateSecretKey } from "nostr-tools";
 import { EventStore } from "applesauce-core";
 import { EventFactory } from "applesauce-factory";
 import { ActionHub } from "applesauce-actions";
+import { bytesToHex } from "@noble/hashes/utils";
 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";
+import { WalletAddPrivateKey, CreateWallet } from "../wallet.js";
+import { getWalletPrivateKey, unlockWallet, WALLET_BACKUP_KIND } from "../../helpers/wallet.js";
+import { WalletBlueprint } from "../../blueprints/wallet.js";
 const user = new FakeUser();
 let events;
 let factory;
@@ -30,3 +33,24 @@ describe("CreateWallet", () => {
         expect(hiddenTags).toEqual(expect.arrayContaining([["mint", "https://mint.money.com"]]));
     });
 });
+describe("WalletAddPrivateKey", () => {
+    it("should add a private key to an existing wallet event without a private key", async () => {
+        const walletEvent = await factory.sign(await factory.create(WalletBlueprint, ["https://mint.money.com"]));
+        await events.add(walletEvent);
+        const privateKey = generateSecretKey();
+        const updatedWallet = await lastValueFrom(hub.exec(WalletAddPrivateKey, privateKey));
+        await unlockWallet(updatedWallet, user);
+        const key = getWalletPrivateKey(updatedWallet);
+        expect(key).toBeDefined();
+        expect(bytesToHex(key)).toEqual(bytesToHex(privateKey));
+    });
+    it("should throw an error if a wallet event already has a private key", async () => {
+        const walletEvent = await factory.sign(await factory.create(WalletBlueprint, ["https://mint.money.com"], generateSecretKey()));
+        await events.add(walletEvent);
+        await expect(hub.run(WalletAddPrivateKey, generateSecretKey())).rejects.toThrow("Wallet already has a private key");
+    });
+    it("should throw an error if the wallet event does not exist", async () => {
+        const privateKey = generateSecretKey();
+        await expect(hub.run(WalletAddPrivateKey, privateKey)).rejects.toThrow("Wallet does not exist");
+    });
+});

package/dist/actions/wallet.d.ts

@@ -1,6 +1,11 @@
 import { Action } from "applesauce-actions";
 /** An action that creates a new 17375 wallet event and 375 wallet backup */
 export declare function CreateWallet(mints: string[], privateKey?: Uint8Array): Action;
+/**
+ * Adds a private key to a wallet event
+ * @throws if the wallet does not exist or is locked
+ */
+export declare function WalletAddPrivateKey(privateKey: Uint8Array): Action;
 /** Unlocks the wallet event and optionally the tokens and history events */
 export declare function UnlockWallet(unlock?: {
     history?: boolean;

package/dist/actions/wallet.js

@@ -1,21 +1,42 @@
-import { generateSecretKey } from "nostr-tools";
-import { isWalletLocked, unlockWallet, WALLET_KIND } from "../helpers/wallet.js";
+import { getWalletMints, getWalletPrivateKey, isWalletLocked, unlockWallet, WALLET_KIND } from "../helpers/wallet.js";
 import { WalletBackupBlueprint, WalletBlueprint } from "../blueprints/wallet.js";
 import { isTokenContentLocked, unlockTokenContent, WALLET_TOKEN_KIND } from "../helpers/tokens.js";
 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()) {
+export function CreateWallet(mints, privateKey) {
     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 wallet = await factory.sign(await factory.create(WalletBlueprint, mints, privateKey));
         const backup = await factory.sign(await factory.create(WalletBackupBlueprint, wallet));
         // publish the backup first
         yield backup;
         yield wallet;
     };
 }
+/**
+ * Adds a private key to a wallet event
+ * @throws if the wallet does not exist or is locked
+ */
+export function WalletAddPrivateKey(privateKey) {
+    return async function* ({ events, self, factory }) {
+        const wallet = events.getReplaceable(WALLET_KIND, self);
+        if (!wallet)
+            throw new Error("Wallet does not exist");
+        if (isWalletLocked(wallet))
+            throw new Error("Wallet is locked");
+        if (getWalletPrivateKey(wallet))
+            throw new Error("Wallet already has a private key");
+        const draft = await factory.create(WalletBlueprint, getWalletMints(wallet), privateKey);
+        const signed = await factory.sign(draft);
+        // create backup event for wallet
+        const backup = await factory.sign(await factory.create(WalletBackupBlueprint, signed));
+        // publish events
+        yield backup;
+        yield signed;
+    };
+}
 /** Unlocks the wallet event and optionally the tokens and history events */
 export function UnlockWallet(unlock) {
     return async function* ({ events, self, factory }) {

package/dist/blueprints/wallet.d.ts

@@ -1,6 +1,6 @@
 import { EventBlueprint } from "applesauce-factory";
 import { NostrEvent } from "nostr-tools";
 /** A blueprint to create a new 17375 wallet */
-export declare function WalletBlueprint(privateKey: Uint8Array, mints: string[]): EventBlueprint;
+export declare function WalletBlueprint(mints: string[], privateKey?: Uint8Array): EventBlueprint;
 /** A blueprint that creates a new 375 wallet backup event */
 export declare function WalletBackupBlueprint(wallet: NostrEvent): EventBlueprint;

package/dist/blueprints/wallet.js

@@ -4,8 +4,8 @@ import { WALLET_BACKUP_KIND, WALLET_KIND } from "../helpers/wallet.js";
 import { setWalletBackupContent } from "../operations/event/wallet.js";
 import { setMintTags, setPrivateKeyTag } from "../operations/tag/wallet.js";
 /** A blueprint to create a new 17375 wallet */
-export function WalletBlueprint(privateKey, mints) {
-    return (ctx) => EventFactory.runProcess({ kind: WALLET_KIND }, ctx, modifyHiddenTags(setPrivateKeyTag(privateKey), setMintTags(mints)));
+export function WalletBlueprint(mints, privateKey) {
+    return (ctx) => EventFactory.runProcess({ kind: WALLET_KIND }, ctx, modifyHiddenTags(privateKey ? setPrivateKeyTag(privateKey) : undefined, setMintTags(mints)));
 }
 /** A blueprint that creates a new 375 wallet backup event */
 export function WalletBackupBlueprint(wallet) {

package/dist/helpers/wallet.d.ts

@@ -12,4 +12,4 @@ 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 */
-export declare function getWalletPrivateKey(wallet: NostrEvent): Uint8Array;
+export declare function getWalletPrivateKey(wallet: NostrEvent): Uint8Array | undefined;

package/dist/helpers/wallet.js

@@ -33,8 +33,6 @@ export function getWalletPrivateKey(wallet) {
         if (!tags)
             throw new Error("Wallet is locked");
         const key = tags.find((t) => t[0] === "privkey" && t[1])?.[1];
-        if (!key)
-            throw new Error("Wallet missing private key");
-        return hexToBytes(key);
+        return key ? hexToBytes(key) : undefined;
     });
 }

package/dist/operations/event/__tests__/wallet.test.js

@@ -14,12 +14,12 @@ describe("setWalletBackupContent", () => {
         await expect(setWalletBackupContent(note)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, factory.context)).rejects.toThrow();
     });
     it("should throw if pubkey does not match", async () => {
-        const wallet = await factory.sign(await factory.create(WalletBlueprint, generateSecretKey(), []));
+        const wallet = await factory.sign(await factory.create(WalletBlueprint, [], generateSecretKey()));
         const user2 = new FakeUser();
         await expect(setWalletBackupContent(wallet)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, { signer: user2 })).rejects.toThrow();
     });
     it("should copy the content of the wallet event", async () => {
-        const wallet = await factory.sign(await factory.create(WalletBlueprint, generateSecretKey(), []));
+        const wallet = await factory.sign(await factory.create(WalletBlueprint, [], generateSecretKey()));
         expect(await setWalletBackupContent(wallet)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, factory.context)).toEqual(expect.objectContaining({ content: wallet.content }));
     });
 });

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

@@ -17,7 +17,7 @@ beforeEach(() => {
 });
 describe("WalletQuery", () => {
     it("it should update when event is unlocked", async () => {
-        const wallet = await user.signEvent(await factory.create(WalletBlueprint, generateSecretKey(), []));
+        const wallet = await user.signEvent(await factory.create(WalletBlueprint, [], generateSecretKey()));
         lockWallet(wallet);
         events.add(wallet);
         const spy = subscribeSpyTo(queries.createQuery(WalletQuery, await user.getPublicKey()));

package/dist/queries/wallet.d.ts

@@ -6,7 +6,7 @@ export type WalletInfo = {
 } | {
     locked: false;
     event: NostrEvent;
-    privateKey: Uint8Array;
+    privateKey?: Uint8Array;
     mints: string[];
 };
 /** A query to get the state of a NIP-60 wallet */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-wallet",
-  "version": "0.0.0-next-20250315140539",
+  "version": "0.12.0",
   "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-20250315140539",
-    "applesauce-core": "0.0.0-next-20250315140539",
-    "applesauce-factory": "0.0.0-next-20250315140539",
+    "applesauce-actions": "^0.12.0",
+    "applesauce-core": "^0.12.0",
+    "applesauce-factory": "^0.12.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.0.0-next-20250315140539",
+    "applesauce-signers": "^0.12.0",
     "typescript": "^5.7.3",
     "vitest": "^3.0.5"
   },

package/dist/operations/__tests__/wallet.test.d.ts

@@ -1 +0,0 @@
-export {};

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

@@ -1,25 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { setWalletBackupContent } from "../wallet.js";
-import { FakeUser } from "../../__tests__/fake-user.js";
-import { EventFactory } from "applesauce-factory";
-import { WalletBlueprint } from "../../blueprints/wallet.js";
-import { generateSecretKey } from "nostr-tools";
-import { WALLET_BACKUP_KIND } from "../../helpers/wallet.js";
-import { unixNow } from "applesauce-core/helpers";
-const user = new FakeUser();
-const factory = new EventFactory({ signer: user });
-describe("setWalletBackupContent", () => {
-    it("should throw if kind is not wallet kind", async () => {
-        const note = user.note();
-        await expect(setWalletBackupContent(note)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, factory.context)).rejects.toThrow();
-    });
-    it("should throw if pubkey does not match", async () => {
-        const wallet = await factory.sign(await factory.create(WalletBlueprint, generateSecretKey(), []));
-        const user2 = new FakeUser();
-        await expect(setWalletBackupContent(wallet)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, { signer: user2 })).rejects.toThrow();
-    });
-    it("should copy the content of the wallet event", async () => {
-        const wallet = await factory.sign(await factory.create(WalletBlueprint, generateSecretKey(), []));
-        expect(await setWalletBackupContent(wallet)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, factory.context)).toEqual(expect.objectContaining({ content: wallet.content }));
-    });
-});

package/dist/operations/events/__tests__/wallet.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/operations/events/__tests__/wallet.test.js

@@ -1,25 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { setWalletBackupContent } from "../wallet.js";
-import { EventFactory } from "applesauce-factory";
-import { generateSecretKey } from "nostr-tools";
-import { unixNow } from "applesauce-core/helpers";
-import { WALLET_BACKUP_KIND } from "../../../helpers/wallet.js";
-import { FakeUser } from "../../../__tests__/fake-user.js";
-import { WalletBlueprint } from "../../../blueprints/wallet.js";
-const user = new FakeUser();
-const factory = new EventFactory({ signer: user });
-describe("setWalletBackupContent", () => {
-    it("should throw if kind is not wallet kind", async () => {
-        const note = user.note();
-        await expect(setWalletBackupContent(note)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, factory.context)).rejects.toThrow();
-    });
-    it("should throw if pubkey does not match", async () => {
-        const wallet = await factory.sign(await factory.create(WalletBlueprint, generateSecretKey(), []));
-        const user2 = new FakeUser();
-        await expect(setWalletBackupContent(wallet)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, { signer: user2 })).rejects.toThrow();
-    });
-    it("should copy the content of the wallet event", async () => {
-        const wallet = await factory.sign(await factory.create(WalletBlueprint, generateSecretKey(), []));
-        expect(await setWalletBackupContent(wallet)({ kind: WALLET_BACKUP_KIND, tags: [], created_at: unixNow(), content: "" }, factory.context)).toEqual(expect.objectContaining({ content: wallet.content }));
-    });
-});

package/dist/operations/events/index.d.ts

@@ -1 +0,0 @@
-export * from "./wallet.js";

package/dist/operations/events/index.js

@@ -1 +0,0 @@
-export * from "./wallet.js";

package/dist/operations/events/wallet.d.ts

@@ -1,4 +0,0 @@
-import { EventOperation } from "applesauce-factory";
-import { NostrEvent } from "nostr-tools";
-/** Sets the content of a kind 375 wallet backup event */
-export declare function setWalletBackupContent(wallet: NostrEvent): EventOperation;

package/dist/operations/events/wallet.js

@@ -1,14 +0,0 @@
-import { WALLET_KIND } from "../../helpers/wallet.js";
-/** Sets the content of a kind 375 wallet backup event */
-export function setWalletBackupContent(wallet) {
-    return async (draft, ctx) => {
-        if (wallet.kind !== WALLET_KIND)
-            throw new Error(`Cant create a wallet backup from kind ${wallet.kind}`);
-        if (!wallet.content)
-            throw new Error("Wallet missing content");
-        const pubkey = await ctx.signer?.getPublicKey();
-        if (wallet.pubkey !== pubkey)
-            throw new Error("Wallet pubkey dose not match signer pubkey");
-        return { ...draft, content: wallet.content };
-    };
-}

package/dist/operations/tags/__tests__/wallet.test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/operations/tags/__tests__/wallet.test.js

@@ -1,16 +0,0 @@
-import { describe, it, expect } from "vitest";
-import { setMintTags } from "../wallet.js";
-describe("setMintTags", () => {
-    it("should replace existing mint tags", () => {
-        expect(setMintTags(["https://mint.com"])([["mint", "https://other.mint.com"]], {})).toEqual(expect.arrayContaining([["mint", "https://mint.com"]]));
-    });
-    it("should ignore other tags", () => {
-        expect(setMintTags(["https://mint.com"])([
-            ["mint", "https://other.mint.com"],
-            ["privkey", "00000000"],
-        ], {})).toEqual(expect.arrayContaining([
-            ["mint", "https://mint.com"],
-            ["privkey", "00000000"],
-        ]));
-    });
-});

package/dist/operations/tags/index.d.ts

@@ -1 +0,0 @@
-export * from "./wallet.js";

package/dist/operations/tags/index.js

@@ -1 +0,0 @@
-export * from "./wallet.js";

package/dist/operations/tags/wallet.d.ts

@@ -1,5 +0,0 @@
-import { TagOperation } from "applesauce-factory";
-/** Sets the "mint" tags in a wallet event */
-export declare function setMintTags(mints: string[]): TagOperation;
-/** Sets the "privkey" tag on a wallet event */
-export declare function setPrivateKeyTag(privateKey: Uint8Array): TagOperation;

package/dist/operations/tags/wallet.js

@@ -1,15 +0,0 @@
-import { bytesToHex } from "@noble/hashes/utils";
-import { ensureSingletonTag } from "applesauce-factory/helpers";
-/** Sets the "mint" tags in a wallet event */
-export function setMintTags(mints) {
-    return (tags) => [
-        // remove all existing mint tags
-        ...tags.filter((t) => t[0] !== "mint"),
-        // add new mint tags
-        ...mints.map((mint) => ["mint", mint]),
-    ];
-}
-/** Sets the "privkey" tag on a wallet event */
-export function setPrivateKeyTag(privateKey) {
-    return (tags) => ensureSingletonTag(tags, ["privkey", bytesToHex(privateKey)], true);
-}

package/dist/operations/wallet.d.ts

@@ -1,4 +0,0 @@
-import { EventOperation } from "applesauce-factory";
-import { NostrEvent } from "nostr-tools";
-/** Sets the content of a kind 375 wallet backup event */
-export declare function setWalletBackupContent(wallet: NostrEvent): EventOperation;

package/dist/operations/wallet.js

@@ -1,14 +0,0 @@
-import { WALLET_KIND } from "../helpers/wallet.js";
-/** Sets the content of a kind 375 wallet backup event */
-export function setWalletBackupContent(wallet) {
-    return async (draft, ctx) => {
-        if (wallet.kind !== WALLET_KIND)
-            throw new Error(`Cant create a wallet backup from kind ${wallet.kind}`);
-        if (!wallet.content)
-            throw new Error("Wallet missing content");
-        const pubkey = await ctx.signer?.getPublicKey();
-        if (wallet.pubkey !== pubkey)
-            throw new Error("Wallet pubkey dose not match signer pubkey");
-        return { ...draft, content: wallet.content };
-    };
-}