mmm, some improvements and fixes

marc2332 · marc2332 · commit d37ca7b69a8c · 2023-12-13T17:20:48.000+01:00
diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
@@ -109,13 +109,13 @@ try {
     contextBridge.exposeInMainWorld('__WALLET__API__', {
         ...methods,
         async createSecretManager(options) {
-            const manager = new IotaSdk.SecretManager(options)
+            const manager = await IotaSdk.SecretManager.create(options)
             bindMethodsAcrossContextBridge(IotaSdk.SecretManager.prototype, manager)
             return manager
         },
         // TODO(2.0): rename to createWallet
         async createWallet(id, options) {
-            const wallet = new IotaSdk.Wallet(options)
+            const wallet = await IotaSdk.Wallet.create(options)
             wallet.id = id
             wallets[id] = wallet
             bindMethodsAcrossContextBridge(IotaSdk.Wallet.prototype, wallet)
@@ -133,7 +133,7 @@ try {
         async getWallet(id, walletOptions) {
             let wallet = wallets[id]
             if (!wallet) {
-                wallet = new IotaSdk.Wallet(walletOptions)
+                wallet = await IotaSdk.Wallet.create(walletOptions)
                 wallets[id] = wallet
                 bindMethodsAcrossContextBridge(IotaSdk.Account.prototype, wallet)
             }
diff --git a/packages/desktop/views/onboarding/views/shared/EncryptMnemonicView.svelte b/packages/desktop/views/onboarding/views/shared/EncryptMnemonicView.svelte
@@ -2,7 +2,7 @@
     import { AnimationEnum } from '@auxiliary/animation'
     import { showAppNotification } from '@auxiliary/notification'
     import { OnboardingLayout } from '@components'
-    import { updateOnboardingProfile, verifyAndStoreMnemonic } from '@contexts/onboarding'
+    import { buildOnboardingSecretManager, updateOnboardingProfile, verifyAndStoreMnemonic } from '@contexts/onboarding'
     import { localize } from '@core/i18n'
     import { MAX_STRONGHOLD_PASSWORD_LENGTH } from '@core/profile'
     import { Subrouter } from '@core/router'
@@ -45,8 +45,9 @@
             try {
                 busy = true
                 await setStrongholdPassword(strongholdPassword)
-                await verifyAndStoreMnemonic()
                 updateOnboardingProfile({ strongholdPassword, hasStoredMnemonic: true })
+                await buildOnboardingSecretManager();
+                await verifyAndStoreMnemonic()
                 router.next()
             } catch (err) {
                 console.error(err)
diff --git a/packages/shared/lib/contexts/onboarding/actions/verifyAndStoreMnemonic.ts b/packages/shared/lib/contexts/onboarding/actions/verifyAndStoreMnemonic.ts
@@ -6,6 +6,7 @@ import { onboardingProfile } from '../stores'
  * Verifies, stores, then clears the mnemonic used in the onboarding flow.
  */
 export async function verifyAndStoreMnemonic(): Promise<void> {
+    // TODO(2.0) This shouldn't use the onboarding profile always
     const mnemonic = get(onboardingProfile)?.mnemonic?.join(' ') ?? ''
 
     await verifyMnemonic(mnemonic)
diff --git a/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts b/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts
@@ -19,6 +19,7 @@ export const onboardingProfileNetwork: Readable<IPersistedNetwork | undefined> =
 
 export function updateOnboardingProfile(payload: Partial<IOnboardingProfile>): void {
     onboardingProfile.update((state) => ({ ...state, ...payload }))
+    console.log("updated", get(onboardingProfile))
 }
 
 export function updateShimmerClaimingAccount(shimmerClaimingAccount: IShimmerClaimingWallet): void {
diff --git a/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts b/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts
@@ -1,23 +1,52 @@
 import { onboardingProfile } from '@contexts/onboarding/stores';
 import { api } from '@core/api';
-import { SecretManager } from '@iota/sdk';
-import { Readable, derived, get } from 'svelte/store';
-
-const onboardingProfileSecretManagerOptions = derived(onboardingProfile, ($onboardingProfile) => {
-    return $onboardingProfile?.secretManagerOptions
-});
-
-export const onboardingProfileSecretManager: Readable<SecretManager | null> = derived(onboardingProfileSecretManagerOptions, ($onboardingProfileSecretManagerOptions, set) => {
-    if ($onboardingProfileSecretManagerOptions) {
-        api.createSecretManager($onboardingProfileSecretManagerOptions)
-            .then((secretManager) => {
-                set(secretManager)
-            })
+import { SecretManager, SecretManagerType } from '@iota/sdk';
+import { USE_LEDGER_SIMULATOR } from 'shared/lib/core/ledger';
+import { getStorageDirectoryOfProfile, ProfileType } from 'shared/lib/core/profile';
+import { get, writable, Writable } from 'svelte/store';
+
+export const onboardingProfileSecretManager: Writable<SecretManager | null> = writable(null);
+
+export async function buildOnboardingSecretManager(){
+    const profile = get(onboardingProfile);
+    if(profile){
+        const { id, type, strongholdPassword } = profile;
+
+        const storagePath = await getStorageDirectoryOfProfile(id)
+        const secretManagerOptions = getSecretManagerFromProfileType(type, {
+            storagePath, 
+            strongholdPassword
+        })
+
+        console.log("options", secretManagerOptions)
+        
+        const secretManager = await api.createSecretManager(secretManagerOptions);
+
+        onboardingProfileSecretManager.set(secretManager)
     } else {
-        set(null)
+        onboardingProfileSecretManager.set(null)
     }
-})
+}
 
 export function isOnboardingSecretManagerInitialized(): boolean {
     return !!get(onboardingProfileSecretManager)
 }
+
+export function getSecretManagerFromProfileType(type?: ProfileType, { storagePath, strongholdPassword }: {
+    storagePath?: string, strongholdPassword?: string
+} = {}): SecretManagerType {
+    const strongholdSecretManager = {
+        stronghold: { snapshotPath: `${storagePath}/wallet.stronghold`, password: strongholdPassword },
+    }
+    const ledgerSecretManager = {
+        ledgerNano: USE_LEDGER_SIMULATOR,
+    }
+
+    switch (type) {
+        case ProfileType.Ledger:
+            return ledgerSecretManager
+        case ProfileType.Software:
+        default:
+            return strongholdSecretManager
+    }
+}
diff --git a/packages/shared/lib/core/profile/actions/active-profile/login.ts b/packages/shared/lib/core/profile/actions/active-profile/login.ts
@@ -48,10 +48,10 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
             // Step 1: create profile manager if its doesn't exist
             incrementLoginProgress()
             await waitForPreviousManagerToBeDestroyed()
-            if (!isOnboardingSecretManagerInitialized()) {
-                // TODO(2.0) Not sure about this
-                await initialiseOnboardingProfileWithSecretManager(true)
-            }
+            // if (!isOnboardingSecretManagerInitialized()) {
+            //     // TODO(2.0) Not sure about this
+            //     await initialiseOnboardingProfileWithSecretManager(true)
+            // }
 
             // Step 3: load and build all the profile data
             incrementLoginProgress()
diff --git a/packages/shared/lib/core/profile/actions/createWallet.ts b/packages/shared/lib/core/profile/actions/createWallet.ts
@@ -15,7 +15,7 @@ import { selectedWalletId } from '../../wallet'
         - __wallet2__/
 */
 export async function createWallet(activeProfile = get(activeProfileStore)): Promise<IWallet> {
-    const id = generateRandomId()
+    const id = activeProfile.id;
     const storagePath = await getStorageDirectoryOfProfile(id)
     // const snapshotPath = ''
 
diff --git a/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts b/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts
@@ -20,7 +20,7 @@ export interface IPersistedProfile {
     hasVisitedDashboard?: boolean
     lastUsedWalletId?: string // Todo(2.0) Fix all usages of lastUsedAccountIndex
     clientOptions: ClientOptions
-    secretManagerOptions: SecretManagerType,
+    secretManagerOptions: SecretManagerType, // TODO(2.0) This sould be gone.
     forceAssetRefresh: boolean
     strongholdVersion?: StrongholdVersion
     needsChrysalisToStardustDbMigration?: boolean
diff --git a/packages/shared/lib/core/secret-manager/actions/storeMnemonic.ts b/packages/shared/lib/core/secret-manager/actions/storeMnemonic.ts
@@ -6,6 +6,8 @@ export async function storeMnemonic(mnemonic: string): Promise<void> {
     // TODO(2.0) There are two secret managers, but we might only actually need one to store the mnemonic.
     const secretManager = get(onboardingProfileSecretManager)    
 
+    console.log(secretManager)
+
     if (!secretManager) {
         return undefined
     }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ export const onboardingProfileNetwork: Readable<IPersistedNetwork \| undefined> =`
`19`	`19`
`20`	`20`	`export function updateOnboardingProfile(payload: Partial<IOnboardingProfile>): void {`
`21`	`21`	`onboardingProfile.update((state) => ({ ...state, ...payload }))`
	`22`	`+ console.log("updated", get(onboardingProfile))`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`export function updateShimmerClaimingAccount(shimmerClaimingAccount: IShimmerClaimingWallet): void {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ export async function storeMnemonic(mnemonic: string): Promise<void> {`
`6`	`6`	`// TODO(2.0) There are two secret managers, but we might only actually need one to store the mnemonic.`
`7`	`7`	`const secretManager = get(onboardingProfileSecretManager)`
`8`	`8`
	`9`	`+ console.log(secretManager)`
	`10`	`+`
`9`	`11`	`if (!secretManager) {`
`10`	`12`	`return undefined`
`11`	`13`	`}`