feat: update events to accomodate accounts

packages/shared/lib/core/profile/actions/active-profile/login.ts

@@ -41,6 +41,7 @@ import { checkAndUpdateActiveProfileNetwork } from './checkAndUpdateActiveProfil
 import { checkAndRemoveProfilePicture } from './checkAndRemoveProfilePicture'
 import { checkActiveProfileAuth, getWallets } from '@core/profile'
 import { setStrongholdPasswordClearInterval, startBackgroundSync } from '@core/wallet/actions'
+import { selectedWallet } from 'shared/lib/core/wallet'
 
 // TODO(2.0) Remove usage of profile manager
 export async function login(loginOptions?: ILoginOptions): Promise<void> {
@@ -149,7 +150,11 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
             // Step 8: start background sync
             incrementLoginProgress()
             subscribeToWalletApiEventsForActiveProfile()
-            await startBackgroundSync({ syncIncomingTransactions: true })
+            if (get(selectedWallet)?.accountOutputs.length === 0) {
+                await startBackgroundSync({ syncIncomingTransactions: true, syncImplicitAccounts: true })
+            } else {
+                await startBackgroundSync({ syncIncomingTransactions: true })
+            }
 
             // Step 9: finish login
             incrementLoginProgress()

packages/shared/lib/core/profile/actions/active-profile/subscribeToWalletApiEventsForActiveProfile.ts

@@ -12,10 +12,10 @@ import {
 export function subscribeToWalletApiEventsForActiveProfile(): void {
     const wallet = getSelectedWallet()
     const eventMap: WalletApiEventMap = {
-        [WalletEventType.NewOutput]: handleNewOutputEvent,
-        [WalletEventType.SpentOutput]: handleSpentOutputEvent,
-        [WalletEventType.TransactionInclusion]: handleTransactionInclusionEvent,
-        [WalletEventType.TransactionProgress]: handleTransactionProgressEvent,
+        [WalletEventType.NewOutput]: handleNewOutputEvent(wallet.id),
+        [WalletEventType.SpentOutput]: handleSpentOutputEvent(wallet.id),
+        [WalletEventType.TransactionInclusion]: handleTransactionInclusionEvent(wallet.id),
+        [WalletEventType.TransactionProgress]: handleTransactionProgressEvent(wallet.id),
     }
     subscribeToWalletApiEvents({
         eventMap,

packages/shared/lib/core/wallet/actions/events-handlers/handleNewOutputEvent.ts

@@ -1,4 +1,13 @@
-import { Event, NewOutputWalletEvent, OutputType, WalletEventType } from '@iota/sdk/out/types'
+import {
+    WalletEvent,
+    NewOutputWalletEvent,
+    OutputType,
+    WalletEventType,
+    CommonOutput,
+    UnlockConditionType,
+    AddressType,
+    AddressUnlockCondition,
+} from '@iota/sdk/out/types'
 
 import { addNftsToDownloadQueue, addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput } from '@core/nfts'
 import { checkAndRemoveProfilePicture } from '@core/profile/actions'
@@ -15,15 +24,18 @@ import {
     getBech32AddressFromAddressTypes,
     preprocessGroupedOutputs,
     addActivitiesToWalletActivitiesInAllWalletActivities,
+    WalletApiEventHandler,
+    updateSelectedWallet,
 } from '@core/wallet'
 import { get } from 'svelte/store'
 import { activeWallets, updateActiveWallet } from '@core/profile'
 
-export function handleNewOutputEvent(error: Error, rawEvent: Event): void {
-    const { walletId, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.NewOutput)
-    const type = payload.type
-    if (type === WalletEventType.NewOutput) {
-        void handleNewOutputEventInternal(walletId, payload as NewOutputWalletEvent)
+export function handleNewOutputEvent(walletId: string): WalletApiEventHandler {
+    return (error: Error, rawEvent: WalletEvent) => {
+        validateWalletApiEvent(error, rawEvent, WalletEventType.NewOutput)
+        if (rawEvent.type === WalletEventType.NewOutput) {
+            void handleNewOutputEventInternal(walletId, rawEvent as NewOutputWalletEvent)
+        }
     }
 }
 
@@ -36,12 +48,31 @@ export async function handleNewOutputEventInternal(walletId: string, payload: Ne
 
     const output = outputData.output
 
+    const isImplicitAccountOutput =
+        output.type === OutputType.Basic &&
+        (output as CommonOutput).unlockConditions.length === 1 &&
+        (
+            (output as CommonOutput).unlockConditions.find(
+                (cmnOutput) => cmnOutput.type === UnlockConditionType.Address
+            ) as AddressUnlockCondition
+        )?.address.type === AddressType.ImplicitAccountCreation
+
+    if (isImplicitAccountOutput) {
+        const implicitAccounts = await wallet.implicitAccounts()
+        updateSelectedWallet({
+            implicitAccountOutputs: implicitAccounts,
+        })
+        return
+    }
+
     const address = getBech32AddressFromAddressTypes(outputData.address)
     const isNewAliasOutput =
         output.type === OutputType.Account &&
         !get(allWalletActivities)[walletId].find((_activity) => _activity.id === outputData.outputId)
     const isNftOutput = output.type === OutputType.Nft
 
+    const isAccountOutput = output.type === OutputType.Account
+
     if ((wallet?.depositAddress === address && !outputData?.remainder) || isNewAliasOutput) {
         await syncBalance(wallet.id)
         const addressesWithOutputs = await getAddressesWithOutputs(wallet)
@@ -69,4 +100,11 @@ export async function handleNewOutputEventInternal(walletId: string, payload: Ne
 
         checkAndRemoveProfilePicture()
     }
+
+    if (isAccountOutput) {
+        const accounts = await wallet.accounts()
+        updateSelectedWallet({
+            accountOutputs: accounts,
+        })
+    }
 }

packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts

@@ -1,6 +1,6 @@
 // TODO(2.0) Fix all of events code, blocked by https://github.com/iotaledger/iota-sdk/issues/1708
 
-import { Event, SpentOutputWalletEvent, WalletEventType } from '@iota/sdk/out/types'
+import { WalletEvent, SpentOutputWalletEvent, WalletEventType } from '@iota/sdk/out/types'
 
 import { getNftByIdFromAllAccountNfts, updateNftInAllWalletNfts } from '@core/nfts'
 import {
@@ -10,15 +10,17 @@ import {
     validateWalletApiEvent,
     updateAsyncDataByTransactionId,
     allWalletActivities,
+    WalletApiEventHandler,
 } from '@core/wallet'
 import { get } from 'svelte/store'
 import { activeWallets, updateActiveWallet } from '@core/profile'
 
-export async function handleSpentOutputEvent(error: Error, rawEvent: Event): Promise<void> {
-    const { walletId, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.SpentOutput)
-    const type = payload.type
-    if (type === WalletEventType.SpentOutput) {
-        await handleSpentOutputEventInternal(walletId, payload as SpentOutputWalletEvent)
+export function handleSpentOutputEvent(walletId: string): WalletApiEventHandler {
+    return async (error: Error, rawEvent: WalletEvent) => {
+        validateWalletApiEvent(error, rawEvent, WalletEventType.SpentOutput)
+        if (rawEvent.type === WalletEventType.SpentOutput) {
+            await handleSpentOutputEventInternal(walletId, rawEvent as SpentOutputWalletEvent)
+        }
     }
 }
 

packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts

@@ -1,5 +1,5 @@
 import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-import { Event, TransactionInclusionWalletEvent, WalletEventType } from '@iota/sdk/out/types'
+import { WalletEvent, TransactionInclusionWalletEvent, WalletEventType } from '@iota/sdk/out/types'
 
 import { updateParticipationOverview } from '@contexts/governance/stores'
 import { isWalletVoting } from 'shared/lib/contexts/governance/utils/isWalletVoting'
@@ -16,15 +16,18 @@ import {
     ActivityType,
     GovernanceActivity,
     InclusionState,
+    WalletApiEventHandler,
 } from '@core/wallet'
 import { get } from 'svelte/store'
 import { activeWallets, updateActiveWallet } from 'shared/lib/core/profile'
 
-export function handleTransactionInclusionEvent(error: Error, rawEvent: Event): void {
-    const { walletId, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.TransactionInclusion)
-    const type = payload?.type
-    if (type === WalletEventType.TransactionInclusion) {
-        handleTransactionInclusionEventInternal(walletId, payload as TransactionInclusionWalletEvent)
+export function handleTransactionInclusionEvent(walletId: string): WalletApiEventHandler {
+    return (error: Error, rawEvent: WalletEvent) => {
+        validateWalletApiEvent(error, rawEvent, WalletEventType.TransactionInclusion)
+        const type = rawEvent?.type
+        if (type === WalletEventType.TransactionInclusion) {
+            handleTransactionInclusionEventInternal(walletId, rawEvent as TransactionInclusionWalletEvent)
+        }
     }
 }
 

packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionProgressEvent.ts

@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 import {
-    Event,
+    WalletEvent,
     TransactionProgressWalletEvent,
     PreparedTransactionSigningHashProgress,
     WalletEventType,
@@ -16,13 +16,16 @@ import { deconstructLedgerVerificationProps } from '@core/ledger/helpers'
 import { validateWalletApiEvent } from '../../utils'
 import { selectedWalletId } from '../../stores'
 import { MissingTransactionProgressEventPayloadError } from '../../errors'
+import { WalletApiEventHandler } from '../../types'
 
-export function handleTransactionProgressEvent(error: Error, rawEvent: Event): void {
-    const { walletId, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.TransactionProgress)
-    const type = payload.type
-    if (type === WalletEventType.TransactionProgress) {
-        const progress = (payload as TransactionProgressWalletEvent).progress
-        handleTransactionProgressEventInternal(walletId, progress)
+export function handleTransactionProgressEvent(walletId: string): WalletApiEventHandler {
+    return (error: Error, rawEvent: WalletEvent) => {
+        validateWalletApiEvent(error, rawEvent, WalletEventType.TransactionProgress)
+        const type = rawEvent.type
+        if (type === WalletEventType.TransactionProgress) {
+            const progress = (rawEvent as TransactionProgressWalletEvent).progress
+            handleTransactionProgressEventInternal(walletId, progress)
+        }
     }
 }
 

packages/shared/lib/core/wallet/utils/validateWalletApiEvent.ts

@@ -1,37 +1,13 @@
 import { localize } from '@core/i18n'
-
-import { Event, WalletEventType } from '@iota/sdk/out/types'
-
+import { WalletEvent, WalletEventType } from '@iota/sdk/out/types'
 import { WalletApiEventError, WalletApiEventValidationError } from '../errors'
-import { IWalletApiEventPayloadWrapper } from '../interfaces'
 
-export function validateWalletApiEvent(
-    error: Error,
-    rawEvent: Event,
-    apiEvent: WalletEventType
-): IWalletApiEventPayloadWrapper {
+export function validateWalletApiEvent(error: Error, rawEvent: WalletEvent, apiEvent: WalletEventType): void {
     if (error) {
         throw new WalletApiEventError(error)
-    } else {
-        /* eslint-disable-next-line prefer-const */
-        const { walletId, event } = rawEvent
-
-        if (Number.isNaN(walletId)) {
-            throw new WalletApiEventValidationError(
-                localize('error.walletApiEvent.invalidAccountIndex', { values: { eventName: apiEvent } })
-            )
-        }
-
-        const payload = event.type === apiEvent ? event : undefined
-        if (!payload) {
-            throw new WalletApiEventValidationError(
-                localize('error.walletApiEvent.invalidPayload', { values: { eventName: apiEvent } })
-            )
-        }
-
-        return {
-            accountIndex,
-            payload,
-        }
+    } else if (rawEvent?.type !== apiEvent) {
+        throw new WalletApiEventValidationError(
+            localize('error.walletApiEvent.invalidPayload', { values: { eventName: apiEvent } })
+        )
     }
 }