chore: signup with wallet

package.json

@@ -42,7 +42,7 @@
     "graphql": "^16.8.2",
     "lodash": "^4.17.21",
     "lucide-react": "^0.395.0",
-    "lwk_wasm": "^0.6.2",
+    "lwk_wasm": "^0.6.3",
     "next": "^14.2.4",
     "next-qrcode": "^2.5.1",
     "next-themes": "^0.3.0",

src/components/SignUpForm.tsx

@@ -1,5 +1,6 @@
 'use client';
 
+import { ApolloError, useApolloClient } from '@apollo/client';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Loader2 } from 'lucide-react';
 import Link from 'next/link';
@@ -18,7 +19,13 @@ import {
   FormMessage,
 } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
-import { useSignUpMutation } from '@/graphql/mutations/__generated__/signUp.generated';
+import {
+  SignUpDocument,
+  SignUpMutation,
+  SignUpMutationVariables,
+} from '@/graphql/mutations/__generated__/signUp.generated';
+import { WalletAccountType, WalletType } from '@/graphql/types';
+import { toWithError } from '@/utils/async';
 import { handleApolloError } from '@/utils/error';
 import {
   evaluatePasswordStrength,
@@ -62,24 +69,11 @@ const FormSchema = z
 export function SignUpForm() {
   const { toast } = useToast();
 
-  const workerRef = useRef<Worker>();
+  const client = useApolloClient();
 
-  const [loading, setLoading] = useState(false);
+  const workerRef = useRef<Worker>();
 
-  const [signUp] = useSignUpMutation({
-    onCompleted: () => {
-      window.location.href = ROUTES.app.home;
-    },
-    onError: err => {
-      const messages = handleApolloError(err);
-
-      toast({
-        variant: 'destructive',
-        title: 'Error logging in.',
-        description: messages.join(', '),
-      });
-    },
-  });
+  const [loading, setLoading] = useState(true);
 
   const form = useForm<z.infer<typeof FormSchema>>({
     reValidateMode: 'onChange',
@@ -120,20 +114,58 @@ export function SignUpForm() {
       new URL('../workers/account/account.ts', import.meta.url)
     );
 
-    workerRef.current.onmessage = event => {
+    workerRef.current.onmessage = async event => {
       const message: WorkerResponse = event.data;
 
       switch (message.type) {
-        case 'create':
-          signUp({ variables: { input: message.payload } });
+        case 'loaded':
+          setLoading(false);
           break;
 
-        default:
-          console.error('Unhandled message type:', event.data.type);
+        case 'create':
+          const { wallet, ...userInfo } = message.payload;
+
+          const [, error] = await toWithError(
+            client.mutate<SignUpMutation, SignUpMutationVariables>({
+              mutation: SignUpDocument,
+              variables: {
+                input: {
+                  ...userInfo,
+                  wallet: {
+                    secp256k1_key_pair: wallet.secp256k1_key_pair,
+                    details: {
+                      type: WalletType.ClientGenerated,
+                      protected_mnemonic: wallet.protectedMnemonic,
+                    },
+                    accounts: [
+                      {
+                        type: WalletAccountType.Liquid,
+                        liquid_descriptor: wallet.liquidDescriptor,
+                      },
+                    ],
+                  },
+                },
+              },
+            })
+          );
+
+          if (error) {
+            const messages = handleApolloError(error as ApolloError);
+
+            toast({
+              variant: 'destructive',
+              title: 'Error creating account.',
+              description: messages.join(', '),
+            });
+
+            setLoading(false);
+            return;
+          }
+
+          window.location.href = ROUTES.app.home;
+
           break;
       }
-
-      setLoading(false);
     };
 
     workerRef.current.onerror = error => {
@@ -144,7 +176,7 @@ export function SignUpForm() {
     return () => {
       if (workerRef.current) workerRef.current.terminate();
     };
-  }, [signUp]);
+  }, [client, toast]);
 
   return (
     <Card>

src/graphql/types.ts

@@ -290,6 +290,7 @@ export type RefreshToken = {
 };
 
 export type RefreshWalletInput = {
+  full_scan?: InputMaybe<Scalars['Boolean']['input']>;
   wallet_id: Scalars['String']['input'];
 };
 
@@ -323,6 +324,7 @@ export type SignUpInput = {
   password_hint?: InputMaybe<Scalars['String']['input']>;
   protected_symmetric_key: Scalars['String']['input'];
   secp256k1_key_pair: Secp256k1KeyPairInput;
+  wallet?: InputMaybe<CreateWalletInput>;
 };
 
 export type SimpleWallet = {

src/workers/account/account.ts

@@ -4,6 +4,7 @@ import {
   secp256k1GenerateProtectedKeyPair,
 } from '@/utils/crypto';
 
+import { createNewWallet } from '../crypto';
 import {
   CreateAccountResult,
   GenerateMasterKeyAndHashResult,
@@ -24,6 +25,8 @@ async function generateAccount(
   const { publicKey, protectedPrivateKey } =
     secp256k1GenerateProtectedKeyPair(masterKey);
 
+  const wallet = await createNewWallet(masterKey);
+
   return {
     email,
     master_password_hash: masterPasswordHash,
@@ -33,6 +36,7 @@ async function generateAccount(
       public_key: publicKey,
       protected_private_key: protectedPrivateKey,
     },
+    wallet,
   };
 }
 
@@ -95,3 +99,5 @@ self.onmessage = async e => {
       break;
   }
 };
+
+self.postMessage({ type: 'loaded' });

src/workers/account/types.ts

@@ -1,3 +1,5 @@
+import { CryptoNewWalletPayload } from '../crypto/types';
+
 export type CreateAccount = {
   email: string;
   password: string;
@@ -28,6 +30,7 @@ export type CreateAccountResult = {
     public_key: string;
     protected_private_key: string;
   };
+  wallet: CryptoNewWalletPayload;
 };
 
 export type GenerateMasterKeyAndHashResult = {
@@ -43,4 +46,5 @@ export type WorkerResponse =
   | {
       type: 'generateMaster';
       payload: GenerateMasterKeyAndHashResult;
-    };
+    }
+  | { type: 'loaded' };

src/workers/crypto.ts

@@ -0,0 +1,37 @@
+import { Mnemonic, Network, Signer } from 'lwk_wasm';
+
+import {
+  generateNewMnemonic,
+  secp256k1GenerateProtectedKeyPair,
+} from '@/utils/crypto';
+
+import { CryptoNewWalletPayload } from './crypto/types';
+
+export const generateLiquidDescriptor = async (mnemonic: string) => {
+  const network = Network.mainnet();
+
+  const signer = new Signer(new Mnemonic(mnemonic), network);
+  const wolletDescriptor = signer.wpkhSlip77Descriptor().toString();
+
+  return wolletDescriptor;
+};
+
+export const createNewWallet = async (
+  masterKey: string
+): Promise<CryptoNewWalletPayload> => {
+  const { mnemonic, protectedMnemonic } = generateNewMnemonic(masterKey);
+
+  const { publicKey, protectedPrivateKey } =
+    secp256k1GenerateProtectedKeyPair(masterKey);
+
+  const liquidDescriptor = await generateLiquidDescriptor(mnemonic);
+
+  return {
+    protectedMnemonic: protectedMnemonic,
+    liquidDescriptor,
+    secp256k1_key_pair: {
+      public_key: publicKey,
+      protected_private_key: protectedPrivateKey,
+    },
+  };
+};

src/workers/crypto/crypto.ts

@@ -13,24 +13,15 @@ import { nip44 } from 'nostr-tools';
 import { toWithError } from '@/utils/async';
 import {
   bufToHex,
-  generateNewMnemonic,
   hexToUint8Array,
   restoreMnemonic,
   secp256k1GenerateProtectedKeyPair,
 } from '@/utils/crypto';
 import { decryptMessage, encryptMessage } from '@/utils/nostr';
 
+import { createNewWallet, generateLiquidDescriptor } from '../crypto';
 import { CryptoWorkerMessage, CryptoWorkerResponse } from './types';
 
-const generateLiquidDescriptor = async (mnemonic: string) => {
-  const network = Network.mainnet();
-
-  const signer = new Signer(new Mnemonic(mnemonic), network);
-  const wolletDescriptor = signer.wpkhSlip77Descriptor().toString();
-
-  return wolletDescriptor;
-};
-
 const signPset = (mnemonic: string, descriptor: string, pset: string) => {
   const network = Network.mainnet();
 
@@ -54,23 +45,12 @@ self.onmessage = async e => {
   switch (message.type) {
     case 'newWallet': {
       const { masterKey } = message.payload;
-      const { mnemonic, protectedMnemonic } = generateNewMnemonic(masterKey);
 
-      const { publicKey, protectedPrivateKey } =
-        secp256k1GenerateProtectedKeyPair(masterKey);
-
-      const liquidDescriptor = await generateLiquidDescriptor(mnemonic);
+      const payload = await createNewWallet(masterKey);
 
       const response: CryptoWorkerResponse = {
         type: 'newWallet',
-        payload: {
-          protectedMnemonic: protectedMnemonic,
-          liquidDescriptor,
-          secp256k1_key_pair: {
-            public_key: publicKey,
-            protected_private_key: protectedPrivateKey,
-          },
-        },
+        payload,
       };
 
       self.postMessage(response);

src/workers/crypto/types.ts

@@ -54,17 +54,19 @@ export type CryptoWorkerMessage =
       };
     };
 
+export type CryptoNewWalletPayload = {
+  protectedMnemonic: string;
+  liquidDescriptor: string;
+  secp256k1_key_pair: {
+    public_key: string;
+    protected_private_key: string;
+  };
+};
+
 export type CryptoWorkerResponse =
   | {
       type: 'newWallet';
-      payload: {
-        protectedMnemonic: string;
-        liquidDescriptor: string;
-        secp256k1_key_pair: {
-          public_key: string;
-          protected_private_key: string;
-        };
-      };
+      payload: CryptoNewWalletPayload;
     }
   | {
       type: 'signPset';