Merge pull request #87 from teddyjfpender/main

Merging as is for refactoring.

packages/mina-wallet/src/Wallet/useWallet.ts

@@ -6,6 +6,7 @@ import {
   FromBip39MnemonicWordsProps,
   generateMnemonicWords,
   GroupedCredentials,
+  InMemoryKeyAgent,
   MinaSpecificArgs,
   Network
 } from '@palladxyz/key-management'
@@ -14,7 +15,6 @@ import { Multichain } from '@palladxyz/multi-chain-core'
 import {
   CredentialName,
   KeyAgentName,
-  KeyAgents,
   SearchQuery,
   SingleCredentialState,
   StoredCredential,
@@ -72,6 +72,7 @@ export const useWallet = ({ network, name }: UseWalletProps) => {
   const initialiseKeyAgent = useKeyAgentStore(
     (state) => state.initialiseKeyAgent
   )
+
   const searchCredentials = useCredentialStore(
     (state) => state.searchCredentials
   )
@@ -287,19 +288,25 @@ export const useWallet = ({ network, name }: UseWalletProps) => {
     network: Multichain.MultiChainNetworks,
     { mnemonicWords, getPassphrase }: FromBip39MnemonicWordsProps,
     keyAgentName: KeyAgentName,
-    keyAgentType: KeyAgents = KeyAgents.InMemory,
+    //keyAgentType: KeyAgents = KeyAgents.InMemory,
     credentialName: CredentialName = getRandomAnimalName()
   ) => {
     const agentArgs: FromBip39MnemonicWordsProps = {
       getPassphrase: getPassphrase,
       mnemonicWords: mnemonicWords,
       mnemonic2ndFactorPassphrase: ''
     }
-    await initialiseKeyAgent(keyAgentName, keyAgentType, agentArgs)
+    const keyAgentInitialised = await InMemoryKeyAgent.fromMnemonicWords(
+      agentArgs
+    )
+
+    //await initialiseKeyAgent(keyAgentName, keyAgentType, keyAgentInitialised)
     setCurrentKeyAgentName(keyAgentName)
-    const keyAgent = getKeyAgent(keyAgentName)
-    console.log('>>>KA', keyAgent)
-    const derivedCredential = await keyAgent?.keyAgent?.deriveCredentials(
+    //const keyAgent = await getKeyAgent(keyAgentName)
+
+    console.log('>>>KAs', keyAgents)
+    //console.log('>>>KA', keyAgent)
+    const derivedCredential = await keyAgentInitialised.deriveCredentials(
       payload,
       args,
       getPassphrase,
@@ -317,11 +324,15 @@ export const useWallet = ({ network, name }: UseWalletProps) => {
     setCredential(singleCredentialState)
     setCurrentWallet(singleCredentialState)
     await _syncWallet(network, derivedCredential)
+    return { keyAgentInitialised }
   }
 
   return {
     walletNetwork,
     walletName,
+    keyAgents,
+    initialiseKeyAgent,
+    setCurrentKeyAgentName,
     restoreWallet,
     createWallet,
     switchNetwork,

packages/mina-wallet/test/Wallet/useWallet.test.ts

@@ -4,7 +4,9 @@ import {
   MinaSpecificArgs,
   Network
 } from '@palladxyz/key-management'
+import { InMemoryKeyAgent } from '@palladxyz/key-management'
 import { Mina } from '@palladxyz/mina-core'
+import { KeyAgents } from '@palladxyz/vault'
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { act, renderHook } from '@testing-library/react'
 
@@ -55,6 +57,47 @@ describe('useWallet', () => {
     })
     expect(mnemonic).toHaveLength(24)
   })
+  it('initializes the key agent correctly', async () => {
+    const { result } = renderHook(() =>
+      useWallet({ network: Mina.Networks.DEVNET, name: 'Pallad' })
+    )
+    const agentArgs = {
+      mnemonicWords: PREMADE_MNEMONIC,
+      getPassphrase: getPassword
+    }
+    let derivedCredential
+    let keyAgentInitialised: InMemoryKeyAgent
+    const restoreArgs: MinaSpecificArgs = {
+      network: Network.Mina,
+      accountIndex: 0,
+      addressIndex: 0,
+      networkType: 'testnet'
+    }
+    const payload = new MinaPayload()
+    await act(async () => {
+      keyAgentInitialised = await result.current.restoreWallet(
+        payload,
+        restoreArgs,
+        Mina.Networks.DEVNET,
+        agentArgs,
+        keyAgentName
+      )
+      derivedCredential = result.current.currentWallet
+    })
+    expect(derivedCredential).toBeDefined()
+    // them initialise the key agent store
+    const keyAgentType = KeyAgents.InMemory
+
+    await act(async () => {
+      await result.current.initialiseKeyAgent(
+        keyAgentName,
+        keyAgentType,
+        keyAgentInitialised
+      )
+      result.current.setCurrentKeyAgentName(keyAgentName)
+    })
+    expect(result.current.keyAgents[keyAgentName]).toBeDefined()
+  })
   it('restores a wallet', async () => {
     const { result } = renderHook(() =>
       useWallet({ network: Mina.Networks.DEVNET, name: 'Pallad' })

packages/vault/src/keyAgent/keyAgentState.ts

@@ -2,10 +2,7 @@
  * @file Represents the state definitions related to keyAgents.
  */
 
-import {
-  FromBip39MnemonicWordsProps,
-  InMemoryKeyAgent
-} from '@palladxyz/key-management'
+import { InMemoryKeyAgent } from '@palladxyz/key-management'
 
 export type KeyAgentName = string
 export enum KeyAgents {
@@ -43,9 +40,9 @@ export type KeyAgentState = {
   keyAgents: InStoreKeyAgents
   ensureKeyAgent: (name: KeyAgentName) => void
   initialiseKeyAgent: (
-    name: KeyAgentName,
+    keyAgentName: KeyAgentName,
     keyAgentType: KeyAgents,
-    { mnemonicWords, getPassphrase }: FromBip39MnemonicWordsProps
+    InMemoryKeyAgent: InMemoryKeyAgent
   ) => Promise<void>
   removeKeyAgent: (name: KeyAgentName) => void
   clear: () => void

packages/vault/src/keyAgent/keyAgentStore.ts

@@ -1,7 +1,3 @@
-import {
-  FromBip39MnemonicWordsProps,
-  InMemoryKeyAgent
-} from '@palladxyz/key-management'
 import { getSecurePersistence } from '@palladxyz/persistence'
 import { produce } from 'immer'
 import { create } from 'zustand'
@@ -26,23 +22,13 @@ export const useKeyAgentStore = create<KeyAgentState>()(
           })
         )
       },
-      async initialiseKeyAgent(
-        name,
-        keyAgentType,
-        { mnemonicWords, getPassphrase }
-      ) {
-        const agentArgs: FromBip39MnemonicWordsProps = {
-          getPassphrase: getPassphrase,
-          mnemonicWords: mnemonicWords,
-          mnemonic2ndFactorPassphrase: ''
-        }
-        const keyAgent = await InMemoryKeyAgent.fromMnemonicWords(agentArgs)
-        console.log('>>>KI EJDZENT', keyAgent)
+      async initialiseKeyAgent(name, keyAgentType, InMemoryKeyAgent) {
+        console.log('>>>KI EJDZENT', InMemoryKeyAgent)
         return set(
           produce((state) => {
             state.keyAgents[name] = {
               keyAgentType: keyAgentType,
-              keyAgent: keyAgent,
+              keyAgent: InMemoryKeyAgent,
               name: name
             }
           })

packages/vault/test/keyAgent/keyAgentStore.test.ts

@@ -1,6 +1,7 @@
 import {
   FromBip39MnemonicWordsProps,
   generateMnemonicWords,
+  InMemoryKeyAgent,
   MinaPayload,
   MinaSpecificArgs,
   Network
@@ -38,6 +39,8 @@ describe('AccountStore', () => {
   let agentArgs2: FromBip39MnemonicWordsProps
   const keyAgentName = 'test key agent'
   const keyAgentName2 = 'test key agent 2'
+  let keyAgentInitialised: InMemoryKeyAgent
+  let keyAgentInitialised2: InMemoryKeyAgent
 
   beforeEach(async () => {
     randomMnemonic = generateMnemonicWords()
@@ -49,6 +52,8 @@ describe('AccountStore', () => {
       getPassphrase: getPassphrase,
       mnemonicWords: randomMnemonic
     }
+    keyAgentInitialised = await InMemoryKeyAgent.fromMnemonicWords(agentArgs)
+    keyAgentInitialised2 = await InMemoryKeyAgent.fromMnemonicWords(agentArgs2)
   })
 
   afterEach(() => {
@@ -69,7 +74,7 @@ describe('AccountStore', () => {
       await result.current.initialiseKeyAgent(
         keyAgentName,
         KeyAgents.InMemory,
-        agentArgs
+        keyAgentInitialised
       )
     })
     expect(result.current.keyAgents[keyAgentName]).toBeDefined()
@@ -82,13 +87,13 @@ describe('AccountStore', () => {
       await result.current.initialiseKeyAgent(
         keyAgentName,
         KeyAgents.InMemory,
-        agentArgs
+        keyAgentInitialised
       )
       // add second key agent
       await result.current.initialiseKeyAgent(
         keyAgentName2,
         KeyAgents.InMemory,
-        agentArgs2
+        keyAgentInitialised2
       )
     })
     const keyAgent1 = result.current.keyAgents[keyAgentName]
@@ -111,13 +116,13 @@ describe('AccountStore', () => {
       await result.current.initialiseKeyAgent(
         keyAgentName,
         KeyAgents.InMemory,
-        agentArgs
+        keyAgentInitialised
       )
       // add second key agent
       await result.current.initialiseKeyAgent(
         keyAgentName2,
         KeyAgents.InMemory,
-        agentArgs2
+        keyAgentInitialised2
       )
     })
     // check that both key agents are in the store