save wallet configuration when possible

Author: pablof7z

ndk-mobile/src/hooks/session.ts

@@ -1,13 +1,32 @@
-import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
+import NDK, { NDKEvent, NDKKind, NDKUser } from '@nostr-dev-kit/ndk';
 import { useNDK } from './ndk';
 import { NDKEventWithFrom } from './subscribe';
 import { useNDKSessionStore } from '../stores/session';
+import { useNDKWallet } from './wallet';
+import { walletFromLoadingString } from '@nostr-dev-kit/ndk-wallet';
+import { SessionInitOpts, SessionInitCallbacks } from '../stores/session/types';
+import { SettingsStore } from '../types';
 
 const useNDKSession = () => {
     const init = useNDKSessionStore(s => s.init);
     const mutePubkey = useNDKSessionStore(s => s.mutePubkey);
 
-    return { init, mutePubkey };
+    const { setActiveWallet } = useNDKWallet();
+
+    const wrappedInit = (ndk: NDK, user: NDKUser, settingsStore: SettingsStore, opts: SessionInitOpts, on: SessionInitCallbacks) => {
+        init(ndk, user, settingsStore, opts, on);
+
+        const walletString = settingsStore?.getSync('wallet');
+        if (walletString) {
+            walletFromLoadingString(ndk, walletString).then((wallet) => {
+                if (wallet) setActiveWallet(wallet);
+            }).catch((e) => {
+                console.error('error setting active wallet', e);
+            });
+        }
+    }
+
+    return { init: wrappedInit, mutePubkey };
 }
 
 const useFollows = () => useNDKSessionStore(s => s.follows);

ndk-mobile/src/hooks/wallet.ts

@@ -1,13 +1,31 @@
+import { NDKWallet } from '@nostr-dev-kit/ndk-wallet';
 import { useWalletStore } from '../stores/wallet';
+import { useNDK } from './ndk';
+import { useNDKStore } from '../stores/ndk';
 
 const useNDKWallet = () => {
+    const { ndk } = useNDK();
+    const settingsStore = useNDKStore(s => s.settingsStore);
     const activeWallet = useWalletStore(s => s.activeWallet);
-    const setActiveWallet = useWalletStore(s => s.setActiveWallet);
+    const storeSetActiveWallet = useWalletStore(s => s.setActiveWallet);
     const balances = useWalletStore(s => s.balances);
     const setBalances = useWalletStore(s => s.setBalances);
     const nutzapMonitor = useWalletStore(s => s.nutzapMonitor);
     const setNutzapMonitor = useWalletStore(s => s.setNutzapMonitor);
 
+    const setActiveWallet = (wallet: NDKWallet) => {
+        storeSetActiveWallet(wallet);
+        ndk.wallet = wallet;
+
+        let loadingString: string | undefined;
+        
+        if (wallet) loadingString = wallet.toLoadingString?.();
+        if (loadingString) 
+            settingsStore.set('wallet', loadingString);
+        else
+            settingsStore.delete('wallet');
+    }
+
     return { activeWallet, setActiveWallet, balances, setBalances, nutzapMonitor, setNutzapMonitor };
 }
 

ndk-mobile/src/stores/session/actions/init.ts

@@ -46,7 +46,6 @@ export const initSession = (
     sub.on('event', handleEvent);
 
     sub.once('eose', () => {
-        console.log('EOSE on main sub', sub.internalId);
         on?.onReady?.();
         eosed = true;
 
@@ -75,7 +74,6 @@ export const initSession = (
         eosed = true;
     });
     sub.start();
-    console.log('sub started', sub.filters, ndk.pool.connectedRelays());
 
     set({ ndk, follows: opts.follows ? [user.pubkey] : [] });
 };

ndk-wallet/src/wallets/cashu/wallet/index.ts

@@ -155,6 +155,13 @@ export class NDKCashuWallet extends EventEmitter<NDKWalletEvents & {
     public checkProofs = consolidateTokens.bind(this);
     public consolidateTokens = consolidateTokens.bind(this);
 
+    public toLoadingString() {
+        return JSON.stringify({
+            type: 'nip60',
+            bech32: this.event!.encode(),
+        });
+    }
+
     async mintNuts(amounts: number[], unit: string) {
         let result: SendResponse | undefined;
         const totalAmount = amounts.reduce((acc, amount) => acc + amount, 0);

ndk-wallet/src/wallets/index.ts

@@ -1,4 +1,4 @@
-import {
+import NDK, {
     CashuPaymentInfo,
     LnPaymentInfo,
     NDKPaymentConfirmation,
@@ -9,6 +9,8 @@ import {
     NDKZapSplit,
 } from "@nostr-dev-kit/ndk";
 import { EventEmitter } from "tseep";
+import { NDKNWCWallet } from "./nwc";
+import { NDKCashuWallet } from "./cashu/wallet";
 
 export type NDKWalletTypes = 'nwc' | 'nip-60' | 'webln';
 
@@ -86,4 +88,24 @@ export interface NDKWallet
      * Get the balance of this wallet
      */
     balance(): NDKWalletBalance[] | undefined;
+
+    /**
+     * Serializes the wallet configuration in a way that can be restored later.
+     */
+    toLoadingString?(): string;
+}
+
+export async function walletFromLoadingString(ndk: NDK, str: string): Promise<NDKNWCWallet | NDKCashuWallet | undefined> {
+    const payload = JSON.parse(str);
+
+    switch (payload.type) {
+        case 'nwc':
+            const w = new NDKNWCWallet(ndk);
+            await w.initWithPairingCode(payload.pairingCode);
+            return w;
+        case 'nip60':
+            const event = await ndk.fetchEvent(payload.bech32);
+            if (!event) return undefined;
+            return await NDKCashuWallet.from(event);
+    }
 }

ndk-wallet/src/wallets/nwc/index.ts

@@ -68,6 +68,13 @@ export class NDKNWCWallet extends EventEmitter<NDKWalletEvents> implements NDKWa
         return this.init(pubkey, relayUrls, secret);
     }
 
+    toLoadingString(): string {
+        return JSON.stringify({
+            type: 'nwc',
+            pairingCode: this.pairingCode
+        });
+    }
+
     async lnPay(payment: LnPaymentInfo): Promise<NDKPaymentConfirmationLN | undefined> {
         if (!this.signer) throw new Error("Wallet not initialized");
 

ndk/src/events/nip19.ts

@@ -2,7 +2,9 @@ import { nip19 } from "nostr-tools";
 
 import type { NDKEvent } from "./index.js";
 
-export function encode(this: NDKEvent, maxRelayCount: number = 5): string {
+const DEFAULT_RELAY_COUNT = 2 as const;
+
+export function encode(this: NDKEvent, maxRelayCount: number = DEFAULT_RELAY_COUNT): string {
     let relays: string[] = [];
 
     if (this.onRelays.length > 0) {

ndk/src/zapper/index.ts

@@ -95,7 +95,14 @@ export type OnCompleteCb = (
 ) => void;
 
 interface NDKZapperOptions {
+    /**
+     * Comment to include in the zap event
+     */
     comment?: string;
+
+    /**
+     * Extra tags to add to the zap event
+     */
     tags?: NDKTag[];
     signer?: NDKSigner;
     lnPay?: LnPayCb;
@@ -139,6 +146,13 @@ class NDKZapper extends EventEmitter<{
 
     public maxRelays = 3;
 
+    /**
+     * 
+     * @param target The target of the zap
+     * @param amount The amount to send indicated in the unit
+     * @param unit The unit of the amount
+     * @param opts Options for the zap
+     */
     constructor(
         target: NDKEvent | NDKUser,
         amount: number,