refactor: Onboarding (#7763)

marc2332 · cpl121 · web-flow · commit f7cfffbcbabd · 2023-12-12T12:21:35.000+01:00
* refactor: Onboarding WIP

* fix: improve logs and try to sync balances for wallet WIP

* refactor: complete onboarding

---------

Co-authored-by: cpl121 &lt;cpeon@boxfish.studio&gt;
diff --git a/packages/desktop/views/login/views/SelectProfileView.svelte b/packages/desktop/views/login/views/SelectProfileView.svelte
@@ -31,6 +31,7 @@
     async function onAddProfileClick(): Promise<void> {
         onboardingRouter.set(new OnboardingRouter())
         await initialiseOnboardingProfile(shouldBeDeveloperProfile())
+        console.log("shuld be created")
         $routerManager.goToAppContext(AppContext.Onboarding)
     }
 
diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte b/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
@@ -28,6 +28,7 @@
     }
 
     async function _continue(): Promise<void> {
+        console.log($onboardingProfile)
         // Note: needed to cover the cases where the user has waited so long that the stronghold is locked
         if ($onboardingProfile?.restoreProfileType === RestoreProfileType.Stronghold) {
             await setStrongholdPassword($onboardingProfile.strongholdPassword)
diff --git a/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte b/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
@@ -2,12 +2,11 @@
     import { OnboardingLayout } from '@components'
     import {
         CreateProfileType,
-        initialiseProfileManagerFromOnboardingProfile,
         onboardingProfile,
         updateOnboardingProfile,
     } from '@contexts/onboarding'
     import { localize } from '@core/i18n'
-    import { ProfileType, clearProfileFromMemory, removeProfileFolder } from '@core/profile'
+    import { ProfileType, clearProfileFromMemory, getSecretManagerFromProfileType, getStorageDirectoryOfProfile, removeProfileFolder } from '@core/profile'
     import features from '@features/features'
     import { Animation, OnboardingButton, Text } from '@ui'
     import { onMount } from 'svelte'
@@ -27,8 +26,10 @@
     async function onProfileTypeClick(createProfileType: CreateProfileType): Promise<void> {
         isBusy = { ...isBusy, [createProfileType]: true }
         const type = createProfileType === CreateProfileType.Ledger ? ProfileType.Ledger : ProfileType.Software
-        updateOnboardingProfile({ createProfileType, type })
-        await initialiseProfileManagerFromOnboardingProfile()
+        const storagePath = await getStorageDirectoryOfProfile($onboardingProfile.id)
+        const secretManagerOptions = getSecretManagerFromProfileType(type, storagePath)
+        console.log("secretManagerOptions", secretManagerOptions)
+        updateOnboardingProfile({ createProfileType, type, secretManagerOptions })
         $createProfileRouter.next()
     }
 
diff --git a/packages/shared/lib/contexts/onboarding/actions/completeOnboardingProcess.ts b/packages/shared/lib/contexts/onboarding/actions/completeOnboardingProcess.ts
@@ -1,4 +1,4 @@
-import { activeProfile, activeWallets, addWalletPersistedDataToActiveProfile, createWallet, login } from '@core/profile'
+import { IWallet, activeProfile, activeWallets, addWalletPersistedDataToActiveProfile, createWallet, login } from '@core/profile'
 import { get } from 'svelte/store'
 import { OnboardingType } from '../enums'
 import { addWalletPersistedDataToOnboardingProfile, onboardingProfile } from '../stores'
@@ -11,6 +11,7 @@ export async function completeOnboardingProcess(): Promise<void> {
     // if we already have an active profile
     // it means we are trying to load again after an error
     // and we don't need to add it again
+    console.log("get(activeProfile), get(onboardingProfile)", get(activeProfile), get(onboardingProfile))
     if (!get(activeProfile)?.id) {
         createNewProfileFromOnboardingProfile()
     }
@@ -19,15 +20,13 @@ export async function completeOnboardingProcess(): Promise<void> {
     const shouldRecoverAccounts = onboardingType === OnboardingType.Restore || onboardingType === OnboardingType.Claim
     showBalanceOverviewPopup.set(shouldRecoverAccounts)
 
-
     await createOnboardingWallet()
-    
     void login({ isFromOnboardingFlow: true, shouldRecoverAccounts })
 
     onboardingProfile.set(undefined)
 }
 
-export async function createOnboardingWallet(name?: string, color?: string): Promise<IWalletState> {
+export async function createOnboardingWallet(name?: string, color?: string): Promise<IWallet> {
     // 1. Get the wallet name
     const walletName = name || `${localize('general.account')} ${(get(activeWallets)?.length ?? 0) + 1}`;
 
@@ -36,17 +35,16 @@ export async function createOnboardingWallet(name?: string, color?: string): Pro
 
     // 3. Sync the wallet with the Node
     // TODO(2.0): test & fix sync when we have iota2.0 nodes
-    //await account.sync(DEFAULT_SYNC_OPTIONS)
-
+    //await wallet.sync(DEFAULT_SYNC_OPTIONS)
     // 4. Create a wrapper over the wallet instance and the persisted data
-    const [walletState, accountPersistedData] = await buildWalletStateAndPersistedData(wallet, walletName, color)
+    // const [walletState, accountPersistedData] = await buildWalletStateAndPersistedData(wallet, walletName, color)
 
     // TODO(2.0) Fix
     // addAccountToActiveAccounts(walletState)
-    addWalletPersistedDataToOnboardingProfile(walletState.id, accountPersistedData)
+    // addWalletPersistedDataToOnboardingProfile(walletState.id, accountPersistedData)
     // TODO(2.0) Fix
     // addEmptyAccountActivitiesToAllAccountActivities(walletState.id)
 
 
-    return walletState
+    return wallet
 }
diff --git a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts
@@ -12,17 +12,17 @@ export async function initialiseOnboardingProfile(
     isDeveloperProfile: boolean,
     destroyPreviousManager = false
 ): Promise<void> {
-    // TODO(2.0) Refactor this logic
-    if (get(profileManager)) {
-        if (destroyPreviousManager) {
-            if (get(isOnboardingLedgerProfile)) {
-                stopPollingLedgerNanoStatus()
-            }
-            await clearProfileFromMemory()
-        } else {
-            throw new OnboardingProfileManagerAlreadyInitializedError()
-        }
-    }
+    // TODO(2.0) Profile manager is gone, we should maybe check onboarding SecretManager insteadd
+    // if (get(profileManager)) {
+    //     if (destroyPreviousManager) {
+    //         if (get(isOnboardingLedgerProfile)) {
+    //             stopPollingLedgerNanoStatus()
+    //         }
+    //         await clearProfileFromMemory()
+    //     } else {
+    //         throw new OnboardingProfileManagerAlreadyInitializedError()
+    //     }
+    // }
 
     const _newProfile = buildInitialOnboardingProfile(isDeveloperProfile)
     onboardingProfile.set(_newProfile)
diff --git a/packages/shared/lib/contexts/onboarding/actions/initialiseProfileManagerFromOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/initialiseProfileManagerFromOnboardingProfile.ts
@@ -26,5 +26,7 @@ export async function initialiseOnboardingProfileWithSecretManager(checkForExist
 
     const secretManagerOptions = getSecretManagerFromProfileType(activeOnboardingProfile.type, storagePath)
 
+    console.log("secretManagerOptions", secretManagerOptions)
+
     updateOnboardingProfile({ secretManagerOptions, hasInitialisedProfileManager: true })
 }
diff --git a/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts b/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts
@@ -6,19 +6,21 @@ import { IOnboardingProfile, IShimmerClaimingWallet } from '../interfaces'
 import { IBaseToken, IPersistedWalletData } from '@core/wallet/interfaces'
 import { IPersistedNetwork } from '@core/network'
 
-export const onboardingProfile = writable<IOnboardingProfile | null>(null)
+export const onboardingProfile = writable<IOnboardingProfile | null | undefined>(null)
 
-export const isOnboardingLedgerProfile: Readable<boolean> = derived(onboardingProfile, ($onboardingProfile) =>
-    isLedgerProfile($onboardingProfile?.type)
-)
+export const isOnboardingLedgerProfile: Readable<boolean> = derived(onboardingProfile, ($onboardingProfile) =>{
+    console.log("Changed?")
+    return  isLedgerProfile($onboardingProfile?.type)
+})
 
 export const onboardingProfileNetwork: Readable<IPersistedNetwork | undefined> = derived(
     onboardingProfile,
     ($onboardingProfile) => $onboardingProfile?.network
 )
 
 export function updateOnboardingProfile(payload: Partial<IOnboardingProfile>): void {
-    return onboardingProfile.update((state) => ({ ...state, ...payload }))
+    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
@@ -3,12 +3,20 @@ import { api } from '@core/api';
 import { SecretManager } from '@iota/sdk';
 import { Readable, derived, get } from 'svelte/store';
 
-const onboardingProfileSecretManagerOptions = derived(onboardingProfile, (onboardingProfile) => onboardingProfile?.secretManagerOptions);
+onboardingProfile.subscribe(console.log)
 
-export const onboardingProfileSecretManager: Readable<SecretManager | null> = derived(onboardingProfileSecretManagerOptions, (onboardingProfileSecretManagerOptions, set) => {
-    if (onboardingProfileSecretManagerOptions) {
-        api.createSecretManager(onboardingProfileSecretManagerOptions)
+
+const onboardingProfileSecretManagerOptions = derived(onboardingProfile, ($onboardingProfile) => {
+    console.log("derived", $onboardingProfile?.secretManagerOptions)
+    return $onboardingProfile?.secretManagerOptions
+});
+
+export const onboardingProfileSecretManager: Readable<SecretManager | null> = derived(onboardingProfileSecretManagerOptions, ($onboardingProfileSecretManagerOptions, set) => {
+    console.log("creating SC", $onboardingProfileSecretManagerOptions)
+    if ($onboardingProfileSecretManagerOptions) {
+        api.createSecretManager($onboardingProfileSecretManagerOptions)
             .then((secretManager) => {
+                console.log("secret manager created", secretManager)
                 set(secretManager)
             })
     } else {
diff --git a/packages/shared/lib/core/profile/actions/active-profile/loadWallets.ts b/packages/shared/lib/core/profile/actions/active-profile/loadWallets.ts
@@ -1,6 +1,6 @@
 import { loadWallet } from '@core/wallet'
 import { get } from 'svelte/store'
-import { activeAccounts, activeProfile } from '../../stores'
+import { activeWallets, activeProfile } from '../../stores'
 import { getWallets } from '../getWallets'
 
 export async function loadWallets(): Promise<void> {
@@ -14,7 +14,7 @@ export async function loadWallets(): Promise<void> {
         const loadedWallets = await Promise.all(
             walletResponse?.map((accountResponse) => loadWallet(accountResponse))
         )
-        activeAccounts.set(loadedWallets) // TODO(2.0) We can't sort this like this: sort((a, b) => a.getMetadata().index - b.getMetadata().index)
+        activeWallets.set(loadedWallets) // TODO(2.0) We can't sort this like this: sort((a, b) => a.getMetadata().index - b.getMetadata().index)
         hasLoadedAccounts.set(true)
     }
 }
diff --git a/packages/shared/lib/core/profile/actions/createWallet.ts b/packages/shared/lib/core/profile/actions/createWallet.ts
@@ -3,7 +3,8 @@ import { generateRandomId } from '@core/utils'
 import { get } from 'svelte/store'
 import { IWallet } from '../interfaces'
 import { activeProfile as activeProfileStore } from '../stores'
-import { getStorageDirectoryOfProfile } from '../utils'
+import { getSecretManagerFromProfileType, getStorageDirectoryOfProfile } from '../utils'
+import { WalletOptions } from '@iota/sdk'
 
 // TODO(2.0): Fix and finish this method
 /* - __storage__/
@@ -15,20 +16,22 @@ import { getStorageDirectoryOfProfile } from '../utils'
 export async function createWallet(activeProfile = get(activeProfileStore)): Promise<IWallet> {
     const id = generateRandomId()
     const storagePath = await getStorageDirectoryOfProfile(id)
-    const snapshotPath = ''
+    // const snapshotPath = ''
 
-    const walletOptions = {
+    const walletOptions: WalletOptions = {
         clientOptions: activeProfile.clientOptions,
-        secretManager: {
-            stronghold: {
-                snapshotPath,
-            },
+        secretManager: getSecretManagerFromProfileType(activeProfile.type, storagePath),
+        bipPath: {
+            coinType: activeProfile.network.coinType,
+            account: 0,
+            addressIndex: 0
         },
+        coinType: activeProfile.network.coinType
     }
+    console.log("walletOptions", walletOptions);
     const wallet = await api.createWallet(id, {
         ...walletOptions,
         storagePath,
     })
-
     return wallet
 }
diff --git a/packages/shared/lib/core/profile/utils/getSecretManagerFromProfileType.ts b/packages/shared/lib/core/profile/utils/getSecretManagerFromProfileType.ts
@@ -4,7 +4,7 @@ import { USE_LEDGER_SIMULATOR } from '@core/ledger'
 import { ProfileType } from '@core/profile'
 
 // TODO(2.0) Fix all usages
-export function getSecretManagerFromProfileType(type: ProfileType, storagePath?: string): SecretManagerType {
+export function getSecretManagerFromProfileType(type?: ProfileType, storagePath?: string): SecretManagerType {
     const strongholdSecretManager = {
         stronghold: { snapshotPath: `${storagePath}/wallet.stronghold`, password: 'mellamobego' },
     }
diff --git a/packages/shared/lib/core/secret-manager/actions/storeMnemonic.ts b/packages/shared/lib/core/secret-manager/actions/storeMnemonic.ts
@@ -1,8 +1,13 @@
+import { onboardingProfileSecretManager } from 'shared/lib/contexts/onboarding'
 import { get } from 'svelte/store'
 import { activeProfileSecretManager } from '../stores'
 
 export async function storeMnemonic(mnemonic: string): Promise<void> {
-    const secretManager = get(activeProfileSecretManager)
+    // 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("storeMnemonic", mnemonic, "secretManager", secretManager);
+    
 
     if (!secretManager) {
         return undefined
diff --git a/packages/shared/lib/core/wallet/actions/buildWalletState.ts b/packages/shared/lib/core/wallet/actions/buildWalletState.ts
@@ -21,12 +21,14 @@ export async function buildWalletState(
             basic: BigInt(0),
             foundry: BigInt(0),
             nft: BigInt(0),
+            delegation: BigInt(0)
         },
         nativeTokens: [],
         nfts: [],
         foundries: [],
         potentiallyLockedOutputs: {},
         accounts: [],
+        delegations: []
     }
     
     let depositAddress = ''
diff --git a/packages/shared/lib/core/wallet/actions/buildWalletStateAndPersistedData.ts b/packages/shared/lib/core/wallet/actions/buildWalletStateAndPersistedData.ts
@@ -18,6 +18,9 @@ export async function buildWalletStateAndPersistedData(
         shouldRevote: false,
         walletOptions: {}
     }
+    console.log("persistedWalletData", persistedWalletData);
+    
     const accountState = await buildWalletState(wallet, persistedWalletData)
+    console.log("accountState", accountState);
     return [accountState, persistedWalletData]
 }
diff --git a/packages/shared/lib/core/wallet/actions/getAddressesWithOutputs.ts b/packages/shared/lib/core/wallet/actions/getAddressesWithOutputs.ts
@@ -3,10 +3,10 @@ import { IWallet } from '@core/profile/interfaces'
 import { Address } from '@iota/sdk/out/types'
 
 // TODO(2.0) Fix all usages
-export async function getAddressesWithOutputs(account: IWallet | IWalletState): Promise<AddressWithOutputs[]> {
+export async function getAddressesWithOutputs(wallet: IWallet | IWalletState): Promise<AddressWithOutputs[]> {
     let addressesWithOutputs: AddressWithOutputs[] = []
     const addresses: Address[] = [] // await account.accounts
-    const outputs = await account.outputs()
+    const outputs = await wallet.outputs()
 
     const outputMapped: AddressWithOutputs[] = outputs.reduce((acc: AddressWithOutputs[], output) => {
         const address = getBech32AddressFromAddressTypes(output.address)
diff --git a/packages/shared/lib/core/wallet/actions/setStrongholdPassword.ts b/packages/shared/lib/core/wallet/actions/setStrongholdPassword.ts
@@ -2,6 +2,7 @@ import { get } from 'svelte/store'
 import { selectedWallet } from '../stores/selected-wallet.store'
 
 export async function setStrongholdPassword(password: string): Promise<void> {
+    console.log(password)
     const wallet = get(selectedWallet)
     // Otherwise error is thrown, if password is still present in memory
     await wallet?.clearStrongholdPassword()
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
@@ -2,11 +2,11 @@ import { IWrappedOutput } from '@core/wallet/interfaces'
 import { getBech32AddressFromAddressTypes } from '../getBech32AddressFromAddressTypes'
 import {
     AddressUnlockCondition,
-    AliasAddress,
-    AliasOutput,
+    AccountOutput,
     CommonOutput,
     ExpirationUnlockCondition,
     UnlockConditionType,
+    AccountAddress,
 } from '@iota/sdk/out/types'
 
 export function getSenderAddressFromInputs(inputs: IWrappedOutput[]): string | undefined {
@@ -38,10 +38,10 @@ export function getSenderAddressFromInputs(inputs: IWrappedOutput[]): string | u
         }
 
         // TODO: if additional metadata is added to an aliasOutput, we could use it to determine the EVM Sender.
-        const aliasId = (output as AliasOutput)?.aliasId
+        const accountId = (output as AccountOutput)?.accountId
 
-        if (aliasId) {
-            return getBech32AddressFromAddressTypes(new AliasAddress(aliasId))
+        if (accountId) {
+            return getBech32AddressFromAddressTypes(new AccountAddress(accountId))
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`async function onAddProfileClick(): Promise<void> {`
`32`	`32`	`onboardingRouter.set(new OnboardingRouter())`
`33`	`33`	`await initialiseOnboardingProfile(shouldBeDeveloperProfile())`
	`34`	`+ console.log("shuld be created")`
`34`	`35`	`$routerManager.goToAppContext(AppContext.Onboarding)`
`35`	`36`	`}`
`36`	`37`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`async function _continue(): Promise<void> {`
	`31`	`+ console.log($onboardingProfile)`
`31`	`32`	`// Note: needed to cover the cases where the user has waited so long that the stronghold is locked`
`32`	`33`	`if ($onboardingProfile?.restoreProfileType === RestoreProfileType.Stronghold) {`
`33`	`34`	`await setStrongholdPassword($onboardingProfile.strongholdPassword)`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,7 @@ export async function initialiseOnboardingProfileWithSecretManager(checkForExist`
`26`	`26`
`27`	`27`	`const secretManagerOptions = getSecretManagerFromProfileType(activeOnboardingProfile.type, storagePath)`
`28`	`28`
	`29`	`+ console.log("secretManagerOptions", secretManagerOptions)`
	`30`	`+`
`29`	`31`	`updateOnboardingProfile({ secretManagerOptions, hasInitialisedProfileManager: true })`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`import { loadWallet } from '@core/wallet'`
`2`	`2`	`import { get } from 'svelte/store'`
`3`		`-import { activeAccounts, activeProfile } from '../../stores'`
	`3`	`+import { activeWallets, activeProfile } from '../../stores'`
`4`	`4`	`import { getWallets } from '../getWallets'`
`5`	`5`
`6`	`6`	`export async function loadWallets(): Promise<void> {`
`@@ -14,7 +14,7 @@ export async function loadWallets(): Promise<void> {`
`14`	`14`	`const loadedWallets = await Promise.all(`
`15`	`15`	`walletResponse?.map((accountResponse) => loadWallet(accountResponse))`
`16`	`16`	`)`
`17`		`- activeAccounts.set(loadedWallets) // TODO(2.0) We can't sort this like this: sort((a, b) => a.getMetadata().index - b.getMetadata().index)`
	`17`	`+ activeWallets.set(loadedWallets) // TODO(2.0) We can't sort this like this: sort((a, b) => a.getMetadata().index - b.getMetadata().index)`
`18`	`18`	`hasLoadedAccounts.set(true)`
`19`	`19`	`}`
`20`	`20`	`}`