From 1b66742d6f08f7871a6a1a5331c6171cfcb18057 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Wed, 12 Jul 2023 09:49:09 +0200
Subject: [PATCH 01/48] feat: Point iota/wallet dependency to iota/sdk

---
 packages/shared/package.json |  2 +-
 yarn.lock                    | 26 +++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/shared/package.json b/packages/shared/package.json
index ede6849c055..3ab753d6654 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -11,7 +11,7 @@
         "@iota/transaction-converter": "^1.0.0-beta.30",
         "@iota/unit-converter": "^1.0.0-beta.30",
         "@iota/util.js": "^2.0.0-rc.1",
-        "@iota/wallet": "2.0.3-rc.42",
+        "@iota/wallet": "npm:@iota/sdk@1.0.0-rc.2",
         "@sveltejs/svelte-virtual-list": "^3.0.1",
         "big-integer": "^1.6.51",
         "big.js": "^6.0.3",
diff --git a/yarn.lock b/yarn.lock
index 748d1666adb..27b99538c45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -888,7 +888,7 @@
   resolved "https://registry.yarnpkg.com/@iota/types/-/types-2.0.0-rc.2.tgz#a4b8e5c3423a2afd322fc05ebfaa6b27587d9a96"
   integrity sha512-huL+171zMQgGYV4/zhHLFcE8heTLRJhtlqLEJaM1Q+klb2KxNqFX0EySU8pxZ/nslh0Dem3QQ+Jmwv1FdBmpFQ==
 
-"@iota/types@^1.0.0-beta.15", "@iota/types@^1.0.0-beta.9":
+"@iota/types@^1.0.0-beta.9":
   version "1.0.0-beta.15"
   resolved "https://registry.yarnpkg.com/@iota/types/-/types-1.0.0-beta.15.tgz#1a1f5722ef176a45d03e92f4cb5bd9a4ea74ec27"
   integrity sha512-67DrzDO5bl2c7RIMpOdtjdOa27Bv1EmX/BHPTQD8c3RtPPAzJpSIpuI8JsIDl3U6Qe4zdLX3kRv9zGBXcr0fZA==
@@ -915,14 +915,16 @@
   dependencies:
     big-integer "^1.6.51"
 
-"@iota/wallet@2.0.3-rc.42":
-  version "2.0.3-rc.42"
-  resolved "https://registry.yarnpkg.com/@iota/wallet/-/wallet-2.0.3-rc.42.tgz#62373ba2dca09a9d6a0358ae2580e89f88d1f353"
-  integrity sha512-w3M0B/KLDYyYP0C72rHgc1KQ+WN21RDdFldapVbGDgtWyDuQN/XiXC90hPDvr8G8++V9d2nQ0gnxfSvpfsgOPQ==
+"@iota/wallet@npm:@iota/sdk@1.0.0-rc.2":
+  version "1.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.0-rc.2.tgz#e776b5c9f54c211403399f32f6b456976e0251b6"
+  integrity sha512-xu4zMjPQFITX5ewoixuYBcn551C/G0DvBn0gl/K7UJMMUK5GfXp6BpwmhR1AcW7py654mgGzL4JX1xfORAtrTg==
   dependencies:
-    "@iota/types" "^1.0.0-beta.15"
+    "@types/node" "^18.15.12"
     cargo-cp-artifact "^0.1.6"
+    class-transformer "^0.5.1"
     prebuild-install "^7.1.1"
+    reflect-metadata "^0.1.13"
     typescript "^4.9.4"
 
 "@isaacs/cliui@^8.0.2":
@@ -1800,7 +1802,7 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.38.tgz#1dcdb6c54d02b323f621213745f2e44af30c73e6"
   integrity sha512-6sfo1qTulpVbkxECP+AVrHV9OoJqhzCsfTNp5NIG+enM4HyM3HvZCO798WShIXBN0+QtDIcutJCjsVYnQP5rIQ==
 
-"@types/node@^18.15.11":
+"@types/node@^18.15.11", "@types/node@^18.15.12":
   version "18.16.19"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.19.tgz#cb03fca8910fdeb7595b755126a8a78144714eea"
   integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA==
@@ -2944,6 +2946,11 @@ cjs-module-lexer@^1.0.0:
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
   integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
 
+class-transformer@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/class-transformer/-/class-transformer-0.5.1.tgz#24147d5dffd2a6cea930a3250a677addf96ab336"
+  integrity sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==
+
 clean-stack@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
@@ -7318,6 +7325,11 @@ rechoir@^0.8.0:
   dependencies:
     resolve "^1.20.0"
 
+reflect-metadata@^0.1.13:
+  version "0.1.13"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
+  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
+
 regexp-tree@~0.1.1:
   version "0.1.27"
   resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd"

From fbd06170b3f9f4e2850da74f202966c01837ae7c Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Wed, 12 Jul 2023 10:53:31 +0200
Subject: [PATCH 02/48] chore: Fix AddressBalance -> Balance &
 MintNativeTokenParams -> CreateNativeTokenParams

---
 .../governance/actions/registerParticipationEvent.ts  |  4 ++--
 .../onboarding/helpers/restoreBackupByCopyingFile.ts  |  4 ++--
 .../account/interfaces/account-state.interface.ts     |  2 +-
 .../lib/core/account/interfaces/account.interface.ts  | 11 ++---------
 .../lib/tests/__mocks__/account-balance.mock.ts       |  1 +
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts b/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
index 80e6b3c5255..4526c61a804 100644
--- a/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
@@ -1,5 +1,5 @@
 import type {
-    Node,
+    INode,
     ParticipationEventWithNodes,
     ParticipationEventId,
     ParticipationEventRegistrationOptions,
@@ -10,7 +10,7 @@ import { createProposalFromEvent } from '@contexts/governance'
 
 export async function registerParticipationEvent(
     eventId: ParticipationEventId,
-    node: Node,
+    node: INode,
     account: IAccountState
 ): Promise<ParticipationEventWithNodes> {
     const options: ParticipationEventRegistrationOptions = {
diff --git a/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts b/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
index 319512469b2..0797d4fbfd4 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
@@ -1,6 +1,6 @@
 import { get, Writable } from 'svelte/store'
 
-import { ClientOptions } from '@iota/wallet'
+import { IClientOptions } from '@iota/wallet'
 
 import { ClientError, CLIENT_ERROR_REGEXES } from '@core/error'
 import { IProfileManager } from '@core/profile-manager'
@@ -12,7 +12,7 @@ export async function restoreBackupByCopyingFile(
     importFilePath: string,
     storageDirectory: string,
     strongholdPassword: string,
-    clientOptions: ClientOptions,
+    clientOptions: IClientOptions,
     manager: Writable<IProfileManager>
 ): Promise<void> {
     try {
diff --git a/packages/shared/lib/core/account/interfaces/account-state.interface.ts b/packages/shared/lib/core/account/interfaces/account-state.interface.ts
index 52b36e258d4..2874660e2b4 100644
--- a/packages/shared/lib/core/account/interfaces/account-state.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account-state.interface.ts
@@ -1,6 +1,6 @@
 import { Balance } from '@iota/wallet'
-import { IAccount } from './account.interface'
 import { IPersistedAccountData } from './persisted-account-data.interface'
+import { IAccount } from './account.interface'
 
 export interface IAccountState extends IAccount, IPersistedAccountData {
     index: number
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index 701d2abae96..ddb86206769 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -1,12 +1,3 @@
-import type {
-    HexEncodedAmount,
-    HexEncodedString,
-    IAliasOutput,
-    IBasicOutput,
-    IFoundryOutput,
-    INftOutput,
-    OutputTypes,
-} from '@iota/types'
 import type {
     AccountMetadata,
     Address,
@@ -23,7 +14,9 @@ import type {
     Ed25519Signature,
     FilterOptions,
     GenerateAddressOptions,
+    CreateNativeTokenParams,
     MintNftParams,
+    MintTokenTransaction,
     Node,
     OutputData,
     OutputParams,
diff --git a/packages/shared/lib/tests/__mocks__/account-balance.mock.ts b/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
index c0e0a84660c..ee61b8d40da 100644
--- a/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
@@ -4,6 +4,7 @@ export const MOCK_ACCOUNT_BALANCE: Balance = {
     baseCoin: {
         total: '10000',
         available: '9000',
+        votingPower: '0',
     },
     aliases: [],
     foundries: [],

From f74a531df4349b11ef3befdec72f6336373f0251 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Wed, 12 Jul 2023 11:02:04 +0200
Subject: [PATCH 03/48] chore: Migrate Node > INode, MintTokenTransaction >
 CreateNativeTokenTransaction, SendAmountParams > SendParams

---
 .../shared/lib/core/account/interfaces/account.interface.ts   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index ddb86206769..9a8244b21e0 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -16,8 +16,8 @@ import type {
     GenerateAddressOptions,
     CreateNativeTokenParams,
     MintNftParams,
-    MintTokenTransaction,
-    Node,
+    CreateNativeTokenTransaction,
+    INode,
     OutputData,
     OutputParams,
     OutputsToClaim,

From d6b6fdc7f6815980b6996223e75cae42dad6be6f Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Wed, 12 Jul 2023 11:32:47 +0200
Subject: [PATCH 04/48] chore: Fix a couple of type sources

---
 .../core/account/interfaces/persisted-account-data.interface.ts | 2 +-
 packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts b/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
index b03dd4cd773..f11719b4651 100644
--- a/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
@@ -1,4 +1,4 @@
-import { ParticipationEventId } from '@iota/wallet/types'
+import { ParticipationEventId } from '@iota/wallet'
 
 export interface IPersistedAccountData {
     name: string
diff --git a/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts b/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts
index 0618ef97d75..f2146e2d6e1 100644
--- a/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts
+++ b/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts
@@ -1,4 +1,4 @@
-import { OutputData } from '@iota/wallet/types/output'
+import { OutputData } from '@iota/wallet'
 
 export function sumTotalFromOutputs(outputs: OutputData[]): number {
     return outputs?.reduce((total: number, outputData: OutputData) => (total += Number(outputData?.output?.amount)), 0)

From 17402665bbd9859f0c247d67a49de4b25c499f1e Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Wed, 12 Jul 2023 11:43:06 +0200
Subject: [PATCH 05/48] chore: Fix ClientOptions > IClientOptions (rename
 firefly IClientOptions > ClientOptions to fix collision)

---
 .../shared/lib/core/network/actions/updateClientOptions.ts  | 6 +++---
 .../lib/core/network/interfaces/client-options.interface.ts | 4 ++--
 .../lib/core/network/utils/getDefaultClientOptions.ts       | 4 ++--
 .../shared/lib/core/profile-manager/api/setClientOptions.ts | 4 ++--
 .../profile-manager/types/profile-manager-options.type.ts   | 4 ++--
 .../core/profile/interfaces/persisted-profile.interface.ts  | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/shared/lib/core/network/actions/updateClientOptions.ts b/packages/shared/lib/core/network/actions/updateClientOptions.ts
index 42f90ace47e..0647626765c 100644
--- a/packages/shared/lib/core/network/actions/updateClientOptions.ts
+++ b/packages/shared/lib/core/network/actions/updateClientOptions.ts
@@ -1,4 +1,4 @@
-import { IClientOptions } from '@core/network'
+import { ClientOptions } from '@core/network'
 import { activeProfile, updateActiveProfile } from '@core/profile'
 import { setClientOptions } from '@core/profile-manager'
 import { get } from 'svelte/store'
@@ -8,12 +8,12 @@ import { get } from 'svelte/store'
  *
  * @method updateClientOptions
  *
- * @param {Partial<IClientOptions>} clientOptions
+ * @param {Partial<ClientOptions>} clientOptions
  *
  * @returns {void}
  */
 
-export function updateClientOptions(clientOptionsToUpdate: Partial<IClientOptions>): Promise<void> {
+export function updateClientOptions(clientOptionsToUpdate: Partial<ClientOptions>): Promise<void> {
     const currentClientOptions = get(activeProfile)?.clientOptions
     const clientOptions = { ...currentClientOptions, ...clientOptionsToUpdate }
     if (clientOptions?.nodes || clientOptions?.primaryNode) {
diff --git a/packages/shared/lib/core/network/interfaces/client-options.interface.ts b/packages/shared/lib/core/network/interfaces/client-options.interface.ts
index 1b1dac4693c..0635b14cc94 100644
--- a/packages/shared/lib/core/network/interfaces/client-options.interface.ts
+++ b/packages/shared/lib/core/network/interfaces/client-options.interface.ts
@@ -1,8 +1,8 @@
-import { ClientOptions } from '@iota/wallet'
+import { IClientOptions } from '@iota/wallet'
 
 import { INode } from './node.interface'
 
-export interface IClientOptions extends Omit<ClientOptions, 'nodes' | 'primaryNode'> {
+export interface ClientOptions extends Omit<IClientOptions, 'nodes' | 'primaryNode'> {
     primaryNode?: INode
     nodes?: INode[]
     localPow?: boolean
diff --git a/packages/shared/lib/core/network/utils/getDefaultClientOptions.ts b/packages/shared/lib/core/network/utils/getDefaultClientOptions.ts
index 6fa41f6c2ab..ae006a9dea7 100644
--- a/packages/shared/lib/core/network/utils/getDefaultClientOptions.ts
+++ b/packages/shared/lib/core/network/utils/getDefaultClientOptions.ts
@@ -1,8 +1,8 @@
 import { NetworkId } from '../enums'
-import { IClientOptions } from '../interfaces'
+import { ClientOptions } from '../interfaces'
 import { getOfficialNodes } from './getOfficialNodes'
 
-export function getDefaultClientOptions(networkId: NetworkId): IClientOptions {
+export function getDefaultClientOptions(networkId: NetworkId): ClientOptions {
     const nodes = getOfficialNodes(networkId)
     return { nodes }
 }
diff --git a/packages/shared/lib/core/profile-manager/api/setClientOptions.ts b/packages/shared/lib/core/profile-manager/api/setClientOptions.ts
index 4dccfb6f2fa..2ff3c51c82f 100644
--- a/packages/shared/lib/core/profile-manager/api/setClientOptions.ts
+++ b/packages/shared/lib/core/profile-manager/api/setClientOptions.ts
@@ -1,8 +1,8 @@
-import { IClientOptions } from '@core/network'
+import { ClientOptions } from '@core/network'
 import { get } from 'svelte/store'
 import { profileManager } from '../stores'
 
-export async function setClientOptions(clientOptions: Partial<IClientOptions>): Promise<void> {
+export async function setClientOptions(clientOptions: Partial<ClientOptions>): Promise<void> {
     const manager = get(profileManager)
     await manager.setClientOptions(clientOptions)
 }
diff --git a/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts b/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
index 86fceb914ef..427ea5bc3d6 100644
--- a/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
+++ b/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
@@ -1,6 +1,6 @@
-import { IClientOptions } from '@core/network/interfaces'
+import { ClientOptions } from '@core/network/interfaces'
 import { AccountManagerOptions } from '@iota/wallet'
 
 export type ProfileManagerOptions = Omit<AccountManagerOptions, 'clientOptions'> & {
-    clientOptions: IClientOptions
+    clientOptions: ClientOptions
 }
diff --git a/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts b/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts
index 272c1184058..ee765dc2627 100644
--- a/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts
+++ b/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts
@@ -1,5 +1,5 @@
 import { IPersistedAccountData } from '@core/account'
-import { IClientOptions, IPersistedNetwork } from '@core/network'
+import { ClientOptions, IPersistedNetwork } from '@core/network'
 import { INft } from '@core/nfts'
 import { StrongholdVersion } from '@core/stronghold/enums'
 import { ProfileType } from '../enums'
@@ -18,7 +18,7 @@ export interface IPersistedProfile {
     isDeveloperProfile: boolean
     hasVisitedDashboard?: boolean
     lastUsedAccountIndex?: number
-    clientOptions: IClientOptions
+    clientOptions: ClientOptions
     forceAssetRefresh: boolean
     strongholdVersion: StrongholdVersion
     pfp?: INft

From 26fe1f69eb77a864684394a3276188fc294d26e4 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Wed, 12 Jul 2023 12:05:00 +0200
Subject: [PATCH 06/48] chore: Migrate EventType > WalletEventType

---
 packages/shared/lib/tests/__mocks__/profile-manager.mock.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts b/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
index eaf2e94cbbd..237fb91a124 100644
--- a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
@@ -8,6 +8,7 @@ import type {
     WalletEvent,
     LedgerNanoStatus,
     GenerateAddressOptions,
+    INode,
 } from '@iota/wallet'
 import { WalletEventType } from '@iota/wallet/out/types'
 

From 37143417db47eb881c46a4ee220caef0526e2ece Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Wed, 12 Jul 2023 12:18:08 +0200
Subject: [PATCH 07/48] chore: Migrate AccountManagerOptions > WalletOptions

---
 .../actions/initialiseProfileManager.ts              | 12 ++++++++----
 .../core/profile-manager/interfaces/api.interface.ts |  5 +++--
 .../types/profile-manager-options.type.ts            |  4 ++--
 packages/shared/lib/tests/__mocks__/api.mock.ts      |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
index 0b2d30e2731..18f8548606f 100644
--- a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
+++ b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
@@ -1,4 +1,4 @@
-import { ClientOptions, CoinType, SecretManager } from '@iota/wallet'
+import { IClientOptions, CoinType, SecretManager } from '@iota/wallet'
 
 import { generateRandomId } from '@core/utils'
 
@@ -8,7 +8,7 @@ import { IProfileManager } from '../interfaces'
 export async function initialiseProfileManager(
     storagePath: string,
     coinType: CoinType,
-    clientOptions?: ClientOptions,
+    clientOptions?: IClientOptions,
     secretManager?: SecretManager,
     id?: string
 ): Promise<IProfileManager> {
@@ -16,9 +16,13 @@ export async function initialiseProfileManager(
 
     const profileManager = await api.createAccountManager(id, {
         storagePath,
-        ...(clientOptions && (clientOptions?.nodes?.length > 0 || clientOptions?.primaryNode) && { clientOptions }),
+        // TODO-sdk is this the right fix for the line ?
+        // ...(clientOptions && (clientOptions?.nodes?.length > 0 || clientOptions?.primaryNode) && { clientOptions }),
+        ...clientOptions,
         coinType,
-        ...(secretManager && { secretManager }),
+        // TODO-sdk is this the right fix for the line ?
+        // ...(secretManager && { secretManager }),
+        ...secretManager,
     })
     return profileManager
 }
diff --git a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
index d71c417506c..18cd3915c64 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
@@ -1,4 +1,4 @@
-import { AccountManagerOptions, CreateAccountPayload } from '@iota/wallet'
+import { WalletOptions, CreateAccountPayload } from '@iota/wallet'
 
 import { IAccount } from '@core/account'
 
@@ -6,7 +6,8 @@ import { IProfileManager } from './profile-manager.interface'
 import { RecoverAccountsPayload } from './recover-account-payload.interface'
 
 export interface IApi {
-    createAccountManager(id: string, options: AccountManagerOptions): Promise<IProfileManager>
+    // TODO-sdk: These should be renamed to createWallet etc... to match naming in sdk
+    createAccountManager(id: string, options: WalletOptions): Promise<IProfileManager>
     createAccount(managerId: string, payload: CreateAccountPayload): Promise<IAccount>
     deleteAccountManager(id: string): void
     getAccount(profileManagerId: string, index: number): Promise<IAccount>
diff --git a/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts b/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
index 427ea5bc3d6..73ff0b5818d 100644
--- a/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
+++ b/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
@@ -1,6 +1,6 @@
 import { ClientOptions } from '@core/network/interfaces'
-import { AccountManagerOptions } from '@iota/wallet'
+import { WalletOptions } from '@iota/wallet'
 
-export type ProfileManagerOptions = Omit<AccountManagerOptions, 'clientOptions'> & {
+export type ProfileManagerOptions = Omit<WalletOptions, 'clientOptions'> & {
     clientOptions: ClientOptions
 }
diff --git a/packages/shared/lib/tests/__mocks__/api.mock.ts b/packages/shared/lib/tests/__mocks__/api.mock.ts
index 58b97ff7504..7c17f8d9842 100644
--- a/packages/shared/lib/tests/__mocks__/api.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/api.mock.ts
@@ -1,7 +1,7 @@
 import { AccountMock } from './account.mock'
 import { ProfileManagerMock } from './profile-manager.mock'
 
-import { AccountManagerOptions, CreateAccountPayload } from '@iota/wallet'
+import { WalletOptions, CreateAccountPayload } from '@iota/wallet'
 
 import { IApi, RecoverAccountsPayload } from '@core/profile-manager'
 import { IAccount } from '@core/account'
@@ -9,7 +9,7 @@ import { IAccount } from '@core/account'
 const profileManagers = {}
 
 const api: IApi = {
-    async createAccountManager(id: string, _: AccountManagerOptions): Promise<ProfileManagerMock> {
+    async createAccountManager(id: string, _: WalletOptions): Promise<ProfileManagerMock> {
         const manager = new ProfileManagerMock(id)
 
         profileManagers[id] = manager

From 29c6593507b482ff6cb7de0f414ed9ab914233f8 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Wed, 12 Jul 2023 15:46:54 +0200
Subject: [PATCH 08/48] chore: Migrate to iota/sdk models (remove @iota/types)
 pass 1

---
 .../governance/utils/isParticipationOutput.ts | 16 ++++++----
 .../lib/core/nfts/interfaces/nft.interface.ts |  4 +--
 .../core/nfts/utils/buildNftFromNftOutput.ts  | 10 +++---
 .../getSpendableStatusFromUnspentNftOutput.ts | 12 +++----
 packages/shared/lib/core/utils/filter.ts      | 13 +++-----
 .../setOutgoingAsyncActivitiesToClaimed.ts    |  5 ++-
 .../wallet/constants/output-type.constants.ts |  1 +
 .../constants/unlock-condition.constants.ts   |  1 +
 .../interfaces/wrapped-output.interface.ts    |  3 +-
 .../shared/lib/core/wallet/types/index.ts     |  1 -
 .../lib/core/wallet/types/output.type.ts      |  3 --
 .../generateActivity/generateActivities.ts    | 16 +++-------
 .../generateActivitiesFromBasicOutputs.ts     | 30 +++++++++--------
 .../generateActivitiesFromNftOutputs.ts       | 12 +++----
 .../generateSingleAliasActivity.ts            | 10 +++---
 .../generateSingleBasicActivity.ts            |  6 ++--
 .../generateSingleConsolidationActivity.ts    |  7 ++--
 .../generateSingleGovernanceActivity.ts       |  4 +--
 .../generateSingleNftActivity.ts              |  6 ++--
 .../helper/getActivityTypeFromOutput.ts       | 12 +++----
 .../helper/getGovernanceInfo.ts               |  2 +-
 .../getGovernorAddressFromAliasOutput.ts      | 15 +++++----
 .../helper/getMetadataFromOutput.ts           | 16 ++++++----
 ...etStateControllerAddressFromAliasOutput.ts | 15 +++++----
 .../helper/getStorageDepositFromOutput.ts     | 13 ++++----
 .../helper/getTimelockDateFromOutput.ts       | 12 ++++---
 .../utils/getBech32AddressFromAddressTypes.ts | 19 ++++++-----
 .../utils/getMetadataFromFoundryOutput.ts     | 16 +++++-----
 .../core/wallet/utils/outputs/getFoundryId.ts | 32 +++++++++----------
 .../utils/outputs/getIssuerFromNftOutput.ts   | 11 ++++---
 .../utils/outputs/getMetadataFromNftOutput.ts | 13 ++++----
 .../utils/outputs/preprocessGroupedOutputs.ts | 29 ++++++++---------
 .../activityOutputContainsValue.ts            |  4 +--
 33 files changed, 181 insertions(+), 188 deletions(-)
 delete mode 100644 packages/shared/lib/core/wallet/types/output.type.ts

diff --git a/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts b/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
index 03c7c7d161d..89dea20179b 100644
--- a/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
+++ b/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
@@ -1,10 +1,14 @@
-import type { ITagFeature } from '@iota/types'
-
-import { FEATURE_TYPE_TAG, Output } from '@core/wallet'
-
 import { PARTICIPATE_TAG_HEX } from '../constants'
+import { CommonOutput, FeatureType, Output, OutputType, TagFeature } from '@iota/wallet'
 
 export function isParticipationOutput(output: Output): boolean {
-    const outputFeature = <ITagFeature>output?.features?.find((feature) => feature.type === FEATURE_TYPE_TAG)
-    return outputFeature?.tag === PARTICIPATE_TAG_HEX
+    if (output.getType() === OutputType.Treasury) {
+        return false
+    }
+
+    const commonOutput = output as CommonOutput
+    const outputFeature = <TagFeature>(
+        commonOutput?.getFeatures()?.find((feature) => feature.getType() === FeatureType.Tag)
+    )
+    return outputFeature?.getTag() === PARTICIPATE_TAG_HEX
 }
diff --git a/packages/shared/lib/core/nfts/interfaces/nft.interface.ts b/packages/shared/lib/core/nfts/interfaces/nft.interface.ts
index e2de874d300..b3378724937 100644
--- a/packages/shared/lib/core/nfts/interfaces/nft.interface.ts
+++ b/packages/shared/lib/core/nfts/interfaces/nft.interface.ts
@@ -1,4 +1,4 @@
-import { AddressTypes } from '@iota/types'
+import { Address } from '@iota/wallet'
 import { NftDownloadMetadata, IIrc27Metadata } from '../interfaces'
 
 export interface INft {
@@ -6,7 +6,7 @@ export interface INft {
     address: string
     name: string
     metadata?: string
-    issuer?: AddressTypes
+    issuer?: Address
     parsedMetadata?: IIrc27Metadata
     isSpendable: boolean
     timelockTime: number
diff --git a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
index 5f20f24f313..a44b1f86680 100644
--- a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
@@ -6,7 +6,6 @@ import {
     getNftId,
 } from '@core/wallet/utils'
 import { IWrappedOutput } from '@core/wallet/interfaces'
-import type { INftOutput } from '@iota/types'
 import { get } from 'svelte/store'
 import { DEFAULT_NFT_NAME } from '../constants'
 import { INft } from '../interfaces'
@@ -14,16 +13,17 @@ import { parseNftMetadata } from './parseNftMetadata'
 import { composeUrlFromNftUri } from './composeUrlFromNftUri'
 import { getSpendableStatusFromUnspentNftOutput } from './getSpendableStatusFromUnspentNftOutput'
 import { ADDRESS_TYPE_NFT } from '@core/wallet/constants'
+import { NftOutput } from '@iota/wallet'
 
 export function buildNftFromNftOutput(
     wrappedOutput: IWrappedOutput,
     accountAddress: string,
     calculateStatus: boolean = true
 ): INft {
-    const nftOutput = wrappedOutput.output as INftOutput
+    const nftOutput = wrappedOutput.output as NftOutput
 
     let isSpendable = false
-    let timeLockTime = undefined
+    let timeLockTime: number | undefined = undefined
 
     if (calculateStatus) {
         const status = getSpendableStatusFromUnspentNftOutput(accountAddress, nftOutput)
@@ -31,14 +31,14 @@ export function buildNftFromNftOutput(
         timeLockTime = status.timeLockTime
     }
 
-    const id = getNftId(nftOutput.nftId, wrappedOutput.outputId)
+    const id = getNftId(nftOutput.getNftId(), wrappedOutput.outputId)
     const address = getBech32AddressFromAddressTypes({ type: ADDRESS_TYPE_NFT, nftId: id })
     const issuer = getIssuerFromNftOutput(nftOutput)
     const metadata = getMetadataFromNftOutput(nftOutput)
     const parsedMetadata = parseNftMetadata(metadata)
     const composedUrl = composeUrlFromNftUri(parsedMetadata?.uri)
     const filePath = `${get(activeProfileId)}/nfts/${id}`
-    const storageDeposit = Number(nftOutput.amount)
+    const storageDeposit = Number(nftOutput.getAmount())
 
     return {
         id,
diff --git a/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts b/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
index 6ee62732f71..345f48d1355 100644
--- a/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
@@ -1,12 +1,12 @@
 import { UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN } from '@core/wallet/constants'
 import { getExpirationUnixTimeFromOutput, getRecipientAddressFromOutput, isOutputAsync } from '@core/wallet/utils'
 import { getTimelockDateFromOutput } from '@core/wallet/utils/generateActivity/helper'
-import { INftOutput } from '@iota/types'
+import { NftOutput } from '@iota/wallet'
 
 export function getSpendableStatusFromUnspentNftOutput(
     accountAddress: string,
-    nftOutput: INftOutput
-): { isSpendable: boolean; timeLockTime: string } {
+    nftOutput: NftOutput
+): { isSpendable: boolean; timeLockTime: number | undefined } {
     let isSpendable = true
     let timeLockTime = undefined
 
@@ -15,9 +15,9 @@ export function getSpendableStatusFromUnspentNftOutput(
         const expirationUnixTime = getExpirationUnixTimeFromOutput(nftOutput)
         const timeLockUnixTime = getTimelockDateFromOutput(nftOutput)?.getTime()
         const isRecipient = getRecipientAddressFromOutput(nftOutput) === accountAddress
-        const hasStorageDepositReturnUnlockCondition = nftOutput.unlockConditions.some(
-            (unlockCondition) => unlockCondition?.type === UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN
-        )
+        const hasStorageDepositReturnUnlockCondition = nftOutput
+            .getUnlockConditions()
+            .some((unlockCondition) => unlockCondition?.getType() === UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN)
         if (expirationUnixTime) {
             if (isRecipient) {
                 isSpendable = false
diff --git a/packages/shared/lib/core/utils/filter.ts b/packages/shared/lib/core/utils/filter.ts
index 19291f1cdb6..3e1b2457ac8 100644
--- a/packages/shared/lib/core/utils/filter.ts
+++ b/packages/shared/lib/core/utils/filter.ts
@@ -1,18 +1,15 @@
-import { OutputData } from '@iota/wallet/types/output'
-import { IBasicOutput } from '@iota/types'
-
-import { OUTPUT_TYPE_BASIC } from '@core/wallet'
+import { BasicOutput, OutputData, OutputType } from '@iota/wallet'
 
 export function filterBasicOutput(outputData: OutputData): boolean {
-    return outputData?.output?.type === OUTPUT_TYPE_BASIC
+    return outputData?.output?.getType() === OutputType.Basic
 }
 
 export function filterShimmerClaimingOutputs(outputData: OutputData): boolean {
-    const output = outputData?.output as IBasicOutput
+    const output = outputData?.output as BasicOutput
 
     const isBasicOutput = filterBasicOutput(outputData)
-    const hasOneUnlockCondition = output?.unlockConditions?.length === 1
-    const hasNoNativeTokens = !output?.nativeTokens || output?.nativeTokens?.length === 0
+    const hasOneUnlockCondition = output?.getUnlockConditions()?.length === 1
+    const hasNoNativeTokens = !output?.getNativeTokens() || output?.getNativeTokens()?.length === 0
 
     return isBasicOutput && hasOneUnlockCondition && hasNoNativeTokens
 }
diff --git a/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts b/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
index f944f857bd7..c02b6d2a07c 100644
--- a/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
+++ b/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
@@ -1,6 +1,5 @@
 import { IAccountState } from '@core/account'
-import { IBasicOutput } from '@iota/types'
-import { OutputData } from '@iota/wallet'
+import { BasicOutput, OutputData } from '@iota/wallet'
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
 import { get } from 'svelte/store'
 import { ActivityAsyncStatus, ActivityDirection } from '../enums'
@@ -31,7 +30,7 @@ export async function setOutgoingAsyncActivitiesToClaimed(account: IAccountState
 }
 
 function isOutputClaimed(output: OutputData): boolean {
-    const expirationDate = getExpirationDateFromOutput(output?.output as IBasicOutput)
+    const expirationDate = getExpirationDateFromOutput(output?.output as BasicOutput)
 
     if (expirationDate) {
         return (
diff --git a/packages/shared/lib/core/wallet/constants/output-type.constants.ts b/packages/shared/lib/core/wallet/constants/output-type.constants.ts
index 234587b7dea..aa45c344ead 100644
--- a/packages/shared/lib/core/wallet/constants/output-type.constants.ts
+++ b/packages/shared/lib/core/wallet/constants/output-type.constants.ts
@@ -1,3 +1,4 @@
+// TODO-sdk this should be gone (switch to OutputTypes.Basic etc...)
 export const OUTPUT_TYPE_TREASURY = 2
 export const OUTPUT_TYPE_BASIC = 3
 export const OUTPUT_TYPE_ALIAS = 4
diff --git a/packages/shared/lib/core/wallet/constants/unlock-condition.constants.ts b/packages/shared/lib/core/wallet/constants/unlock-condition.constants.ts
index 9cb9608640c..9936de35334 100644
--- a/packages/shared/lib/core/wallet/constants/unlock-condition.constants.ts
+++ b/packages/shared/lib/core/wallet/constants/unlock-condition.constants.ts
@@ -1,3 +1,4 @@
+// TODO-sdk this should be gone (switch to iota/sdk etc...)
 export const UNLOCK_CONDITION_ADDRESS = 0
 export const UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN = 1
 export const UNLOCK_CONDITION_TIMELOCK = 2
diff --git a/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts b/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts
index e769028dfc0..cf856286ddc 100644
--- a/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts
@@ -1,5 +1,4 @@
-import { OutputData } from '@iota/wallet'
-import { Output } from '../types'
+import { Output, OutputData } from '@iota/wallet'
 
 export interface IWrappedOutput extends Omit<Partial<OutputData>, 'output'> {
     outputId: string
diff --git a/packages/shared/lib/core/wallet/types/index.ts b/packages/shared/lib/core/wallet/types/index.ts
index 7d5f6c7136d..44340de0211 100644
--- a/packages/shared/lib/core/wallet/types/index.ts
+++ b/packages/shared/lib/core/wallet/types/index.ts
@@ -1,6 +1,5 @@
 export * from './activity.type'
 export * from './asset-verification.type'
-export * from './output.type'
 export * from './sender-info.type'
 export * from './subject.type'
 export * from './activities'
diff --git a/packages/shared/lib/core/wallet/types/output.type.ts b/packages/shared/lib/core/wallet/types/output.type.ts
deleted file mode 100644
index bebe6303b72..00000000000
--- a/packages/shared/lib/core/wallet/types/output.type.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { IAliasOutput, IBasicOutput, IFoundryOutput, INftOutput } from '@iota/types'
-
-export type Output = IBasicOutput | INftOutput | IAliasOutput | IFoundryOutput
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
index 594795327dc..10f80fd9424 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
@@ -1,12 +1,5 @@
 import { IAccountState } from '@core/account'
-import {
-    ActivityAction,
-    ActivityType,
-    IProcessedTransaction,
-    OUTPUT_TYPE_ALIAS,
-    OUTPUT_TYPE_FOUNDRY,
-    OUTPUT_TYPE_NFT,
-} from '@core/wallet'
+import { ActivityAction, ActivityType, IProcessedTransaction } from '@core/wallet'
 import { Activity } from '@core/wallet/types'
 import { isParticipationOutput } from '@contexts/governance/utils'
 import { generateSingleAliasActivity } from './generateSingleAliasActivity'
@@ -19,6 +12,7 @@ import { generateActivitiesFromNftOutputs } from './generateActivitiesFromNftOut
 import { generateActivitiesFromAliasOutputs } from './generateActivitiesFromAliasOutputs'
 import { generateActivitiesFromFoundryOutputs } from './generateActivitiesFromFoundryOutputs'
 import { generateActivitiesFromBasicOutputs } from './generateActivitiesFromBasicOutputs'
+import { OutputType } from '@iota/wallet'
 
 export async function generateActivities(
     processedTransaction: IProcessedTransaction,
@@ -38,20 +32,20 @@ async function generateActivitiesFromProcessedTransactionsWithInputs(
     const { outputs, wrappedInputs } = processedTransaction
     const activities: Activity[] = []
 
-    const containsFoundryActivity = outputs.some((output) => output.output.type === OUTPUT_TYPE_FOUNDRY)
+    const containsFoundryActivity = outputs.some((output) => output.output.getType() === OutputType.Foundry)
     if (containsFoundryActivity) {
         const foundryActivities = await generateActivitiesFromFoundryOutputs(processedTransaction, account)
         activities.push(...foundryActivities)
     }
 
-    const containsNftActivity = outputs.some((output) => output.output.type === OUTPUT_TYPE_NFT)
+    const containsNftActivity = outputs.some((output) => output.output.getType() === OutputType.Nft)
     if (containsNftActivity) {
         const nftActivities = await generateActivitiesFromNftOutputs(processedTransaction, account)
         activities.push(...nftActivities)
     }
 
     const containsAliasActivity =
-        outputs.some((output) => output.output.type === OUTPUT_TYPE_ALIAS) && !containsFoundryActivity
+        outputs.some((output) => output.output.getType() === OutputType.Alias) && !containsFoundryActivity
     if (containsAliasActivity) {
         const aliasActivities = await generateActivitiesFromAliasOutputs(processedTransaction, account)
         activities.push(...aliasActivities)
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
index 67782b88799..00665aa57fb 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
@@ -7,14 +7,12 @@ import {
     getNonRemainderBasicOutputsFromTransaction,
     IProcessedTransaction,
     IWrappedOutput,
-    OUTPUT_TYPE_BASIC,
-    OUTPUT_TYPE_NFT,
 } from '@core/wallet'
 import { Activity } from '@core/wallet/types'
-import { INftOutput } from '@iota/types'
 import { generateSingleBasicActivity } from './generateSingleBasicActivity'
 import { generateSingleConsolidationActivity } from './generateSingleConsolidationActivity'
 import { generateSingleNftActivity } from './generateSingleNftActivity'
+import { NftOutput, OutputType } from '@iota/wallet'
 
 export async function generateActivitiesFromBasicOutputs(
     processedTransaction: IProcessedTransaction,
@@ -33,14 +31,14 @@ export async function generateActivitiesFromBasicOutputs(
 
         const isSelfTransaction = processedTransaction.direction === ActivityDirection.SelfTransaction
         const burnedNftInputIndex = burnedNftInputs.findIndex(
-            (input) => input.output.amount === basicOutput.output.amount
+            (input) => input.output.getAmount() === basicOutput.output.getAmount()
         )
         const burnedNativeToken =
             burnedNftInputIndex < 0 ? getBurnedNativeTokens(basicOutput, processedTransaction) : undefined
 
         if (isSelfTransaction && burnedNftInputIndex >= 0) {
             const wrappedInput = burnedNftInputs[burnedNftInputIndex]
-            const nftInput = wrappedInput.output as INftOutput
+            const nftInput = wrappedInput.output as NftOutput
             activity = await generateSingleNftActivity(
                 account,
                 {
@@ -48,7 +46,7 @@ export async function generateActivitiesFromBasicOutputs(
                     processedTransaction,
                     wrappedOutput: basicOutput,
                 },
-                getNftId(nftInput.nftId, wrappedInput.outputId)
+                getNftId(nftInput.getNftId(), wrappedInput.outputId)
             )
             const nft = buildNftFromNftOutput(wrappedInput, account.depositAddress, false)
             addOrUpdateNftInAllAccountNfts(account.index, nft)
@@ -86,12 +84,14 @@ export async function generateActivitiesFromBasicOutputs(
 function getBurnedNftInputs(processedTransaction: IProcessedTransaction): IWrappedOutput[] {
     return processedTransaction.wrappedInputs.filter((wrappedInput) => {
         const input = wrappedInput.output
-        if (input.type === OUTPUT_TYPE_NFT) {
-            const nftId = getNftId(input.nftId, wrappedInput.outputId)
+        if (input.getType() === OutputType.Nft) {
+            const nftInput = input as NftOutput
+            const nftId = getNftId(nftInput.getNftId(), wrappedInput.outputId)
 
             const isIncludedInOutputs = processedTransaction.outputs.some((output) => {
-                if (output.output.type === OUTPUT_TYPE_NFT) {
-                    return getNftId(output.output.nftId, output.outputId) === nftId
+                if (output.output.getType() === OutputType.Nft) {
+                    const nftOutput = output.output as NftOutput
+                    return getNftId(nftOutput.getNftId(), output.outputId) === nftId
                 } else {
                     return false
                 }
@@ -131,7 +131,7 @@ function getBurnedNativeTokens(
 function getAllNativeTokensFromOutputs(outputs: IWrappedOutput[]): { [key: string]: number } {
     const nativeTokens: { [key: string]: number } = {}
     for (const output of outputs) {
-        for (const nativeToken of output.output.nativeTokens ?? []) {
+        for (const nativeToken of output.output.getNativeTokens() ?? []) {
             if (!nativeTokens[nativeToken.id]) {
                 nativeTokens[nativeToken.id] = 0
             }
@@ -142,11 +142,13 @@ function getAllNativeTokensFromOutputs(outputs: IWrappedOutput[]): { [key: strin
 }
 
 function isConsolidation(output: IWrappedOutput, processedTransaction: IProcessedTransaction): boolean {
-    const allBasicInputs = processedTransaction.wrappedInputs.every((input) => input.output.type === OUTPUT_TYPE_BASIC)
+    const allBasicInputs = processedTransaction.wrappedInputs.every(
+        (input) => input.output.getType() === OutputType.Basic
+    )
     const isSelfTransaction = processedTransaction.direction === ActivityDirection.SelfTransaction
     const isSameAmount =
-        processedTransaction.wrappedInputs.reduce((sum, input) => sum + Number(input.output.amount), 0) ===
-        Number(output.output.amount)
+        processedTransaction.wrappedInputs.reduce((sum, input) => sum + Number(input.output.getAmount()), 0) ===
+        Number(output.output.getAmount())
 
     return allBasicInputs && isSelfTransaction && isSameAmount
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
index 5c6c109e15c..1dc29452397 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
@@ -1,8 +1,8 @@
 import { IAccountState } from '@core/account'
-import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction, OUTPUT_TYPE_NFT } from '@core/wallet'
-import { Activity } from '@core/wallet/types'
-import type { INftOutput } from '@iota/types'
+import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction } from '@core/wallet'
+import { Activity } from '@core/wallet'
 import { generateSingleNftActivity } from './generateSingleNftActivity'
+import { NftOutput, OutputType } from '@iota/wallet'
 
 export async function generateActivitiesFromNftOutputs(
     processedTransaction: IProcessedTransaction,
@@ -11,11 +11,11 @@ export async function generateActivitiesFromNftOutputs(
     const outputs = processedTransaction.outputs
     const activities = []
 
-    const nftOutputs = outputs.filter((output) => output.output.type === OUTPUT_TYPE_NFT)
+    const nftOutputs = outputs.filter((output) => output.output.getType() === OutputType.Nft)
     for (const nftOutput of nftOutputs) {
-        const output = nftOutput.output as INftOutput
+        const output = nftOutput.output as NftOutput
         const activity = await generateSingleNftActivity(account, {
-            action: output.nftId === EMPTY_HEX_ID ? ActivityAction.Mint : ActivityAction.Send,
+            action: output.getNftId() === EMPTY_HEX_ID ? ActivityAction.Mint : ActivityAction.Send,
             processedTransaction,
             wrappedOutput: nftOutput,
         })
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
index a509f315504..f3cef75ddd9 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
@@ -3,7 +3,6 @@ import { ADDRESS_TYPE_ALIAS, EMPTY_HEX_ID } from '@core/wallet/constants'
 import { ActivityType } from '@core/wallet/enums'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { AliasActivity } from '@core/wallet/types'
-import { IAliasOutput } from '@iota/types'
 import { convertHexAddressToBech32, hashOutputId } from '..'
 import {
     getAmountFromOutput,
@@ -15,6 +14,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
+import { AliasOutput } from '@iota/wallet'
 
 export async function generateSingleAliasActivity(
     account: IAccountState,
@@ -22,7 +22,7 @@ export async function generateSingleAliasActivity(
 ): Promise<AliasActivity> {
     const { transactionId, claimingData, direction, time, inclusionState } = processedTransaction
 
-    const output = wrappedOutput.output as IAliasOutput
+    const output = wrappedOutput.output as AliasOutput
     const outputId = wrappedOutput.outputId
     const id = outputId || transactionId
 
@@ -65,8 +65,8 @@ export async function generateSingleAliasActivity(
     }
 }
 
-function getAliasId(output: IAliasOutput, outputId: string): string {
-    const isNewAlias = output.aliasId === EMPTY_HEX_ID
-    const aliasId = isNewAlias ? hashOutputId(outputId) : output.aliasId
+function getAliasId(output: AliasOutput, outputId: string): string {
+    const isNewAlias = output.getAliasId() === EMPTY_HEX_ID
+    const aliasId = isNewAlias ? hashOutputId(outputId) : output.getAliasId()
     return convertHexAddressToBech32(ADDRESS_TYPE_ALIAS, aliasId)
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
index d95ff0c6092..32ed0b6c1bf 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
@@ -3,7 +3,6 @@ import { IAccountState } from '@core/account'
 import { activeProfileId, getCoinType } from '@core/profile'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { TransactionActivity } from '@core/wallet/types'
-import { IBasicOutput } from '@iota/types'
 import { get } from 'svelte/store'
 import { activityOutputContainsValue, getNativeTokenFromOutput } from '..'
 import { ActivityAction, ActivityType } from '../../enums'
@@ -16,6 +15,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
+import { BasicOutput } from '@iota/wallet'
 
 export async function generateSingleBasicActivity(
     account: IAccountState,
@@ -32,7 +32,7 @@ export async function generateSingleBasicActivity(
     const outputId = wrappedOutput.outputId
     const id = outputId || transactionId
 
-    const output = wrappedOutput.output as IBasicOutput
+    const output = wrappedOutput.output as BasicOutput
 
     const isShimmerClaiming = isShimmerClaimingTransaction(transactionId, get(activeProfileId))
 
@@ -58,7 +58,7 @@ export async function generateSingleBasicActivity(
     let surplus: number | undefined = undefined
     if (nativeToken) {
         const storageDepositToDeduct = (storageDeposit > 0 ? storageDeposit : giftedStorageDeposit) ?? 0
-        surplus = Number(output.amount) - storageDepositToDeduct
+        surplus = Number(output.getAmount()) - storageDepositToDeduct
     }
 
     let rawAmount: number
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
index 06dd9e35899..d786d0a05df 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
@@ -1,7 +1,6 @@
 import { IAccountState } from '@core/account'
 import { IActivityGenerationParameters, IWrappedOutput } from '@core/wallet/interfaces'
 import { ConsolidationActivity } from '@core/wallet/types'
-import { IBasicOutput } from '@iota/types'
 import { ActivityType } from '../../enums'
 import { activityOutputContainsValue } from '..'
 import {
@@ -11,7 +10,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { OUTPUT_TYPE_BASIC } from '@core/wallet/constants'
+import { BasicOutput, OutputType } from '@iota/wallet'
 
 export async function generateSingleConsolidationActivity(
     account: IAccountState,
@@ -26,7 +25,7 @@ export async function generateSingleConsolidationActivity(
     const outputId = wrappedOutput.outputId
     const id = outputId || transactionId
 
-    const output = wrappedOutput.output as IBasicOutput
+    const output = wrappedOutput.output as BasicOutput
 
     const amountConsolidatedInputs = getAmountOfConsolidationInputs(wrappedInputs)
 
@@ -60,5 +59,5 @@ export async function generateSingleConsolidationActivity(
 }
 
 function getAmountOfConsolidationInputs(inputs: IWrappedOutput[]): number {
-    return inputs.filter((input) => input.output.type === OUTPUT_TYPE_BASIC).length
+    return inputs.filter((input) => input.output.getType() === OutputType.Basic).length
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
index b5b5f3e0d83..a2be0c8ac48 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
@@ -1,7 +1,6 @@
 import { IAccountState } from '@core/account'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { GovernanceActivity } from '@core/wallet/types'
-import type { IBasicOutput } from '@iota/types'
 import { ActivityType } from '../../enums'
 import { activityOutputContainsValue } from '..'
 import {
@@ -12,6 +11,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
+import { BasicOutput } from '@iota/wallet'
 
 export async function generateSingleGovernanceActivity(
     account: IAccountState,
@@ -26,7 +26,7 @@ export async function generateSingleGovernanceActivity(
     const outputId = wrappedOutput.outputId
     const id = outputId || transactionId
 
-    const output = wrappedOutput.output as IBasicOutput
+    const output = wrappedOutput.output as BasicOutput
 
     const tag = getTagFromOutput(output)
     const metadata = getMetadataFromOutput(output)
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
index 62f27efa24b..70912605d3a 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
@@ -3,7 +3,6 @@ import { handleError } from '@core/error/handlers'
 import { ActivityAction, ActivityType } from '@core/wallet/enums'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { NftActivity } from '@core/wallet/types'
-import type { INftOutput } from '@iota/types'
 import { getNftId } from '../outputs/getNftId'
 import {
     getAsyncDataFromOutput,
@@ -13,6 +12,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
+import { NftOutput } from '@iota/wallet'
 
 export async function generateSingleNftActivity(
     account: IAccountState,
@@ -21,14 +21,14 @@ export async function generateSingleNftActivity(
 ): Promise<NftActivity> {
     const { claimingData, time, inclusionState, transactionId, direction } = processedTransaction
     const outputId = wrappedOutput.outputId
-    const output = wrappedOutput.output as INftOutput
+    const output = wrappedOutput.output as NftOutput
     const id = outputId || transactionId
 
     const isHidden = false
     const isAssetHidden = false
     const containsValue = true
 
-    const nftId = nftIdFromInput ? nftIdFromInput : getNftId(output.nftId, outputId)
+    const nftId = nftIdFromInput ? nftIdFromInput : getNftId(output.getNftId(), outputId)
     const metadata = getMetadataFromOutput(output)
     const tag = getTagFromOutput(output)
 
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
index 2a5a04d89ad..f26e925fdc6 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
@@ -1,17 +1,17 @@
 import { isParticipationOutput } from '@contexts/governance/utils'
-import { OUTPUT_TYPE_ALIAS, OUTPUT_TYPE_BASIC, OUTPUT_TYPE_FOUNDRY, OUTPUT_TYPE_NFT } from '@core/wallet/constants'
 import { ActivityType } from '@core/wallet/enums'
 import { IWrappedOutput } from '@core/wallet/interfaces'
+import { OutputType } from '@iota/wallet'
 
 export function getActivityTypeFromOutput(output: IWrappedOutput): ActivityType {
-    switch (output.output.type) {
-        case OUTPUT_TYPE_NFT:
+    switch (output.output.getType()) {
+        case OutputType.Nft:
             return ActivityType.Nft
-        case OUTPUT_TYPE_ALIAS:
+        case OutputType.Alias:
             return ActivityType.Alias
-        case OUTPUT_TYPE_FOUNDRY:
+        case OutputType.Foundry:
             return ActivityType.Foundry
-        case OUTPUT_TYPE_BASIC:
+        case OutputType.Basic:
             if (isParticipationOutput(output.output)) {
                 return ActivityType.Governance
             } else {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts
index 501565d5c9e..c29800a9b2f 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts
@@ -1,10 +1,10 @@
 import { isParticipationOutput } from '@contexts/governance/utils'
 import { GovernanceAction } from '@core/wallet/enums'
 import { IParticipation, IWrappedOutput } from '@core/wallet/interfaces'
-import { Output } from '@core/wallet/types'
 import { parseGovernanceMetadata } from '../../parseGovernanceMetadata'
 import { getAmountFromOutput } from './getAmountFromOutput'
 import { getMetadataFromOutput } from './getMetadataFromOutput'
+import { Output } from '@iota/wallet'
 
 interface IGovernanceInfo {
     governanceAction: GovernanceAction
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
index fc738d6585c..cd36df72b0d 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
@@ -1,10 +1,11 @@
-import { UNLOCK_CONDITION_GOVERNOR_ADDRESS } from '@core/wallet/constants'
-import { IGovernorAddressUnlockCondition, IAliasOutput } from '@iota/types'
 import { getBech32AddressFromAddressTypes } from '../../getBech32AddressFromAddressTypes'
+import { AliasOutput, GovernorAddressUnlockCondition, UnlockConditionType } from '@iota/wallet'
 
-export function getGovernorAddressFromAliasOutput(output: IAliasOutput): string {
-    const governorUnlockCondition = output.unlockConditions.find(
-        (unlockCondition) => unlockCondition.type === UNLOCK_CONDITION_GOVERNOR_ADDRESS
-    ) as IGovernorAddressUnlockCondition
-    return getBech32AddressFromAddressTypes(governorUnlockCondition.address)
+export function getGovernorAddressFromAliasOutput(output: AliasOutput): string {
+    const governorUnlockCondition = output
+        .getUnlockConditions()
+        .find(
+            (unlockCondition) => unlockCondition.getType() === UnlockConditionType.GovernorAddress
+        ) as GovernorAddressUnlockCondition
+    return getBech32AddressFromAddressTypes(governorUnlockCondition.getAddress())
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
index 5378a9d2903..bad1abd4fdc 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
@@ -1,16 +1,20 @@
 import type { IMetadataFeature } from '@iota/types'
 import { isParticipationOutput } from '@contexts/governance/utils'
 import { EXTERNALLY_OWNED_ACCOUNT } from '@core/layer-2/constants'
-import { containsControlCharacters, Converter } from '@core/utils'
-import type { Output } from '@core/wallet/types'
-
-import { FEATURE_TYPE_METADATA } from '../../../constants'
 import { parseLayer2MetadataForTransfer } from '@core/layer-2/utils'
+import { containsControlCharacters, Converter } from '@core/utils'
+import { CommonOutput, FeatureType, MetadataFeature, Output, OutputType } from '@iota/wallet'
 
 export function getMetadataFromOutput(output: Output): string | undefined {
-    const { data } = <IMetadataFeature>output?.features?.find((feature) => feature.type === FEATURE_TYPE_METADATA) ?? {
-        data: undefined,
+    if (output.getType() === OutputType.Treasury) {
+        return undefined
     }
+
+    const commonOutput = output as CommonOutput
+    const feature = commonOutput?.getFeatures()?.find((feature) => feature.getType() === FeatureType.Metadata)
+    const metadataFeature = feature as MetadataFeature
+    const data = metadataFeature.getData() ?? undefined
+
     if (data) {
         const isVotingOutput = isParticipationOutput(output)
         const metadataBytes = Converter.hexToBytes(data)
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
index 032a2a66ab1..5f44d45291a 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
@@ -1,10 +1,11 @@
-import { UNLOCK_CONDITION_STATE_CONTROLLER_ADDRESS } from '@core/wallet/constants'
-import { IStateControllerAddressUnlockCondition, IAliasOutput } from '@iota/types'
+import { AliasOutput, StateControllerAddressUnlockCondition, UnlockConditionType } from '@iota/wallet'
 import { getBech32AddressFromAddressTypes } from '../../getBech32AddressFromAddressTypes'
 
-export function getStateControllerAddressFromAliasOutput(output: IAliasOutput): string {
-    const stateControllerUnlockCondition = output.unlockConditions.find(
-        (unlockCondition) => unlockCondition.type === UNLOCK_CONDITION_STATE_CONTROLLER_ADDRESS
-    ) as IStateControllerAddressUnlockCondition
-    return getBech32AddressFromAddressTypes(stateControllerUnlockCondition.address)
+export function getStateControllerAddressFromAliasOutput(output: AliasOutput): string {
+    const stateControllerUnlockCondition = output
+        .getUnlockConditions()
+        .find(
+            (unlockCondition) => unlockCondition.getType() === UnlockConditionType.StateControllerAddress
+        ) as StateControllerAddressUnlockCondition
+    return getBech32AddressFromAddressTypes(stateControllerUnlockCondition.getAddress())
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
index 47484ff895f..b1dced44ad5 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
@@ -1,7 +1,6 @@
 import { IAccountState } from '@core/account/interfaces'
 import { Output } from '@core/wallet/types'
-import { IStorageDepositReturnUnlockCondition } from '@iota/types'
-import { UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN } from '../../../constants'
+import { StorageDepositReturnUnlockCondition, UnlockConditionType } from '@iota/wallet'
 
 export async function getStorageDepositFromOutput(
     account: IAccountState,
@@ -13,13 +12,13 @@ export async function getStorageDepositFromOutput(
     if (!(account?.index >= 0)) {
         return { storageDeposit: 0, giftedStorageDeposit: 0 }
     }
-    const storageDepositReturnUnlockCondition = <IStorageDepositReturnUnlockCondition>(
-        output?.unlockConditions?.find(
-            (unlockCondition) => unlockCondition?.type === UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN
-        )
+    const storageDepositReturnUnlockCondition = <StorageDepositReturnUnlockCondition>(
+        output
+            ?.getUnlockConditions()
+            ?.find((unlockCondition) => unlockCondition?.getType() === UnlockConditionType.StorageDepositReturn)
     )
     if (storageDepositReturnUnlockCondition) {
-        return { storageDeposit: Number(storageDepositReturnUnlockCondition.amount), giftedStorageDeposit: 0 }
+        return { storageDeposit: Number(storageDepositReturnUnlockCondition.getAmount()), giftedStorageDeposit: 0 }
     } else {
         const minimumRequiredStorageDeposit = await account.minimumRequiredStorageDeposit(output)
         let minimumRequiredStorageDepositNumber = Number(minimumRequiredStorageDeposit)
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
index b70b22da08e..c25312279f7 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
@@ -1,11 +1,13 @@
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
 import { Output } from '@core/wallet/types'
-import { UNLOCK_CONDITION_TIMELOCK } from '../../../constants'
+import { TimelockUnlockCondition, UnlockConditionType } from '@iota/wallet'
 
-export function getTimelockDateFromOutput(output: Output): Date {
-    for (const unlockCondition of output.unlockConditions) {
-        if (unlockCondition?.type === UNLOCK_CONDITION_TIMELOCK) {
-            return unlockCondition?.unixTime ? new Date(unlockCondition?.unixTime * MILLISECONDS_PER_SECOND) : undefined
+export function getTimelockDateFromOutput(output: Output): Date | undefined {
+    for (const unlockCondition of output.getUnlockConditions()) {
+        if (unlockCondition?.getType() === UnlockConditionType.Timelock) {
+            const timelockUnlockCondition = unlockCondition as TimelockUnlockCondition
+            const unixTime = timelockUnlockCondition?.getUnixTime()
+            return unixTime ? new Date(unixTime * MILLISECONDS_PER_SECOND) : undefined
         }
     }
 }
diff --git a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
index e1cbe4ccbb9..edf904a7041 100644
--- a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
@@ -1,15 +1,14 @@
-import type { AddressTypes } from '@iota/types'
-
 import { convertHexAddressToBech32 } from './convertHexAddressToBech32'
 import { ADDRESS_TYPE_ALIAS, ADDRESS_TYPE_ED25519, ADDRESS_TYPE_NFT } from '../constants'
+import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/wallet'
 
-export function getBech32AddressFromAddressTypes(address: AddressTypes): string {
-    switch (address?.type) {
-        case ADDRESS_TYPE_ED25519:
-            return convertHexAddressToBech32(ADDRESS_TYPE_ED25519, address.pubKeyHash)
-        case ADDRESS_TYPE_ALIAS:
-            return convertHexAddressToBech32(ADDRESS_TYPE_ALIAS, address.aliasId)
-        case ADDRESS_TYPE_NFT:
-            return convertHexAddressToBech32(ADDRESS_TYPE_NFT, address.nftId)
+export function getBech32AddressFromAddressTypes(address: Address): string {
+    switch (address?.getType()) {
+        case AddressType.Ed25519:
+            return convertHexAddressToBech32(ADDRESS_TYPE_ED25519, (address as Ed25519Address).getPubKeyHash())
+        case AddressType.Alias:
+            return convertHexAddressToBech32(ADDRESS_TYPE_ALIAS, (address as AliasAddress).getAliasId())
+        case AddressType.Nft:
+            return convertHexAddressToBech32(ADDRESS_TYPE_NFT, (address as NftAddress).getNftId())
     }
 }
diff --git a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
index 924ae7e61c9..7ac2f611947 100644
--- a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
@@ -1,15 +1,15 @@
-import type { IFoundryOutput } from '@iota/types'
+import { FeatureType, FoundryOutput, MetadataFeature } from '@iota/wallet'
 
-export function getMetadataFromFoundryOutput(foundry: IFoundryOutput): string {
-    for (const feature of foundry?.immutableFeatures ?? []) {
-        if (feature?.type === 2) {
-            return feature.data
+export function getMetadataFromFoundryOutput(foundry: FoundryOutput): string {
+    for (const feature of foundry?.getImmutableFeatures() ?? []) {
+        if (feature?.getType() === FeatureType.Metadata) {
+            return (feature as MetadataFeature).getData()
         }
     }
 
-    for (const feature of foundry?.features ?? []) {
-        if (feature.type === 2) {
-            return feature.data
+    for (const feature of foundry?.getFeatures() ?? []) {
+        if (feature?.getType() === FeatureType.Metadata) {
+            return (feature as MetadataFeature).getData()
         }
     }
     return undefined
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
index 0efd11a9d0a..fd60772502d 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
@@ -1,22 +1,20 @@
-import { ADDRESS_TYPE_ALIAS } from '@core/wallet/constants'
-import type { IFoundryOutput } from '@iota/types'
-import { HexHelper, WriteStream } from '@iota/util.js'
+import {
+    AddressType,
+    AliasAddress,
+    FoundryOutput,
+    ImmutableAliasAddressUnlockCondition,
+    UnlockConditionType,
+    Utils,
+} from '@iota/wallet'
 
-export function buildFoundryId(foundry: IFoundryOutput): string {
-    const immutableAliasUnlockCondition = foundry.unlockConditions[0]
+export function buildFoundryId(foundry: FoundryOutput): string {
+    const unlockCondition = foundry.getUnlockConditions()[0]
+    // TODO-sdk Make this clearer without inline casts
     const aliasId =
-        immutableAliasUnlockCondition.type === 6 && immutableAliasUnlockCondition.address.type === ADDRESS_TYPE_ALIAS
-            ? immutableAliasUnlockCondition.address.aliasId
+        unlockCondition.getType() === UnlockConditionType.ImmutableAliasAddress &&
+        (unlockCondition as ImmutableAliasAddressUnlockCondition).getAddress().getType() === AddressType.Alias
+            ? ((unlockCondition as ImmutableAliasAddressUnlockCondition).getAddress() as AliasAddress).getAliasId()
             : ''
-    const typeWS = new WriteStream()
-    typeWS.writeUInt8('alias address type', ADDRESS_TYPE_ALIAS)
-    const aliasAddress = HexHelper.addPrefix(`${typeWS.finalHex()}${HexHelper.stripPrefix(aliasId)}`)
-    const serialNumberWS = new WriteStream()
-    serialNumberWS.writeUInt32('serialNumber', foundry.serialNumber)
-    const serialNumberHex = serialNumberWS.finalHex()
-    const tokenSchemeTypeWS = new WriteStream()
-    tokenSchemeTypeWS.writeUInt8('tokenSchemeType', foundry.tokenScheme.type)
-    const tokenSchemeTypeHex = tokenSchemeTypeWS.finalHex()
 
-    return `${aliasAddress}${serialNumberHex}${tokenSchemeTypeHex}`
+    return Utils.computeFoundryId(aliasId, foundry.getSerialNumber(), foundry.getTokenScheme().getType())
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
index ad1fa8d1bb6..21742e6beee 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
@@ -1,7 +1,8 @@
-import { FEATURE_TYPE_ISSUER } from '@core/wallet/constants'
-import type { AddressTypes, IIssuerFeature, INftOutput } from '@iota/types'
+import { Address, FeatureType, IssuerFeature, NftOutput } from '@iota/wallet'
 
-export function getIssuerFromNftOutput(output: INftOutput): AddressTypes {
-    const metadata = output.immutableFeatures?.find((feature) => feature.type === FEATURE_TYPE_ISSUER) as IIssuerFeature
-    return metadata?.address
+export function getIssuerFromNftOutput(output: NftOutput): Address {
+    const metadata = output
+        .getImmutableFeatures()
+        ?.find((feature) => feature.getType() === FeatureType.Issuer) as IssuerFeature
+    return metadata?.getIssuer()
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
index 7b3ae6c32df..4ff7a175380 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
@@ -1,9 +1,8 @@
-import { FEATURE_TYPE_METADATA } from '@core/wallet/constants'
-import type { IMetadataFeature, INftOutput } from '@iota/types'
+import { FeatureType, MetadataFeature, NftOutput } from '@iota/wallet'
 
-export function getMetadataFromNftOutput(output: INftOutput): string {
-    const metadata = output.immutableFeatures?.find(
-        (feature) => feature.type === FEATURE_TYPE_METADATA
-    ) as IMetadataFeature
-    return metadata?.data
+export function getMetadataFromNftOutput(output: NftOutput): string {
+    const metadata = output
+        .getImmutableFeatures()
+        ?.find((feature) => feature.getType() === FeatureType.Metadata) as MetadataFeature
+    return metadata?.getData()
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
index 444dc596926..666df326bf2 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
@@ -1,5 +1,4 @@
-import { OutputData } from '@iota/wallet'
-import { IOutputResponse, IUTXOInput } from '@iota/types'
+import { OutputData, OutputResponse, OutputType, UTXOInput } from '@iota/wallet'
 import { MILLISECONDS_PER_SECOND } from '@core/utils/constants'
 import { IAccountState } from '@core/account/interfaces'
 import { InclusionState, ActivityDirection } from '../../enums'
@@ -11,7 +10,7 @@ import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransacti
 
 export function preprocessGroupedOutputs(
     outputDatas: OutputData[],
-    transactionInputs: IOutputResponse[],
+    transactionInputs: OutputResponse[],
     account: IAccountState
 ): IProcessedTransaction {
     const transactionMetadata = outputDatas[0]?.metadata
@@ -24,7 +23,7 @@ export function preprocessGroupedOutputs(
     const wrappedOutputs = outputDatas.map((outputData) => ({
         outputId: outputData.outputId,
         remainder: outputData.remainder,
-        output: outputData.output.type !== OUTPUT_TYPE_TREASURY ? outputData.output : undefined,
+        output: outputData.output.getType() !== OutputType.Treasury ? outputData.output : undefined,
     }))
 
     return {
@@ -64,7 +63,7 @@ function getDirectionForOutputs(
 
 function convertTransactionOutputResponsesToWrappedOutputs(
     transactionId: string,
-    outputResponses: IOutputResponse[]
+    outputResponses: OutputResponse[]
 ): IWrappedOutput[] {
     return outputResponses.map((outputResponse) =>
         convertTransactionOutputResponseToWrappedOutput(transactionId, outputResponse)
@@ -73,9 +72,9 @@ function convertTransactionOutputResponsesToWrappedOutputs(
 
 function convertTransactionOutputResponseToWrappedOutput(
     transactionId: string,
-    outputResponse: IOutputResponse
+    outputResponse: OutputResponse
 ): IWrappedOutput {
-    if (outputResponse.output.type === OUTPUT_TYPE_TREASURY) {
+    if (outputResponse.output.getType() === OutputType.Treasury) {
         return undefined
     } else {
         const outputId = getOutputIdFromTransactionIdAndIndex(transactionId, outputResponse.metadata.outputIndex)
@@ -83,15 +82,13 @@ function convertTransactionOutputResponseToWrappedOutput(
     }
 }
 
-function getUtxoInputsFromWrappedInputs(wrappedInputs: IWrappedOutput[]): IUTXOInput[] {
+function getUtxoInputsFromWrappedInputs(wrappedInputs: IWrappedOutput[]): UTXOInput[] {
+    // TODO-sdk This won't work probably
     return (
-        wrappedInputs?.map(
-            (input) =>
-                ({
-                    type: 0,
-                    transactionId: input.metadata?.transactionId,
-                    transactionOutputIndex: input.metadata.outputIndex,
-                } as IUTXOInput)
-        ) ?? []
+        wrappedInputs?.map((input) => ({
+            type: 0,
+            transactionId: input.metadata?.transactionId,
+            transactionInputIndex: input.metadata?.outputIndex,
+        })) ?? []
     )
 }
diff --git a/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
index d2b319a4565..394014f256e 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
@@ -1,9 +1,9 @@
 import { IAccountState } from '@core/account/interfaces'
 import { ActivityType } from '@core/wallet/enums'
-import { IBasicOutput } from '@iota/types'
 import { getNativeTokenFromOutput, isOutputAsync } from '..'
 import { IWrappedOutput } from '../../interfaces'
 import { getActivityTypeFromOutput, getAmountFromOutput, getStorageDepositFromOutput } from '../generateActivity/helper'
+import { BasicOutput } from '@iota/wallet'
 
 export async function activityOutputContainsValue(
     account: IAccountState,
@@ -12,7 +12,7 @@ export async function activityOutputContainsValue(
     const type = getActivityTypeFromOutput(wrappedOutput)
     const typesToCheck = [ActivityType.Basic]
     if (typesToCheck.includes(type)) {
-        const output = wrappedOutput.output as IBasicOutput
+        const output = wrappedOutput.output as BasicOutput
 
         const isAsync = isOutputAsync(output)
         const nativeToken = getNativeTokenFromOutput(output)

From fb1c7cf74d8890576393fab1c60ab111fa1e845d Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Thu, 13 Jul 2023 17:45:15 +0200
Subject: [PATCH 09/48] chore: Migrate to iota/sdk models (remove @iota/types)
 pass 2

---
 .../popups/BalanceBreakdownPopup.svelte       | 30 ++++++++--------
 .../drawers/BalanceBreakdownDrawer.svelte     | 34 +++++++++----------
 .../utils/sumTotalClaimedRewards.ts           |  9 +++--
 .../account/interfaces/account.interface.ts   | 14 +++++---
 .../helpers/getNetworkStatusFromNodeInfo.ts   |  4 +--
 .../lib/core/network/interfaces/index.ts      |  1 -
 .../node-info-response.interface.ts           |  2 +-
 .../network/interfaces/node-info.interface.ts |  3 --
 .../core/network/stores/node-info.store.ts    |  2 +-
 .../activities/preprocessOutputsForAccount.ts |  5 ++-
 .../core/wallet/utils/buildNftOutputData.ts   | 26 +++++---------
 .../helper/getStorageDepositFromOutput.ts     |  5 ++-
 .../helper/getTagFromOutput.ts                | 12 +++----
 .../utils/getHexAddressFromAddressTypes.ts    | 20 +++++------
 .../lib/tests/__mocks__/account.mock.ts       | 24 +++++++------
 15 files changed, 90 insertions(+), 101 deletions(-)

diff --git a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
index 883c0dd9767..e7ff8f3a2fa 100644
--- a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
+++ b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
@@ -3,15 +3,9 @@
     import { selectedAccount } from '@core/account'
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth } from '@core/profile'
-    import {
-        OUTPUT_TYPE_TREASURY,
-        UNLOCK_CONDITION_EXPIRATION,
-        UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN,
-        UNLOCK_CONDITION_TIMELOCK,
-    } from '@core/wallet'
     import { consolidateOutputs } from '@core/wallet/actions/consolidateOutputs'
     import { getStorageDepositFromOutput } from '@core/wallet/utils/generateActivity/helper'
-    import type { UnlockConditionTypes } from '@iota/types'
+    import { UnlockCondition, UnlockConditionType, OutputType, CommonOutput } from '@iota/wallet'
     import { BalanceSummarySection, Button, FontWeight, Text, TextType } from 'shared/components'
 
     interface BalanceBreakdown {
@@ -57,18 +51,24 @@
 
                 let type: string
                 let amount: number
-                if (output.type !== OUTPUT_TYPE_TREASURY) {
-                    if (containsUnlockCondition(output.unlockConditions, UNLOCK_CONDITION_EXPIRATION)) {
+                if (output.getType() !== OutputType.Treasury) {
+                    const commonOutput = output as CommonOutput
+                    if (containsUnlockCondition(commonOutput.getUnlockConditions(), UnlockConditionType.Expiration)) {
                         type = PendingFundsType.Unclaimed
-                        amount = Number(output.amount)
+                        amount = Number(output.getAmount())
                     } else if (
-                        containsUnlockCondition(output.unlockConditions, UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN)
+                        containsUnlockCondition(
+                            commonOutput.getUnlockConditions(),
+                            UnlockConditionType.StorageDepositReturn
+                        )
                     ) {
                         type = PendingFundsType.StorageDepositReturn
                         amount = (await getStorageDepositFromOutput($selectedAccount, output))?.storageDeposit
-                    } else if (containsUnlockCondition(output.unlockConditions, UNLOCK_CONDITION_TIMELOCK)) {
+                    } else if (
+                        containsUnlockCondition(commonOutput.getUnlockConditions(), UnlockConditionType.Timelock)
+                    ) {
                         type = PendingFundsType.Timelock
-                        amount = Number(output.amount)
+                        amount = Number(output.getAmount())
                     }
                 }
 
@@ -114,8 +114,8 @@
         return { amount: totalStorageDeposit, subBreakdown }
     }
 
-    function containsUnlockCondition(unlockConditions: UnlockConditionTypes[], unlockConditionId: number) {
-        return unlockConditions.some((unlockCondition) => unlockCondition.type === unlockConditionId)
+    function containsUnlockCondition(unlockConditions: UnlockCondition[], unlockConditionId: number): boolean {
+        return unlockConditions.some((unlockCondition) => unlockCondition.getType() === unlockConditionId)
     }
 
     function onConsolidationClick(): void {
diff --git a/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte b/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
index fb5dfbfc4e9..93c8703e5d4 100644
--- a/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
+++ b/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
@@ -1,17 +1,10 @@
 <script lang="ts">
-    import type { UnlockConditionTypes } from '@iota/types'
-
+    import { UnlockConditionType, UnlockCondition, OutputType, CommonOutput } from '@iota/wallet'
     import { BalanceSummarySection, Button } from '@ui'
 
     import { selectedAccount } from '@core/account'
     import { localize } from '@core/i18n'
     import { isStrongholdUnlocked } from '@core/profile-manager'
-    import {
-        OUTPUT_TYPE_TREASURY,
-        UNLOCK_CONDITION_EXPIRATION,
-        UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN,
-        UNLOCK_CONDITION_TIMELOCK,
-    } from '@core/wallet'
     import { consolidateOutputs } from '@core/wallet/actions/consolidateOutputs'
     import { getStorageDepositFromOutput } from '@core/wallet/utils/generateActivity/helper'
 
@@ -60,18 +53,25 @@
 
                 let type: string
                 let amount: number
-                if (output.type !== OUTPUT_TYPE_TREASURY) {
-                    if (containsUnlockCondition(output.unlockConditions, UNLOCK_CONDITION_EXPIRATION)) {
+                if (output.getType() !== OutputType.Treasury) {
+                    const commonOutput = output as CommonOutput
+                    if (containsUnlockCondition(commonOutput.getUnlockConditions(), UnlockConditionType.Expiration)) {
                         type = PendingFundsType.Unclaimed
-                        amount = Number(output.amount)
+                        amount = Number(commonOutput.getAmount())
                     } else if (
-                        containsUnlockCondition(output.unlockConditions, UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN)
+                        containsUnlockCondition(
+                            commonOutput.getUnlockConditions(),
+                            UnlockConditionType.StorageDepositReturn
+                        )
                     ) {
                         type = PendingFundsType.StorageDepositReturn
-                        amount = getStorageDepositFromOutput(output).storageDeposit
-                    } else if (containsUnlockCondition(output.unlockConditions, UNLOCK_CONDITION_TIMELOCK)) {
+                        // TODO-sdk the signature of this function has changed recently. Find a way to fix
+                        amount = getStorageDepositFromOutput(commonOutput).storageDeposit
+                    } else if (
+                        containsUnlockCondition(commonOutput.getUnlockConditions(), UnlockConditionType.Timelock)
+                    ) {
                         type = PendingFundsType.Timelock
-                        amount = Number(output.amount)
+                        amount = Number(output.getAmount())
                     }
                 }
 
@@ -117,8 +117,8 @@
         return { amount: totalStorageDeposit, subBreakdown }
     }
 
-    function containsUnlockCondition(unlockConditions: UnlockConditionTypes[], unlockConditionId: number) {
-        return unlockConditions.some((unlockCondition) => unlockCondition.type === unlockConditionId)
+    function containsUnlockCondition(unlockConditions: UnlockCondition[], unlockConditionId: number): boolean {
+        return unlockConditions.some((unlockCondition) => unlockCondition.getType() === unlockConditionId)
     }
 
     function onConsolidationClick(): void {
diff --git a/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts b/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
index 6fa7eef2756..d678554d142 100644
--- a/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
+++ b/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
@@ -1,17 +1,16 @@
-import { OutputTypes } from '@iota/types'
-
 import { tryNumberOrZero } from '@core/utils'
 
 import { IShimmerClaimingAccount } from '../interfaces'
+import { Output, RegularTransactionEssence } from '@iota/wallet'
 
 export function sumTotalClaimedRewards(shimmerClaimingAccounts: IShimmerClaimingAccount[]): number {
     return shimmerClaimingAccounts?.reduce(
         (total: number, curr: IShimmerClaimingAccount) =>
             total +
             tryNumberOrZero(
-                curr?.claimingTransaction?.payload?.essence?.outputs?.reduce(
-                    (outputsTotal: number, currentOutput: OutputTypes) =>
-                        outputsTotal + tryNumberOrZero(currentOutput?.amount),
+                (curr?.claimingTransaction?.payload?.essence as RegularTransactionEssence).outputs?.reduce(
+                    (outputsTotal: number, currentOutput: Output) =>
+                        outputsTotal + tryNumberOrZero(currentOutput?.getAmount()),
                     0
                 )
             ),
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index 9a8244b21e0..5681c156d2f 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -36,15 +36,21 @@ import type {
     SyncOptions,
     Transaction,
     TransactionOptions,
+    AliasOutput,
+    BasicOutput,
+    FoundryOutput,
+    NftOutput,
+    HexEncodedAmount,
+    Output,
 } from '@iota/wallet'
 
 export interface IAccount {
     addresses(): Promise<Address[]>
     addressesWithUnspentOutputs(): Promise<AddressWithUnspentOutputs[]>
-    buildAliasOutput(data: BuildAliasOutputData): Promise<IAliasOutput>
-    buildBasicOutput(data: BuildBasicOutputData): Promise<IBasicOutput>
-    buildFoundryOutput(data: BuildFoundryOutputData): Promise<IFoundryOutput>
-    buildNftOutput(data: BuildNftOutputData): Promise<INftOutput>
+    buildAliasOutput(data: BuildAliasOutputData): Promise<AliasOutput>
+    buildBasicOutput(data: BuildBasicOutputData): Promise<BasicOutput>
+    buildFoundryOutput(data: BuildFoundryOutputData): Promise<FoundryOutput>
+    buildNftOutput(data: BuildNftOutputData): Promise<NftOutput>
     burnNativeToken(
         tokenId: string,
         burnAmount: HexEncodedAmount,
diff --git a/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts b/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts
index 241805ec353..367987054d7 100644
--- a/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts
+++ b/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts
@@ -1,13 +1,13 @@
 import { MILLISECONDS_PER_SECOND, SECONDS_PER_MINUTE } from '@core/utils'
 import { NetworkHealth } from '../enums'
 import { INetworkStatus } from '../interfaces'
-import { INodeInfo } from '@iota/types'
+import { INodeInfo } from '@iota/wallet'
 
 /**
  * Update the network status store from the NodeInfo.
  *
  * @method updateNetworkStatusFromNodeInfo
- * @param {IStardustNodeInfo} NodeInfo
+ * @param {IStardustNodeInfo} nodeInfo
  * @returns {INetworkStatus}
  */
 export function getNetworkStatusFromNodeInfo(nodeInfo: INodeInfo): INetworkStatus {
diff --git a/packages/shared/lib/core/network/interfaces/index.ts b/packages/shared/lib/core/network/interfaces/index.ts
index c7316ed3440..228da613644 100644
--- a/packages/shared/lib/core/network/interfaces/index.ts
+++ b/packages/shared/lib/core/network/interfaces/index.ts
@@ -4,7 +4,6 @@ export * from './connected-chain.interface'
 export * from './client-options.interface'
 export * from './network-status.interface'
 export * from './node-info-response.interface'
-export * from './node-info.interface'
 export * from './node.interface'
 export * from './persisted-network.interface'
 export * from './protocol.interface'
diff --git a/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts b/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts
index 097ba720898..69283d00f11 100644
--- a/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts
+++ b/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts
@@ -1,4 +1,4 @@
-import { INodeInfo } from '@iota/types'
+import { INodeInfo } from '@iota/wallet'
 
 export interface INodeInfoResponse {
     nodeInfo: INodeInfo
diff --git a/packages/shared/lib/core/network/interfaces/node-info.interface.ts b/packages/shared/lib/core/network/interfaces/node-info.interface.ts
index c207799eca8..e69de29bb2d 100644
--- a/packages/shared/lib/core/network/interfaces/node-info.interface.ts
+++ b/packages/shared/lib/core/network/interfaces/node-info.interface.ts
@@ -1,3 +0,0 @@
-import { INodeInfo as _INodeInfo } from '@iota/types'
-
-export type INodeInfo = _INodeInfo
diff --git a/packages/shared/lib/core/network/stores/node-info.store.ts b/packages/shared/lib/core/network/stores/node-info.store.ts
index 343cbe76888..e4793885711 100644
--- a/packages/shared/lib/core/network/stores/node-info.store.ts
+++ b/packages/shared/lib/core/network/stores/node-info.store.ts
@@ -1,4 +1,4 @@
-import type { INodeInfo } from '@iota/types'
+import { INodeInfo } from '@iota/wallet'
 import { writable } from 'svelte/store'
 
 export const nodeInfo = writable<INodeInfo | undefined>(undefined)
diff --git a/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts b/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
index de7e5e50b8f..787443a7b9c 100644
--- a/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
@@ -1,10 +1,9 @@
-import type { OutputData, Transaction } from '@iota/wallet'
+import type { OutputData, OutputResponse, Transaction } from '@iota/wallet'
 
 import { IAccountState } from '@core/account/interfaces'
 
 import { preprocessGroupedOutputs } from '../../utils/outputs'
 import { IProcessedTransaction } from '../../interfaces'
-import { IOutputResponse } from '@iota/types'
 
 export async function preprocessOutputsForAccount(account: IAccountState): Promise<IProcessedTransaction[]> {
     const outputs = await account.outputs()
@@ -29,7 +28,7 @@ export async function preprocessOutputsForAccount(account: IAccountState): Promi
     const processedTransactions: IProcessedTransaction[] = []
     for (const transactionId of Object.keys(groupedOutputs)) {
         try {
-            const inputs: IOutputResponse[] = incomingTransactions[transactionId]?.inputs ?? []
+            const inputs: OutputResponse[] = incomingTransactions[transactionId]?.inputs ?? []
             const processedTransaction = preprocessGroupedOutputs(groupedOutputs[transactionId], inputs, account)
 
             processedTransactions.push(processedTransaction)
diff --git a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
index 354b56d3c79..256014905d0 100644
--- a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
@@ -1,27 +1,17 @@
-import type { FeatureTypes, UnlockConditionTypes } from '@iota/types'
-import type { BuildNftOutputData } from '@iota/wallet'
+import { AddressUnlockCondition, BuildNftOutputData, Ed25519Address, MetadataFeature } from '@iota/wallet'
 import { Converter } from '@core/utils'
-import { ADDRESS_TYPE_ED25519, EMPTY_HEX_ID, FEATURE_TYPE_METADATA, UNLOCK_CONDITION_ADDRESS } from '../constants'
+import { EMPTY_HEX_ID } from '../constants'
 import { convertBech32ToHexAddress } from './convertBech32ToHexAddress'
 import { IIrc27Metadata } from '@core/nfts/interfaces'
 
 export function buildNftOutputData(metadata: IIrc27Metadata, address: string): BuildNftOutputData {
-    const unlockConditions: UnlockConditionTypes[] = [
-        {
-            type: UNLOCK_CONDITION_ADDRESS,
-            address: {
-                type: ADDRESS_TYPE_ED25519,
-                pubKeyHash: convertBech32ToHexAddress(address),
-            },
-        },
-    ]
+    const addressUnlockCondition = new AddressUnlockCondition(new Ed25519Address(convertBech32ToHexAddress(address)))
 
-    const immutableFeatures: FeatureTypes[] = [
-        {
-            type: FEATURE_TYPE_METADATA,
-            data: Converter.utf8ToHex(JSON.stringify(metadata)),
-        },
-    ]
+    const unlockConditions: AddressUnlockCondition[] = [addressUnlockCondition]
+
+    const metadataFeature = new MetadataFeature(Converter.utf8ToHex(JSON.stringify(metadata)))
+
+    const immutableFeatures: MetadataFeature[] = [metadataFeature]
 
     return {
         nftId: EMPTY_HEX_ID,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
index b1dced44ad5..09cb5b55f37 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
@@ -1,10 +1,9 @@
 import { IAccountState } from '@core/account/interfaces'
-import { Output } from '@core/wallet/types'
-import { StorageDepositReturnUnlockCondition, UnlockConditionType } from '@iota/wallet'
+import { CommonOutput, StorageDepositReturnUnlockCondition, UnlockConditionType } from '@iota/wallet'
 
 export async function getStorageDepositFromOutput(
     account: IAccountState,
-    output: Output
+    output: CommonOutput
 ): Promise<{
     storageDeposit: number
     giftedStorageDeposit: number
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
index a34e8f46449..f903de91954 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
@@ -1,12 +1,10 @@
-import { FEATURE_TYPE_TAG } from '../../../constants'
-import { ITagFeature } from '@iota/types'
+import { CommonOutput, FeatureType, TagFeature } from '@iota/wallet'
 import { Converter } from '@core/utils'
-import { Output } from '@core/wallet/types'
 
-export function getTagFromOutput(output: Output): string {
-    const { tag } = <ITagFeature>output?.features?.find((feature) => feature.type === FEATURE_TYPE_TAG) ?? {
-        tag: undefined,
-    }
+export function getTagFromOutput(output: CommonOutput): string | undefined {
+    const tagFeature = output?.getFeatures()?.find((feature) => feature.getType() === FeatureType.Tag) as TagFeature
+    const tag = tagFeature?.getTag() ?? undefined
+
     if (tag) {
         return Converter.hexToUtf8(tag)
     }
diff --git a/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
index 69956f461b7..f858d1cfe22 100644
--- a/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
@@ -1,14 +1,12 @@
-import type { AddressTypes } from '@iota/types'
+import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/wallet'
 
-import { ADDRESS_TYPE_ALIAS, ADDRESS_TYPE_ED25519, ADDRESS_TYPE_NFT } from '../constants'
-
-export function getHexAddressFromAddressTypes(address: AddressTypes): string {
-    switch (address?.type) {
-        case ADDRESS_TYPE_ED25519:
-            return address.pubKeyHash
-        case ADDRESS_TYPE_ALIAS:
-            return address.aliasId
-        case ADDRESS_TYPE_NFT:
-            return address.nftId
+export function getHexAddressFromAddressTypes(address: Address): string {
+    switch (address?.getType()) {
+        case AddressType.Ed25519:
+            return (address as Ed25519Address).getPubKeyHash()
+        case AddressType.Alias:
+            return (address as AliasAddress).getAliasId()
+        case AddressType.Nft:
+            return (address as NftAddress).getNftId()
     }
 }
diff --git a/packages/shared/lib/tests/__mocks__/account.mock.ts b/packages/shared/lib/tests/__mocks__/account.mock.ts
index 6e8d3ad8654..f7aa5ab26a4 100644
--- a/packages/shared/lib/tests/__mocks__/account.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/account.mock.ts
@@ -1,4 +1,3 @@
-import type { IAliasOutput, IBasicOutput, IFoundryOutput, INftOutput, OutputTypes } from '@iota/types'
 import {
     Balance,
     AccountMetadata,
@@ -31,6 +30,11 @@ import {
     GenerateAddressOptions,
     SyncOptions,
     Ed25519Signature,
+  AliasOutput,
+    BasicOutput,
+    FoundryOutput,
+    NftOutput,
+    Output,
 } from '@iota/wallet'
 
 import { IAccount } from '../../core/account'
@@ -49,19 +53,19 @@ export class AccountMock implements IAccount {
         return Promise.resolve([])
     }
 
-    buildAliasOutput(data: BuildAliasOutputData): Promise<IAliasOutput> {
+    buildAliasOutput(data: BuildAliasOutputData): Promise<AliasOutput> {
         throw new Error('Method not implemented.')
     }
 
-    buildBasicOutput(data: BuildBasicOutputData): Promise<IBasicOutput> {
+    buildBasicOutput(data: BuildBasicOutputData): Promise<BasicOutput> {
         throw new Error('Method not implemented.')
     }
 
-    buildFoundryOutput(data: BuildFoundryOutputData): Promise<IFoundryOutput> {
+    buildFoundryOutput(data: BuildFoundryOutputData): Promise<FoundryOutput> {
         throw new Error('Method not implemented.')
     }
 
-    buildNftOutput(data: BuildNftOutputData): Promise<INftOutput> {
+    buildNftOutput(data: BuildNftOutputData): Promise<NftOutput> {
         throw new Error('Method not implemented.')
     }
 
@@ -125,7 +129,7 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    getFoundryOutput(tokenId: string): Promise<IFoundryOutput> {
+    getFoundryOutput(tokenId: string): Promise<FoundryOutput> {
         throw new Error('Method not implemented.')
     }
 
@@ -208,7 +212,7 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    minimumRequiredStorageDeposit(output: OutputTypes): Promise<string> {
+    minimumRequiredStorageDeposit(output: Output): Promise<string> {
         throw new Error('Method not implemented.')
     }
 
@@ -224,7 +228,7 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    prepareTransaction(outputs: OutputTypes[], options?: TransactionOptions): Promise<PreparedTransactionData> {
+    prepareTransaction(outputs: Output[], options?: TransactionOptions): Promise<PreparedTransactionData> {
         throw new Error('Method not implemented.')
     }
 
@@ -244,7 +248,7 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    prepareOutput(options: OutputParams, transactionOptions?: TransactionOptions): Promise<OutputTypes> {
+    prepareOutput(options: OutputParams, transactionOptions?: TransactionOptions): Promise<Output> {
         throw new Error('Method not implemented.')
     }
 
@@ -286,7 +290,7 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    sendOutputs(outputs: OutputTypes[], transactionOptions?: TransactionOptions): Promise<Transaction> {
+    sendOutputs(outputs: Output[], transactionOptions?: TransactionOptions): Promise<Transaction> {
         throw new Error('Method not implemented.')
     }
 

From abd219daa8f057116db48f49a44f34a77717d5a6 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Fri, 14 Jul 2023 13:08:30 +0200
Subject: [PATCH 10/48] chore: Migrate to iota/sdk models (remove @iota/types)
 pass 3

---
 .../nfts/tests/buildNftFromNftOutput.test.ts  | 151 +++++++-----------
 .../processed-transaction.interface.ts        |   4 +-
 .../wallet/utils/buildFoundryOutputData.ts    |  46 +++---
 .../generateSingleFoundryActivity.ts          |  29 ++--
 .../utils/getBech32AddressFromAddressTypes.ts |   2 +-
 .../getSenderAddressFromUnlockCondition.ts    |  23 +--
 .../utils/outputs/getNativeTokenFromOutput.ts |  17 +-
 .../utils/outputs/preprocessTransaction.ts    |  26 +--
 .../utils/send/validateSendConfirmation.ts    |  18 +--
 .../getSenderAddressFromInputs.ts             |  48 +++---
 10 files changed, 180 insertions(+), 184 deletions(-)

diff --git a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
index b0da444076a..1c361c7f292 100644
--- a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
+++ b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
@@ -1,66 +1,49 @@
-import { FeatureTypes, UnlockConditionTypes } from '@iota/types'
 import { IWrappedOutput } from '../../wallet/interfaces'
 import { buildNftFromNftOutput } from '../utils/buildNftFromNftOutput'
 import { Converter } from '../../utils/convert'
 import { Bech32Helper } from '../../utils/crypto'
+import {
+    AddressUnlockCondition,
+    Ed25519Address,
+    Feature,
+    IssuerFeature,
+    MetadataFeature,
+    NftOutput,
+    TimelockUnlockCondition,
+    UnlockCondition,
+} from '@iota/wallet'
 
 const accountAddress = 'rms1qr47ee0fhahukrzec088v9lngv7w5k2sn3jjtwvkcpjfgxhhsazlsurxrx9'
 
 const outputId = '0x16cc2007c1f0120b4832f89950ac5099f804c9730f54c4c1865f485b7b12a7870000'
-const type = 6
 const amount = '68900'
 const nftId = '0xd17971b9baf1b80356bcc42715447acd01fb6aadb7ebfa8d0af2b07f911325a0'
 
-const immutableFeatures: FeatureTypes[] = [
-    {
-        type: 1,
-        address: {
-            type: 0,
-            pubKeyHash: '0x20dceb927cfdc2cea642fbf77aed81f42400145b5a4fd906f1aa40af1c31afb1',
-        },
-    },
-    {
-        type: 2,
-        data: '0x7b227374616e64617264223a224952433237222c2276657273696f6e223a2276312e30222c226e616d65223a227364617364222c2274797065223a22696d6167652f706e67222c22757269223a2268747470733a2f2f697066732e696f2f697066732f516d51717a4d546176516754346634543576365057427037584e4b746f506d43396a766e313257505433676b5345227d',
-    },
+const immutableFeatures: Feature[] = [
+    new IssuerFeature(new Ed25519Address('0x20dceb927cfdc2cea642fbf77aed81f42400145b5a4fd906f1aa40af1c31afb1')),
+    new MetadataFeature(
+        '0x7b227374616e64617264223a224952433237222c2276657273696f6e223a2276312e30222c226e616d65223a227364617364222c2274797065223a22696d6167652f706e67222c22757269223a2268747470733a2f2f697066732e696f2f697066732f516d51717a4d546176516754346634543576365057427037584e4b746f506d43396a766e313257505433676b5345227d'
+    ),
 ]
 
-const incomingUnlockConditions: UnlockConditionTypes[] = [
-    {
-        type: 0,
-        address: {
-            type: 0,
-            pubKeyHash: '0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8',
-        },
-    },
+const incomingUnlockConditions: UnlockCondition[] = [
+    new AddressUnlockCondition(
+        new Ed25519Address('0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8')
+    ),
 ]
 
-const incomingTimelockedCondition: UnlockConditionTypes[] = [
-    {
-        type: 0,
-        address: {
-            type: 0,
-            pubKeyHash: '0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8',
-        },
-    },
-    {
-        type: 2,
-        unixTime: 2876367917,
-    },
+const incomingTimelockedCondition: UnlockCondition[] = [
+    new AddressUnlockCondition(
+        new Ed25519Address('0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8')
+    ),
+    new TimelockUnlockCondition(2876367917),
 ]
 
-const incomingExpiredTimelockedCondition: UnlockConditionTypes[] = [
-    {
-        type: 0,
-        address: {
-            type: 0,
-            pubKeyHash: '0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8',
-        },
-    },
-    {
-        type: 2,
-        unixTime: 136367917,
-    },
+const incomingExpiredTimelockedCondition: UnlockCondition[] = [
+    new AddressUnlockCondition(
+        new Ed25519Address('0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8')
+    ),
+    new TimelockUnlockCondition(136367917),
 ]
 
 jest.mock('../../wallet/utils/convertHexAddressToBech32.ts', () => ({
@@ -73,30 +56,25 @@ describe('File: buildNFtFromOutput.ts', () => {
     let outputData: IWrappedOutput
 
     it('should classify default nft as spendable', () => {
+        const nftOutput = new NftOutput(amount, nftId, incomingUnlockConditions)
+        nftOutput.setImmutableFeatures(immutableFeatures)
+
         outputData = {
             outputId,
-            output: {
-                type,
-                nftId,
-                amount,
-                unlockConditions: incomingUnlockConditions,
-                immutableFeatures,
-            },
+            output: nftOutput,
         }
+
         let nft = buildNftFromNftOutput(outputData, accountAddress, true)
         expect(nft.isSpendable).toBe(true)
     })
 
     it('should correctly classify nft as timelocked', () => {
+        const nftOutput = new NftOutput(amount, nftId, incomingTimelockedCondition)
+        nftOutput.setImmutableFeatures(immutableFeatures)
+
         outputData = {
             outputId,
-            output: {
-                type,
-                nftId,
-                amount,
-                unlockConditions: incomingTimelockedCondition,
-                immutableFeatures,
-            },
+            output: nftOutput,
         }
         const nft = buildNftFromNftOutput(outputData, accountAddress)
         expect(nft.isSpendable).toBe(true)
@@ -104,15 +82,12 @@ describe('File: buildNFtFromOutput.ts', () => {
     })
 
     it('should correctly classify expired timelocked nft', () => {
+        const nftOutput = new NftOutput(amount, nftId, incomingExpiredTimelockedCondition)
+        nftOutput.setImmutableFeatures(immutableFeatures)
+
         outputData = {
             outputId,
-            output: {
-                type,
-                nftId,
-                amount,
-                unlockConditions: incomingExpiredTimelockedCondition,
-                immutableFeatures,
-            },
+            output: nftOutput,
         }
         const nft = buildNftFromNftOutput(outputData, accountAddress)
         expect(nft.isSpendable).toBe(true)
@@ -120,41 +95,33 @@ describe('File: buildNFtFromOutput.ts', () => {
     })
 
     it('should ignore parsing spendable state and timelock', () => {
+        let nftOutput = new NftOutput(amount, nftId, incomingUnlockConditions)
+
         outputData = {
             outputId,
-            output: {
-                type,
-                nftId,
-                amount,
-                unlockConditions: incomingUnlockConditions,
-            },
+            output: nftOutput,
         }
+
         let nft = buildNftFromNftOutput(outputData, accountAddress, false)
         expect(nft.isSpendable).toBe(false)
         expect(nft.timelockTime).toBe(undefined)
 
+        nftOutput = new NftOutput(amount, nftId, incomingTimelockedCondition)
+
         outputData = {
             outputId,
-            output: {
-                type,
-                nftId,
-                amount,
-                unlockConditions: incomingTimelockedCondition,
-            },
+            output: nftOutput,
         }
         nft = buildNftFromNftOutput(outputData, accountAddress, false)
         expect(nft.isSpendable).toBe(false)
         expect(nft.timelockTime).toBe(undefined)
 
+        nftOutput = new NftOutput(amount, nftId, incomingExpiredTimelockedCondition)
+        nftOutput.setImmutableFeatures(immutableFeatures)
+
         outputData = {
             outputId,
-            output: {
-                type,
-                nftId,
-                amount,
-                unlockConditions: incomingExpiredTimelockedCondition,
-                immutableFeatures,
-            },
+            output: nftOutput,
         }
         nft = buildNftFromNftOutput(outputData, accountAddress, false)
         expect(nft.isSpendable).toBe(false)
@@ -162,15 +129,13 @@ describe('File: buildNFtFromOutput.ts', () => {
     })
 
     it('should parse the metadata correctly', () => {
+        let nftOutput = new NftOutput(amount, nftId, incomingUnlockConditions)
+
+        nftOutput.setImmutableFeatures(immutableFeatures)
+
         outputData = {
             outputId,
-            output: {
-                type,
-                nftId,
-                amount,
-                unlockConditions: incomingUnlockConditions,
-                immutableFeatures,
-            },
+            output: nftOutput,
         }
         let nft = buildNftFromNftOutput(outputData, accountAddress)
 
diff --git a/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts b/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts
index 7d65686d31e..0a3ca920663 100644
--- a/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts
@@ -1,6 +1,6 @@
 import { ActivityDirection, InclusionState } from '@core/wallet/enums'
-import { IUTXOInput } from '@iota/types'
 import { IWrappedOutput } from './wrapped-output.interface'
+import { UTXOInput } from '@iota/wallet'
 
 export interface IProcessedTransaction {
     outputs: IWrappedOutput[]
@@ -8,7 +8,7 @@ export interface IProcessedTransaction {
     direction: ActivityDirection
     time: Date
     inclusionState: InclusionState
-    utxoInputs: IUTXOInput[]
+    utxoInputs: UTXOInput[]
     wrappedInputs: IWrappedOutput[]
     claimingData?: IClaimData
 }
diff --git a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
index c3b98c6df3c..bebd836133a 100644
--- a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
@@ -1,5 +1,12 @@
-import type { FeatureTypes, TokenSchemeTypes, UnlockConditionTypes } from '@iota/types'
-import type { BuildFoundryOutputData } from '@iota/wallet'
+import {
+    ImmutableAliasAddressUnlockCondition,
+    type BuildFoundryOutputData,
+    type UnlockCondition,
+    AliasAddress,
+    SimpleTokenScheme,
+    MetadataFeature,
+    Feature,
+} from '@iota/wallet'
 import { Converter } from '@core/utils'
 import { ADDRESS_TYPE_ALIAS, FEATURE_TYPE_METADATA, UNLOCK_CONDITION_IMMUTABLE_ALIAS } from '../constants'
 import { IIrc30Metadata } from '../interfaces'
@@ -12,28 +19,21 @@ export async function buildFoundryOutputData(
     metadata: IIrc30Metadata,
     aliasId: string
 ): Promise<BuildFoundryOutputData> {
-    const unlockConditions: UnlockConditionTypes[] = [
-        {
-            type: UNLOCK_CONDITION_IMMUTABLE_ALIAS,
-            address: {
-                type: ADDRESS_TYPE_ALIAS,
-                aliasId: convertBech32ToHexAddress(aliasId),
-            },
-        },
-    ]
-    const tokenScheme: TokenSchemeTypes = {
-        type: 0,
-        maximumSupply: Converter.decimalToHex(totalSupply),
-        meltedTokens: Converter.decimalToHex(0),
-        mintedTokens: Converter.decimalToHex(circulatingSupply),
-    }
+    const immutableAliasUnlockCondition = new ImmutableAliasAddressUnlockCondition(
+        new AliasAddress(convertBech32ToHexAddress(aliasId))
+    )
+
+    const unlockConditions: UnlockCondition[] = [immutableAliasUnlockCondition]
+
+    const tokenScheme = new SimpleTokenScheme(
+        Converter.decimalToHex(circulatingSupply),
+        Converter.decimalToHex(0),
+        Converter.decimalToHex(totalSupply)
+    )
+
+    const metadataFeature = new MetadataFeature(Converter.utf8ToHex(JSON.stringify(metadata)))
 
-    const immutableFeatures: FeatureTypes[] = [
-        {
-            type: FEATURE_TYPE_METADATA,
-            data: Converter.utf8ToHex(JSON.stringify(metadata)),
-        },
-    ]
+    const immutableFeatures: Feature[] = [metadataFeature]
 
     const serialNumber = await getSerialNumberFromAliasOutput(aliasId)
 
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
index 01169462cc6..c0c8a9f72ef 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
@@ -1,10 +1,8 @@
 import { IAccountState } from '@core/account'
 import { getCoinType } from '@core/profile'
-import { ADDRESS_TYPE_ALIAS, UNLOCK_CONDITION_IMMUTABLE_ALIAS } from '@core/wallet/constants'
 import { ActivityType } from '@core/wallet/enums'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { FoundryActivity } from '@core/wallet/types'
-import type { IAliasAddress, IFoundryOutput, IImmutableAliasUnlockCondition } from '@iota/types'
 import { convertHexAddressToBech32, getNativeTokenFromOutput } from '..'
 import {
     getAmountFromOutput,
@@ -13,6 +11,14 @@ import {
     getSendingInformation,
     getTagFromOutput,
 } from './helper'
+import {
+    AddressType,
+    AliasAddress,
+    FoundryOutput,
+    ImmutableAliasAddressUnlockCondition,
+    SimpleTokenScheme,
+    UnlockConditionType,
+} from '@iota/wallet'
 
 export async function generateSingleFoundryActivity(
     account: IAccountState,
@@ -20,15 +26,20 @@ export async function generateSingleFoundryActivity(
 ): Promise<FoundryActivity> {
     const { transactionId, claimingData, time, direction, inclusionState } = processedTransaction
 
-    const output = wrappedOutput.output as IFoundryOutput
+    const output = wrappedOutput.output as FoundryOutput
     const outputId = wrappedOutput.outputId
-    const { mintedTokens, meltedTokens, maximumSupply } = output.tokenScheme
+    const tokenScheme = output.getTokenScheme() as SimpleTokenScheme
+    const mintedTokens = tokenScheme.getMintedTokens()
+    const meltedTokens = tokenScheme.getMeltedTokens()
+    const maximumSupply = tokenScheme.getMaximumSupply()
 
-    const addressUnlockCondition = output.unlockConditions.find(
-        (unlockCondition) => unlockCondition.type === UNLOCK_CONDITION_IMMUTABLE_ALIAS
-    ) as IImmutableAliasUnlockCondition
-    const aliasId = (addressUnlockCondition?.address as IAliasAddress)?.aliasId
-    const aliasAddress = aliasId ? convertHexAddressToBech32(ADDRESS_TYPE_ALIAS, aliasId) : undefined
+    const addressUnlockCondition = output
+        .getUnlockConditions()
+        .find(
+            (unlockCondition) => unlockCondition.getType() === UnlockConditionType.ImmutableAliasAddress
+        ) as ImmutableAliasAddressUnlockCondition
+    const aliasId = (addressUnlockCondition?.getAddress() as AliasAddress)?.getAliasId()
+    const aliasAddress = aliasId ? convertHexAddressToBech32(AddressType.Alias, aliasId) : undefined
 
     const isHidden = false
     const isAssetHidden = false
diff --git a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
index edf904a7041..7daafae8f91 100644
--- a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
@@ -2,7 +2,7 @@ import { convertHexAddressToBech32 } from './convertHexAddressToBech32'
 import { ADDRESS_TYPE_ALIAS, ADDRESS_TYPE_ED25519, ADDRESS_TYPE_NFT } from '../constants'
 import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/wallet'
 
-export function getBech32AddressFromAddressTypes(address: Address): string {
+export function getBech32AddressFromAddressTypes(address: Address): string | undefined {
     switch (address?.getType()) {
         case AddressType.Ed25519:
             return convertHexAddressToBech32(ADDRESS_TYPE_ED25519, (address as Ed25519Address).getPubKeyHash())
diff --git a/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts b/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
index f096a70d083..523c4ba8b30 100644
--- a/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
+++ b/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
@@ -1,20 +1,23 @@
-import { IExpirationUnlockCondition, IStorageDepositReturnUnlockCondition } from '@iota/types'
 import {
-    ADDRESS_TYPE_ED25519,
-    UNLOCK_CONDITION_EXPIRATION,
-    UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN,
-} from '../constants'
+    AddressType,
+    Ed25519Address,
+    ExpirationUnlockCondition,
+    StorageDepositReturnUnlockCondition,
+    UnlockConditionType,
+} from '@iota/wallet'
 import { getBech32AddressFromAddressTypes } from './getBech32AddressFromAddressTypes'
 
 export function getSenderAddressFromUnlockCondition(
-    unlockCondition: IStorageDepositReturnUnlockCondition | IExpirationUnlockCondition
+    unlockCondition: StorageDepositReturnUnlockCondition | ExpirationUnlockCondition
 ): string | undefined {
     if (
-        (unlockCondition?.type === UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN ||
-            unlockCondition?.type === UNLOCK_CONDITION_EXPIRATION) &&
-        unlockCondition?.returnAddress?.type === ADDRESS_TYPE_ED25519
+        (unlockCondition?.getType() === UnlockConditionType.StorageDepositReturn ||
+            unlockCondition?.getType() === UnlockConditionType.Expiration) &&
+        unlockCondition?.getReturnAddress()?.getType() === AddressType.Ed25519
     ) {
-        return getBech32AddressFromAddressTypes(unlockCondition?.returnAddress)
+        return getBech32AddressFromAddressTypes(
+            new Ed25519Address((unlockCondition.getReturnAddress() as Ed25519Address).getPubKeyHash())
+        )
     } else {
         return undefined
     }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
index 83cfa482708..6211619f8b7 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
@@ -1,11 +1,14 @@
-import { OUTPUT_TYPE_FOUNDRY } from '@core/wallet/constants'
-import { Output } from '@core/wallet/types'
-import type { INativeToken } from '@iota/types'
 import { buildFoundryId } from './getFoundryId'
+import { CommonOutput, FoundryOutput, INativeToken, OutputType, SimpleTokenScheme } from '@iota/wallet'
 
-export function getNativeTokenFromOutput(output: Output): INativeToken {
-    if (output?.type === OUTPUT_TYPE_FOUNDRY) {
-        return { id: buildFoundryId(output), amount: output.tokenScheme.mintedTokens }
+export function getNativeTokenFromOutput(output: CommonOutput): INativeToken | undefined {
+    if (output?.getType() === OutputType.Foundry) {
+        const foundryOutput = output as FoundryOutput
+        return {
+            id: buildFoundryId(output as FoundryOutput),
+            amount: (foundryOutput.getTokenScheme() as SimpleTokenScheme).getMintedTokens(),
+        }
     }
-    return output?.nativeTokens?.[0]
+
+    return output?.getNativeTokens()?.[0]
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
index ccb03ab9703..ffa57410bfe 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
@@ -1,25 +1,29 @@
 import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
-import { Transaction } from '@iota/wallet'
+import { Output, OutputType, RegularTransactionEssence, Transaction, UTXOInput, Utils } from '@iota/wallet'
 import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
-import { OUTPUT_TYPE_TREASURY } from '@core/wallet/constants'
 import { getDirectionFromTransaction } from '../transactions'
 import { IAccountState } from '@core/account'
-import { OutputTypes } from '@iota/types'
 
 export async function preprocessTransaction(
     transaction: Transaction,
     account: IAccountState
 ): Promise<IProcessedTransaction> {
+    const regularTransactionEssence = transaction.payload.essence as RegularTransactionEssence
+
     const outputs = convertTransactionsOutputTypesToWrappedOutputs(
         transaction?.transactionId,
-        transaction.payload.essence.outputs
+        regularTransactionEssence.outputs
     )
     const direction = getDirectionFromTransaction(outputs, transaction.incoming, account.depositAddress)
-    const utxoInputs = transaction.payload.essence.inputs
-    const inputIds = utxoInputs.map((input) =>
-        getOutputIdFromTransactionIdAndIndex(input?.transactionId, input.transactionOutputIndex)
-    )
+    const utxoInputs = regularTransactionEssence.inputs.map((i) => i as UTXOInput)
+    const inputIds = utxoInputs.map((input) => {
+        const transactionId = input.transactionId
+        const transactionOutputIndex = input.transactionInputIndex
+        return Utils.computeOutputId(transactionId, transactionOutputIndex)
+    })
+
     const inputs = await Promise.all(inputIds.map((inputId) => account.getOutput(inputId)))
+
     return {
         outputs: outputs,
         transactionId: transaction?.transactionId,
@@ -33,7 +37,7 @@ export async function preprocessTransaction(
 
 function convertTransactionsOutputTypesToWrappedOutputs(
     transactionId: string,
-    outputTypes: OutputTypes[]
+    outputTypes: Output[]
 ): IWrappedOutput[] {
     return outputTypes.map((outputType, index) =>
         convertTransactionOutputTypeToWrappedOutput(transactionId, index, outputType)
@@ -43,12 +47,12 @@ function convertTransactionsOutputTypesToWrappedOutputs(
 function convertTransactionOutputTypeToWrappedOutput(
     transactionId: string,
     index: number,
-    outputType: OutputTypes
+    outputType: Output
 ): IWrappedOutput {
     const outputId = getOutputIdFromTransactionIdAndIndex(transactionId, index)
     return {
         outputId,
-        output: outputType.type !== OUTPUT_TYPE_TREASURY ? outputType : undefined,
+        output: outputType.getType() !== OutputType.Treasury ? outputType : undefined,
         remainder: false,
     }
 }
diff --git a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
index f604e6666bd..2c3a645c285 100644
--- a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
+++ b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
@@ -2,24 +2,22 @@ import { getSelectedAccount } from '@core/account'
 import { InsufficientFundsForStorageDepositError, InvalidExpirationDateTimeError } from '@contexts/wallet'
 import { convertUnixTimestampToDate, isValidExpirationDateTime } from '@core/utils'
 import { getStorageDepositFromOutput } from '../generateActivity/helper'
-import { Output } from '@core/wallet/types'
-import { OUTPUT_TYPE_NFT, UNLOCK_CONDITION_EXPIRATION } from '@core/wallet/constants'
-import { IExpirationUnlockCondition } from '@iota/types'
 import { IAccountState } from '@core/account/interfaces'
+import { CommonOutput, ExpirationUnlockCondition, OutputType, UnlockConditionType } from '@iota/wallet'
 
-export async function validateSendConfirmation(account: IAccountState, output: Output): Promise<void> {
+export async function validateSendConfirmation(account: IAccountState, output: CommonOutput): Promise<void> {
     const parseNumber: (value: string) => number = (value: string) => parseInt(value, 10) ?? 0
-    const amount = parseNumber(output?.amount)
+    const amount = parseNumber(output?.getAmount())
     const balance = parseNumber(getSelectedAccount()?.balances?.baseCoin.available ?? '0')
     const { storageDeposit, giftedStorageDeposit } = await getStorageDepositFromOutput(account, output)
 
-    const expirationUnlockCondition = output.unlockConditions.find(
-        (c) => c.type === UNLOCK_CONDITION_EXPIRATION
-    ) as IExpirationUnlockCondition
-    const expirationUnixTime = expirationUnlockCondition?.unixTime
+    const expirationUnlockCondition = output
+        .getUnlockConditions()
+        .find((c) => c.getType() === UnlockConditionType.Expiration) as ExpirationUnlockCondition
+    const expirationUnixTime = expirationUnlockCondition?.getUnixTime()
     const expirationDateTime = expirationUnixTime ? convertUnixTimestampToDate(expirationUnixTime) : undefined
 
-    const isNft = output.type === OUTPUT_TYPE_NFT
+    const isNft = output.getType() === OutputType.Nft
     if (!isNft && (balance < amount + storageDeposit || balance < amount + giftedStorageDeposit)) {
         throw new InsufficientFundsForStorageDepositError()
     } else if (expirationDateTime && !isValidExpirationDateTime(expirationDateTime)) {
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
index f56b7774afc..403763ace7b 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
@@ -1,37 +1,49 @@
 import { IWrappedOutput } from '@core/wallet/interfaces'
-import { ADDRESS_TYPE_ALIAS } from '@core/wallet/constants'
-import { IAddressUnlockCondition, IAliasOutput, IExpirationUnlockCondition } from '@iota/types'
-import { UNLOCK_CONDITION_ADDRESS, UNLOCK_CONDITION_EXPIRATION } from '../../constants'
 import { getBech32AddressFromAddressTypes } from '../getBech32AddressFromAddressTypes'
+import {
+    AddressUnlockCondition,
+    AliasAddress,
+    AliasOutput,
+    CommonOutput,
+    ExpirationUnlockCondition,
+    UnlockConditionType,
+} from '@iota/wallet'
 
-export function getSenderAddressFromInputs(inputs: IWrappedOutput[]): string {
+export function getSenderAddressFromInputs(inputs: IWrappedOutput[]): string | undefined {
     for (const input of inputs) {
         const { output, metadata } = input
-        const { unlockConditions } = output
+        const unlockConditions = (output as CommonOutput)?.getUnlockConditions()
 
-        const spentDate = metadata.milestoneTimestampSpent
+        const spentDate = metadata?.milestoneTimestampSpent
 
-        // A transaction with an expiration unlock condition is included if the transaction expired
-        const expirationUnlockCondition = unlockConditions.find(
-            (unlockCondition) =>
-                unlockCondition.type === UNLOCK_CONDITION_EXPIRATION && unlockCondition.unixTime < spentDate
-        ) as IExpirationUnlockCondition
-        if (expirationUnlockCondition) {
-            return getBech32AddressFromAddressTypes(expirationUnlockCondition.returnAddress)
+        if (spentDate) {
+            // A transaction with an expiration unlock condition is included if the transaction expired
+            const expirationUnlockCondition = unlockConditions.find(
+                (unlockCondition) =>
+                    unlockCondition.getType() === UnlockConditionType.Expiration &&
+                    (unlockCondition as ExpirationUnlockCondition).getUnixTime() < spentDate
+            ) as ExpirationUnlockCondition
+
+            if (expirationUnlockCondition) {
+                return getBech32AddressFromAddressTypes(expirationUnlockCondition.getReturnAddress())
+            }
         }
 
         const addressUnlockCondition = unlockConditions.find(
-            ({ type }) => type === UNLOCK_CONDITION_ADDRESS
-        ) as IAddressUnlockCondition
+            (unlockCondition) => unlockCondition.getType() === UnlockConditionType.Address
+        ) as AddressUnlockCondition
+
         if (addressUnlockCondition) {
-            return getBech32AddressFromAddressTypes(addressUnlockCondition.address)
+            return getBech32AddressFromAddressTypes(addressUnlockCondition.getAddress())
         }
 
         // TODO: if additional metadata is added to an aliasOutput, we could use it to determine the EVM Sender.
-        const aliasId = (output as IAliasOutput)?.aliasId
+        const aliasId = (output as AliasOutput)?.getAliasId()
+
         if (aliasId) {
-            return getBech32AddressFromAddressTypes({ type: ADDRESS_TYPE_ALIAS, aliasId })
+            return getBech32AddressFromAddressTypes(new AliasAddress(aliasId))
         }
     }
+
     return undefined
 }

From 0ddde6886458d203755ddba500f28e27ee6e1971 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Fri, 14 Jul 2023 13:10:57 +0200
Subject: [PATCH 11/48] chore: Remove @iota/types dependency

---
 package.json                 |  1 -
 packages/shared/package.json |  1 -
 yarn.lock                    | 10 ----------
 3 files changed, 12 deletions(-)

diff --git a/package.json b/package.json
index 0ed9b6163de..7d67065fd81 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
     ],
     "devDependencies": {
         "@babel/eslint-parser": "^7.15.0",
-        "@iota/types": "^1.0.0-beta.9",
         "@types/node": "^18.15.11",
         "@typescript-eslint/eslint-plugin": "^5.58.0",
         "@typescript-eslint/parser": "^5.57.1",
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 3ab753d6654..56f89b08274 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -30,7 +30,6 @@
         "test": "jest"
     },
     "devDependencies": {
-        "@iota/types": "2.0.0-rc.2",
         "@swc/core": "^1.3.44",
         "@swc/jest": "^0.2.24",
         "@tsconfig/svelte": "^4.0.1",
diff --git a/yarn.lock b/yarn.lock
index 27b99538c45..fe7a083605e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -883,16 +883,6 @@
     "@types/warning" "^3.0.0"
     warning "^4.0.3"
 
-"@iota/types@2.0.0-rc.2":
-  version "2.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@iota/types/-/types-2.0.0-rc.2.tgz#a4b8e5c3423a2afd322fc05ebfaa6b27587d9a96"
-  integrity sha512-huL+171zMQgGYV4/zhHLFcE8heTLRJhtlqLEJaM1Q+klb2KxNqFX0EySU8pxZ/nslh0Dem3QQ+Jmwv1FdBmpFQ==
-
-"@iota/types@^1.0.0-beta.9":
-  version "1.0.0-beta.15"
-  resolved "https://registry.yarnpkg.com/@iota/types/-/types-1.0.0-beta.15.tgz#1a1f5722ef176a45d03e92f4cb5bd9a4ea74ec27"
-  integrity sha512-67DrzDO5bl2c7RIMpOdtjdOa27Bv1EmX/BHPTQD8c3RtPPAzJpSIpuI8JsIDl3U6Qe4zdLX3kRv9zGBXcr0fZA==
-
 "@iota/unit-converter@^1.0.0-beta.30":
   version "1.0.0-beta.30"
   resolved "https://registry.yarnpkg.com/@iota/unit-converter/-/unit-converter-1.0.0-beta.30.tgz#a29b80e46ae935c69175f68121faec81adcea90e"

From 32ba0ad866f034e852e8518c2f1f21f9fb407986 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Mon, 31 Jul 2023 14:39:33 +0200
Subject: [PATCH 12/48] chore: Fix issues after rebase (to develop). Bump
 iota/sdk used to 1.0.2.

---
 .../utils/getVotingParticipationEventIds.ts   |  5 ++-
 .../core/account/actions/buildAccountState.ts | 12 +++----
 .../lib/core/account/api/prepareOutput.ts     |  3 +-
 .../account/interfaces/account.interface.ts   | 33 +++++++++----------
 .../stores/ledger-prepared-output.store.ts    |  2 +-
 .../interfaces/profile-manager.interface.ts   |  8 ++---
 ...ildProfileManagerOptionsFromProfileData.ts |  2 +-
 .../utils/getSecretManagerFromProfileType.ts  |  4 +--
 .../core/wallet/actions/createNativeToken.ts  |  4 +--
 .../lib/core/wallet/actions/sendOutput.ts     |  9 ++---
 .../wallet/utils/buildFoundryOutputData.ts    | 11 ++-----
 .../generateActivitiesFromAliasOutputs.ts     |  4 +--
 .../generateActivitiesFromBasicOutputs.ts     | 13 +++++---
 .../helper/getAmountFromOutput.ts             |  2 +-
 .../helper/getAsyncDataFromOutput.ts          | 10 +++---
 .../generateActivity/helper/getAsyncStatus.ts |  4 +--
 .../helper/getMetadataFromOutput.ts           |  1 -
 .../helper/getSendingInformation.ts           |  3 +-
 .../helper/getTimelockDateFromOutput.ts       |  5 ++-
 .../core/wallet/utils/getOutputParameters.ts  |  2 +-
 .../outputs/getExpirationDateFromOutput.ts    | 11 +++----
 .../outputs/getSerialNumberFromAliasOutput.ts |  4 +--
 .../wallet/utils/outputs/isOutputAsync.ts     | 10 ++++--
 .../utils/outputs/preprocessTransaction.ts    |  6 ++--
 packages/shared/package.json                  |  2 +-
 yarn.lock                                     |  8 ++---
 26 files changed, 90 insertions(+), 88 deletions(-)

diff --git a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
index 4ce7146138f..b5a1a2c419e 100644
--- a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
+++ b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
@@ -1,10 +1,9 @@
 import { get } from 'svelte/store'
 
-import { ParticipationEventId, ParticipationEventType } from '@iota/wallet/out/types'
+import { INode, ParticipationEventId, ParticipationEventType } from '@iota/wallet/out/types'
 
 import { selectedAccount } from '@core/account/stores'
-import { INode } from '@core/network/interfaces'
 
-export function getVotingParticipationEventIds(node: INode): Promise<ParticipationEventId[]> {
+export function getVotingParticipationEventIds(node: INode): Promise<ParticipationEventId[]> | undefined {
     return get(selectedAccount)?.getParticipationEventIds(node, ParticipationEventType.Voting)
 }
diff --git a/packages/shared/lib/core/account/actions/buildAccountState.ts b/packages/shared/lib/core/account/actions/buildAccountState.ts
index b2326cd7ad7..1d9ad0bb97e 100644
--- a/packages/shared/lib/core/account/actions/buildAccountState.ts
+++ b/packages/shared/lib/core/account/actions/buildAccountState.ts
@@ -10,15 +10,15 @@ export async function buildAccountState(
 ): Promise<IAccountState> {
     let balances: Balance = {
         baseCoin: {
-            total: '0',
-            available: '0',
+            total: BigInt(0),
+            available: BigInt(0),
             votingPower: '0',
         },
         requiredStorageDeposit: {
-            alias: '0',
-            basic: '0',
-            foundry: '0',
-            nft: '0',
+            alias: BigInt(0),
+            basic: BigInt(0),
+            foundry: BigInt(0),
+            nft: BigInt(0),
         },
         nativeTokens: [],
         nfts: [],
diff --git a/packages/shared/lib/core/account/api/prepareOutput.ts b/packages/shared/lib/core/account/api/prepareOutput.ts
index c03415edb06..fe2b4198bae 100644
--- a/packages/shared/lib/core/account/api/prepareOutput.ts
+++ b/packages/shared/lib/core/account/api/prepareOutput.ts
@@ -1,6 +1,5 @@
 import { getAccount } from '@core/profile-manager'
-import { Output } from '@core/wallet'
-import { OutputParams, TransactionOptions } from '@iota/wallet'
+import { Output, OutputParams, TransactionOptions } from '@iota/wallet'
 
 export async function prepareOutput(
     accountIndex: number,
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index 5681c156d2f..6c0d5d9592a 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -4,20 +4,13 @@ import type {
     AddressWithUnspentOutputs,
     AliasOutputParams,
     Balance,
-    BuildAliasOutputData,
-    BuildBasicOutputData,
-    BuildFoundryOutputData,
-    BuildNftOutputData,
     CreateNativeTokenParams,
     CreateNativeTokenTransaction,
     ConsolidationParams,
     Ed25519Signature,
     FilterOptions,
     GenerateAddressOptions,
-    CreateNativeTokenParams,
     MintNftParams,
-    CreateNativeTokenTransaction,
-    INode,
     OutputData,
     OutputParams,
     OutputsToClaim,
@@ -42,15 +35,21 @@ import type {
     NftOutput,
     HexEncodedAmount,
     Output,
+    HexEncodedString,
+    AliasOutputBuilderParams,
+    BasicOutputBuilderParams,
+    FoundryOutputBuilderParams,
+    NftOutputBuilderParams,
+    INode,
 } from '@iota/wallet'
 
 export interface IAccount {
     addresses(): Promise<Address[]>
     addressesWithUnspentOutputs(): Promise<AddressWithUnspentOutputs[]>
-    buildAliasOutput(data: BuildAliasOutputData): Promise<AliasOutput>
-    buildBasicOutput(data: BuildBasicOutputData): Promise<BasicOutput>
-    buildFoundryOutput(data: BuildFoundryOutputData): Promise<FoundryOutput>
-    buildNftOutput(data: BuildNftOutputData): Promise<NftOutput>
+    buildAliasOutput(data: AliasOutputBuilderParams): Promise<AliasOutput>
+    buildBasicOutput(data: BasicOutputBuilderParams): Promise<BasicOutput>
+    buildFoundryOutput(data: FoundryOutputBuilderParams): Promise<FoundryOutput>
+    buildNftOutput(data: NftOutputBuilderParams): Promise<NftOutput>
     burnNativeToken(
         tokenId: string,
         burnAmount: HexEncodedAmount,
@@ -73,13 +72,13 @@ export interface IAccount {
     generateEd25519Addresses(amount: number, options?: GenerateAddressOptions): Promise<Address[]>
     generateEvmAddresses(generateAddressesOptions: GenerateAddressOptions): Promise<string[]>
     getBalance(): Promise<Balance>
-    getFoundryOutput(tokenId: string): Promise<IFoundryOutput>
+    getFoundryOutput(tokenId: string): Promise<FoundryOutput>
     getIncomingTransaction(transactionId: string): Promise<Transaction>
     getMetadata(): AccountMetadata
     getOutput(outputId: string): Promise<OutputData>
     claimableOutputs(outputs: OutputsToClaim): Promise<string[]>
     getParticipationEvent(eventId: string): Promise<ParticipationEventWithNodes>
-    getParticipationEventIds(node: Node, eventType?: ParticipationEventType): Promise<string[]>
+    getParticipationEventIds(node: INode, eventType?: ParticipationEventType): Promise<string[]>
     getParticipationEvents(): Promise<{ [eventId: string]: ParticipationEventWithNodes }>
     getParticipationEventStatus(eventId: string): Promise<ParticipationEventStatus>
     getParticipationOverview(eventIds?: string[]): Promise<ParticipationOverview>
@@ -91,17 +90,17 @@ export interface IAccount {
         transactionOptions?: TransactionOptions
     ): Promise<CreateNativeTokenTransaction>
     increaseVotingPower(amount: string): Promise<Transaction>
-    minimumRequiredStorageDeposit(output: OutputTypes): Promise<string>
+    minimumRequiredStorageDeposit(output: Output): Promise<string>
     createNativeToken(
         params: CreateNativeTokenParams,
         transactionOptions?: TransactionOptions
     ): Promise<CreateNativeTokenTransaction>
     mintNfts(params: MintNftParams[], transactionOptions?: TransactionOptions): Promise<Transaction>
     outputs(filterOptions?: FilterOptions): Promise<OutputData[]>
-    prepareOutput(params: OutputParams, transactionOptions?: TransactionOptions): Promise<OutputTypes>
+    prepareOutput(params: OutputParams, transactionOptions?: TransactionOptions): Promise<Output>
     pendingTransactions(): Promise<Transaction[]>
     prepareSend(params: SendParams[], options?: TransactionOptions): Promise<PreparedTransactionData>
-    prepareTransaction(outputs: OutputTypes[], options?: TransactionOptions): Promise<PreparedTransactionData>
+    prepareTransaction(outputs: Output[], options?: TransactionOptions): Promise<PreparedTransactionData>
     registerParticipationEvents(options: ParticipationEventRegistrationOptions): Promise<ParticipationEventMap>
     retryTransactionUntilIncluded(
         transactionId: string,
@@ -112,7 +111,7 @@ export interface IAccount {
     sendAmount(params: SendParams[], transactionOptions?: TransactionOptions): Promise<Transaction>
     sendNativeTokens(params: SendNativeTokensParams[], transactionOptions?: TransactionOptions): Promise<Transaction>
     sendNft(params: SendNftParams[], transactionOptions?: TransactionOptions): Promise<Transaction>
-    sendOutputs(outputs: OutputTypes[], transactionOptions?: TransactionOptions): Promise<Transaction>
+    sendOutputs(outputs: Output[], transactionOptions?: TransactionOptions): Promise<Transaction>
     setAlias(alias: string): Promise<void>
     setDefaultSyncOptions(options: SyncOptions): Promise<void>
     signSecp256k1Ecdsa(message: HexEncodedString, chain: number[]): Promise<Secp256k1EcdsaSignature>
diff --git a/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts b/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts
index 573dc701769..2df3293c557 100644
--- a/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts
+++ b/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts
@@ -1,4 +1,4 @@
-import { Output } from '@core/wallet'
+import { Output } from '@iota/wallet'
 import { writable } from 'svelte/store'
 
 export const ledgerPreparedOutput = writable<Output>(null)
diff --git a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
index 8d9435ddb8a..18e63a9cfae 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
@@ -1,8 +1,8 @@
 import type {
-    ClientOptions,
+    IClientOptions,
     GenerateAddressOptions,
     LedgerNanoStatus,
-    NodeInfoWrapper,
+    INodeInfoWrapper,
     SyncOptions,
     WalletEvent,
 } from '@iota/wallet'
@@ -31,7 +31,7 @@ export interface IProfileManager {
     getAccountIndexes(): Promise<number[]>
     getAccount(accountIndex: number): Promise<IAccount>
     getAccounts(): Promise<IAccount[]>
-    getNodeInfo(url?: string, auth?: IAuth): Promise<NodeInfoWrapper>
+    getNodeInfo(url?: string, auth?: IAuth): Promise<INodeInfoWrapper>
     getLedgerNanoStatus(): Promise<LedgerNanoStatus>
     hexToBech32(hex: string, bech32Hrp?: string): Promise<string>
     isStrongholdPasswordAvailable(): Promise<boolean>
@@ -44,7 +44,7 @@ export interface IProfileManager {
         ignoreIfCoinTypeMismatch: boolean,
         ignoreIfBech32Mismatch: string
     ): Promise<void>
-    setClientOptions(options: ClientOptions): Promise<void>
+    setClientOptions(options: IClientOptions): Promise<void>
     setStrongholdPassword(password: string): Promise<void>
     setStrongholdPasswordClearInterval(intervalInMilliseconds?: number): Promise<void>
     startBackgroundSync(options?: SyncOptions, intervalInMilliseconds?: number): Promise<void>
diff --git a/packages/shared/lib/core/profile-manager/utils/buildProfileManagerOptionsFromProfileData.ts b/packages/shared/lib/core/profile-manager/utils/buildProfileManagerOptionsFromProfileData.ts
index 2c423530a02..34e3ec2abd6 100644
--- a/packages/shared/lib/core/profile-manager/utils/buildProfileManagerOptionsFromProfileData.ts
+++ b/packages/shared/lib/core/profile-manager/utils/buildProfileManagerOptionsFromProfileData.ts
@@ -7,7 +7,7 @@ export async function buildProfileManagerOptionsFromProfileData(
 ): Promise<ProfileManagerOptions> {
     const { id, type, network } = profileData
     const storagePath = await getStorageDirectoryOfProfile(id)
-    const coinType = network?.coinType ?? COIN_TYPE[network?.id] ?? 1
+    const coinType = network?.coinType ?? network ? COIN_TYPE[network?.id] ?? 1 : 1
     const useDefaultClientOptions =
         !profileData?.clientOptions ||
         !profileData?.clientOptions?.nodes ||
diff --git a/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts b/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts
index f44a0db8b31..a248af972f6 100644
--- a/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts
+++ b/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts
@@ -1,9 +1,9 @@
-import { SecretManager } from '@iota/wallet'
+import { SecretManagerType } from '@iota/wallet'
 
 import { USE_LEDGER_SIMULATOR } from '@core/ledger'
 import { ProfileType } from '@core/profile'
 
-export function getSecretManagerFromProfileType(type: ProfileType, storagePath?: string): SecretManager {
+export function getSecretManagerFromProfileType(type: ProfileType, storagePath?: string): SecretManagerType {
     const strongholdSecretManager = {
         stronghold: { snapshotPath: `${storagePath}/wallet.stronghold` },
     }
diff --git a/packages/shared/lib/core/wallet/actions/createNativeToken.ts b/packages/shared/lib/core/wallet/actions/createNativeToken.ts
index c2f67b8f999..d2bee3af1ad 100644
--- a/packages/shared/lib/core/wallet/actions/createNativeToken.ts
+++ b/packages/shared/lib/core/wallet/actions/createNativeToken.ts
@@ -22,8 +22,8 @@ export async function createNativeToken(
         const account = get(selectedAccount)
 
         const params: CreateNativeTokenParams = {
-            maximumSupply: Converter.decimalToHex(maximumSupply),
-            circulatingSupply: Converter.decimalToHex(circulatingSupply),
+            maximumSupply: BigInt(maximumSupply),
+            circulatingSupply: BigInt(circulatingSupply),
             foundryMetadata: Converter.utf8ToHex(JSON.stringify(metadata)),
         }
 
diff --git a/packages/shared/lib/core/wallet/actions/sendOutput.ts b/packages/shared/lib/core/wallet/actions/sendOutput.ts
index 8031272a002..f6df7b39696 100644
--- a/packages/shared/lib/core/wallet/actions/sendOutput.ts
+++ b/packages/shared/lib/core/wallet/actions/sendOutput.ts
@@ -2,10 +2,10 @@ import { get } from 'svelte/store'
 import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { updateNftInAllAccountNfts } from '@core/nfts/actions'
 
-import { DEFAULT_TRANSACTION_OPTIONS, OUTPUT_TYPE_NFT } from '../constants'
+import { DEFAULT_TRANSACTION_OPTIONS } from '../constants'
 import { resetNewTokenTransactionDetails } from '../stores'
-import { Output } from '../types'
 import { processAndAddToActivities } from '../utils'
+import { NftOutput, Output, OutputType } from '@iota/wallet'
 
 export async function sendOutput(output: Output): Promise<void> {
     try {
@@ -13,8 +13,9 @@ export async function sendOutput(output: Output): Promise<void> {
         const account = get(selectedAccount)
         const transaction = await account.sendOutputs([output], DEFAULT_TRANSACTION_OPTIONS)
         // Reset transaction details state, since the transaction has been sent
-        if (output.type === OUTPUT_TYPE_NFT) {
-            updateNftInAllAccountNfts(account.index, output.nftId, { isSpendable: false })
+        if (output.type === OutputType.Nft) {
+            const nftId = (output as NftOutput).nftId
+            updateNftInAllAccountNfts(account.index, nftId, { isSpendable: false })
         }
 
         resetNewTokenTransactionDetails()
diff --git a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
index bebd836133a..6cb093f5224 100644
--- a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
@@ -1,6 +1,6 @@
 import {
     ImmutableAliasAddressUnlockCondition,
-    type BuildFoundryOutputData,
+    type FoundryOutputBuilderParams,
     type UnlockCondition,
     AliasAddress,
     SimpleTokenScheme,
@@ -8,7 +8,6 @@ import {
     Feature,
 } from '@iota/wallet'
 import { Converter } from '@core/utils'
-import { ADDRESS_TYPE_ALIAS, FEATURE_TYPE_METADATA, UNLOCK_CONDITION_IMMUTABLE_ALIAS } from '../constants'
 import { IIrc30Metadata } from '../interfaces'
 import { convertBech32ToHexAddress } from './convertBech32ToHexAddress'
 import { getSerialNumberFromAliasOutput } from './outputs/getSerialNumberFromAliasOutput'
@@ -18,18 +17,14 @@ export async function buildFoundryOutputData(
     circulatingSupply: number,
     metadata: IIrc30Metadata,
     aliasId: string
-): Promise<BuildFoundryOutputData> {
+): Promise<FoundryOutputBuilderParams> {
     const immutableAliasUnlockCondition = new ImmutableAliasAddressUnlockCondition(
         new AliasAddress(convertBech32ToHexAddress(aliasId))
     )
 
     const unlockConditions: UnlockCondition[] = [immutableAliasUnlockCondition]
 
-    const tokenScheme = new SimpleTokenScheme(
-        Converter.decimalToHex(circulatingSupply),
-        Converter.decimalToHex(0),
-        Converter.decimalToHex(totalSupply)
-    )
+    const tokenScheme = new SimpleTokenScheme(BigInt(circulatingSupply), BigInt(0), BigInt(totalSupply))
 
     const metadataFeature = new MetadataFeature(Converter.utf8ToHex(JSON.stringify(metadata)))
 
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
index a0405f766a2..52448c6062d 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
@@ -1,8 +1,8 @@
 import { IAccountState } from '@core/account'
 import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction, OUTPUT_TYPE_ALIAS } from '@core/wallet'
 import { Activity, type AliasActivity } from '@core/wallet/types'
-import type { IAliasOutput } from '@iota/types'
 import { generateSingleAliasActivity } from './generateSingleAliasActivity'
+import { AliasOutput } from '@iota/wallet'
 
 export async function generateActivitiesFromAliasOutputs(
     processedTransaction: IProcessedTransaction,
@@ -13,7 +13,7 @@ export async function generateActivitiesFromAliasOutputs(
 
     const aliasOutputs = outputs.filter((output) => output.output.type === OUTPUT_TYPE_ALIAS)
     for (const aliasOutput of aliasOutputs) {
-        const output = aliasOutput.output as IAliasOutput
+        const output = aliasOutput.output as AliasOutput
         const activity = await generateSingleAliasActivity(account, {
             action: output.aliasId === EMPTY_HEX_ID ? ActivityAction.Mint : ActivityAction.Send,
             processedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
index 00665aa57fb..a58d3984c98 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
@@ -12,7 +12,7 @@ import { Activity } from '@core/wallet/types'
 import { generateSingleBasicActivity } from './generateSingleBasicActivity'
 import { generateSingleConsolidationActivity } from './generateSingleConsolidationActivity'
 import { generateSingleNftActivity } from './generateSingleNftActivity'
-import { NftOutput, OutputType } from '@iota/wallet'
+import { CommonOutput, NftOutput, OutputType } from '@iota/wallet'
 
 export async function generateActivitiesFromBasicOutputs(
     processedTransaction: IProcessedTransaction,
@@ -131,11 +131,14 @@ function getBurnedNativeTokens(
 function getAllNativeTokensFromOutputs(outputs: IWrappedOutput[]): { [key: string]: number } {
     const nativeTokens: { [key: string]: number } = {}
     for (const output of outputs) {
-        for (const nativeToken of output.output.getNativeTokens() ?? []) {
-            if (!nativeTokens[nativeToken.id]) {
-                nativeTokens[nativeToken.id] = 0
+        if (output.output.type !== OutputType.Treasury) {
+            const commonOutput = output.output as CommonOutput
+            for (const nativeToken of commonOutput.getNativeTokens() ?? []) {
+                if (!nativeTokens[nativeToken.id]) {
+                    nativeTokens[nativeToken.id] = 0
+                }
+                nativeTokens[nativeToken.id] += Number(nativeToken.amount)
             }
-            nativeTokens[nativeToken.id] += Number(nativeToken.amount)
         }
     }
     return nativeTokens
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts
index bfa88778142..ae683332dbd 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts
@@ -1,4 +1,4 @@
-import { Output } from '@core/wallet/types'
+import { Output } from '@iota/wallet'
 
 export function getAmountFromOutput(output: Output): number {
     return Number(output?.amount ?? 0)
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
index 6e02d889246..8b9d0150c39 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
@@ -1,10 +1,11 @@
 import { IAccountState } from '@core/account'
-import { isActivityHiddenForAccountIndex, IClaimData, Output, AsyncData } from '@core/wallet'
+import { isActivityHiddenForAccountIndex, IClaimData, AsyncData } from '@core/wallet'
 import { getExpirationDateFromOutput } from '../../outputs/getExpirationDateFromOutput'
 import { getTimelockDateFromOutput } from './getTimelockDateFromOutput'
 import { isOutputAsync } from '../../outputs/isOutputAsync'
 import { getAsyncStatus } from './getAsyncStatus'
 import { getStorageDepositFromOutput } from './getStorageDepositFromOutput'
+import { CommonOutput, Output } from '@iota/wallet'
 
 export async function getAsyncDataFromOutput(
     output: Output,
@@ -14,14 +15,15 @@ export async function getAsyncDataFromOutput(
 ): Promise<AsyncData> {
     const isAsync = isOutputAsync(output)
     if (isAsync) {
+        const commonOutput = output as CommonOutput
         const isClaiming = false
         const claimingTransactionId = claimingData?.claimingTransactionId
         const claimedDate = claimingData?.claimedDate
         const isRejected = isActivityHiddenForAccountIndex(account.index, outputId)
 
-        const expirationDate = getExpirationDateFromOutput(output)
-        const timelockDate = getTimelockDateFromOutput(output)
-        const { storageDeposit } = await getStorageDepositFromOutput(account, output)
+        const expirationDate = getExpirationDateFromOutput(commonOutput)
+        const timelockDate = getTimelockDateFromOutput(commonOutput)
+        const { storageDeposit } = await getStorageDepositFromOutput(account, commonOutput)
 
         const asyncStatus = getAsyncStatus(
             !!claimingTransactionId,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncStatus.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncStatus.ts
index 8e45ed24718..020f9fd20ff 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncStatus.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncStatus.ts
@@ -2,8 +2,8 @@ import { ActivityAsyncStatus } from '@core/wallet/enums'
 
 export function getAsyncStatus(
     isClaimed: boolean,
-    expirationDate: Date,
-    timelockDate: Date,
+    expirationDate: Date | undefined,
+    timelockDate: Date | undefined,
     hasStorageDeposit: boolean,
     currentTimeStamp: number
 ): ActivityAsyncStatus {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
index bad1abd4fdc..389aadaa1ef 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
@@ -1,4 +1,3 @@
-import type { IMetadataFeature } from '@iota/types'
 import { isParticipationOutput } from '@contexts/governance/utils'
 import { EXTERNALLY_OWNED_ACCOUNT } from '@core/layer-2/constants'
 import { parseLayer2MetadataForTransfer } from '@core/layer-2/utils'
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
index 097cb48fe46..4a1bd23a3d2 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
@@ -1,11 +1,12 @@
 import { IAccountState } from '@core/account'
 import { ActivityDirection } from '@core/wallet/enums'
 import { IProcessedTransaction } from '@core/wallet/interfaces'
-import { Output, SenderInfo } from '@core/wallet/types'
+import { SenderInfo } from '@core/wallet/types'
 import { getSubjectFromAddress } from '../../getSubjectFromAddress'
 import { isSubjectInternal } from '../../isSubjectInternal'
 import { getRecipientFromOutput } from '../../outputs'
 import { getSenderAddressFromInputs, getSenderFromTransaction } from '../../transactions'
+import { Output } from '@iota/wallet'
 
 export function getSendingInformation(
     processedTransaction: IProcessedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
index c25312279f7..e22408cc620 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
@@ -1,8 +1,7 @@
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
-import { Output } from '@core/wallet/types'
-import { TimelockUnlockCondition, UnlockConditionType } from '@iota/wallet'
+import { CommonOutput, TimelockUnlockCondition, UnlockConditionType } from '@iota/wallet'
 
-export function getTimelockDateFromOutput(output: Output): Date | undefined {
+export function getTimelockDateFromOutput(output: CommonOutput): Date | undefined {
     for (const unlockCondition of output.getUnlockConditions()) {
         if (unlockCondition?.getType() === UnlockConditionType.Timelock) {
             const timelockUnlockCondition = unlockCondition as TimelockUnlockCondition
diff --git a/packages/shared/lib/core/wallet/utils/getOutputParameters.ts b/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
index b6ed38114bb..ec71d5536c5 100644
--- a/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
+++ b/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
@@ -81,7 +81,7 @@ function getAssetFromTransactionDetails(transactionDetails: NewTransactionDetail
                 nativeTokens: [
                     {
                         id: nativeTokenId,
-                        amount: Converter.bigIntToHex(bigAmount),
+                        amount: BigInt(bigAmount),
                     },
                 ],
             }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
index 6913f9a3590..c418be07846 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
@@ -1,16 +1,15 @@
-import { UNLOCK_CONDITION_EXPIRATION } from '../../constants'
+import { CommonOutput, ExpirationUnlockCondition, UnlockConditionType } from '@iota/wallet'
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
-import { Output } from '@core/wallet/types'
 
-export function getExpirationDateFromOutput(output: Output): Date {
+export function getExpirationDateFromOutput(output: CommonOutput): Date | undefined {
     const expirationTime = getExpirationUnixTimeFromOutput(output)
     return expirationTime ? new Date(expirationTime) : undefined
 }
 
-export function getExpirationUnixTimeFromOutput(output: Output): number {
+export function getExpirationUnixTimeFromOutput(output: CommonOutput): number | undefined {
     for (const unlockCondition of output.unlockConditions) {
-        if (unlockCondition?.type === UNLOCK_CONDITION_EXPIRATION) {
-            return unlockCondition?.unixTime * MILLISECONDS_PER_SECOND
+        if (unlockCondition?.type === UnlockConditionType.Expiration) {
+            return (unlockCondition as ExpirationUnlockCondition).unixTime * MILLISECONDS_PER_SECOND
         }
     }
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
index f1e79dff88a..a1f79facfaa 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
 import { selectedAccount } from '@core/account/stores'
 import { convertBech32ToHexAddress } from '@core/wallet/utils/convertBech32ToHexAddress'
-import { IAliasOutput } from '@iota/types'
+import { AliasOutput } from '@iota/wallet'
 
 export async function getSerialNumberFromAliasOutput(aliasAddress: string): Promise<number> {
     const account = get(selectedAccount)
@@ -14,6 +14,6 @@ export async function getSerialNumberFromAliasOutput(aliasAddress: string): Prom
 
     // If it's the first state transition of the alias address, the aliasId is 0x0.
     // So we set the foundry counter to 0.
-    const foundryCounter = aliasOutput ? (aliasOutput.output as IAliasOutput).foundryCounter : 0
+    const foundryCounter = aliasOutput ? (aliasOutput.output as AliasOutput).foundryCounter : 0
     return foundryCounter + 1
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts b/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
index ddc8d27c986..b53cf5d54a4 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
@@ -1,10 +1,16 @@
+import { CommonOutput, Output, OutputType } from '@iota/wallet'
 import { ASYNC_UNLOCK_CONDITION_TYPES } from '../../constants'
-import { Output } from '@core/wallet/types'
 
 export function isOutputAsync(output: Output): boolean {
-    for (const unlockCondition of output.unlockConditions) {
+    if (output.type === OutputType.Treasury) {
+        return false
+    }
+
+    for (const unlockCondition of (output as CommonOutput).getUnlockConditions()) {
         if (ASYNC_UNLOCK_CONDITION_TYPES.some((type) => type === unlockCondition.type)) {
             return true
         }
     }
+
+    return false
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
index ffa57410bfe..18c24f340dd 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
@@ -1,5 +1,5 @@
 import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
-import { Output, OutputType, RegularTransactionEssence, Transaction, UTXOInput, Utils } from '@iota/wallet'
+import { Output, RegularTransactionEssence, Transaction, UTXOInput, Utils } from '@iota/wallet'
 import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
 import { getDirectionFromTransaction } from '../transactions'
 import { IAccountState } from '@core/account'
@@ -18,7 +18,7 @@ export async function preprocessTransaction(
     const utxoInputs = regularTransactionEssence.inputs.map((i) => i as UTXOInput)
     const inputIds = utxoInputs.map((input) => {
         const transactionId = input.transactionId
-        const transactionOutputIndex = input.transactionInputIndex
+        const transactionOutputIndex = input.transactionOutputIndex
         return Utils.computeOutputId(transactionId, transactionOutputIndex)
     })
 
@@ -52,7 +52,7 @@ function convertTransactionOutputTypeToWrappedOutput(
     const outputId = getOutputIdFromTransactionIdAndIndex(transactionId, index)
     return {
         outputId,
-        output: outputType.getType() !== OutputType.Treasury ? outputType : undefined,
+        output: outputType,
         remainder: false,
     }
 }
diff --git a/packages/shared/package.json b/packages/shared/package.json
index 56f89b08274..fd714d5b38b 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -11,7 +11,7 @@
         "@iota/transaction-converter": "^1.0.0-beta.30",
         "@iota/unit-converter": "^1.0.0-beta.30",
         "@iota/util.js": "^2.0.0-rc.1",
-        "@iota/wallet": "npm:@iota/sdk@1.0.0-rc.2",
+        "@iota/wallet": "npm:@iota/sdk@1.0.2",
         "@sveltejs/svelte-virtual-list": "^3.0.1",
         "big-integer": "^1.6.51",
         "big.js": "^6.0.3",
diff --git a/yarn.lock b/yarn.lock
index fe7a083605e..f20f3f9fd29 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -905,10 +905,10 @@
   dependencies:
     big-integer "^1.6.51"
 
-"@iota/wallet@npm:@iota/sdk@1.0.0-rc.2":
-  version "1.0.0-rc.2"
-  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.0-rc.2.tgz#e776b5c9f54c211403399f32f6b456976e0251b6"
-  integrity sha512-xu4zMjPQFITX5ewoixuYBcn551C/G0DvBn0gl/K7UJMMUK5GfXp6BpwmhR1AcW7py654mgGzL4JX1xfORAtrTg==
+"@iota/wallet@npm:@iota/sdk@1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.2.tgz#48f43f91b57552bb2631b32b312356af5a2113f4"
+  integrity sha512-DnjGnSvcMRKpeJmNduFaZ321lHslc/IeehQFU3RrpPk11yKQUKvcjNAMK7iWHZA9BL3ubgtv+wkhnZcvUkhKiQ==
   dependencies:
     "@types/node" "^18.15.12"
     cargo-cp-artifact "^0.1.6"

From f6bf6e9763f52b6ecc5c8b9a8bcb324540b06de1 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Tue, 1 Aug 2023 09:41:43 +0200
Subject: [PATCH 13/48] chore: Fix imports for enums (index.node loader issue
 fix attempt)

---
 .../popups/BalanceBreakdownPopup.svelte       |  2 +-
 .../drawers/BalanceBreakdownDrawer.svelte     |  2 +-
 .../utils/getVotingParticipationEventIds.ts   |  3 ++-
 .../governance/utils/isParticipationOutput.ts |  3 ++-
 .../account/interfaces/account.interface.ts   |  3 ++-
 .../actions/initialiseProfileManager.ts       |  3 ++-
 packages/shared/lib/core/utils/filter.ts      |  3 ++-
 .../lib/core/wallet/actions/sendOutput.ts     |  2 +-
 .../wallet/utils/buildFoundryOutputData.ts    |  2 +-
 .../core/wallet/utils/buildNftOutputData.ts   |  2 +-
 .../generateActivity/generateActivities.ts    |  2 +-
 .../helper/getActivityTypeFromOutput.ts       |  2 +-
 .../getGovernorAddressFromAliasOutput.ts      |  2 +-
 .../helper/getMetadataFromOutput.ts           |  2 +-
 ...etStateControllerAddressFromAliasOutput.ts |  2 +-
 .../helper/getStorageDepositFromOutput.ts     |  2 +-
 .../helper/getTagFromOutput.ts                |  2 +-
 .../helper/getTimelockDateFromOutput.ts       |  2 +-
 .../utils/getBech32AddressFromAddressTypes.ts |  2 +-
 .../utils/getHexAddressFromAddressTypes.ts    |  2 +-
 .../utils/getMetadataFromFoundryOutput.ts     |  2 +-
 .../getSenderAddressFromUnlockCondition.ts    |  2 +-
 .../outputs/getExpirationDateFromOutput.ts    |  2 +-
 .../utils/outputs/getNativeTokenFromOutput.ts |  3 ++-
 .../wallet/utils/outputs/isOutputAsync.ts     |  2 +-
 .../tests/__mocks__/account-balance.mock.ts   | 12 +++++-----
 .../lib/tests/__mocks__/account.mock.ts       | 24 +++++++++----------
 27 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
index e7ff8f3a2fa..a810ab4e7fd 100644
--- a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
+++ b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
@@ -5,7 +5,7 @@
     import { checkActiveProfileAuth } from '@core/profile'
     import { consolidateOutputs } from '@core/wallet/actions/consolidateOutputs'
     import { getStorageDepositFromOutput } from '@core/wallet/utils/generateActivity/helper'
-    import { UnlockCondition, UnlockConditionType, OutputType, CommonOutput } from '@iota/wallet'
+    import { UnlockCondition, UnlockConditionType, OutputType, CommonOutput } from '@iota/wallet/out/types'
     import { BalanceSummarySection, Button, FontWeight, Text, TextType } from 'shared/components'
 
     interface BalanceBreakdown {
diff --git a/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte b/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
index 93c8703e5d4..7bd0c2ea0ca 100644
--- a/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
+++ b/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { UnlockConditionType, UnlockCondition, OutputType, CommonOutput } from '@iota/wallet'
+    import { UnlockConditionType, UnlockCondition, OutputType, CommonOutput } from '@iota/wallet/out/types'
     import { BalanceSummarySection, Button } from '@ui'
 
     import { selectedAccount } from '@core/account'
diff --git a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
index b5a1a2c419e..aa7a9fc27f5 100644
--- a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
+++ b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
@@ -1,6 +1,7 @@
 import { get } from 'svelte/store'
 
-import { INode, ParticipationEventId, ParticipationEventType } from '@iota/wallet/out/types'
+import { INode, ParticipationEventId } from '@iota/wallet'
+import { ParticipationEventType } from '@iota/wallet/out/types'
 
 import { selectedAccount } from '@core/account/stores'
 
diff --git a/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts b/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
index 89dea20179b..36ffafbbbad 100644
--- a/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
+++ b/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
@@ -1,5 +1,6 @@
 import { PARTICIPATE_TAG_HEX } from '../constants'
-import { CommonOutput, FeatureType, Output, OutputType, TagFeature } from '@iota/wallet'
+import { CommonOutput, Output, TagFeature } from '@iota/wallet'
+import { FeatureType, OutputType } from '@iota/wallet/out/types'
 
 export function isParticipationOutput(output: Output): boolean {
     if (output.getType() === OutputType.Treasury) {
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index 6c0d5d9592a..aa4addb1f0d 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -17,7 +17,6 @@ import type {
     ParticipationEventMap,
     ParticipationEventRegistrationOptions,
     ParticipationEventStatus,
-    ParticipationEventType,
     ParticipationEventWithNodes,
     ParticipationOverview,
     PreparedTransactionData,
@@ -43,6 +42,8 @@ import type {
     INode,
 } from '@iota/wallet'
 
+import { ParticipationEventType } from '@iota/wallet/out/types'
+
 export interface IAccount {
     addresses(): Promise<Address[]>
     addressesWithUnspentOutputs(): Promise<AddressWithUnspentOutputs[]>
diff --git a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
index 18f8548606f..3adc90a7dcb 100644
--- a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
+++ b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
@@ -1,4 +1,5 @@
-import { IClientOptions, CoinType, SecretManager } from '@iota/wallet'
+import { IClientOptions, SecretManager } from '@iota/wallet'
+import { CoinType } from '@iota/wallet/out/types'
 
 import { generateRandomId } from '@core/utils'
 
diff --git a/packages/shared/lib/core/utils/filter.ts b/packages/shared/lib/core/utils/filter.ts
index 3e1b2457ac8..c525c98b747 100644
--- a/packages/shared/lib/core/utils/filter.ts
+++ b/packages/shared/lib/core/utils/filter.ts
@@ -1,4 +1,5 @@
-import { BasicOutput, OutputData, OutputType } from '@iota/wallet'
+import type { BasicOutput, OutputData } from '@iota/wallet'
+import { OutputType } from '@iota/wallet/out/types'
 
 export function filterBasicOutput(outputData: OutputData): boolean {
     return outputData?.output?.getType() === OutputType.Basic
diff --git a/packages/shared/lib/core/wallet/actions/sendOutput.ts b/packages/shared/lib/core/wallet/actions/sendOutput.ts
index f6df7b39696..c58259ab9dc 100644
--- a/packages/shared/lib/core/wallet/actions/sendOutput.ts
+++ b/packages/shared/lib/core/wallet/actions/sendOutput.ts
@@ -5,7 +5,7 @@ import { updateNftInAllAccountNfts } from '@core/nfts/actions'
 import { DEFAULT_TRANSACTION_OPTIONS } from '../constants'
 import { resetNewTokenTransactionDetails } from '../stores'
 import { processAndAddToActivities } from '../utils'
-import { NftOutput, Output, OutputType } from '@iota/wallet'
+import { NftOutput, Output, OutputType } from '@iota/wallet/out/types'
 
 export async function sendOutput(output: Output): Promise<void> {
     try {
diff --git a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
index 6cb093f5224..91aaa730b17 100644
--- a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
@@ -6,7 +6,7 @@ import {
     SimpleTokenScheme,
     MetadataFeature,
     Feature,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 import { Converter } from '@core/utils'
 import { IIrc30Metadata } from '../interfaces'
 import { convertBech32ToHexAddress } from './convertBech32ToHexAddress'
diff --git a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
index 256014905d0..d3a67b022b4 100644
--- a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
@@ -1,4 +1,4 @@
-import { AddressUnlockCondition, BuildNftOutputData, Ed25519Address, MetadataFeature } from '@iota/wallet'
+import { AddressUnlockCondition, BuildNftOutputData, Ed25519Address, MetadataFeature } from '@iota/wallet/out/types'
 import { Converter } from '@core/utils'
 import { EMPTY_HEX_ID } from '../constants'
 import { convertBech32ToHexAddress } from './convertBech32ToHexAddress'
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
index 10f80fd9424..0f58d0f99ed 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
@@ -12,7 +12,7 @@ import { generateActivitiesFromNftOutputs } from './generateActivitiesFromNftOut
 import { generateActivitiesFromAliasOutputs } from './generateActivitiesFromAliasOutputs'
 import { generateActivitiesFromFoundryOutputs } from './generateActivitiesFromFoundryOutputs'
 import { generateActivitiesFromBasicOutputs } from './generateActivitiesFromBasicOutputs'
-import { OutputType } from '@iota/wallet'
+import { OutputType } from '@iota/wallet/out/types'
 
 export async function generateActivities(
     processedTransaction: IProcessedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
index f26e925fdc6..d6e53cb10d1 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
@@ -1,7 +1,7 @@
 import { isParticipationOutput } from '@contexts/governance/utils'
 import { ActivityType } from '@core/wallet/enums'
 import { IWrappedOutput } from '@core/wallet/interfaces'
-import { OutputType } from '@iota/wallet'
+import { OutputType } from '@iota/wallet/out/types'
 
 export function getActivityTypeFromOutput(output: IWrappedOutput): ActivityType {
     switch (output.output.getType()) {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
index cd36df72b0d..c28973730fa 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
@@ -1,5 +1,5 @@
 import { getBech32AddressFromAddressTypes } from '../../getBech32AddressFromAddressTypes'
-import { AliasOutput, GovernorAddressUnlockCondition, UnlockConditionType } from '@iota/wallet'
+import { AliasOutput, GovernorAddressUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
 
 export function getGovernorAddressFromAliasOutput(output: AliasOutput): string {
     const governorUnlockCondition = output
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
index 389aadaa1ef..a84cd7448b5 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
@@ -2,7 +2,7 @@ import { isParticipationOutput } from '@contexts/governance/utils'
 import { EXTERNALLY_OWNED_ACCOUNT } from '@core/layer-2/constants'
 import { parseLayer2MetadataForTransfer } from '@core/layer-2/utils'
 import { containsControlCharacters, Converter } from '@core/utils'
-import { CommonOutput, FeatureType, MetadataFeature, Output, OutputType } from '@iota/wallet'
+import { CommonOutput, FeatureType, MetadataFeature, Output, OutputType } from '@iota/wallet/out/types'
 
 export function getMetadataFromOutput(output: Output): string | undefined {
     if (output.getType() === OutputType.Treasury) {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
index 5f44d45291a..f68488a4b03 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
@@ -1,4 +1,4 @@
-import { AliasOutput, StateControllerAddressUnlockCondition, UnlockConditionType } from '@iota/wallet'
+import { AliasOutput, StateControllerAddressUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
 import { getBech32AddressFromAddressTypes } from '../../getBech32AddressFromAddressTypes'
 
 export function getStateControllerAddressFromAliasOutput(output: AliasOutput): string {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
index 09cb5b55f37..e6737334d82 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
@@ -1,5 +1,5 @@
 import { IAccountState } from '@core/account/interfaces'
-import { CommonOutput, StorageDepositReturnUnlockCondition, UnlockConditionType } from '@iota/wallet'
+import { CommonOutput, StorageDepositReturnUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
 
 export async function getStorageDepositFromOutput(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
index f903de91954..842b0ef2571 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
@@ -1,4 +1,4 @@
-import { CommonOutput, FeatureType, TagFeature } from '@iota/wallet'
+import { CommonOutput, FeatureType, TagFeature } from '@iota/wallet/out/types'
 import { Converter } from '@core/utils'
 
 export function getTagFromOutput(output: CommonOutput): string | undefined {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
index e22408cc620..df60788b1ba 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
@@ -1,5 +1,5 @@
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
-import { CommonOutput, TimelockUnlockCondition, UnlockConditionType } from '@iota/wallet'
+import { CommonOutput, TimelockUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
 
 export function getTimelockDateFromOutput(output: CommonOutput): Date | undefined {
     for (const unlockCondition of output.getUnlockConditions()) {
diff --git a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
index 7daafae8f91..330d1875a28 100644
--- a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
@@ -1,6 +1,6 @@
 import { convertHexAddressToBech32 } from './convertHexAddressToBech32'
 import { ADDRESS_TYPE_ALIAS, ADDRESS_TYPE_ED25519, ADDRESS_TYPE_NFT } from '../constants'
-import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/wallet'
+import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/wallet/out/types'
 
 export function getBech32AddressFromAddressTypes(address: Address): string | undefined {
     switch (address?.getType()) {
diff --git a/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
index f858d1cfe22..e1cec7b7ea3 100644
--- a/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
@@ -1,4 +1,4 @@
-import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/wallet'
+import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/wallet/out/types'
 
 export function getHexAddressFromAddressTypes(address: Address): string {
     switch (address?.getType()) {
diff --git a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
index 7ac2f611947..976a2b1fca5 100644
--- a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
@@ -1,4 +1,4 @@
-import { FeatureType, FoundryOutput, MetadataFeature } from '@iota/wallet'
+import { FeatureType, FoundryOutput, MetadataFeature } from '@iota/wallet/out/types'
 
 export function getMetadataFromFoundryOutput(foundry: FoundryOutput): string {
     for (const feature of foundry?.getImmutableFeatures() ?? []) {
diff --git a/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts b/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
index 523c4ba8b30..15d4032da34 100644
--- a/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
+++ b/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
@@ -4,7 +4,7 @@ import {
     ExpirationUnlockCondition,
     StorageDepositReturnUnlockCondition,
     UnlockConditionType,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 import { getBech32AddressFromAddressTypes } from './getBech32AddressFromAddressTypes'
 
 export function getSenderAddressFromUnlockCondition(
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
index c418be07846..2a3434db51a 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
@@ -1,4 +1,4 @@
-import { CommonOutput, ExpirationUnlockCondition, UnlockConditionType } from '@iota/wallet'
+import { CommonOutput, ExpirationUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
 
 export function getExpirationDateFromOutput(output: CommonOutput): Date | undefined {
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
index 6211619f8b7..25acbadd63c 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
@@ -1,5 +1,6 @@
 import { buildFoundryId } from './getFoundryId'
-import { CommonOutput, FoundryOutput, INativeToken, OutputType, SimpleTokenScheme } from '@iota/wallet'
+import type { CommonOutput, FoundryOutput, INativeToken, SimpleTokenScheme } from '@iota/wallet'
+import { OutputType } from '@iota/wallet/out/types'
 
 export function getNativeTokenFromOutput(output: CommonOutput): INativeToken | undefined {
     if (output?.getType() === OutputType.Foundry) {
diff --git a/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts b/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
index b53cf5d54a4..4adc1c31f19 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
@@ -1,4 +1,4 @@
-import { CommonOutput, Output, OutputType } from '@iota/wallet'
+import { CommonOutput, Output, OutputType } from '@iota/wallet/out/types'
 import { ASYNC_UNLOCK_CONDITION_TYPES } from '../../constants'
 
 export function isOutputAsync(output: Output): boolean {
diff --git a/packages/shared/lib/tests/__mocks__/account-balance.mock.ts b/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
index ee61b8d40da..8410917cb17 100644
--- a/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
@@ -2,8 +2,8 @@ import { Balance } from '@iota/wallet'
 
 export const MOCK_ACCOUNT_BALANCE: Balance = {
     baseCoin: {
-        total: '10000',
-        available: '9000',
+        total: BigInt('10000'),
+        available: BigInt('9000'),
         votingPower: '0',
     },
     aliases: [],
@@ -12,9 +12,9 @@ export const MOCK_ACCOUNT_BALANCE: Balance = {
     nfts: [],
     potentiallyLockedOutputs: {},
     requiredStorageDeposit: {
-        alias: '0',
-        basic: '0',
-        foundry: '0',
-        nft: '0',
+        alias: BigInt('0'),
+        basic: BigInt('0'),
+        foundry: BigInt('0'),
+        nft: BigInt('0'),
     },
 }
diff --git a/packages/shared/lib/tests/__mocks__/account.mock.ts b/packages/shared/lib/tests/__mocks__/account.mock.ts
index f7aa5ab26a4..a4b91f36f72 100644
--- a/packages/shared/lib/tests/__mocks__/account.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/account.mock.ts
@@ -6,14 +6,14 @@ import {
     SendNftParams,
     SendParams,
     AliasOutputParams,
-    BuildAliasOutputData,
-    BuildBasicOutputData,
-    BuildFoundryOutputData,
-    BuildNftOutputData,
+    AliasOutputBuilderParams,
+    BasicOutputBuilderParams,
+    FoundryOutputBuilderParams,
+    NftOutputBuilderParams,
     ConsolidationParams,
     FilterOptions,
     CreateNativeTokenTransaction,
-    Node,
+    INode,
     OutputData,
     OutputParams,
     OutputsToClaim,
@@ -30,12 +30,12 @@ import {
     GenerateAddressOptions,
     SyncOptions,
     Ed25519Signature,
-  AliasOutput,
+    AliasOutput,
     BasicOutput,
     FoundryOutput,
     NftOutput,
     Output,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 
 import { IAccount } from '../../core/account'
 
@@ -53,19 +53,19 @@ export class AccountMock implements IAccount {
         return Promise.resolve([])
     }
 
-    buildAliasOutput(data: BuildAliasOutputData): Promise<AliasOutput> {
+    buildAliasOutput(data: AliasOutputBuilderParams): Promise<AliasOutput> {
         throw new Error('Method not implemented.')
     }
 
-    buildBasicOutput(data: BuildBasicOutputData): Promise<BasicOutput> {
+    buildBasicOutput(data: BasicOutputBuilderParams): Promise<BasicOutput> {
         throw new Error('Method not implemented.')
     }
 
-    buildFoundryOutput(data: BuildFoundryOutputData): Promise<FoundryOutput> {
+    buildFoundryOutput(data: FoundryOutputBuilderParams): Promise<FoundryOutput> {
         throw new Error('Method not implemented.')
     }
 
-    buildNftOutput(data: BuildNftOutputData): Promise<NftOutput> {
+    buildNftOutput(data: NftOutputBuilderParams): Promise<NftOutput> {
         throw new Error('Method not implemented.')
     }
 
@@ -180,7 +180,7 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    getParticipationEventIds(node: Node, eventType?: ParticipationEventType): Promise<string[]> {
+    getParticipationEventIds(node: INode, eventType?: ParticipationEventType): Promise<string[]> {
         throw new Error('Method not implemented.')
     }
 

From 17d77074626ba6bff597a730495d3de7adbbbf1e Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Tue, 1 Aug 2023 11:18:23 +0200
Subject: [PATCH 14/48] chore: Replace all sdk imports to point to
 '@iota/wallet/out/types'

---
 packages/desktop/components/ProposalAnswer.svelte     |  2 +-
 packages/desktop/components/ProposalQuestion.svelte   |  2 +-
 .../desktop/components/popups/AddProposalPopup.svelte |  2 +-
 .../components/popups/NodeAuthRequiredPopup.svelte    |  2 +-
 .../getAccountsParticipationEventStatusForEvent.ts    |  2 +-
 .../lib/contexts/governance/actions/getVotingEvent.ts |  2 +-
 .../actions/initializeParticipationOverviews.ts       |  2 +-
 .../governance/actions/registerParticipationEvent.ts  |  2 +-
 .../governance/actions/stopVotingForProposal.ts       |  2 +-
 .../default-participation-overview.constant.ts        |  2 +-
 .../governance/interfaces/proposal-state.interface.ts |  2 +-
 .../selected-participation-event-status.store.ts      |  2 +-
 .../calculateTotalVotesForTrackedParticipations.ts    |  2 +-
 .../governance/utils/getActiveParticipation.ts        |  2 +-
 .../governance/utils/getParticipationsForProposal.ts  |  2 +-
 .../governance/utils/isParticipationOutput.ts         | 11 ++++-------
 .../contexts/governance/utils/isVotingForProposal.ts  |  2 +-
 .../tests/getPercentagesFromAnswerStatuses.test.ts    |  2 +-
 ...ndleTransactionInclusionEventForShimmerClaiming.ts |  2 +-
 .../shimmer-claiming-account-sync-options.constant.ts |  2 +-
 .../helpers/prepareShimmerClaimingAccount.ts          |  2 +-
 .../onboarding/helpers/restoreBackupByCopyingFile.ts  |  2 +-
 .../interfaces/shimmer-claiming-account.interface.ts  |  2 +-
 .../onboarding/utils/sumTotalClaimedRewards.ts        |  2 +-
 .../lib/core/account/actions/buildAccountState.ts     |  2 +-
 packages/shared/lib/core/account/api/getBalance.ts    |  2 +-
 .../lib/core/account/api/getParticipationOverview.ts  |  2 +-
 packages/shared/lib/core/account/api/prepareOutput.ts |  2 +-
 .../constants/default-sync-options.constant.ts        |  2 +-
 .../account/interfaces/account-balances.interface.ts  |  2 +-
 .../account/interfaces/account-state.interface.ts     |  2 +-
 .../lib/core/account/interfaces/account.interface.ts  |  2 +-
 .../interfaces/persisted-account-data.interface.ts    |  2 +-
 .../lib/core/account/utils/sumTotalFromOutputs.ts     |  2 +-
 .../lib/core/account/utils/syncAccountsInParallel.ts  |  2 +-
 .../lib/core/account/utils/syncAccountsInSeries.ts    |  2 +-
 .../core/ledger/stores/ledger-nano-status.store.ts    |  2 +-
 .../ledger/stores/ledger-prepared-output.store.ts     |  2 +-
 .../ledger/utils/determineLedgerConnectionState.ts    |  2 +-
 .../network/helpers/getNetworkStatusFromNodeInfo.ts   |  2 +-
 .../network/interfaces/client-options.interface.ts    |  2 +-
 .../interfaces/node-info-response.interface.ts        |  2 +-
 .../shared/lib/core/network/stores/node-info.store.ts |  2 +-
 .../shared/lib/core/nfts/interfaces/nft.interface.ts  |  2 +-
 .../lib/core/nfts/tests/buildNftFromNftOutput.test.ts |  2 +-
 .../lib/core/nfts/utils/buildNftFromNftOutput.ts      |  2 +-
 .../utils/getSpendableStatusFromUnspentNftOutput.ts   |  2 +-
 .../actions/events-handlers/handleNewOutputEvent.ts   |  2 +-
 .../actions/events-handlers/handleSpentOutputEvent.ts |  2 +-
 .../handleTransactionInclusionEvent.ts                |  2 +-
 .../events-handlers/handleTransactionProgressEvent.ts |  2 +-
 .../actions/initialiseProfileManager.ts               |  2 +-
 .../lib/core/profile-manager/api/createAccount.ts     |  2 +-
 .../core/profile-manager/api/getLedgerNanoStatus.ts   |  2 +-
 .../core/profile-manager/api/startBackgroundSync.ts   |  2 +-
 .../core/profile-manager/interfaces/api.interface.ts  |  2 +-
 .../interfaces/profile-manager.interface.ts           |  2 +-
 .../interfaces/recover-account-payload.interface.ts   |  2 +-
 .../wallet-api-event-payload-wrapper.interface.ts     |  2 +-
 .../types/profile-manager-options.type.ts             |  2 +-
 .../types/transaction-progress-event.type.ts          |  2 +-
 .../types/wallet-api-event-handler.type.ts            |  2 +-
 .../utils/getSecretManagerFromProfileType.ts          |  2 +-
 .../profile-manager/utils/validateWalletApiEvent.ts   |  2 +-
 packages/shared/lib/core/utils/filter.ts              |  2 +-
 .../actions/activities/preprocessOutputsForAccount.ts |  2 +-
 .../lib/core/wallet/actions/createNativeToken.ts      |  2 +-
 packages/shared/lib/core/wallet/actions/mintNft.ts    |  2 +-
 .../actions/setOutgoingAsyncActivitiesToClaimed.ts    |  2 +-
 .../constants/default-transaction-options.constant.ts |  2 +-
 .../interfaces/processed-transaction.interface.ts     |  2 +-
 .../wallet/interfaces/wrapped-output.interface.ts     |  2 +-
 .../generateActivitiesFromAliasOutputs.ts             |  2 +-
 .../generateActivitiesFromBasicOutputs.ts             |  2 +-
 .../generateActivitiesFromNftOutputs.ts               |  2 +-
 .../generateActivity/generateSingleAliasActivity.ts   |  2 +-
 .../generateActivity/generateSingleBasicActivity.ts   |  2 +-
 .../generateSingleConsolidationActivity.ts            |  2 +-
 .../generateActivity/generateSingleFoundryActivity.ts |  2 +-
 .../generateSingleGovernanceActivity.ts               |  2 +-
 .../generateActivity/generateSingleNftActivity.ts     |  2 +-
 .../generateActivity/helper/getAmountFromOutput.ts    |  2 +-
 .../generateActivity/helper/getAsyncDataFromOutput.ts |  2 +-
 .../generateActivity/helper/getGovernanceInfo.ts      |  2 +-
 .../generateActivity/helper/getSendingInformation.ts  |  2 +-
 .../lib/core/wallet/utils/outputs/getFoundryId.ts     |  2 +-
 .../wallet/utils/outputs/getIssuerFromNftOutput.ts    |  2 +-
 .../wallet/utils/outputs/getMetadataFromNftOutput.ts  |  2 +-
 .../wallet/utils/outputs/getNativeTokenFromOutput.ts  |  2 +-
 .../utils/outputs/getSerialNumberFromAliasOutput.ts   |  2 +-
 .../wallet/utils/outputs/preprocessGroupedOutputs.ts  |  2 +-
 .../wallet/utils/outputs/preprocessTransaction.ts     |  2 +-
 .../wallet/utils/send/validateSendConfirmation.ts     |  2 +-
 .../utils/transactions/activityOutputContainsValue.ts |  2 +-
 .../utils/transactions/getSenderAddressFromInputs.ts  |  2 +-
 .../lib/tests/__mocks__/account-balance.mock.ts       |  2 +-
 packages/shared/lib/tests/__mocks__/api.mock.ts       |  2 +-
 .../lib/tests/__mocks__/profile-manager.mock.ts       |  2 +-
 98 files changed, 101 insertions(+), 104 deletions(-)

diff --git a/packages/desktop/components/ProposalAnswer.svelte b/packages/desktop/components/ProposalAnswer.svelte
index 7abe5565822..4962c9902a3 100644
--- a/packages/desktop/components/ProposalAnswer.svelte
+++ b/packages/desktop/components/ProposalAnswer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import type { Answer } from '@iota/wallet'
+    import type { Answer } from '@iota/wallet/out/types'
 
     import { Icon, PingingBadge, Text, TooltipIcon } from '@ui'
     import { FontWeight, Position } from '@ui/enums'
diff --git a/packages/desktop/components/ProposalQuestion.svelte b/packages/desktop/components/ProposalQuestion.svelte
index 1ab4b53ecc6..db2f8985277 100644
--- a/packages/desktop/components/ProposalQuestion.svelte
+++ b/packages/desktop/components/ProposalQuestion.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import type { AnswerStatus, Question } from '@iota/wallet'
+    import type { AnswerStatus, Question } from '@iota/wallet/out/types'
 
     import { ProposalAnswer } from '@components'
     import { Icon, Text, TooltipIcon } from '@ui'
diff --git a/packages/desktop/components/popups/AddProposalPopup.svelte b/packages/desktop/components/popups/AddProposalPopup.svelte
index fbe5d43fd9b..0e24513e113 100644
--- a/packages/desktop/components/popups/AddProposalPopup.svelte
+++ b/packages/desktop/components/popups/AddProposalPopup.svelte
@@ -7,7 +7,7 @@
     import { localize } from '@core/i18n'
     import { activeAccounts, updateActiveAccountPersistedData } from '@core/profile'
     import { truncateString } from '@core/utils/string'
-    import type { Auth } from '@iota/wallet'
+    import type { Auth } from '@iota/wallet/out/types'
     import { Button, Checkbox, NodeInput, Text, TextInput, TextType } from 'shared/components'
     import { HTMLButtonType } from 'shared/components/enums'
 
diff --git a/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte b/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte
index 4a364c02d09..8a1e8c02011 100644
--- a/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte
+++ b/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Button, HTMLButtonType, Text, TextInput, TextType } from 'shared/components'
-    import type { Auth } from '@iota/wallet'
+    import type { Auth } from '@iota/wallet/out/types'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
     import { closePopup } from '@auxiliary/popup'
diff --git a/packages/shared/lib/contexts/governance/actions/getAccountsParticipationEventStatusForEvent.ts b/packages/shared/lib/contexts/governance/actions/getAccountsParticipationEventStatusForEvent.ts
index a449888d026..4816fd5bf04 100644
--- a/packages/shared/lib/contexts/governance/actions/getAccountsParticipationEventStatusForEvent.ts
+++ b/packages/shared/lib/contexts/governance/actions/getAccountsParticipationEventStatusForEvent.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 
-import type { ParticipationEventId, ParticipationEventStatus } from '@iota/wallet'
+import type { ParticipationEventId, ParticipationEventStatus } from '@iota/wallet/out/types'
 
 import { IAccount } from '@core/account/interfaces'
 import { selectedAccount } from '@core/account/stores'
diff --git a/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts b/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
index 0530d3bdbf6..3672cde974f 100644
--- a/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
+++ b/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import type { ParticipationEventId, ParticipationEventWithNodes } from '@iota/wallet'
+import type { ParticipationEventId, ParticipationEventWithNodes } from '@iota/wallet/out/types'
 import { selectedAccount } from '@core/account/stores'
 
 export function getVotingEvent(eventId: ParticipationEventId): Promise<ParticipationEventWithNodes> {
diff --git a/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts b/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts
index a546494f1d6..e9465343cc8 100644
--- a/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts
+++ b/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts
@@ -1,5 +1,5 @@
 import { activeAccounts } from '@core/profile'
-import { ParticipationOverview } from '@iota/wallet'
+import { ParticipationOverview } from '@iota/wallet/out/types'
 import { get } from 'svelte/store'
 import { DEFAULT_PARTICIPATION_OVERVIEW } from '../constants'
 import { allParticipationOverviews } from '../stores'
diff --git a/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts b/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
index 4526c61a804..8cc03675fe0 100644
--- a/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
@@ -3,7 +3,7 @@ import type {
     ParticipationEventWithNodes,
     ParticipationEventId,
     ParticipationEventRegistrationOptions,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 import { IAccountState } from '@core/account'
 import { addOrUpdateProposalToRegisteredProposals } from '../stores'
 import { createProposalFromEvent } from '@contexts/governance'
diff --git a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
index a84c8cab18f..011d4634223 100644
--- a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
+++ b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import type { Transaction } from '@iota/wallet'
+import type { Transaction } from '@iota/wallet/out/types'
 import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
 import { showAppNotification } from '@auxiliary/notification/actions'
 import { localize } from '@core/i18n'
diff --git a/packages/shared/lib/contexts/governance/constants/default-participation-overview.constant.ts b/packages/shared/lib/contexts/governance/constants/default-participation-overview.constant.ts
index e63eefb8378..9b663a085b0 100644
--- a/packages/shared/lib/contexts/governance/constants/default-participation-overview.constant.ts
+++ b/packages/shared/lib/contexts/governance/constants/default-participation-overview.constant.ts
@@ -1,3 +1,3 @@
-import type { ParticipationOverview } from '@iota/wallet'
+import type { ParticipationOverview } from '@iota/wallet/out/types'
 
 export const DEFAULT_PARTICIPATION_OVERVIEW: ParticipationOverview = { participations: {} }
diff --git a/packages/shared/lib/contexts/governance/interfaces/proposal-state.interface.ts b/packages/shared/lib/contexts/governance/interfaces/proposal-state.interface.ts
index 6098bfa144a..99d1deddce2 100644
--- a/packages/shared/lib/contexts/governance/interfaces/proposal-state.interface.ts
+++ b/packages/shared/lib/contexts/governance/interfaces/proposal-state.interface.ts
@@ -1,4 +1,4 @@
-import type { ParticipationEventStatus, Question } from '@iota/wallet'
+import type { ParticipationEventStatus, Question } from '@iota/wallet/out/types'
 import { IOrganization, ProposalError } from '..'
 import { ProposalStatus, ProposalType } from '../enums'
 
diff --git a/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts b/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
index d0e8fb33daf..fe186118535 100644
--- a/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
+++ b/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
@@ -1,4 +1,4 @@
-import { ParticipationEventStatus } from '@iota/wallet'
+import { ParticipationEventStatus } from '@iota/wallet/out/types'
 import { get, writable } from 'svelte/store'
 import { selectedAccountIndex } from '@core/account/stores'
 import { getAccountsParticipationEventStatusForEvent } from '../actions'
diff --git a/packages/shared/lib/contexts/governance/utils/calculateTotalVotesForTrackedParticipations.ts b/packages/shared/lib/contexts/governance/utils/calculateTotalVotesForTrackedParticipations.ts
index 5f23f5347dd..c1d66e5ccd7 100644
--- a/packages/shared/lib/contexts/governance/utils/calculateTotalVotesForTrackedParticipations.ts
+++ b/packages/shared/lib/contexts/governance/utils/calculateTotalVotesForTrackedParticipations.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import { TrackedParticipationOverview } from '@iota/wallet'
+import { TrackedParticipationOverview } from '@iota/wallet/out/types'
 import { networkStatus } from '@core/network/stores'
 import { MILESTONE_NOT_FOUND } from '@core/network/constants'
 
diff --git a/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts b/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts
index 438f4471036..180bf89e52e 100644
--- a/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts
+++ b/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import type { TrackedParticipationOverview } from '@iota/wallet'
+import type { TrackedParticipationOverview } from '@iota/wallet/out/types'
 import { participationOverviewForSelectedAccount } from '../stores/participation-overviews.store'
 
 export function getActiveParticipation(proposalId: string): TrackedParticipationOverview {
diff --git a/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts b/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
index 09806aa5f72..c75707ee185 100644
--- a/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
+++ b/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 
-import type { ParticipationOverview, TrackedParticipationOverview } from '@iota/wallet'
+import type { ParticipationOverview, TrackedParticipationOverview } from '@iota/wallet/out/types'
 
 import { allParticipationOverviews } from '@contexts/governance/stores'
 import { selectedAccountIndex } from '@core/account/stores'
diff --git a/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts b/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
index 36ffafbbbad..b71f2df7512 100644
--- a/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
+++ b/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
@@ -1,15 +1,12 @@
 import { PARTICIPATE_TAG_HEX } from '../constants'
-import { CommonOutput, Output, TagFeature } from '@iota/wallet'
-import { FeatureType, OutputType } from '@iota/wallet/out/types'
+import { CommonOutput, Output, TagFeature } from '@iota/wallet/out/types'
 
 export function isParticipationOutput(output: Output): boolean {
-    if (output.getType() === OutputType.Treasury) {
+    if (output.type === 2) {
         return false
     }
 
     const commonOutput = output as CommonOutput
-    const outputFeature = <TagFeature>(
-        commonOutput?.getFeatures()?.find((feature) => feature.getType() === FeatureType.Tag)
-    )
-    return outputFeature?.getTag() === PARTICIPATE_TAG_HEX
+    const outputFeature = commonOutput?.features?.find((feature) => feature.type === 3) as TagFeature
+    return outputFeature?.tag === PARTICIPATE_TAG_HEX
 }
diff --git a/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts b/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts
index 7a416ba3347..705cd93343f 100644
--- a/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts
+++ b/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import type { TrackedParticipationOverview } from '@iota/wallet'
+import type { TrackedParticipationOverview } from '@iota/wallet/out/types'
 import { selectedAccountIndex } from '@core/account'
 import { getParticipationsForProposal } from './getParticipationsForProposal'
 
diff --git a/packages/shared/lib/contexts/governance/utils/tests/getPercentagesFromAnswerStatuses.test.ts b/packages/shared/lib/contexts/governance/utils/tests/getPercentagesFromAnswerStatuses.test.ts
index d9c7e221fa3..18efe38d338 100644
--- a/packages/shared/lib/contexts/governance/utils/tests/getPercentagesFromAnswerStatuses.test.ts
+++ b/packages/shared/lib/contexts/governance/utils/tests/getPercentagesFromAnswerStatuses.test.ts
@@ -1,5 +1,5 @@
 import '@mocks/i18n.mock'
-import type { AnswerStatus } from '@iota/wallet'
+import type { AnswerStatus } from '@iota/wallet/out/types'
 
 import { getPercentagesFromAnswerStatuses } from '../getPercentagesFromAnswerStatuses'
 
diff --git a/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts b/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
index 4b42cd9a3b2..77c6dfc3f9d 100644
--- a/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 
-import { Event, TransactionInclusionWalletEvent } from '@iota/wallet'
+import { Event, TransactionInclusionWalletEvent } from '@iota/wallet/out/types'
 import { WalletEventType } from '@iota/wallet/out/types'
 
 import { localize } from '@core/i18n'
diff --git a/packages/shared/lib/contexts/onboarding/constants/shimmer-claiming-account-sync-options.constant.ts b/packages/shared/lib/contexts/onboarding/constants/shimmer-claiming-account-sync-options.constant.ts
index 8785e6779cc..b870dc590c2 100644
--- a/packages/shared/lib/contexts/onboarding/constants/shimmer-claiming-account-sync-options.constant.ts
+++ b/packages/shared/lib/contexts/onboarding/constants/shimmer-claiming-account-sync-options.constant.ts
@@ -1,4 +1,4 @@
-import type { SyncOptions } from '@iota/wallet'
+import type { SyncOptions } from '@iota/wallet/out/types'
 
 export const SHIMMER_CLAIMING_ACCOUNT_SYNC_OPTIONS: SyncOptions = {
     alias: {
diff --git a/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts b/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts
index 0076bb6f91d..77e1163b0f4 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 
-import { Transaction } from '@iota/wallet'
+import { Transaction } from '@iota/wallet/out/types'
 
 import { IAccount, sumTotalFromOutputs, syncAccountsInParallel, syncAccountsInSeries } from '@core/account'
 import { filterShimmerClaimingOutputs } from '@core/utils'
diff --git a/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts b/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
index 0797d4fbfd4..0f7a1a94540 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
@@ -1,6 +1,6 @@
 import { get, Writable } from 'svelte/store'
 
-import { IClientOptions } from '@iota/wallet'
+import { IClientOptions } from '@iota/wallet/out/types'
 
 import { ClientError, CLIENT_ERROR_REGEXES } from '@core/error'
 import { IProfileManager } from '@core/profile-manager'
diff --git a/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts b/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts
index 7763a8097d2..edd0319968a 100644
--- a/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts
+++ b/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts
@@ -1,4 +1,4 @@
-import { Transaction } from '@iota/wallet'
+import { Transaction } from '@iota/wallet/out/types'
 
 import { IAccount } from '@core/account'
 
diff --git a/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts b/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
index d678554d142..84c3f8b6296 100644
--- a/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
+++ b/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
@@ -1,7 +1,7 @@
 import { tryNumberOrZero } from '@core/utils'
 
 import { IShimmerClaimingAccount } from '../interfaces'
-import { Output, RegularTransactionEssence } from '@iota/wallet'
+import { Output, RegularTransactionEssence } from '@iota/wallet/out/types'
 
 export function sumTotalClaimedRewards(shimmerClaimingAccounts: IShimmerClaimingAccount[]): number {
     return shimmerClaimingAccounts?.reduce(
diff --git a/packages/shared/lib/core/account/actions/buildAccountState.ts b/packages/shared/lib/core/account/actions/buildAccountState.ts
index 1d9ad0bb97e..d0606222d58 100644
--- a/packages/shared/lib/core/account/actions/buildAccountState.ts
+++ b/packages/shared/lib/core/account/actions/buildAccountState.ts
@@ -1,4 +1,4 @@
-import { Balance } from '@iota/wallet'
+import { Balance } from '@iota/wallet/out/types'
 
 import { getDepositAddress } from '@core/account/utils'
 
diff --git a/packages/shared/lib/core/account/api/getBalance.ts b/packages/shared/lib/core/account/api/getBalance.ts
index 00992a78ae2..8b395bce1f7 100644
--- a/packages/shared/lib/core/account/api/getBalance.ts
+++ b/packages/shared/lib/core/account/api/getBalance.ts
@@ -1,4 +1,4 @@
-import { Balance } from '@iota/wallet'
+import { Balance } from '@iota/wallet/out/types'
 import { getAccount } from '@core/profile-manager'
 
 export async function getBalance(index?: number): Promise<Balance> {
diff --git a/packages/shared/lib/core/account/api/getParticipationOverview.ts b/packages/shared/lib/core/account/api/getParticipationOverview.ts
index 7d086e0154b..8ab07e3b4c7 100644
--- a/packages/shared/lib/core/account/api/getParticipationOverview.ts
+++ b/packages/shared/lib/core/account/api/getParticipationOverview.ts
@@ -1,4 +1,4 @@
-import type { ParticipationOverview } from '@iota/wallet'
+import type { ParticipationOverview } from '@iota/wallet/out/types'
 
 import { getAccount } from '@core/profile-manager/api'
 
diff --git a/packages/shared/lib/core/account/api/prepareOutput.ts b/packages/shared/lib/core/account/api/prepareOutput.ts
index fe2b4198bae..518a7f73430 100644
--- a/packages/shared/lib/core/account/api/prepareOutput.ts
+++ b/packages/shared/lib/core/account/api/prepareOutput.ts
@@ -1,5 +1,5 @@
 import { getAccount } from '@core/profile-manager'
-import { Output, OutputParams, TransactionOptions } from '@iota/wallet'
+import { Output, OutputParams, TransactionOptions } from '@iota/wallet/out/types'
 
 export async function prepareOutput(
     accountIndex: number,
diff --git a/packages/shared/lib/core/account/constants/default-sync-options.constant.ts b/packages/shared/lib/core/account/constants/default-sync-options.constant.ts
index dd7a6e7abe4..cb3b7dc33a6 100644
--- a/packages/shared/lib/core/account/constants/default-sync-options.constant.ts
+++ b/packages/shared/lib/core/account/constants/default-sync-options.constant.ts
@@ -1,4 +1,4 @@
-import type { SyncOptions } from '@iota/wallet'
+import type { SyncOptions } from '@iota/wallet/out/types'
 
 export const DEFAULT_SYNC_OPTIONS: SyncOptions = {
     account: {
diff --git a/packages/shared/lib/core/account/interfaces/account-balances.interface.ts b/packages/shared/lib/core/account/interfaces/account-balances.interface.ts
index dd8c8b530ca..e04ae1caa74 100644
--- a/packages/shared/lib/core/account/interfaces/account-balances.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account-balances.interface.ts
@@ -1,4 +1,4 @@
-import { RequiredStorageDeposit } from '@iota/wallet'
+import { RequiredStorageDeposit } from '@iota/wallet/out/types'
 
 export interface IAccountBalances {
     aliases: unknown[]
diff --git a/packages/shared/lib/core/account/interfaces/account-state.interface.ts b/packages/shared/lib/core/account/interfaces/account-state.interface.ts
index 2874660e2b4..909ce19d818 100644
--- a/packages/shared/lib/core/account/interfaces/account-state.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account-state.interface.ts
@@ -1,4 +1,4 @@
-import { Balance } from '@iota/wallet'
+import { Balance } from '@iota/wallet/out/types'
 import { IPersistedAccountData } from './persisted-account-data.interface'
 import { IAccount } from './account.interface'
 
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index aa4addb1f0d..cc45afb0138 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -40,7 +40,7 @@ import type {
     FoundryOutputBuilderParams,
     NftOutputBuilderParams,
     INode,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 
 import { ParticipationEventType } from '@iota/wallet/out/types'
 
diff --git a/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts b/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
index f11719b4651..a927af9a489 100644
--- a/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
@@ -1,4 +1,4 @@
-import { ParticipationEventId } from '@iota/wallet'
+import { ParticipationEventId } from '@iota/wallet/out/types'
 
 export interface IPersistedAccountData {
     name: string
diff --git a/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts b/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts
index f2146e2d6e1..dc8fcf51f4e 100644
--- a/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts
+++ b/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts
@@ -1,4 +1,4 @@
-import { OutputData } from '@iota/wallet'
+import { OutputData } from '@iota/wallet/out/types'
 
 export function sumTotalFromOutputs(outputs: OutputData[]): number {
     return outputs?.reduce((total: number, outputData: OutputData) => (total += Number(outputData?.output?.amount)), 0)
diff --git a/packages/shared/lib/core/account/utils/syncAccountsInParallel.ts b/packages/shared/lib/core/account/utils/syncAccountsInParallel.ts
index 2b76034d480..f0b96dfe5b7 100644
--- a/packages/shared/lib/core/account/utils/syncAccountsInParallel.ts
+++ b/packages/shared/lib/core/account/utils/syncAccountsInParallel.ts
@@ -1,4 +1,4 @@
-import { Balance, SyncOptions } from '@iota/wallet'
+import { Balance, SyncOptions } from '@iota/wallet/out/types'
 
 import { IAccount } from '../interfaces'
 
diff --git a/packages/shared/lib/core/account/utils/syncAccountsInSeries.ts b/packages/shared/lib/core/account/utils/syncAccountsInSeries.ts
index 9a3ae80bed4..00db6912a1f 100644
--- a/packages/shared/lib/core/account/utils/syncAccountsInSeries.ts
+++ b/packages/shared/lib/core/account/utils/syncAccountsInSeries.ts
@@ -1,4 +1,4 @@
-import { Balance, SyncOptions } from '@iota/wallet'
+import { Balance, SyncOptions } from '@iota/wallet/out/types'
 
 import { IAccount } from '@core/account'
 
diff --git a/packages/shared/lib/core/ledger/stores/ledger-nano-status.store.ts b/packages/shared/lib/core/ledger/stores/ledger-nano-status.store.ts
index f4dcdf47b5b..f03749dd7c8 100644
--- a/packages/shared/lib/core/ledger/stores/ledger-nano-status.store.ts
+++ b/packages/shared/lib/core/ledger/stores/ledger-nano-status.store.ts
@@ -1,4 +1,4 @@
-import { LedgerNanoStatus } from '@iota/wallet'
+import { LedgerNanoStatus } from '@iota/wallet/out/types'
 import { writable } from 'svelte/store'
 
 const DEFAULT_LEDGER_STATUS: LedgerNanoStatus = {
diff --git a/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts b/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts
index 2df3293c557..6ca6d637506 100644
--- a/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts
+++ b/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts
@@ -1,4 +1,4 @@
-import { Output } from '@iota/wallet'
+import { Output } from '@iota/wallet/out/types'
 import { writable } from 'svelte/store'
 
 export const ledgerPreparedOutput = writable<Output>(null)
diff --git a/packages/shared/lib/core/ledger/utils/determineLedgerConnectionState.ts b/packages/shared/lib/core/ledger/utils/determineLedgerConnectionState.ts
index 59e6dcdc4e3..dbf2118f881 100644
--- a/packages/shared/lib/core/ledger/utils/determineLedgerConnectionState.ts
+++ b/packages/shared/lib/core/ledger/utils/determineLedgerConnectionState.ts
@@ -1,6 +1,6 @@
 import { LedgerConnectionState } from '../interfaces'
 import { LedgerAppName } from '../enums'
-import { LedgerNanoStatus } from '@iota/wallet'
+import { LedgerNanoStatus } from '@iota/wallet/out/types'
 
 export function determineLedgerConnectionState(
     status: LedgerNanoStatus,
diff --git a/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts b/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts
index 367987054d7..399d20c78f7 100644
--- a/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts
+++ b/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts
@@ -1,7 +1,7 @@
 import { MILLISECONDS_PER_SECOND, SECONDS_PER_MINUTE } from '@core/utils'
 import { NetworkHealth } from '../enums'
 import { INetworkStatus } from '../interfaces'
-import { INodeInfo } from '@iota/wallet'
+import { INodeInfo } from '@iota/wallet/out/types'
 
 /**
  * Update the network status store from the NodeInfo.
diff --git a/packages/shared/lib/core/network/interfaces/client-options.interface.ts b/packages/shared/lib/core/network/interfaces/client-options.interface.ts
index 0635b14cc94..3ee39e25874 100644
--- a/packages/shared/lib/core/network/interfaces/client-options.interface.ts
+++ b/packages/shared/lib/core/network/interfaces/client-options.interface.ts
@@ -1,4 +1,4 @@
-import { IClientOptions } from '@iota/wallet'
+import { IClientOptions } from '@iota/wallet/out/types'
 
 import { INode } from './node.interface'
 
diff --git a/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts b/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts
index 69283d00f11..03c5682ad8c 100644
--- a/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts
+++ b/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts
@@ -1,4 +1,4 @@
-import { INodeInfo } from '@iota/wallet'
+import { INodeInfo } from '@iota/wallet/out/types'
 
 export interface INodeInfoResponse {
     nodeInfo: INodeInfo
diff --git a/packages/shared/lib/core/network/stores/node-info.store.ts b/packages/shared/lib/core/network/stores/node-info.store.ts
index e4793885711..b47a3b008e2 100644
--- a/packages/shared/lib/core/network/stores/node-info.store.ts
+++ b/packages/shared/lib/core/network/stores/node-info.store.ts
@@ -1,4 +1,4 @@
-import { INodeInfo } from '@iota/wallet'
+import { INodeInfo } from '@iota/wallet/out/types'
 import { writable } from 'svelte/store'
 
 export const nodeInfo = writable<INodeInfo | undefined>(undefined)
diff --git a/packages/shared/lib/core/nfts/interfaces/nft.interface.ts b/packages/shared/lib/core/nfts/interfaces/nft.interface.ts
index b3378724937..00986ff1532 100644
--- a/packages/shared/lib/core/nfts/interfaces/nft.interface.ts
+++ b/packages/shared/lib/core/nfts/interfaces/nft.interface.ts
@@ -1,4 +1,4 @@
-import { Address } from '@iota/wallet'
+import { Address } from '@iota/wallet/out/types'
 import { NftDownloadMetadata, IIrc27Metadata } from '../interfaces'
 
 export interface INft {
diff --git a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
index 1c361c7f292..3bc7a28f920 100644
--- a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
+++ b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
@@ -11,7 +11,7 @@ import {
     NftOutput,
     TimelockUnlockCondition,
     UnlockCondition,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 
 const accountAddress = 'rms1qr47ee0fhahukrzec088v9lngv7w5k2sn3jjtwvkcpjfgxhhsazlsurxrx9'
 
diff --git a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
index a44b1f86680..d0d23b66504 100644
--- a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
@@ -13,7 +13,7 @@ import { parseNftMetadata } from './parseNftMetadata'
 import { composeUrlFromNftUri } from './composeUrlFromNftUri'
 import { getSpendableStatusFromUnspentNftOutput } from './getSpendableStatusFromUnspentNftOutput'
 import { ADDRESS_TYPE_NFT } from '@core/wallet/constants'
-import { NftOutput } from '@iota/wallet'
+import { NftOutput } from '@iota/wallet/out/types'
 
 export function buildNftFromNftOutput(
     wrappedOutput: IWrappedOutput,
diff --git a/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts b/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
index 345f48d1355..ece0e89a680 100644
--- a/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
@@ -1,7 +1,7 @@
 import { UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN } from '@core/wallet/constants'
 import { getExpirationUnixTimeFromOutput, getRecipientAddressFromOutput, isOutputAsync } from '@core/wallet/utils'
 import { getTimelockDateFromOutput } from '@core/wallet/utils/generateActivity/helper'
-import { NftOutput } from '@iota/wallet'
+import { NftOutput } from '@iota/wallet/out/types'
 
 export function getSpendableStatusFromUnspentNftOutput(
     accountAddress: string,
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
index 1d16384ace7..d005603a5c3 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
@@ -1,4 +1,4 @@
-import { Event, NewOutputWalletEvent } from '@iota/wallet'
+import { Event, NewOutputWalletEvent } from '@iota/wallet/out/types'
 import { WalletEventType } from '@iota/wallet/out/types'
 
 import { syncBalance } from '@core/account/actions/syncBalance'
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
index 037821d031c..07f76efbff1 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
@@ -1,4 +1,4 @@
-import { Event, SpentOutputWalletEvent } from '@iota/wallet'
+import { Event, SpentOutputWalletEvent } from '@iota/wallet/out/types'
 import { WalletEventType } from '@iota/wallet/out/types'
 
 import { syncBalance } from '@core/account/actions/syncBalance'
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
index a2392597fba..31b20243daa 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
@@ -1,5 +1,5 @@
 import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-import { Event, TransactionInclusionWalletEvent } from '@iota/wallet'
+import { Event, TransactionInclusionWalletEvent } from '@iota/wallet/out/types'
 import { WalletEventType } from '@iota/wallet/out/types'
 
 import { updateParticipationOverview } from '@contexts/governance/stores'
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
index 266afd38294..d1c937b53ae 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import { Event, TransactionProgressWalletEvent, PreparedTransactionEssenceHashProgress } from '@iota/wallet'
+import { Event, TransactionProgressWalletEvent, PreparedTransactionEssenceHashProgress } from '@iota/wallet/out/types'
 import { WalletEventType, TransactionProgressType } from '@iota/wallet/out/types'
 
 import { selectedAccountIndex } from '@core/account'
diff --git a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
index 3adc90a7dcb..844f82326f9 100644
--- a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
+++ b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
@@ -1,4 +1,4 @@
-import { IClientOptions, SecretManager } from '@iota/wallet'
+import { IClientOptions, SecretManager } from '@iota/wallet/out/types'
 import { CoinType } from '@iota/wallet/out/types'
 
 import { generateRandomId } from '@core/utils'
diff --git a/packages/shared/lib/core/profile-manager/api/createAccount.ts b/packages/shared/lib/core/profile-manager/api/createAccount.ts
index 0b6bdd64d7d..24c33377484 100644
--- a/packages/shared/lib/core/profile-manager/api/createAccount.ts
+++ b/packages/shared/lib/core/profile-manager/api/createAccount.ts
@@ -1,6 +1,6 @@
 import { get, Writable } from 'svelte/store'
 
-import { CreateAccountPayload } from '@iota/wallet'
+import { CreateAccountPayload } from '@iota/wallet/out/types'
 
 import { IAccount } from '@core/account'
 
diff --git a/packages/shared/lib/core/profile-manager/api/getLedgerNanoStatus.ts b/packages/shared/lib/core/profile-manager/api/getLedgerNanoStatus.ts
index 659e9b963ac..55b4d219046 100644
--- a/packages/shared/lib/core/profile-manager/api/getLedgerNanoStatus.ts
+++ b/packages/shared/lib/core/profile-manager/api/getLedgerNanoStatus.ts
@@ -1,4 +1,4 @@
-import { LedgerNanoStatus } from '@iota/wallet'
+import { LedgerNanoStatus } from '@iota/wallet/out/types'
 import { get } from 'svelte/store'
 import { profileManager as _profileManager } from '@core/profile-manager/stores'
 
diff --git a/packages/shared/lib/core/profile-manager/api/startBackgroundSync.ts b/packages/shared/lib/core/profile-manager/api/startBackgroundSync.ts
index 5584a3dde21..6393afeb78f 100644
--- a/packages/shared/lib/core/profile-manager/api/startBackgroundSync.ts
+++ b/packages/shared/lib/core/profile-manager/api/startBackgroundSync.ts
@@ -1,4 +1,4 @@
-import { SyncOptions } from '@iota/wallet'
+import { SyncOptions } from '@iota/wallet/out/types'
 import { get } from 'svelte/store'
 import { profileManager } from '../stores'
 
diff --git a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
index 18cd3915c64..f173d267bc2 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
@@ -1,4 +1,4 @@
-import { WalletOptions, CreateAccountPayload } from '@iota/wallet'
+import { WalletOptions, CreateAccountPayload } from '@iota/wallet/out/types'
 
 import { IAccount } from '@core/account'
 
diff --git a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
index 18e63a9cfae..0aff6017978 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
@@ -5,7 +5,7 @@ import type {
     INodeInfoWrapper,
     SyncOptions,
     WalletEvent,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 import { WalletEventType } from '@iota/wallet/out/types'
 
 import { IAccount } from '@core/account/interfaces'
diff --git a/packages/shared/lib/core/profile-manager/interfaces/recover-account-payload.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/recover-account-payload.interface.ts
index 49cf8fb2890..8aa19f26514 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/recover-account-payload.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/recover-account-payload.interface.ts
@@ -1,4 +1,4 @@
-import type { SyncOptions } from '@iota/wallet'
+import type { SyncOptions } from '@iota/wallet/out/types'
 
 export interface RecoverAccountsPayload {
     accountStartIndex: number
diff --git a/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-payload-wrapper.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-payload-wrapper.interface.ts
index bfbd9dea226..994485f18fd 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-payload-wrapper.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-payload-wrapper.interface.ts
@@ -5,7 +5,7 @@ import {
     SpentOutputWalletEvent,
     TransactionInclusionWalletEvent,
     TransactionProgressWalletEvent,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 
 export interface IWalletApiEventPayloadWrapper {
     accountIndex: number
diff --git a/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts b/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
index 73ff0b5818d..4a93b3750ae 100644
--- a/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
+++ b/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
@@ -1,5 +1,5 @@
 import { ClientOptions } from '@core/network/interfaces'
-import { WalletOptions } from '@iota/wallet'
+import { WalletOptions } from '@iota/wallet/out/types'
 
 export type ProfileManagerOptions = Omit<WalletOptions, 'clientOptions'> & {
     clientOptions: ClientOptions
diff --git a/packages/shared/lib/core/profile-manager/types/transaction-progress-event.type.ts b/packages/shared/lib/core/profile-manager/types/transaction-progress-event.type.ts
index d3f5503f054..45562272cc6 100644
--- a/packages/shared/lib/core/profile-manager/types/transaction-progress-event.type.ts
+++ b/packages/shared/lib/core/profile-manager/types/transaction-progress-event.type.ts
@@ -6,7 +6,7 @@ import {
     SigningTransactionProgress,
     PerformingPowProgress,
     BroadcastingProgress,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 
 export type TransactionProgressEventPayload =
     | SelectingInputsProgress
diff --git a/packages/shared/lib/core/profile-manager/types/wallet-api-event-handler.type.ts b/packages/shared/lib/core/profile-manager/types/wallet-api-event-handler.type.ts
index eae458b9b59..4e88cc6fbec 100644
--- a/packages/shared/lib/core/profile-manager/types/wallet-api-event-handler.type.ts
+++ b/packages/shared/lib/core/profile-manager/types/wallet-api-event-handler.type.ts
@@ -1,3 +1,3 @@
-import { Event } from '@iota/wallet'
+import { Event } from '@iota/wallet/out/types'
 
 export type WalletApiEventHandler = (error: Error, rawEvent: Event) => void | Promise<void>
diff --git a/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts b/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts
index a248af972f6..62d0303dbf9 100644
--- a/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts
+++ b/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts
@@ -1,4 +1,4 @@
-import { SecretManagerType } from '@iota/wallet'
+import { SecretManagerType } from '@iota/wallet/out/types'
 
 import { USE_LEDGER_SIMULATOR } from '@core/ledger'
 import { ProfileType } from '@core/profile'
diff --git a/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts b/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts
index f8def73141a..9d120269177 100644
--- a/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts
+++ b/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts
@@ -1,6 +1,6 @@
 import { localize } from '@core/i18n'
 
-import { Event } from '@iota/wallet'
+import { Event } from '@iota/wallet/out/types'
 import { WalletEventType } from '@iota/wallet/out/types'
 
 import { WalletApiEventError, WalletApiEventValidationError } from '../errors'
diff --git a/packages/shared/lib/core/utils/filter.ts b/packages/shared/lib/core/utils/filter.ts
index c525c98b747..51b58ba9677 100644
--- a/packages/shared/lib/core/utils/filter.ts
+++ b/packages/shared/lib/core/utils/filter.ts
@@ -1,4 +1,4 @@
-import type { BasicOutput, OutputData } from '@iota/wallet'
+import type { BasicOutput, OutputData } from '@iota/wallet/out/types'
 import { OutputType } from '@iota/wallet/out/types'
 
 export function filterBasicOutput(outputData: OutputData): boolean {
diff --git a/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts b/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
index 787443a7b9c..7b0e088d35b 100644
--- a/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
@@ -1,4 +1,4 @@
-import type { OutputData, OutputResponse, Transaction } from '@iota/wallet'
+import type { OutputData, OutputResponse, Transaction } from '@iota/wallet/out/types'
 
 import { IAccountState } from '@core/account/interfaces'
 
diff --git a/packages/shared/lib/core/wallet/actions/createNativeToken.ts b/packages/shared/lib/core/wallet/actions/createNativeToken.ts
index d2bee3af1ad..ac26b5b8231 100644
--- a/packages/shared/lib/core/wallet/actions/createNativeToken.ts
+++ b/packages/shared/lib/core/wallet/actions/createNativeToken.ts
@@ -3,7 +3,7 @@ import { showAppNotification } from '@auxiliary/notification'
 import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { localize } from '@core/i18n'
 import { Converter } from '@core/utils'
-import { CreateNativeTokenParams } from '@iota/wallet'
+import { CreateNativeTokenParams } from '@iota/wallet/out/types'
 import { DEFAULT_TRANSACTION_OPTIONS } from '../constants'
 import { VerifiedStatus } from '../enums'
 import { buildPersistedAssetFromMetadata } from '../helpers'
diff --git a/packages/shared/lib/core/wallet/actions/mintNft.ts b/packages/shared/lib/core/wallet/actions/mintNft.ts
index e2fae347f29..450ad61ce49 100644
--- a/packages/shared/lib/core/wallet/actions/mintNft.ts
+++ b/packages/shared/lib/core/wallet/actions/mintNft.ts
@@ -3,7 +3,7 @@ import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { localize } from '@core/i18n'
 import { addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput, IIrc27Metadata } from '@core/nfts'
 import { Converter } from '@core/utils'
-import { MintNftParams } from '@iota/wallet'
+import { MintNftParams } from '@iota/wallet/out/types'
 import { get } from 'svelte/store'
 import { DEFAULT_TRANSACTION_OPTIONS, OUTPUT_TYPE_NFT } from '../constants'
 import { ActivityAction } from '../enums'
diff --git a/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts b/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
index c02b6d2a07c..fc51400bce8 100644
--- a/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
+++ b/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
@@ -1,5 +1,5 @@
 import { IAccountState } from '@core/account'
-import { BasicOutput, OutputData } from '@iota/wallet'
+import { BasicOutput, OutputData } from '@iota/wallet/out/types'
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
 import { get } from 'svelte/store'
 import { ActivityAsyncStatus, ActivityDirection } from '../enums'
diff --git a/packages/shared/lib/core/wallet/constants/default-transaction-options.constant.ts b/packages/shared/lib/core/wallet/constants/default-transaction-options.constant.ts
index 24b06bc5a70..093a1975cf7 100644
--- a/packages/shared/lib/core/wallet/constants/default-transaction-options.constant.ts
+++ b/packages/shared/lib/core/wallet/constants/default-transaction-options.constant.ts
@@ -1,4 +1,4 @@
-import { TransactionOptions } from '@iota/wallet'
+import { TransactionOptions } from '@iota/wallet/out/types'
 
 export const DEFAULT_TRANSACTION_OPTIONS: TransactionOptions = {
     remainderValueStrategy: { strategy: 'ReuseAddress', value: null },
diff --git a/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts b/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts
index 0a3ca920663..23df1fa85d8 100644
--- a/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts
@@ -1,6 +1,6 @@
 import { ActivityDirection, InclusionState } from '@core/wallet/enums'
 import { IWrappedOutput } from './wrapped-output.interface'
-import { UTXOInput } from '@iota/wallet'
+import { UTXOInput } from '@iota/wallet/out/types'
 
 export interface IProcessedTransaction {
     outputs: IWrappedOutput[]
diff --git a/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts b/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts
index cf856286ddc..ef5a1202246 100644
--- a/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts
@@ -1,4 +1,4 @@
-import { Output, OutputData } from '@iota/wallet'
+import { Output, OutputData } from '@iota/wallet/out/types'
 
 export interface IWrappedOutput extends Omit<Partial<OutputData>, 'output'> {
     outputId: string
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
index 52448c6062d..4606f328144 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
@@ -2,7 +2,7 @@ import { IAccountState } from '@core/account'
 import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction, OUTPUT_TYPE_ALIAS } from '@core/wallet'
 import { Activity, type AliasActivity } from '@core/wallet/types'
 import { generateSingleAliasActivity } from './generateSingleAliasActivity'
-import { AliasOutput } from '@iota/wallet'
+import { AliasOutput } from '@iota/wallet/out/types'
 
 export async function generateActivitiesFromAliasOutputs(
     processedTransaction: IProcessedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
index a58d3984c98..978ab83f00b 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
@@ -12,7 +12,7 @@ import { Activity } from '@core/wallet/types'
 import { generateSingleBasicActivity } from './generateSingleBasicActivity'
 import { generateSingleConsolidationActivity } from './generateSingleConsolidationActivity'
 import { generateSingleNftActivity } from './generateSingleNftActivity'
-import { CommonOutput, NftOutput, OutputType } from '@iota/wallet'
+import { CommonOutput, NftOutput, OutputType } from '@iota/wallet/out/types'
 
 export async function generateActivitiesFromBasicOutputs(
     processedTransaction: IProcessedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
index 1dc29452397..fb4d9189b03 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
@@ -2,7 +2,7 @@ import { IAccountState } from '@core/account'
 import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction } from '@core/wallet'
 import { Activity } from '@core/wallet'
 import { generateSingleNftActivity } from './generateSingleNftActivity'
-import { NftOutput, OutputType } from '@iota/wallet'
+import { NftOutput, OutputType } from '@iota/wallet/out/types'
 
 export async function generateActivitiesFromNftOutputs(
     processedTransaction: IProcessedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
index f3cef75ddd9..848b0521c26 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
@@ -14,7 +14,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { AliasOutput } from '@iota/wallet'
+import { AliasOutput } from '@iota/wallet/out/types'
 
 export async function generateSingleAliasActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
index 32ed0b6c1bf..e77dc1773a3 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
@@ -15,7 +15,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { BasicOutput } from '@iota/wallet'
+import { BasicOutput } from '@iota/wallet/out/types'
 
 export async function generateSingleBasicActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
index d786d0a05df..c92b88d268a 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
@@ -10,7 +10,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { BasicOutput, OutputType } from '@iota/wallet'
+import { BasicOutput, OutputType } from '@iota/wallet/out/types'
 
 export async function generateSingleConsolidationActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
index c0c8a9f72ef..4108b46aba1 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
@@ -18,7 +18,7 @@ import {
     ImmutableAliasAddressUnlockCondition,
     SimpleTokenScheme,
     UnlockConditionType,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 
 export async function generateSingleFoundryActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
index a2be0c8ac48..3bac9a54280 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
@@ -11,7 +11,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { BasicOutput } from '@iota/wallet'
+import { BasicOutput } from '@iota/wallet/out/types'
 
 export async function generateSingleGovernanceActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
index 70912605d3a..0e5a05d9320 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
@@ -12,7 +12,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { NftOutput } from '@iota/wallet'
+import { NftOutput } from '@iota/wallet/out/types'
 
 export async function generateSingleNftActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts
index ae683332dbd..226e002ce0f 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts
@@ -1,4 +1,4 @@
-import { Output } from '@iota/wallet'
+import { Output } from '@iota/wallet/out/types'
 
 export function getAmountFromOutput(output: Output): number {
     return Number(output?.amount ?? 0)
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
index 8b9d0150c39..858fcad594d 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
@@ -5,7 +5,7 @@ import { getTimelockDateFromOutput } from './getTimelockDateFromOutput'
 import { isOutputAsync } from '../../outputs/isOutputAsync'
 import { getAsyncStatus } from './getAsyncStatus'
 import { getStorageDepositFromOutput } from './getStorageDepositFromOutput'
-import { CommonOutput, Output } from '@iota/wallet'
+import { CommonOutput, Output } from '@iota/wallet/out/types'
 
 export async function getAsyncDataFromOutput(
     output: Output,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts
index c29800a9b2f..96182416461 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts
@@ -4,7 +4,7 @@ import { IParticipation, IWrappedOutput } from '@core/wallet/interfaces'
 import { parseGovernanceMetadata } from '../../parseGovernanceMetadata'
 import { getAmountFromOutput } from './getAmountFromOutput'
 import { getMetadataFromOutput } from './getMetadataFromOutput'
-import { Output } from '@iota/wallet'
+import { Output } from '@iota/wallet/out/types'
 
 interface IGovernanceInfo {
     governanceAction: GovernanceAction
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
index 4a1bd23a3d2..3935b245b3e 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
@@ -6,7 +6,7 @@ import { getSubjectFromAddress } from '../../getSubjectFromAddress'
 import { isSubjectInternal } from '../../isSubjectInternal'
 import { getRecipientFromOutput } from '../../outputs'
 import { getSenderAddressFromInputs, getSenderFromTransaction } from '../../transactions'
-import { Output } from '@iota/wallet'
+import { Output } from '@iota/wallet/out/types'
 
 export function getSendingInformation(
     processedTransaction: IProcessedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
index fd60772502d..c5b7b46e782 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
@@ -5,7 +5,7 @@ import {
     ImmutableAliasAddressUnlockCondition,
     UnlockConditionType,
     Utils,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 
 export function buildFoundryId(foundry: FoundryOutput): string {
     const unlockCondition = foundry.getUnlockConditions()[0]
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
index 21742e6beee..2763d5567b3 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
@@ -1,4 +1,4 @@
-import { Address, FeatureType, IssuerFeature, NftOutput } from '@iota/wallet'
+import { Address, FeatureType, IssuerFeature, NftOutput } from '@iota/wallet/out/types'
 
 export function getIssuerFromNftOutput(output: NftOutput): Address {
     const metadata = output
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
index 4ff7a175380..e43f31df6c5 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
@@ -1,4 +1,4 @@
-import { FeatureType, MetadataFeature, NftOutput } from '@iota/wallet'
+import { FeatureType, MetadataFeature, NftOutput } from '@iota/wallet/out/types'
 
 export function getMetadataFromNftOutput(output: NftOutput): string {
     const metadata = output
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
index 25acbadd63c..88e08f26e50 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
@@ -1,5 +1,5 @@
 import { buildFoundryId } from './getFoundryId'
-import type { CommonOutput, FoundryOutput, INativeToken, SimpleTokenScheme } from '@iota/wallet'
+import type { CommonOutput, FoundryOutput, INativeToken, SimpleTokenScheme } from '@iota/wallet/out/types'
 import { OutputType } from '@iota/wallet/out/types'
 
 export function getNativeTokenFromOutput(output: CommonOutput): INativeToken | undefined {
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
index a1f79facfaa..936443027fa 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
 import { selectedAccount } from '@core/account/stores'
 import { convertBech32ToHexAddress } from '@core/wallet/utils/convertBech32ToHexAddress'
-import { AliasOutput } from '@iota/wallet'
+import { AliasOutput } from '@iota/wallet/out/types'
 
 export async function getSerialNumberFromAliasOutput(aliasAddress: string): Promise<number> {
     const account = get(selectedAccount)
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
index 666df326bf2..607d2da5a37 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
@@ -1,4 +1,4 @@
-import { OutputData, OutputResponse, OutputType, UTXOInput } from '@iota/wallet'
+import { OutputData, OutputResponse, OutputType, UTXOInput } from '@iota/wallet/out/types'
 import { MILLISECONDS_PER_SECOND } from '@core/utils/constants'
 import { IAccountState } from '@core/account/interfaces'
 import { InclusionState, ActivityDirection } from '../../enums'
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
index 18c24f340dd..1a613d474b1 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
@@ -1,5 +1,5 @@
 import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
-import { Output, RegularTransactionEssence, Transaction, UTXOInput, Utils } from '@iota/wallet'
+import { Output, RegularTransactionEssence, Transaction, UTXOInput, Utils } from '@iota/wallet/out/types'
 import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
 import { getDirectionFromTransaction } from '../transactions'
 import { IAccountState } from '@core/account'
diff --git a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
index 2c3a645c285..f570c3ac433 100644
--- a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
+++ b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
@@ -3,7 +3,7 @@ import { InsufficientFundsForStorageDepositError, InvalidExpirationDateTimeError
 import { convertUnixTimestampToDate, isValidExpirationDateTime } from '@core/utils'
 import { getStorageDepositFromOutput } from '../generateActivity/helper'
 import { IAccountState } from '@core/account/interfaces'
-import { CommonOutput, ExpirationUnlockCondition, OutputType, UnlockConditionType } from '@iota/wallet'
+import { CommonOutput, ExpirationUnlockCondition, OutputType, UnlockConditionType } from '@iota/wallet/out/types'
 
 export async function validateSendConfirmation(account: IAccountState, output: CommonOutput): Promise<void> {
     const parseNumber: (value: string) => number = (value: string) => parseInt(value, 10) ?? 0
diff --git a/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
index 394014f256e..9549640acaf 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
@@ -3,7 +3,7 @@ import { ActivityType } from '@core/wallet/enums'
 import { getNativeTokenFromOutput, isOutputAsync } from '..'
 import { IWrappedOutput } from '../../interfaces'
 import { getActivityTypeFromOutput, getAmountFromOutput, getStorageDepositFromOutput } from '../generateActivity/helper'
-import { BasicOutput } from '@iota/wallet'
+import { BasicOutput } from '@iota/wallet/out/types'
 
 export async function activityOutputContainsValue(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
index 403763ace7b..ba200ef32af 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
@@ -7,7 +7,7 @@ import {
     CommonOutput,
     ExpirationUnlockCondition,
     UnlockConditionType,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 
 export function getSenderAddressFromInputs(inputs: IWrappedOutput[]): string | undefined {
     for (const input of inputs) {
diff --git a/packages/shared/lib/tests/__mocks__/account-balance.mock.ts b/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
index 8410917cb17..d0722cdcccd 100644
--- a/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
@@ -1,4 +1,4 @@
-import { Balance } from '@iota/wallet'
+import { Balance } from '@iota/wallet/out/types'
 
 export const MOCK_ACCOUNT_BALANCE: Balance = {
     baseCoin: {
diff --git a/packages/shared/lib/tests/__mocks__/api.mock.ts b/packages/shared/lib/tests/__mocks__/api.mock.ts
index 7c17f8d9842..81182655787 100644
--- a/packages/shared/lib/tests/__mocks__/api.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/api.mock.ts
@@ -1,7 +1,7 @@
 import { AccountMock } from './account.mock'
 import { ProfileManagerMock } from './profile-manager.mock'
 
-import { WalletOptions, CreateAccountPayload } from '@iota/wallet'
+import { WalletOptions, CreateAccountPayload } from '@iota/wallet/out/types'
 
 import { IApi, RecoverAccountsPayload } from '@core/profile-manager'
 import { IAccount } from '@core/account'
diff --git a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts b/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
index 237fb91a124..232a6a280ca 100644
--- a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
@@ -9,7 +9,7 @@ import type {
     LedgerNanoStatus,
     GenerateAddressOptions,
     INode,
-} from '@iota/wallet'
+} from '@iota/wallet/out/types'
 import { WalletEventType } from '@iota/wallet/out/types'
 
 import { IAccount } from '@core/account'

From 63e7b37a2414fcc9b610ec771940abb8fc807889 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Tue, 1 Aug 2023 12:48:53 +0200
Subject: [PATCH 15/48] chore: Add import for 'reflect-metadata' to top of the
 app (needed for runtime with sdk)

---
 packages/desktop/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/desktop/index.js b/packages/desktop/index.js
index c46f8d29009..7471c3dec68 100644
--- a/packages/desktop/index.js
+++ b/packages/desktop/index.js
@@ -1,3 +1,4 @@
+import 'reflect-metadata'
 import App from './App.svelte'
 import { Electron } from './lib/electron'
 import { shouldReportError } from './electron/lib/errorHandling'

From f11ef8435dcce56065d87d173e7f6dd86ed58924 Mon Sep 17 00:00:00 2001
From: marc2332 <mespinsanz@gmail.com>
Date: Tue, 1 Aug 2023 12:57:29 +0200
Subject: [PATCH 16/48] chore: Rename AccountManager to Wallet

---
 packages/desktop/electron/preload.js                      | 8 ++++----
 .../core/profile-manager/actions/destroyProfileManager.ts | 2 +-
 .../profile-manager/actions/initialiseProfileManager.ts   | 2 +-
 .../lib/core/profile-manager/interfaces/api.interface.ts  | 5 ++---
 packages/shared/lib/tests/__mocks__/api.mock.ts           | 4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index ee49d74a220..d89b12b3bea 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -97,11 +97,11 @@ try {
     // This workaround exposes the classes through factory methods
     // The factory method also copies all the prototype methods to the object so that it gets passed through the bridge
     contextBridge.exposeInMainWorld('__WALLET__API__', {
-        createAccountManager(id, options) {
-            const manager = new WalletApi.AccountManager(options)
+        createWallet(id, options) {
+            const manager = new WalletApi.Wallet(options)
             manager.id = id
             profileManagers[id] = manager
-            bindMethodsAcrossContextBridge(WalletApi.AccountManager.prototype, manager)
+            bindMethodsAcrossContextBridge(WalletApi.Wallet.prototype, manager)
             return manager
         },
         async createAccount(managerId, payload) {
@@ -110,7 +110,7 @@ try {
             bindMethodsAcrossContextBridge(WalletApi.Account.prototype, account)
             return account
         },
-        deleteAccountManager(id) {
+        deleteWallet(id) {
             if (id && id in profileManagers) {
                 delete profileManagers[id]
             }
diff --git a/packages/shared/lib/core/profile-manager/actions/destroyProfileManager.ts b/packages/shared/lib/core/profile-manager/actions/destroyProfileManager.ts
index 3b5d13c790d..bbd9e108765 100644
--- a/packages/shared/lib/core/profile-manager/actions/destroyProfileManager.ts
+++ b/packages/shared/lib/core/profile-manager/actions/destroyProfileManager.ts
@@ -11,6 +11,6 @@ export async function destroyProfileManager(
     if (!manager) return
 
     _profileManager.set(null)
-    api.deleteAccountManager(manager?.id)
+    api.deleteWallet(manager?.id)
     await manager.destroy()
 }
diff --git a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
index 844f82326f9..59726158c02 100644
--- a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
+++ b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
@@ -15,7 +15,7 @@ export async function initialiseProfileManager(
 ): Promise<IProfileManager> {
     id = id ?? generateRandomId()
 
-    const profileManager = await api.createAccountManager(id, {
+    const profileManager = await api.createWallet(id, {
         storagePath,
         // TODO-sdk is this the right fix for the line ?
         // ...(clientOptions && (clientOptions?.nodes?.length > 0 || clientOptions?.primaryNode) && { clientOptions }),
diff --git a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
index f173d267bc2..f8b36b9f0c1 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
@@ -6,10 +6,9 @@ import { IProfileManager } from './profile-manager.interface'
 import { RecoverAccountsPayload } from './recover-account-payload.interface'
 
 export interface IApi {
-    // TODO-sdk: These should be renamed to createWallet etc... to match naming in sdk
-    createAccountManager(id: string, options: WalletOptions): Promise<IProfileManager>
+    createWallet(id: string, options: WalletOptions): Promise<IProfileManager>
     createAccount(managerId: string, payload: CreateAccountPayload): Promise<IAccount>
-    deleteAccountManager(id: string): void
+    deleteWallet(id: string): void
     getAccount(profileManagerId: string, index: number): Promise<IAccount>
     getAccounts(profileManagerId: string): Promise<IAccount[]>
     recoverAccounts(profileManagerId: string, payload: RecoverAccountsPayload): Promise<IAccount[]>
diff --git a/packages/shared/lib/tests/__mocks__/api.mock.ts b/packages/shared/lib/tests/__mocks__/api.mock.ts
index 81182655787..289410e8dab 100644
--- a/packages/shared/lib/tests/__mocks__/api.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/api.mock.ts
@@ -9,7 +9,7 @@ import { IAccount } from '@core/account'
 const profileManagers = {}
 
 const api: IApi = {
-    async createAccountManager(id: string, _: WalletOptions): Promise<ProfileManagerMock> {
+    async createWallet(id: string, _: WalletOptions): Promise<ProfileManagerMock> {
         const manager = new ProfileManagerMock(id)
 
         profileManagers[id] = manager
@@ -21,7 +21,7 @@ const api: IApi = {
             resolve(new AccountMock())
         })
     },
-    deleteAccountManager(id: string) {
+    deleteWallet(id: string) {
         if (id && id in profileManagers) {
             delete profileManagers[id]
         }

From 3222e04f26f370ffbb1c529f3d6b2e0b14914e75 Mon Sep 17 00:00:00 2001
From: marc2332 <mespinsanz@gmail.com>
Date: Tue, 1 Aug 2023 13:17:12 +0200
Subject: [PATCH 17/48] chore: Fix initialiseProfileManager

---
 .../actions/initialiseProfileManager.ts              | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
index 59726158c02..d67f7213ba5 100644
--- a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
+++ b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
@@ -1,4 +1,4 @@
-import { IClientOptions, SecretManager } from '@iota/wallet/out/types'
+import { IClientOptions, SecretManagerType } from '@iota/wallet/out/types'
 import { CoinType } from '@iota/wallet/out/types'
 
 import { generateRandomId } from '@core/utils'
@@ -10,20 +10,16 @@ export async function initialiseProfileManager(
     storagePath: string,
     coinType: CoinType,
     clientOptions?: IClientOptions,
-    secretManager?: SecretManager,
+    secretManager?: SecretManagerType,
     id?: string
 ): Promise<IProfileManager> {
     id = id ?? generateRandomId()
 
     const profileManager = await api.createWallet(id, {
         storagePath,
-        // TODO-sdk is this the right fix for the line ?
-        // ...(clientOptions && (clientOptions?.nodes?.length > 0 || clientOptions?.primaryNode) && { clientOptions }),
-        ...clientOptions,
+        clientOptions,
         coinType,
-        // TODO-sdk is this the right fix for the line ?
-        // ...(secretManager && { secretManager }),
-        ...secretManager,
+        secretManager,
     })
     return profileManager
 }

From 63d2a72ef209e2742a17d05eb80387bdeb359bb5 Mon Sep 17 00:00:00 2001
From: marc2332 <mespinsanz@gmail.com>
Date: Tue, 1 Aug 2023 13:58:36 +0200
Subject: [PATCH 18/48] chore: Move utility functions to electron

---
 packages/desktop/electron/preload.js                 | 12 ++++++++++++
 .../lib/core/profile-manager/api/generateMnemonic.ts |  6 ++----
 .../lib/core/profile-manager/api/getNodeInfo.ts      |  3 ++-
 .../lib/core/profile-manager/api/verifyMnemonic.ts   |  6 ++----
 .../core/profile-manager/interfaces/api.interface.ts |  5 +++++
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index d89b12b3bea..788a34bdf7f 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -97,6 +97,18 @@ try {
     // This workaround exposes the classes through factory methods
     // The factory method also copies all the prototype methods to the object so that it gets passed through the bridge
     contextBridge.exposeInMainWorld('__WALLET__API__', {
+        async getNodeInfo(managerId, url, auth) {
+            const manager = profileManagers[managerId]
+            const client = await manager.getClient()
+
+            return client.getNodeInfo(url, auth)
+        },
+        generateMnemonic() {
+            return WalletApi.Utils.generateMnemonic()
+        },
+        verifyMnemonic(mnemonic) {
+            return WalletApi.Utils.verifyMnemonic(mnemonic)
+        },
         createWallet(id, options) {
             const manager = new WalletApi.Wallet(options)
             manager.id = id
diff --git a/packages/shared/lib/core/profile-manager/api/generateMnemonic.ts b/packages/shared/lib/core/profile-manager/api/generateMnemonic.ts
index aedf2a17585..ab7168a2da4 100644
--- a/packages/shared/lib/core/profile-manager/api/generateMnemonic.ts
+++ b/packages/shared/lib/core/profile-manager/api/generateMnemonic.ts
@@ -1,7 +1,5 @@
-import { get } from 'svelte/store'
-import { profileManager } from '../stores'
+import { api } from '../api'
 
 export function generateMnemonic(): Promise<string> {
-    const manager = get(profileManager)
-    return manager.generateMnemonic()
+    return api.generateMnemonic()
 }
diff --git a/packages/shared/lib/core/profile-manager/api/getNodeInfo.ts b/packages/shared/lib/core/profile-manager/api/getNodeInfo.ts
index 5045d144113..3bfa23b69ea 100644
--- a/packages/shared/lib/core/profile-manager/api/getNodeInfo.ts
+++ b/packages/shared/lib/core/profile-manager/api/getNodeInfo.ts
@@ -2,8 +2,9 @@ import { IAuth } from '@core/network'
 import { INodeInfoResponse } from '@core/network/interfaces/node-info-response.interface'
 import { get } from 'svelte/store'
 import { profileManager } from '../stores'
+import { api } from '../api'
 
 export function getNodeInfo(url?: string, auth?: IAuth): Promise<INodeInfoResponse> {
     const manager = get(profileManager)
-    return manager.getNodeInfo(url, auth)
+    return api.getNodeInfo(manager.id, url, auth)
 }
diff --git a/packages/shared/lib/core/profile-manager/api/verifyMnemonic.ts b/packages/shared/lib/core/profile-manager/api/verifyMnemonic.ts
index 9a736b9773b..3e5e6d125a0 100644
--- a/packages/shared/lib/core/profile-manager/api/verifyMnemonic.ts
+++ b/packages/shared/lib/core/profile-manager/api/verifyMnemonic.ts
@@ -1,7 +1,5 @@
-import { get } from 'svelte/store'
-import { profileManager } from '../stores'
+import { api } from '../api'
 
 export async function verifyMnemonic(mnemonic: string): Promise<void> {
-    const manager = get(profileManager)
-    await manager.verifyMnemonic(mnemonic)
+    return api.verifyMnemonic(mnemonic)
 }
diff --git a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
index f8b36b9f0c1..839dcfbd5e3 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
@@ -1,4 +1,6 @@
 import { WalletOptions, CreateAccountPayload } from '@iota/wallet/out/types'
+import { IAuth } from '@core/network'
+import { INodeInfoResponse } from '@core/network/interfaces'
 
 import { IAccount } from '@core/account'
 
@@ -6,6 +8,9 @@ import { IProfileManager } from './profile-manager.interface'
 import { RecoverAccountsPayload } from './recover-account-payload.interface'
 
 export interface IApi {
+    getNodeInfo(profileManagerId: string, url?: string, auth?: IAuth): Promise<INodeInfoResponse>
+    generateMnemonic(): Promise<string>
+    verifyMnemonic(mnemonic: string): Promise<void>
     createWallet(id: string, options: WalletOptions): Promise<IProfileManager>
     createAccount(managerId: string, payload: CreateAccountPayload): Promise<IAccount>
     deleteWallet(id: string): void

From 5615dabf4a025913e6586225ddd9590e9d0e4772 Mon Sep 17 00:00:00 2001
From: marc2332 <mespinsanz@gmail.com>
Date: Tue, 1 Aug 2023 15:47:35 +0200
Subject: [PATCH 19/48] fix: Update getNodeInfo

---
 packages/desktop/electron/preload.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index 788a34bdf7f..48246dfd6e1 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -100,8 +100,14 @@ try {
         async getNodeInfo(managerId, url, auth) {
             const manager = profileManagers[managerId]
             const client = await manager.getClient()
+            const nodeUrl = url ?? (await client.getNode()).url
 
-            return client.getNodeInfo(url, auth)
+            const nodeInfo = await client.getNodeInfo(nodeUrl, auth)
+
+            return {
+                url: nodeUrl,
+                nodeInfo,
+            }
         },
         generateMnemonic() {
             return WalletApi.Utils.generateMnemonic()

From a927c1b4c13c84c450838b661e2f85b35323424d Mon Sep 17 00:00:00 2001
From: marc2332 <mespinsanz@gmail.com>
Date: Tue, 1 Aug 2023 16:04:54 +0200
Subject: [PATCH 20/48] chore: Update sdk to v1.0.3

---
 packages/shared/package.json | 2 +-
 yarn.lock                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/shared/package.json b/packages/shared/package.json
index fd714d5b38b..bb787e41fcf 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -11,7 +11,7 @@
         "@iota/transaction-converter": "^1.0.0-beta.30",
         "@iota/unit-converter": "^1.0.0-beta.30",
         "@iota/util.js": "^2.0.0-rc.1",
-        "@iota/wallet": "npm:@iota/sdk@1.0.2",
+        "@iota/wallet": "npm:@iota/sdk@1.0.3",
         "@sveltejs/svelte-virtual-list": "^3.0.1",
         "big-integer": "^1.6.51",
         "big.js": "^6.0.3",
diff --git a/yarn.lock b/yarn.lock
index 28d95823aab..70005d60665 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -905,10 +905,10 @@
   dependencies:
     big-integer "^1.6.51"
 
-"@iota/wallet@npm:@iota/sdk@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.2.tgz#48f43f91b57552bb2631b32b312356af5a2113f4"
-  integrity sha512-DnjGnSvcMRKpeJmNduFaZ321lHslc/IeehQFU3RrpPk11yKQUKvcjNAMK7iWHZA9BL3ubgtv+wkhnZcvUkhKiQ==
+"@iota/wallet@npm:@iota/sdk@1.0.3":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.3.tgz#990b5874e188056b722d99dcfc762713b3da3ff0"
+  integrity sha512-ZQDZT8vbSd5Q2el5P6ixL95LgD+KI7jT8XIVaLPGd8VzE6qU8o/0inDOAJ/8T9qGknqrJ3CybGuGQpdxbSmpCQ==
   dependencies:
     "@types/node" "^18.15.12"
     cargo-cp-artifact "^0.1.6"

From 3691923c2a68d340d0b7ebdd19384ba7b819e2cc Mon Sep 17 00:00:00 2001
From: marc2332 <mespinsanz@gmail.com>
Date: Wed, 2 Aug 2023 14:49:14 +0200
Subject: [PATCH 21/48] chore: Small fixes

---
 packages/desktop/electron/preload.js          | 31 ++++++++++++++-----
 .../profile-manager/api/computeOutputId.ts    |  6 ++++
 .../lib/core/profile-manager/api/index.ts     |  1 +
 .../interfaces/api.interface.ts               |  3 +-
 .../utils/outputs/preprocessTransaction.ts    | 15 +++++----
 5 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 packages/shared/lib/core/profile-manager/api/computeOutputId.ts

diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index 48246dfd6e1..fd53d3d1db0 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -96,7 +96,18 @@ try {
     // https://www.electronjs.org/docs/latest/api/context-bridge
     // This workaround exposes the classes through factory methods
     // The factory method also copies all the prototype methods to the object so that it gets passed through the bridge
+
+    const methodNames = Object.getOwnPropertyNames(WalletApi.Utils).filter(
+        (m) => !['length', 'name', 'prototype'].includes(m)
+    )
+    const methods = {}
+
+    for (const name of methodNames) {
+        methods[name] = (...args) => WalletApi.Utils[name](...args)
+    }
+
     contextBridge.exposeInMainWorld('__WALLET__API__', {
+        ...methods,
         async getNodeInfo(managerId, url, auth) {
             const manager = profileManagers[managerId]
             const client = await manager.getClient()
@@ -109,12 +120,6 @@ try {
                 nodeInfo,
             }
         },
-        generateMnemonic() {
-            return WalletApi.Utils.generateMnemonic()
-        },
-        verifyMnemonic(mnemonic) {
-            return WalletApi.Utils.verifyMnemonic(mnemonic)
-        },
         createWallet(id, options) {
             const manager = new WalletApi.Wallet(options)
             manager.id = id
@@ -173,7 +178,19 @@ function bindMethodsAcrossContextBridge(prototype, object) {
     const prototypeProperties = Object.getOwnPropertyNames(prototype)
     prototypeProperties.forEach((key) => {
         if (key !== 'constructor') {
-            object[key] = object[key].bind(object)
+            if (key === 'incomingTransactions') {
+                const method = object[key].bind(object)
+                object[key] = async function () {
+                    const txs = await method(arguments)
+                    txs.forEach((tx) => {
+                        // Or classToInstance?
+                        bindMethodsAcrossContextBridge(WalletApi.Transaction.prototype, tx)
+                    })
+                    return txs
+                }
+            } else {
+                object[key] = object[key].bind(object)
+            }
         }
     })
 }
diff --git a/packages/shared/lib/core/profile-manager/api/computeOutputId.ts b/packages/shared/lib/core/profile-manager/api/computeOutputId.ts
new file mode 100644
index 00000000000..44072a8a30a
--- /dev/null
+++ b/packages/shared/lib/core/profile-manager/api/computeOutputId.ts
@@ -0,0 +1,6 @@
+import { api } from '../api'
+import { TransactionId, OutputId } from '@iota/wallet/out/types'
+
+export function computeOutputId(id: TransactionId, index: number): Promise<OutputId> {
+    return api.computeOutputId(id, index)
+}
diff --git a/packages/shared/lib/core/profile-manager/api/index.ts b/packages/shared/lib/core/profile-manager/api/index.ts
index 3344db9e800..79e64fcf0b7 100644
--- a/packages/shared/lib/core/profile-manager/api/index.ts
+++ b/packages/shared/lib/core/profile-manager/api/index.ts
@@ -18,3 +18,4 @@ export * from './setStrongholdPasswordClearInterval'
 export * from './startBackgroundSync'
 export * from './storeMnemonic'
 export * from './verifyMnemonic'
+export * from './computeOutputId'
diff --git a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
index 839dcfbd5e3..a0b101c2a29 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
@@ -1,4 +1,4 @@
-import { WalletOptions, CreateAccountPayload } from '@iota/wallet/out/types'
+import { WalletOptions, CreateAccountPayload, TransactionId, OutputId } from '@iota/wallet/out/types'
 import { IAuth } from '@core/network'
 import { INodeInfoResponse } from '@core/network/interfaces'
 
@@ -8,6 +8,7 @@ import { IProfileManager } from './profile-manager.interface'
 import { RecoverAccountsPayload } from './recover-account-payload.interface'
 
 export interface IApi {
+    computeOutputId(id: TransactionId, index: number): Promise<OutputId>
     getNodeInfo(profileManagerId: string, url?: string, auth?: IAuth): Promise<INodeInfoResponse>
     generateMnemonic(): Promise<string>
     verifyMnemonic(mnemonic: string): Promise<void>
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
index 1a613d474b1..4e8b426637c 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
@@ -1,8 +1,9 @@
 import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
-import { Output, RegularTransactionEssence, Transaction, UTXOInput, Utils } from '@iota/wallet/out/types'
+import { Output, RegularTransactionEssence, Transaction, UTXOInput } from '@iota/wallet/out/types'
 import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
 import { getDirectionFromTransaction } from '../transactions'
 import { IAccountState } from '@core/account'
+import { computeOutputId } from '@core/profile-manager'
 
 export async function preprocessTransaction(
     transaction: Transaction,
@@ -16,11 +17,13 @@ export async function preprocessTransaction(
     )
     const direction = getDirectionFromTransaction(outputs, transaction.incoming, account.depositAddress)
     const utxoInputs = regularTransactionEssence.inputs.map((i) => i as UTXOInput)
-    const inputIds = utxoInputs.map((input) => {
-        const transactionId = input.transactionId
-        const transactionOutputIndex = input.transactionOutputIndex
-        return Utils.computeOutputId(transactionId, transactionOutputIndex)
-    })
+    const inputIds = await Promise.all(
+        utxoInputs.map((input) => {
+            const transactionId = input.transactionId
+            const transactionOutputIndex = input.transactionOutputIndex
+            return computeOutputId(transactionId, transactionOutputIndex)
+        })
+    )
 
     const inputs = await Promise.all(inputIds.map((inputId) => account.getOutput(inputId)))
 

From 2352480723d5f770673b8cdfb184f812276c2fe1 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Tue, 8 Aug 2023 14:01:35 +0200
Subject: [PATCH 22/48] chore: Fix "getters" from sdk in favour of readonly
 fields (instead of using class-transformer)

---
 .../popups/BalanceBreakdownPopup.svelte       | 19 +++----
 packages/desktop/electron/preload.js          |  7 +++
 .../drawers/BalanceBreakdownDrawer.svelte     | 19 +++----
 .../utils/sumTotalClaimedRewards.ts           |  2 +-
 .../account/interfaces/account.interface.ts   |  1 -
 .../core/nfts/utils/buildNftFromNftOutput.ts  |  2 +-
 .../getSpendableStatusFromUnspentNftOutput.ts |  6 +--
 .../lib/core/profile-manager/api/getClient.ts |  9 ++++
 .../interfaces/api.interface.ts               | 10 ++--
 packages/shared/lib/core/utils/filter.ts      |  6 +--
 .../wallet/utils/convertHexAddressToBech32.ts |  1 +
 .../generateActivity/generateActivities.ts    |  6 +--
 .../generateActivitiesFromBasicOutputs.ts     | 22 ++++-----
 .../generateActivitiesFromNftOutputs.ts       |  4 +-
 .../generateSingleAliasActivity.ts            |  4 +-
 .../generateSingleBasicActivity.ts            |  2 +-
 .../generateSingleConsolidationActivity.ts    |  2 +-
 .../generateSingleFoundryActivity.ts          | 18 +++----
 .../helper/getActivityTypeFromOutput.ts       |  2 +-
 .../getGovernorAddressFromAliasOutput.ts      | 10 ++--
 .../helper/getMetadataFromOutput.ts           | 49 ++++++++++---------
 ...etStateControllerAddressFromAliasOutput.ts | 10 ++--
 .../helper/getStorageDepositFromOutput.ts     | 12 +++--
 .../helper/getTagFromOutput.ts                |  4 +-
 .../helper/getTimelockDateFromOutput.ts       |  6 +--
 .../utils/getBech32AddressFromAddressTypes.ts |  9 ++--
 .../utils/getHexAddressFromAddressTypes.ts    |  8 +--
 .../utils/getMetadataFromFoundryOutput.ts     |  8 +--
 .../getSenderAddressFromUnlockCondition.ts    |  8 +--
 .../lib/core/wallet/utils/hashOutputId.ts     |  1 +
 .../core/wallet/utils/outputs/getFoundryId.ts | 16 +++---
 .../utils/outputs/getIssuerFromNftOutput.ts   |  6 +--
 .../utils/outputs/getMetadataFromNftOutput.ts |  8 +--
 .../utils/outputs/getNativeTokenFromOutput.ts |  6 +--
 .../wallet/utils/outputs/isOutputAsync.ts     | 11 +++--
 .../utils/outputs/preprocessGroupedOutputs.ts |  4 +-
 .../utils/send/validateSendConfirmation.ts    | 10 ++--
 .../getSenderAddressFromInputs.ts             | 14 +++---
 38 files changed, 176 insertions(+), 166 deletions(-)
 create mode 100644 packages/shared/lib/core/profile-manager/api/getClient.ts

diff --git a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
index a810ab4e7fd..4822f64b3c2 100644
--- a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
+++ b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
@@ -51,24 +51,19 @@
 
                 let type: string
                 let amount: number
-                if (output.getType() !== OutputType.Treasury) {
+                if (output.type !== OutputType.Treasury) {
                     const commonOutput = output as CommonOutput
-                    if (containsUnlockCondition(commonOutput.getUnlockConditions(), UnlockConditionType.Expiration)) {
+                    if (containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.Expiration)) {
                         type = PendingFundsType.Unclaimed
-                        amount = Number(output.getAmount())
+                        amount = Number(output.amount)
                     } else if (
-                        containsUnlockCondition(
-                            commonOutput.getUnlockConditions(),
-                            UnlockConditionType.StorageDepositReturn
-                        )
+                        containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.StorageDepositReturn)
                     ) {
                         type = PendingFundsType.StorageDepositReturn
                         amount = (await getStorageDepositFromOutput($selectedAccount, output))?.storageDeposit
-                    } else if (
-                        containsUnlockCondition(commonOutput.getUnlockConditions(), UnlockConditionType.Timelock)
-                    ) {
+                    } else if (containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.Timelock)) {
                         type = PendingFundsType.Timelock
-                        amount = Number(output.getAmount())
+                        amount = Number(output.amount)
                     }
                 }
 
@@ -115,7 +110,7 @@
     }
 
     function containsUnlockCondition(unlockConditions: UnlockCondition[], unlockConditionId: number): boolean {
-        return unlockConditions.some((unlockCondition) => unlockCondition.getType() === unlockConditionId)
+        return unlockConditions.some((unlockCondition) => unlockCondition.type === unlockConditionId)
     }
 
     function onConsolidationClick(): void {
diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index fd53d3d1db0..cffb4689f10 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -156,6 +156,13 @@ try {
             accounts.forEach((account) => bindMethodsAcrossContextBridge(WalletApi.Account.prototype, account))
             return accounts
         },
+        async getClient(managerId) {
+            const manager = profileManagers[managerId]
+            const client = await manager.getClient()
+            bindMethodsAcrossContextBridge(WalletApi.Client.prototype, client)
+
+            return client
+        },
         async migrateStrongholdSnapshotV2ToV3(currentPath, newPath, currentPassword, newPassword) {
             const snapshotSaltV2 = 'wallet.rs'
             const snapshotRoundsV2 = 100
diff --git a/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte b/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
index 7bd0c2ea0ca..255621d18de 100644
--- a/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
+++ b/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
@@ -53,25 +53,20 @@
 
                 let type: string
                 let amount: number
-                if (output.getType() !== OutputType.Treasury) {
+                if (output.type !== OutputType.Treasury) {
                     const commonOutput = output as CommonOutput
-                    if (containsUnlockCondition(commonOutput.getUnlockConditions(), UnlockConditionType.Expiration)) {
+                    if (containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.Expiration)) {
                         type = PendingFundsType.Unclaimed
-                        amount = Number(commonOutput.getAmount())
+                        amount = Number(commonOutput.amount)
                     } else if (
-                        containsUnlockCondition(
-                            commonOutput.getUnlockConditions(),
-                            UnlockConditionType.StorageDepositReturn
-                        )
+                        containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.StorageDepositReturn)
                     ) {
                         type = PendingFundsType.StorageDepositReturn
                         // TODO-sdk the signature of this function has changed recently. Find a way to fix
                         amount = getStorageDepositFromOutput(commonOutput).storageDeposit
-                    } else if (
-                        containsUnlockCondition(commonOutput.getUnlockConditions(), UnlockConditionType.Timelock)
-                    ) {
+                    } else if (containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.Timelock)) {
                         type = PendingFundsType.Timelock
-                        amount = Number(output.getAmount())
+                        amount = Number(output.amount)
                     }
                 }
 
@@ -118,7 +113,7 @@
     }
 
     function containsUnlockCondition(unlockConditions: UnlockCondition[], unlockConditionId: number): boolean {
-        return unlockConditions.some((unlockCondition) => unlockCondition.getType() === unlockConditionId)
+        return unlockConditions.some((unlockCondition) => unlockCondition.type === unlockConditionId)
     }
 
     function onConsolidationClick(): void {
diff --git a/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts b/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
index 84c3f8b6296..739393f6710 100644
--- a/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
+++ b/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
@@ -10,7 +10,7 @@ export function sumTotalClaimedRewards(shimmerClaimingAccounts: IShimmerClaiming
             tryNumberOrZero(
                 (curr?.claimingTransaction?.payload?.essence as RegularTransactionEssence).outputs?.reduce(
                     (outputsTotal: number, currentOutput: Output) =>
-                        outputsTotal + tryNumberOrZero(currentOutput?.getAmount()),
+                        outputsTotal + tryNumberOrZero(currentOutput?.amount),
                     0
                 )
             ),
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index cc45afb0138..8b58e7d741c 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -91,7 +91,6 @@ export interface IAccount {
         transactionOptions?: TransactionOptions
     ): Promise<CreateNativeTokenTransaction>
     increaseVotingPower(amount: string): Promise<Transaction>
-    minimumRequiredStorageDeposit(output: Output): Promise<string>
     createNativeToken(
         params: CreateNativeTokenParams,
         transactionOptions?: TransactionOptions
diff --git a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
index d0d23b66504..dba3eb07ba4 100644
--- a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
@@ -38,7 +38,7 @@ export function buildNftFromNftOutput(
     const parsedMetadata = parseNftMetadata(metadata)
     const composedUrl = composeUrlFromNftUri(parsedMetadata?.uri)
     const filePath = `${get(activeProfileId)}/nfts/${id}`
-    const storageDeposit = Number(nftOutput.getAmount())
+    const storageDeposit = Number(nftOutput.amount)
 
     return {
         id,
diff --git a/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts b/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
index ece0e89a680..bbc20fb0145 100644
--- a/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
@@ -15,9 +15,9 @@ export function getSpendableStatusFromUnspentNftOutput(
         const expirationUnixTime = getExpirationUnixTimeFromOutput(nftOutput)
         const timeLockUnixTime = getTimelockDateFromOutput(nftOutput)?.getTime()
         const isRecipient = getRecipientAddressFromOutput(nftOutput) === accountAddress
-        const hasStorageDepositReturnUnlockCondition = nftOutput
-            .getUnlockConditions()
-            .some((unlockCondition) => unlockCondition?.getType() === UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN)
+        const hasStorageDepositReturnUnlockCondition = nftOutput.unlockConditions.some(
+            (unlockCondition) => unlockCondition?.type === UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN
+        )
         if (expirationUnixTime) {
             if (isRecipient) {
                 isSpendable = false
diff --git a/packages/shared/lib/core/profile-manager/api/getClient.ts b/packages/shared/lib/core/profile-manager/api/getClient.ts
new file mode 100644
index 00000000000..9da4986b924
--- /dev/null
+++ b/packages/shared/lib/core/profile-manager/api/getClient.ts
@@ -0,0 +1,9 @@
+import { Client } from '@iota/wallet/out/client'
+import { api } from './api'
+import { get } from 'svelte/store'
+import { profileManager } from '../stores'
+
+export function getClient(manager = profileManager): Promise<Client> {
+    const { id } = get(manager)
+    return api.getClient(id)
+}
diff --git a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
index a0b101c2a29..383900f28a0 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
@@ -1,4 +1,5 @@
 import { WalletOptions, CreateAccountPayload, TransactionId, OutputId } from '@iota/wallet/out/types'
+import { AliasId, Client, FoundryId } from '@iota/wallet'
 import { IAuth } from '@core/network'
 import { INodeInfoResponse } from '@core/network/interfaces'
 
@@ -8,15 +9,13 @@ import { IProfileManager } from './profile-manager.interface'
 import { RecoverAccountsPayload } from './recover-account-payload.interface'
 
 export interface IApi {
-    computeOutputId(id: TransactionId, index: number): Promise<OutputId>
     getNodeInfo(profileManagerId: string, url?: string, auth?: IAuth): Promise<INodeInfoResponse>
-    generateMnemonic(): Promise<string>
-    verifyMnemonic(mnemonic: string): Promise<void>
     createWallet(id: string, options: WalletOptions): Promise<IProfileManager>
     createAccount(managerId: string, payload: CreateAccountPayload): Promise<IAccount>
     deleteWallet(id: string): void
     getAccount(profileManagerId: string, index: number): Promise<IAccount>
     getAccounts(profileManagerId: string): Promise<IAccount[]>
+    getClient(profileManagerId: string): Promise<Client>
     recoverAccounts(profileManagerId: string, payload: RecoverAccountsPayload): Promise<IAccount[]>
     migrateStrongholdSnapshotV2ToV3(
         currentPath: string,
@@ -24,4 +23,9 @@ export interface IApi {
         newPath: string,
         newPassword: string
     ): Promise<void>
+    // Mapped from sdk#Utils
+    generateMnemonic(): Promise<string>
+    verifyMnemonic(mnemonic: string): Promise<void>
+    computeOutputId(id: TransactionId, index: number): Promise<OutputId>
+    computeFoundryId(aliasId: AliasId, serialNumber: number, tokenSchemeType: number): Promise<FoundryId>
 }
diff --git a/packages/shared/lib/core/utils/filter.ts b/packages/shared/lib/core/utils/filter.ts
index 51b58ba9677..e323fe69cc0 100644
--- a/packages/shared/lib/core/utils/filter.ts
+++ b/packages/shared/lib/core/utils/filter.ts
@@ -2,15 +2,15 @@ import type { BasicOutput, OutputData } from '@iota/wallet/out/types'
 import { OutputType } from '@iota/wallet/out/types'
 
 export function filterBasicOutput(outputData: OutputData): boolean {
-    return outputData?.output?.getType() === OutputType.Basic
+    return outputData?.output?.type === OutputType.Basic
 }
 
 export function filterShimmerClaimingOutputs(outputData: OutputData): boolean {
     const output = outputData?.output as BasicOutput
 
     const isBasicOutput = filterBasicOutput(outputData)
-    const hasOneUnlockCondition = output?.getUnlockConditions()?.length === 1
-    const hasNoNativeTokens = !output?.getNativeTokens() || output?.getNativeTokens()?.length === 0
+    const hasOneUnlockCondition = output?.unlockConditions?.length === 1
+    const hasNoNativeTokens = !output?.nativeTokens || output?.nativeTokens?.length === 0
 
     return isBasicOutput && hasOneUnlockCondition && hasNoNativeTokens
 }
diff --git a/packages/shared/lib/core/wallet/utils/convertHexAddressToBech32.ts b/packages/shared/lib/core/wallet/utils/convertHexAddressToBech32.ts
index 03c66fa9302..f35522428da 100644
--- a/packages/shared/lib/core/wallet/utils/convertHexAddressToBech32.ts
+++ b/packages/shared/lib/core/wallet/utils/convertHexAddressToBech32.ts
@@ -2,6 +2,7 @@ import { getNetworkHrp } from '@core/profile'
 import { Converter } from '@core/utils/convert'
 import { Bech32Helper } from '@core/utils/crypto'
 
+// TODO-sdk replace in favour of utils
 export function convertHexAddressToBech32(addressType: number, hexAddress: string): string | undefined {
     return hexAddress
         ? Bech32Helper.toBech32(addressType, Converter.hexToBytes(hexAddress), getNetworkHrp())
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
index 0f58d0f99ed..60a4b287677 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
@@ -32,20 +32,20 @@ async function generateActivitiesFromProcessedTransactionsWithInputs(
     const { outputs, wrappedInputs } = processedTransaction
     const activities: Activity[] = []
 
-    const containsFoundryActivity = outputs.some((output) => output.output.getType() === OutputType.Foundry)
+    const containsFoundryActivity = outputs.some((output) => output.output.type === OutputType.Foundry)
     if (containsFoundryActivity) {
         const foundryActivities = await generateActivitiesFromFoundryOutputs(processedTransaction, account)
         activities.push(...foundryActivities)
     }
 
-    const containsNftActivity = outputs.some((output) => output.output.getType() === OutputType.Nft)
+    const containsNftActivity = outputs.some((output) => output.output.type === OutputType.Nft)
     if (containsNftActivity) {
         const nftActivities = await generateActivitiesFromNftOutputs(processedTransaction, account)
         activities.push(...nftActivities)
     }
 
     const containsAliasActivity =
-        outputs.some((output) => output.output.getType() === OutputType.Alias) && !containsFoundryActivity
+        outputs.some((output) => output.output.type === OutputType.Alias) && !containsFoundryActivity
     if (containsAliasActivity) {
         const aliasActivities = await generateActivitiesFromAliasOutputs(processedTransaction, account)
         activities.push(...aliasActivities)
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
index 978ab83f00b..e8e3cf9c18d 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
@@ -31,7 +31,7 @@ export async function generateActivitiesFromBasicOutputs(
 
         const isSelfTransaction = processedTransaction.direction === ActivityDirection.SelfTransaction
         const burnedNftInputIndex = burnedNftInputs.findIndex(
-            (input) => input.output.getAmount() === basicOutput.output.getAmount()
+            (input) => input.output.amount === basicOutput.output.amount
         )
         const burnedNativeToken =
             burnedNftInputIndex < 0 ? getBurnedNativeTokens(basicOutput, processedTransaction) : undefined
@@ -46,7 +46,7 @@ export async function generateActivitiesFromBasicOutputs(
                     processedTransaction,
                     wrappedOutput: basicOutput,
                 },
-                getNftId(nftInput.getNftId(), wrappedInput.outputId)
+                getNftId(nftInput.nftId, wrappedInput.outputId)
             )
             const nft = buildNftFromNftOutput(wrappedInput, account.depositAddress, false)
             addOrUpdateNftInAllAccountNfts(account.index, nft)
@@ -84,14 +84,14 @@ export async function generateActivitiesFromBasicOutputs(
 function getBurnedNftInputs(processedTransaction: IProcessedTransaction): IWrappedOutput[] {
     return processedTransaction.wrappedInputs.filter((wrappedInput) => {
         const input = wrappedInput.output
-        if (input.getType() === OutputType.Nft) {
+        if (input.type === OutputType.Nft) {
             const nftInput = input as NftOutput
-            const nftId = getNftId(nftInput.getNftId(), wrappedInput.outputId)
+            const nftId = getNftId(nftInput.nftId, wrappedInput.outputId)
 
             const isIncludedInOutputs = processedTransaction.outputs.some((output) => {
-                if (output.output.getType() === OutputType.Nft) {
+                if (output.output.type === OutputType.Nft) {
                     const nftOutput = output.output as NftOutput
-                    return getNftId(nftOutput.getNftId(), output.outputId) === nftId
+                    return getNftId(nftOutput.nftId, output.outputId) === nftId
                 } else {
                     return false
                 }
@@ -133,7 +133,7 @@ function getAllNativeTokensFromOutputs(outputs: IWrappedOutput[]): { [key: strin
     for (const output of outputs) {
         if (output.output.type !== OutputType.Treasury) {
             const commonOutput = output.output as CommonOutput
-            for (const nativeToken of commonOutput.getNativeTokens() ?? []) {
+            for (const nativeToken of commonOutput.nativeTokens ?? []) {
                 if (!nativeTokens[nativeToken.id]) {
                     nativeTokens[nativeToken.id] = 0
                 }
@@ -145,13 +145,11 @@ function getAllNativeTokensFromOutputs(outputs: IWrappedOutput[]): { [key: strin
 }
 
 function isConsolidation(output: IWrappedOutput, processedTransaction: IProcessedTransaction): boolean {
-    const allBasicInputs = processedTransaction.wrappedInputs.every(
-        (input) => input.output.getType() === OutputType.Basic
-    )
+    const allBasicInputs = processedTransaction.wrappedInputs.every((input) => input.output.type === OutputType.Basic)
     const isSelfTransaction = processedTransaction.direction === ActivityDirection.SelfTransaction
     const isSameAmount =
-        processedTransaction.wrappedInputs.reduce((sum, input) => sum + Number(input.output.getAmount()), 0) ===
-        Number(output.output.getAmount())
+        processedTransaction.wrappedInputs.reduce((sum, input) => sum + Number(input.output.amount), 0) ===
+        Number(output.output.amount)
 
     return allBasicInputs && isSelfTransaction && isSameAmount
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
index fb4d9189b03..02f88925535 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
@@ -11,11 +11,11 @@ export async function generateActivitiesFromNftOutputs(
     const outputs = processedTransaction.outputs
     const activities = []
 
-    const nftOutputs = outputs.filter((output) => output.output.getType() === OutputType.Nft)
+    const nftOutputs = outputs.filter((output) => output.output.type === OutputType.Nft)
     for (const nftOutput of nftOutputs) {
         const output = nftOutput.output as NftOutput
         const activity = await generateSingleNftActivity(account, {
-            action: output.getNftId() === EMPTY_HEX_ID ? ActivityAction.Mint : ActivityAction.Send,
+            action: output.nftId === EMPTY_HEX_ID ? ActivityAction.Mint : ActivityAction.Send,
             processedTransaction,
             wrappedOutput: nftOutput,
         })
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
index 848b0521c26..1cc36e1df4a 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
@@ -66,7 +66,7 @@ export async function generateSingleAliasActivity(
 }
 
 function getAliasId(output: AliasOutput, outputId: string): string {
-    const isNewAlias = output.getAliasId() === EMPTY_HEX_ID
-    const aliasId = isNewAlias ? hashOutputId(outputId) : output.getAliasId()
+    const isNewAlias = output.aliasId === EMPTY_HEX_ID
+    const aliasId = isNewAlias ? hashOutputId(outputId) : output.aliasId
     return convertHexAddressToBech32(ADDRESS_TYPE_ALIAS, aliasId)
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
index e77dc1773a3..98a469e65d7 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
@@ -58,7 +58,7 @@ export async function generateSingleBasicActivity(
     let surplus: number | undefined = undefined
     if (nativeToken) {
         const storageDepositToDeduct = (storageDeposit > 0 ? storageDeposit : giftedStorageDeposit) ?? 0
-        surplus = Number(output.getAmount()) - storageDepositToDeduct
+        surplus = Number(output.amount) - storageDepositToDeduct
     }
 
     let rawAmount: number
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
index c92b88d268a..24aad66d5bd 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
@@ -59,5 +59,5 @@ export async function generateSingleConsolidationActivity(
 }
 
 function getAmountOfConsolidationInputs(inputs: IWrappedOutput[]): number {
-    return inputs.filter((input) => input.output.getType() === OutputType.Basic).length
+    return inputs.filter((input) => input.output.type === OutputType.Basic).length
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
index 4108b46aba1..ef752e6ab80 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
@@ -28,17 +28,15 @@ export async function generateSingleFoundryActivity(
 
     const output = wrappedOutput.output as FoundryOutput
     const outputId = wrappedOutput.outputId
-    const tokenScheme = output.getTokenScheme() as SimpleTokenScheme
-    const mintedTokens = tokenScheme.getMintedTokens()
-    const meltedTokens = tokenScheme.getMeltedTokens()
-    const maximumSupply = tokenScheme.getMaximumSupply()
+    const tokenScheme = output.tokenScheme as SimpleTokenScheme
+    const mintedTokens = tokenScheme.mintedTokens.toString()
+    const meltedTokens = tokenScheme.meltedTokens.toString()
+    const maximumSupply = tokenScheme.maximumSupply.toString()
 
-    const addressUnlockCondition = output
-        .getUnlockConditions()
-        .find(
-            (unlockCondition) => unlockCondition.getType() === UnlockConditionType.ImmutableAliasAddress
-        ) as ImmutableAliasAddressUnlockCondition
-    const aliasId = (addressUnlockCondition?.getAddress() as AliasAddress)?.getAliasId()
+    const addressUnlockCondition = output.unlockConditions.find(
+        (unlockCondition) => unlockCondition.type === UnlockConditionType.ImmutableAliasAddress
+    ) as ImmutableAliasAddressUnlockCondition
+    const aliasId = (addressUnlockCondition?.address as AliasAddress)?.aliasId
     const aliasAddress = aliasId ? convertHexAddressToBech32(AddressType.Alias, aliasId) : undefined
 
     const isHidden = false
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
index d6e53cb10d1..9c138dba36d 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
@@ -4,7 +4,7 @@ import { IWrappedOutput } from '@core/wallet/interfaces'
 import { OutputType } from '@iota/wallet/out/types'
 
 export function getActivityTypeFromOutput(output: IWrappedOutput): ActivityType {
-    switch (output.output.getType()) {
+    switch (output.output.type) {
         case OutputType.Nft:
             return ActivityType.Nft
         case OutputType.Alias:
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
index c28973730fa..e73d3322c8c 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
@@ -2,10 +2,8 @@ import { getBech32AddressFromAddressTypes } from '../../getBech32AddressFromAddr
 import { AliasOutput, GovernorAddressUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
 
 export function getGovernorAddressFromAliasOutput(output: AliasOutput): string {
-    const governorUnlockCondition = output
-        .getUnlockConditions()
-        .find(
-            (unlockCondition) => unlockCondition.getType() === UnlockConditionType.GovernorAddress
-        ) as GovernorAddressUnlockCondition
-    return getBech32AddressFromAddressTypes(governorUnlockCondition.getAddress())
+    const governorUnlockCondition = output.unlockConditions.find(
+        (unlockCondition) => unlockCondition.type === UnlockConditionType.GovernorAddress
+    ) as GovernorAddressUnlockCondition
+    return getBech32AddressFromAddressTypes(governorUnlockCondition.address)
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
index a84cd7448b5..1044571fb51 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
@@ -5,38 +5,41 @@ import { containsControlCharacters, Converter } from '@core/utils'
 import { CommonOutput, FeatureType, MetadataFeature, Output, OutputType } from '@iota/wallet/out/types'
 
 export function getMetadataFromOutput(output: Output): string | undefined {
-    if (output.getType() === OutputType.Treasury) {
+    if (output.type === OutputType.Treasury) {
         return undefined
     }
 
     const commonOutput = output as CommonOutput
-    const feature = commonOutput?.getFeatures()?.find((feature) => feature.getType() === FeatureType.Metadata)
+    const feature = commonOutput?.features?.find((feature) => feature.type === FeatureType.Metadata)
     const metadataFeature = feature as MetadataFeature
-    const data = metadataFeature.getData() ?? undefined
 
-    if (data) {
-        const isVotingOutput = isParticipationOutput(output)
-        const metadataBytes = Converter.hexToBytes(data)
-        const startValue = Number(data.substring(0, 10))
+    if (metadataFeature) {
+        const data = metadataFeature.data ?? undefined
 
-        // For smart contract calls the first 32 bits of the metadata
-        // correspond to 0 if an an end-user initiates the transaction
-        // instead of a smart contract. A stop voting output could
-        // also start with a 0 metadata, so we check that as well.
-        const isLayer2Output = startValue === EXTERNALLY_OWNED_ACCOUNT && !isVotingOutput
-        if (isLayer2Output) {
-            try {
-                const layer2Data = parseLayer2MetadataForTransfer(metadataBytes)
-                return JSON.stringify(layer2Data)
-            } catch (err) {
-                console.error(err)
+        if (data) {
+            const isVotingOutput = isParticipationOutput(output)
+            const metadataBytes = Converter.hexToBytes(data)
+            const startValue = Number(data.substring(0, 10))
+
+            // For smart contract calls the first 32 bits of the metadata
+            // correspond to 0 if an an end-user initiates the transaction
+            // instead of a smart contract. A stop voting output could
+            // also start with a 0 metadata, so we check that as well.
+            const isLayer2Output = startValue === EXTERNALLY_OWNED_ACCOUNT && !isVotingOutput
+            if (isLayer2Output) {
+                try {
+                    const layer2Data = parseLayer2MetadataForTransfer(metadataBytes)
+                    return JSON.stringify(layer2Data)
+                } catch (err) {
+                    console.error(err)
+                    return data
+                }
+            } else if (isVotingOutput) {
                 return data
+            } else {
+                const convertedString = Converter.hexToUtf8(data)
+                return containsControlCharacters(convertedString) ? data : convertedString
             }
-        } else if (isVotingOutput) {
-            return data
-        } else {
-            const convertedString = Converter.hexToUtf8(data)
-            return containsControlCharacters(convertedString) ? data : convertedString
         }
     }
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
index f68488a4b03..27fb25eda97 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
@@ -2,10 +2,8 @@ import { AliasOutput, StateControllerAddressUnlockCondition, UnlockConditionType
 import { getBech32AddressFromAddressTypes } from '../../getBech32AddressFromAddressTypes'
 
 export function getStateControllerAddressFromAliasOutput(output: AliasOutput): string {
-    const stateControllerUnlockCondition = output
-        .getUnlockConditions()
-        .find(
-            (unlockCondition) => unlockCondition.getType() === UnlockConditionType.StateControllerAddress
-        ) as StateControllerAddressUnlockCondition
-    return getBech32AddressFromAddressTypes(stateControllerUnlockCondition.getAddress())
+    const stateControllerUnlockCondition = output.unlockConditions.find(
+        (unlockCondition) => unlockCondition.type === UnlockConditionType.StateControllerAddress
+    ) as StateControllerAddressUnlockCondition
+    return getBech32AddressFromAddressTypes(stateControllerUnlockCondition.address)
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
index e6737334d82..dcf8d10c84d 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
@@ -1,4 +1,5 @@
 import { IAccountState } from '@core/account/interfaces'
+import { getClient } from '@core/profile-manager/api/getClient'
 import { CommonOutput, StorageDepositReturnUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
 
 export async function getStorageDepositFromOutput(
@@ -12,14 +13,15 @@ export async function getStorageDepositFromOutput(
         return { storageDeposit: 0, giftedStorageDeposit: 0 }
     }
     const storageDepositReturnUnlockCondition = <StorageDepositReturnUnlockCondition>(
-        output
-            ?.getUnlockConditions()
-            ?.find((unlockCondition) => unlockCondition?.getType() === UnlockConditionType.StorageDepositReturn)
+        output?.unlockConditions?.find(
+            (unlockCondition) => unlockCondition?.type === UnlockConditionType.StorageDepositReturn
+        )
     )
     if (storageDepositReturnUnlockCondition) {
-        return { storageDeposit: Number(storageDepositReturnUnlockCondition.getAmount()), giftedStorageDeposit: 0 }
+        return { storageDeposit: Number(storageDepositReturnUnlockCondition.amount), giftedStorageDeposit: 0 }
     } else {
-        const minimumRequiredStorageDeposit = await account.minimumRequiredStorageDeposit(output)
+        const client = await getClient()
+        const minimumRequiredStorageDeposit = await client.minimumRequiredStorageDeposit(output)
         let minimumRequiredStorageDepositNumber = Number(minimumRequiredStorageDeposit)
         minimumRequiredStorageDepositNumber =
             minimumRequiredStorageDepositNumber > 0 ? minimumRequiredStorageDepositNumber : 0
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
index 842b0ef2571..b5e671282b5 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
@@ -2,8 +2,8 @@ import { CommonOutput, FeatureType, TagFeature } from '@iota/wallet/out/types'
 import { Converter } from '@core/utils'
 
 export function getTagFromOutput(output: CommonOutput): string | undefined {
-    const tagFeature = output?.getFeatures()?.find((feature) => feature.getType() === FeatureType.Tag) as TagFeature
-    const tag = tagFeature?.getTag() ?? undefined
+    const tagFeature = output?.features?.find((feature) => feature.type === FeatureType.Tag) as TagFeature
+    const tag = tagFeature?.tag ?? undefined
 
     if (tag) {
         return Converter.hexToUtf8(tag)
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
index df60788b1ba..80bbc9b7795 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
@@ -2,10 +2,10 @@ import { MILLISECONDS_PER_SECOND } from '@core/utils'
 import { CommonOutput, TimelockUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
 
 export function getTimelockDateFromOutput(output: CommonOutput): Date | undefined {
-    for (const unlockCondition of output.getUnlockConditions()) {
-        if (unlockCondition?.getType() === UnlockConditionType.Timelock) {
+    for (const unlockCondition of output.unlockConditions) {
+        if (unlockCondition?.type === UnlockConditionType.Timelock) {
             const timelockUnlockCondition = unlockCondition as TimelockUnlockCondition
-            const unixTime = timelockUnlockCondition?.getUnixTime()
+            const unixTime = timelockUnlockCondition?.unixTime
             return unixTime ? new Date(unixTime * MILLISECONDS_PER_SECOND) : undefined
         }
     }
diff --git a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
index 330d1875a28..ae3abcbd4ad 100644
--- a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
@@ -1,14 +1,13 @@
 import { convertHexAddressToBech32 } from './convertHexAddressToBech32'
-import { ADDRESS_TYPE_ALIAS, ADDRESS_TYPE_ED25519, ADDRESS_TYPE_NFT } from '../constants'
 import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/wallet/out/types'
 
 export function getBech32AddressFromAddressTypes(address: Address): string | undefined {
-    switch (address?.getType()) {
+    switch (address.type) {
         case AddressType.Ed25519:
-            return convertHexAddressToBech32(ADDRESS_TYPE_ED25519, (address as Ed25519Address).getPubKeyHash())
+            return convertHexAddressToBech32(AddressType.Ed25519, (address as Ed25519Address).pubKeyHash)
         case AddressType.Alias:
-            return convertHexAddressToBech32(ADDRESS_TYPE_ALIAS, (address as AliasAddress).getAliasId())
+            return convertHexAddressToBech32(AddressType.Alias, (address as AliasAddress).aliasId)
         case AddressType.Nft:
-            return convertHexAddressToBech32(ADDRESS_TYPE_NFT, (address as NftAddress).getNftId())
+            return convertHexAddressToBech32(AddressType.Nft, (address as NftAddress).nftId)
     }
 }
diff --git a/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
index e1cec7b7ea3..8d59b148850 100644
--- a/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
@@ -1,12 +1,12 @@
 import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/wallet/out/types'
 
 export function getHexAddressFromAddressTypes(address: Address): string {
-    switch (address?.getType()) {
+    switch (address?.type) {
         case AddressType.Ed25519:
-            return (address as Ed25519Address).getPubKeyHash()
+            return (address as Ed25519Address).pubKeyHash
         case AddressType.Alias:
-            return (address as AliasAddress).getAliasId()
+            return (address as AliasAddress).aliasId
         case AddressType.Nft:
-            return (address as NftAddress).getNftId()
+            return (address as NftAddress).nftId
     }
 }
diff --git a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
index 976a2b1fca5..a5955a885bc 100644
--- a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
@@ -2,14 +2,14 @@ import { FeatureType, FoundryOutput, MetadataFeature } from '@iota/wallet/out/ty
 
 export function getMetadataFromFoundryOutput(foundry: FoundryOutput): string {
     for (const feature of foundry?.getImmutableFeatures() ?? []) {
-        if (feature?.getType() === FeatureType.Metadata) {
-            return (feature as MetadataFeature).getData()
+        if (feature?.type === FeatureType.Metadata) {
+            return (feature as MetadataFeature).data
         }
     }
 
     for (const feature of foundry?.getFeatures() ?? []) {
-        if (feature?.getType() === FeatureType.Metadata) {
-            return (feature as MetadataFeature).getData()
+        if (feature?.type === FeatureType.Metadata) {
+            return (feature as MetadataFeature).data
         }
     }
     return undefined
diff --git a/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts b/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
index 15d4032da34..019bbb6efbb 100644
--- a/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
+++ b/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
@@ -11,12 +11,12 @@ export function getSenderAddressFromUnlockCondition(
     unlockCondition: StorageDepositReturnUnlockCondition | ExpirationUnlockCondition
 ): string | undefined {
     if (
-        (unlockCondition?.getType() === UnlockConditionType.StorageDepositReturn ||
-            unlockCondition?.getType() === UnlockConditionType.Expiration) &&
-        unlockCondition?.getReturnAddress()?.getType() === AddressType.Ed25519
+        (unlockCondition?.type === UnlockConditionType.StorageDepositReturn ||
+            unlockCondition?.type === UnlockConditionType.Expiration) &&
+        unlockCondition?.returnAddress?.type === AddressType.Ed25519
     ) {
         return getBech32AddressFromAddressTypes(
-            new Ed25519Address((unlockCondition.getReturnAddress() as Ed25519Address).getPubKeyHash())
+            new Ed25519Address((unlockCondition.returnAddress as Ed25519Address).pubKeyHash)
         )
     } else {
         return undefined
diff --git a/packages/shared/lib/core/wallet/utils/hashOutputId.ts b/packages/shared/lib/core/wallet/utils/hashOutputId.ts
index ab2a02f7787..0b340763dc0 100644
--- a/packages/shared/lib/core/wallet/utils/hashOutputId.ts
+++ b/packages/shared/lib/core/wallet/utils/hashOutputId.ts
@@ -1,6 +1,7 @@
 import { Converter } from '@core/utils'
 import { Blake2b } from '@iota/crypto.js'
 
+// TODO-sdk Replace/remove in favour of sdk Utils
 export function hashOutputId(outputId: string): string {
     return Converter.bytesToHex(Blake2b.sum256(Converter.hexToBytes(outputId)))
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
index c5b7b46e782..d2aaae3003a 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
@@ -1,20 +1,20 @@
+import { api } from '@core/profile-manager'
 import {
     AddressType,
     AliasAddress,
+    FoundryId,
     FoundryOutput,
     ImmutableAliasAddressUnlockCondition,
     UnlockConditionType,
-    Utils,
 } from '@iota/wallet/out/types'
 
-export function buildFoundryId(foundry: FoundryOutput): string {
-    const unlockCondition = foundry.getUnlockConditions()[0]
-    // TODO-sdk Make this clearer without inline casts
+export function buildFoundryId(foundry: FoundryOutput): Promise<FoundryId> {
+    const unlockCondition = foundry.unlockConditions[0]
     const aliasId =
-        unlockCondition.getType() === UnlockConditionType.ImmutableAliasAddress &&
-        (unlockCondition as ImmutableAliasAddressUnlockCondition).getAddress().getType() === AddressType.Alias
-            ? ((unlockCondition as ImmutableAliasAddressUnlockCondition).getAddress() as AliasAddress).getAliasId()
+        unlockCondition.type === UnlockConditionType.ImmutableAliasAddress &&
+        (unlockCondition as ImmutableAliasAddressUnlockCondition).address.type === AddressType.Alias
+            ? ((unlockCondition as ImmutableAliasAddressUnlockCondition).address as AliasAddress).aliasId
             : ''
 
-    return Utils.computeFoundryId(aliasId, foundry.getSerialNumber(), foundry.getTokenScheme().getType())
+    return api.computeFoundryId(aliasId, foundry.serialNumber, foundry.tokenScheme.type)
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
index 2763d5567b3..302fa760e4b 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
@@ -1,8 +1,6 @@
 import { Address, FeatureType, IssuerFeature, NftOutput } from '@iota/wallet/out/types'
 
 export function getIssuerFromNftOutput(output: NftOutput): Address {
-    const metadata = output
-        .getImmutableFeatures()
-        ?.find((feature) => feature.getType() === FeatureType.Issuer) as IssuerFeature
-    return metadata?.getIssuer()
+    const metadata = output.immutableFeatures?.find((feature) => feature.type === FeatureType.Issuer) as IssuerFeature
+    return metadata?.address
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
index e43f31df6c5..dc4e570b87a 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
@@ -1,8 +1,8 @@
 import { FeatureType, MetadataFeature, NftOutput } from '@iota/wallet/out/types'
 
 export function getMetadataFromNftOutput(output: NftOutput): string {
-    const metadata = output
-        .getImmutableFeatures()
-        ?.find((feature) => feature.getType() === FeatureType.Metadata) as MetadataFeature
-    return metadata?.getData()
+    const metadata = output.immutableFeatures?.find(
+        (feature) => feature.type === FeatureType.Metadata
+    ) as MetadataFeature
+    return metadata?.data
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
index 88e08f26e50..5426c553199 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
@@ -3,13 +3,13 @@ import type { CommonOutput, FoundryOutput, INativeToken, SimpleTokenScheme } fro
 import { OutputType } from '@iota/wallet/out/types'
 
 export function getNativeTokenFromOutput(output: CommonOutput): INativeToken | undefined {
-    if (output?.getType() === OutputType.Foundry) {
+    if (output?.type === OutputType.Foundry) {
         const foundryOutput = output as FoundryOutput
         return {
             id: buildFoundryId(output as FoundryOutput),
-            amount: (foundryOutput.getTokenScheme() as SimpleTokenScheme).getMintedTokens(),
+            amount: (foundryOutput.tokenScheme as SimpleTokenScheme).mintedTokens,
         }
     }
 
-    return output?.getNativeTokens()?.[0]
+    return output?.nativeTokens?.[0]
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts b/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
index 4adc1c31f19..3805a3fa7f4 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
@@ -1,12 +1,17 @@
-import { CommonOutput, Output, OutputType } from '@iota/wallet/out/types'
-import { ASYNC_UNLOCK_CONDITION_TYPES } from '../../constants'
+import { CommonOutput, Output, OutputType, UnlockConditionType } from '@iota/wallet/out/types'
+
+const ASYNC_UNLOCK_CONDITION_TYPES = [
+    UnlockConditionType.StorageDepositReturn,
+    UnlockConditionType.Expiration,
+    UnlockConditionType.Timelock,
+]
 
 export function isOutputAsync(output: Output): boolean {
     if (output.type === OutputType.Treasury) {
         return false
     }
 
-    for (const unlockCondition of (output as CommonOutput).getUnlockConditions()) {
+    for (const unlockCondition of (output as CommonOutput).unlockConditions) {
         if (ASYNC_UNLOCK_CONDITION_TYPES.some((type) => type === unlockCondition.type)) {
             return true
         }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
index 607d2da5a37..5ee9c750646 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
@@ -23,7 +23,7 @@ export function preprocessGroupedOutputs(
     const wrappedOutputs = outputDatas.map((outputData) => ({
         outputId: outputData.outputId,
         remainder: outputData.remainder,
-        output: outputData.output.getType() !== OutputType.Treasury ? outputData.output : undefined,
+        output: outputData.output.type !== OutputType.Treasury ? outputData.output : undefined,
     }))
 
     return {
@@ -74,7 +74,7 @@ function convertTransactionOutputResponseToWrappedOutput(
     transactionId: string,
     outputResponse: OutputResponse
 ): IWrappedOutput {
-    if (outputResponse.output.getType() === OutputType.Treasury) {
+    if (outputResponse.output.type === OutputType.Treasury) {
         return undefined
     } else {
         const outputId = getOutputIdFromTransactionIdAndIndex(transactionId, outputResponse.metadata.outputIndex)
diff --git a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
index f570c3ac433..7ebc709daa1 100644
--- a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
+++ b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
@@ -7,17 +7,17 @@ import { CommonOutput, ExpirationUnlockCondition, OutputType, UnlockConditionTyp
 
 export async function validateSendConfirmation(account: IAccountState, output: CommonOutput): Promise<void> {
     const parseNumber: (value: string) => number = (value: string) => parseInt(value, 10) ?? 0
-    const amount = parseNumber(output?.getAmount())
+    const amount = parseNumber(output?.amount)
     const balance = parseNumber(getSelectedAccount()?.balances?.baseCoin.available ?? '0')
     const { storageDeposit, giftedStorageDeposit } = await getStorageDepositFromOutput(account, output)
 
-    const expirationUnlockCondition = output
-        .getUnlockConditions()
-        .find((c) => c.getType() === UnlockConditionType.Expiration) as ExpirationUnlockCondition
+    const expirationUnlockCondition = output.unlockConditions.find(
+        (c) => c.type === UnlockConditionType.Expiration
+    ) as ExpirationUnlockCondition
     const expirationUnixTime = expirationUnlockCondition?.getUnixTime()
     const expirationDateTime = expirationUnixTime ? convertUnixTimestampToDate(expirationUnixTime) : undefined
 
-    const isNft = output.getType() === OutputType.Nft
+    const isNft = output.type === OutputType.Nft
     if (!isNft && (balance < amount + storageDeposit || balance < amount + giftedStorageDeposit)) {
         throw new InsufficientFundsForStorageDepositError()
     } else if (expirationDateTime && !isValidExpirationDateTime(expirationDateTime)) {
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
index ba200ef32af..e519879ef3e 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
@@ -12,7 +12,7 @@ import {
 export function getSenderAddressFromInputs(inputs: IWrappedOutput[]): string | undefined {
     for (const input of inputs) {
         const { output, metadata } = input
-        const unlockConditions = (output as CommonOutput)?.getUnlockConditions()
+        const unlockConditions = (output as CommonOutput)?.unlockConditions
 
         const spentDate = metadata?.milestoneTimestampSpent
 
@@ -20,25 +20,25 @@ export function getSenderAddressFromInputs(inputs: IWrappedOutput[]): string | u
             // A transaction with an expiration unlock condition is included if the transaction expired
             const expirationUnlockCondition = unlockConditions.find(
                 (unlockCondition) =>
-                    unlockCondition.getType() === UnlockConditionType.Expiration &&
-                    (unlockCondition as ExpirationUnlockCondition).getUnixTime() < spentDate
+                    unlockCondition.type === UnlockConditionType.Expiration &&
+                    (unlockCondition as ExpirationUnlockCondition).unixTime < spentDate
             ) as ExpirationUnlockCondition
 
             if (expirationUnlockCondition) {
-                return getBech32AddressFromAddressTypes(expirationUnlockCondition.getReturnAddress())
+                return getBech32AddressFromAddressTypes(expirationUnlockCondition.returnAddress)
             }
         }
 
         const addressUnlockCondition = unlockConditions.find(
-            (unlockCondition) => unlockCondition.getType() === UnlockConditionType.Address
+            (unlockCondition) => unlockCondition.type === UnlockConditionType.Address
         ) as AddressUnlockCondition
 
         if (addressUnlockCondition) {
-            return getBech32AddressFromAddressTypes(addressUnlockCondition.getAddress())
+            return getBech32AddressFromAddressTypes(addressUnlockCondition.address)
         }
 
         // TODO: if additional metadata is added to an aliasOutput, we could use it to determine the EVM Sender.
-        const aliasId = (output as AliasOutput)?.getAliasId()
+        const aliasId = (output as AliasOutput)?.aliasId
 
         if (aliasId) {
             return getBech32AddressFromAddressTypes(new AliasAddress(aliasId))

From 12bf34a2d42918fff1c41dfb70f6c11355e2e4c4 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Tue, 8 Aug 2023 15:31:35 +0200
Subject: [PATCH 23/48] chore: Bump version of @iota/sdk used

---
 packages/shared/package.json | 2 +-
 yarn.lock                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/shared/package.json b/packages/shared/package.json
index bb787e41fcf..cd075cfed32 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -11,7 +11,7 @@
         "@iota/transaction-converter": "^1.0.0-beta.30",
         "@iota/unit-converter": "^1.0.0-beta.30",
         "@iota/util.js": "^2.0.0-rc.1",
-        "@iota/wallet": "npm:@iota/sdk@1.0.3",
+        "@iota/wallet": "npm:@iota/sdk@1.0.4",
         "@sveltejs/svelte-virtual-list": "^3.0.1",
         "big-integer": "^1.6.51",
         "big.js": "^6.0.3",
diff --git a/yarn.lock b/yarn.lock
index 70005d60665..04522660b55 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -905,10 +905,10 @@
   dependencies:
     big-integer "^1.6.51"
 
-"@iota/wallet@npm:@iota/sdk@1.0.3":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.3.tgz#990b5874e188056b722d99dcfc762713b3da3ff0"
-  integrity sha512-ZQDZT8vbSd5Q2el5P6ixL95LgD+KI7jT8XIVaLPGd8VzE6qU8o/0inDOAJ/8T9qGknqrJ3CybGuGQpdxbSmpCQ==
+"@iota/wallet@npm:@iota/sdk@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.4.tgz#47fa6f559a551a2bf3c2664f8840c48a497dde47"
+  integrity sha512-qjgxce/aOIFoWBDKU+fdcDiX4xbihMiigmsJqb5nK9I3vRPMOG3kxQ9eC7BPRNME3u8c8/sQgdQY9gzqywhZXA==
   dependencies:
     "@types/node" "^18.15.12"
     cargo-cp-artifact "^0.1.6"

From a0dcec05fcdb497f4b99915b6edab7e013c9f899 Mon Sep 17 00:00:00 2001
From: marc2332 <mespinsanz@gmail.com>
Date: Wed, 9 Aug 2023 11:07:33 +0200
Subject: [PATCH 24/48] chore: Type fixes

---
 .../account/interfaces/account.interface.ts   |  4 ++-
 .../nfts/actions/loadNftsForActiveProfile.ts  |  4 ++-
 .../core/nfts/utils/buildNftFromNftOutput.ts  |  6 ++--
 .../events-handlers/handleNewOutputEvent.ts   | 29 +++++++++++--------
 .../generateSingleBasicActivity.ts            |  2 +-
 .../generateSingleFoundryActivity.ts          |  2 +-
 .../helper/getLayer2ActivityInformation.ts    |  2 +-
 .../helper/getSendingInformation.ts           |  4 +--
 .../utils/outputs/getNativeTokenFromOutput.ts |  4 +--
 .../outputs/getRecipientAddressFromOutput.ts  |  7 +++--
 .../utils/outputs/getRecipientFromOutput.ts   |  9 ++++--
 .../utils/outputs/getSenderFromOutput.ts      | 13 +++++++--
 .../utils/outputs/preprocessGroupedOutputs.ts |  7 +----
 .../utils/send/validateSendConfirmation.ts    |  4 +--
 .../activityOutputContainsValue.ts            |  2 +-
 .../transactions/getSenderFromTransaction.ts  |  5 ++--
 16 files changed, 60 insertions(+), 44 deletions(-)

diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index 8b58e7d741c..bf0cff6c634 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -40,12 +40,13 @@ import type {
     FoundryOutputBuilderParams,
     NftOutputBuilderParams,
     INode,
+    AccountAddress,
 } from '@iota/wallet/out/types'
 
 import { ParticipationEventType } from '@iota/wallet/out/types'
 
 export interface IAccount {
-    addresses(): Promise<Address[]>
+    addresses(): Promise<AccountAddress[]>
     addressesWithUnspentOutputs(): Promise<AddressWithUnspentOutputs[]>
     buildAliasOutput(data: AliasOutputBuilderParams): Promise<AliasOutput>
     buildBasicOutput(data: BasicOutputBuilderParams): Promise<BasicOutput>
@@ -124,4 +125,5 @@ export interface IAccount {
     vote(eventId?: string, answers?: number[]): Promise<Transaction>
     verifyEd25519Signature(signature: Ed25519Signature, message: HexEncodedString): Promise<boolean>
     verifySecp256k1EcdsaSignature(signature: Secp256k1EcdsaSignature, message: HexEncodedString): Promise<boolean>
+    minimumRequiredStorageDeposit(output: Output): Promise<number>
 }
diff --git a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
index f79d0b61a04..fac08a18912 100644
--- a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
+++ b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
@@ -7,6 +7,7 @@ import { OUTPUT_TYPE_NFT } from '../../wallet/constants'
 import { INft } from '../interfaces'
 import { buildNftFromNftOutput } from '../utils'
 import { setAccountNftsInAllAccountNfts } from './setAccountNftsInAllAccountNfts'
+import { NftOutput } from '@iota/wallet/out/types'
 
 export async function loadNftsForActiveProfile(): Promise<void> {
     const allAccounts = get(activeAccounts)
@@ -31,7 +32,8 @@ async function loadNftsForAccount(account: IAccountState): Promise<void> {
         .sort((a, b) => b.metadata.milestoneTimestampBooked - a.metadata.milestoneTimestampBooked)
     for (const outputData of sortedNftOutputs) {
         if (outputData.output.type === OUTPUT_TYPE_NFT) {
-            const nftId = getNftId(outputData.output.nftId, outputData.outputId)
+            const nftOutput = outputData.output as NftOutput
+            const nftId = getNftId(nftOutput.nftId, outputData.outputId)
             if (!accountNfts.some((nft) => nft.id === nftId)) {
                 const nft = buildNftFromNftOutput(outputData as IWrappedOutput, account.depositAddress, false)
                 accountNfts.push(nft)
diff --git a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
index dba3eb07ba4..ce577988f79 100644
--- a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
@@ -13,7 +13,7 @@ import { parseNftMetadata } from './parseNftMetadata'
 import { composeUrlFromNftUri } from './composeUrlFromNftUri'
 import { getSpendableStatusFromUnspentNftOutput } from './getSpendableStatusFromUnspentNftOutput'
 import { ADDRESS_TYPE_NFT } from '@core/wallet/constants'
-import { NftOutput } from '@iota/wallet/out/types'
+import { Address, NftOutput } from '@iota/wallet/out/types'
 
 export function buildNftFromNftOutput(
     wrappedOutput: IWrappedOutput,
@@ -32,11 +32,11 @@ export function buildNftFromNftOutput(
     }
 
     const id = getNftId(nftOutput.getNftId(), wrappedOutput.outputId)
-    const address = getBech32AddressFromAddressTypes({ type: ADDRESS_TYPE_NFT, nftId: id })
+    const address = getBech32AddressFromAddressTypes({ type: ADDRESS_TYPE_NFT, nftId: id } as unknown as Address)
     const issuer = getIssuerFromNftOutput(nftOutput)
     const metadata = getMetadataFromNftOutput(nftOutput)
     const parsedMetadata = parseNftMetadata(metadata)
-    const composedUrl = composeUrlFromNftUri(parsedMetadata?.uri)
+    const composedUrl = composeUrlFromNftUri(parsedMetadata.uri)
     const filePath = `${get(activeProfileId)}/nfts/${id}`
     const storageDeposit = Number(nftOutput.amount)
 
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
index d005603a5c3..bcfa178bbc3 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
@@ -1,4 +1,4 @@
-import { Event, NewOutputWalletEvent } from '@iota/wallet/out/types'
+import { AliasOutput, Event, NewOutputWalletEvent } from '@iota/wallet/out/types'
 import { WalletEventType } from '@iota/wallet/out/types'
 
 import { syncBalance } from '@core/account/actions/syncBalance'
@@ -32,34 +32,39 @@ export function handleNewOutputEvent(error: Error, rawEvent: Event): void {
 
 export async function handleNewOutputEventInternal(accountIndex: number, payload: NewOutputWalletEvent): Promise<void> {
     const account = get(activeAccounts)?.find((account) => account.index === accountIndex)
-    const output = payload.output
+    const outputData = payload.output
 
-    if (!account || !output) return
+    if (!account || !outputData) return
 
-    const address = getBech32AddressFromAddressTypes(output?.address)
+    const output = outputData.output as AliasOutput
+
+    const address = getBech32AddressFromAddressTypes(outputData?.address)
     const isNewAliasOutput =
-        output.output.type === OUTPUT_TYPE_ALIAS &&
-        output.output.stateIndex === 0 &&
-        !get(allAccountActivities)[accountIndex].find((_activity) => _activity.id === output.outputId)
-    const isNftOutput = output.output.type === OUTPUT_TYPE_NFT
+        output.type === OUTPUT_TYPE_ALIAS &&
+        output.stateIndex === 0 &&
+        !get(allAccountActivities)[accountIndex].find((_activity) => _activity.id === outputData.outputId)
+    const isNftOutput = outputData.output.type === OUTPUT_TYPE_NFT
 
-    if ((account?.depositAddress === address && !output?.remainder) || isNewAliasOutput) {
+    if ((account?.depositAddress === address && !outputData?.remainder) || isNewAliasOutput) {
         await syncBalance(account.index)
 
-        const processedOutput = preprocessGroupedOutputs([output], payload?.transactionInputs ?? [], account)
+        const processedOutput = preprocessGroupedOutputs([outputData], payload?.transactionInputs ?? [], account)
 
         const activities = await generateActivities(processedOutput, account)
         for (const activity of activities) {
             if (activity.type === ActivityType.Basic || activity.type === ActivityType.Foundry) {
                 const asset = await getOrRequestAssetFromPersistedAssets(activity.assetId)
-                addPersistedAsset(asset)
+                if (asset) {
+                    addPersistedAsset(asset)
+                }
             }
         }
         addActivitiesToAccountActivitiesInAllAccountActivities(account.index, activities)
     }
 
     if (isNftOutput) {
-        const nft = buildNftFromNftOutput(output as IWrappedOutput, account.depositAddress)
+        const wrappedOutput = outputData.output as unknown as IWrappedOutput
+        const nft = buildNftFromNftOutput(wrappedOutput, account.depositAddress)
         addOrUpdateNftInAllAccountNfts(account.index, nft)
         void addNftsToDownloadQueue(accountIndex, [nft])
 
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
index 98a469e65d7..cd62a38ded1 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
@@ -52,7 +52,7 @@ export async function generateSingleBasicActivity(
 
     const baseTokenAmount = getAmountFromOutput(output) - storageDeposit - gasBudget
 
-    const nativeToken = getNativeTokenFromOutput(output)
+    const nativeToken = await getNativeTokenFromOutput(output)
     const assetId = fallbackAssetId ?? nativeToken?.id ?? getCoinType()
 
     let surplus: number | undefined = undefined
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
index ef752e6ab80..e636ab1a77b 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
@@ -44,7 +44,7 @@ export async function generateSingleFoundryActivity(
     const containsValue = true
 
     const id = outputId || transactionId
-    const nativeToken = getNativeTokenFromOutput(output)
+    const nativeToken = await getNativeTokenFromOutput(output)
     const assetId = nativeToken?.id ?? getCoinType()
 
     const storageDeposit = getAmountFromOutput(output)
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getLayer2ActivityInformation.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getLayer2ActivityInformation.ts
index b9e422605b5..37ffb119579 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getLayer2ActivityInformation.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getLayer2ActivityInformation.ts
@@ -14,7 +14,7 @@ export function getLayer2ActivityInformation(
     try {
         parsedLayer2Metadata = parseLayer2Metadata(metadata)
         destinationNetwork = getDestinationNetworkFromAddress(
-            sendingInfo.subject.type === 'address' ? sendingInfo.subject.address : undefined
+            sendingInfo.subject?.type === 'address' ? sendingInfo.subject.address : undefined
         )
     } catch (_err) {
         parsedLayer2Metadata = null
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
index 3935b245b3e..224adf3bddb 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
@@ -6,11 +6,11 @@ import { getSubjectFromAddress } from '../../getSubjectFromAddress'
 import { isSubjectInternal } from '../../isSubjectInternal'
 import { getRecipientFromOutput } from '../../outputs'
 import { getSenderAddressFromInputs, getSenderFromTransaction } from '../../transactions'
-import { Output } from '@iota/wallet/out/types'
+import { CommonOutput } from '@iota/wallet/out/types'
 
 export function getSendingInformation(
     processedTransaction: IProcessedTransaction,
-    output: Output,
+    output: CommonOutput,
     account: IAccountState
 ): SenderInfo {
     const { direction, wrappedInputs } = processedTransaction
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
index 5426c553199..77fbd0e9477 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
@@ -2,11 +2,11 @@ import { buildFoundryId } from './getFoundryId'
 import type { CommonOutput, FoundryOutput, INativeToken, SimpleTokenScheme } from '@iota/wallet/out/types'
 import { OutputType } from '@iota/wallet/out/types'
 
-export function getNativeTokenFromOutput(output: CommonOutput): INativeToken | undefined {
+export async function getNativeTokenFromOutput(output: CommonOutput): Promise<INativeToken | undefined> {
     if (output?.type === OutputType.Foundry) {
         const foundryOutput = output as FoundryOutput
         return {
-            id: buildFoundryId(output as FoundryOutput),
+            id: await buildFoundryId(output as FoundryOutput),
             amount: (foundryOutput.tokenScheme as SimpleTokenScheme).mintedTokens,
         }
     }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts
index 2ac767295d3..f349a45dadb 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts
@@ -1,11 +1,12 @@
+import { AddressUnlockCondition, CommonOutput } from '@iota/wallet/out/types'
 import { UNLOCK_CONDITION_ADDRESS } from '../../constants'
-import { Output } from '../../types'
 import { getBech32AddressFromAddressTypes } from '../getBech32AddressFromAddressTypes'
 
-export function getRecipientAddressFromOutput(output: Output): string {
+export function getRecipientAddressFromOutput(output: CommonOutput): string | undefined {
     for (const unlockCondition of output.unlockConditions) {
         if (unlockCondition.type === UNLOCK_CONDITION_ADDRESS) {
-            return getBech32AddressFromAddressTypes(unlockCondition.address)
+            const addressUnlockCondition = unlockCondition as AddressUnlockCondition
+            return getBech32AddressFromAddressTypes(addressUnlockCondition.address)
         }
     }
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts
index 080a786d34f..75090b954db 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts
@@ -1,8 +1,11 @@
 import { getRecipientAddressFromOutput } from './getRecipientAddressFromOutput'
-import { Output, Subject } from '../../types'
+import { Subject } from '../../types'
 import { getSubjectFromAddress } from '../getSubjectFromAddress'
+import { CommonOutput } from '@iota/wallet'
 
-export function getRecipientFromOutput(output: Output): Subject {
+export function getRecipientFromOutput(output: CommonOutput): Subject | undefined {
     const recipientAddress = getRecipientAddressFromOutput(output)
-    return getSubjectFromAddress(recipientAddress)
+    if (recipientAddress) {
+        return getSubjectFromAddress(recipientAddress)
+    }
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts
index 916b27d45dd..c6eabe54fe0 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts
@@ -1,15 +1,22 @@
-import { Output, Subject } from '../../types'
+import { Subject } from '../../types'
 import { getBech32AddressFromAddressTypes } from '../getBech32AddressFromAddressTypes'
 import { UNLOCK_CONDITION_EXPIRATION, UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN } from '@core/wallet/constants'
 import { getSubjectFromAddress } from '../getSubjectFromAddress'
+import { CommonOutput, ExpirationUnlockCondition, StorageDepositReturnUnlockCondition } from '@iota/wallet'
 
-export function getSenderFromOutput(output: Output): Subject | undefined {
+export function getSenderFromOutput(output: CommonOutput): Subject | undefined {
     for (const unlockCondition of output.unlockConditions) {
         if (
             unlockCondition?.type === UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN ||
             unlockCondition?.type === UNLOCK_CONDITION_EXPIRATION
         ) {
-            return getSubjectFromAddress(getBech32AddressFromAddressTypes(unlockCondition?.returnAddress))
+            const storageOrExpirationUnlockCondition = unlockCondition as
+                | StorageDepositReturnUnlockCondition
+                | ExpirationUnlockCondition
+            const address = getBech32AddressFromAddressTypes(storageOrExpirationUnlockCondition?.returnAddress)
+            if (address) {
+                return getSubjectFromAddress(address)
+            }
         }
     }
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
index 5ee9c750646..935649daa51 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
@@ -83,12 +83,7 @@ function convertTransactionOutputResponseToWrappedOutput(
 }
 
 function getUtxoInputsFromWrappedInputs(wrappedInputs: IWrappedOutput[]): UTXOInput[] {
-    // TODO-sdk This won't work probably
     return (
-        wrappedInputs?.map((input) => ({
-            type: 0,
-            transactionId: input.metadata?.transactionId,
-            transactionInputIndex: input.metadata?.outputIndex,
-        })) ?? []
+        wrappedInputs?.map((input) => new UTXOInput(input.metadata?.transactionId, input.metadata?.outputIndex)) ?? []
     )
 }
diff --git a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
index 7ebc709daa1..5e7df9aa4f7 100644
--- a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
+++ b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
@@ -6,9 +6,9 @@ import { IAccountState } from '@core/account/interfaces'
 import { CommonOutput, ExpirationUnlockCondition, OutputType, UnlockConditionType } from '@iota/wallet/out/types'
 
 export async function validateSendConfirmation(account: IAccountState, output: CommonOutput): Promise<void> {
-    const parseNumber: (value: string) => number = (value: string) => parseInt(value, 10) ?? 0
+    const parseNumber = (value: string) => parseInt(value, 10) ?? 0
     const amount = parseNumber(output?.amount)
-    const balance = parseNumber(getSelectedAccount()?.balances?.baseCoin.available ?? '0')
+    const balance = parseNumber(getSelectedAccount()?.balances?.baseCoin.available.toString() ?? '0')
     const { storageDeposit, giftedStorageDeposit } = await getStorageDepositFromOutput(account, output)
 
     const expirationUnlockCondition = output.unlockConditions.find(
diff --git a/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
index 9549640acaf..ed4d7d32045 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
@@ -15,7 +15,7 @@ export async function activityOutputContainsValue(
         const output = wrappedOutput.output as BasicOutput
 
         const isAsync = isOutputAsync(output)
-        const nativeToken = getNativeTokenFromOutput(output)
+        const nativeToken = await getNativeTokenFromOutput(output)
 
         const { storageDeposit } = await getStorageDepositFromOutput(account, output)
         const rawAmount = getAmountFromOutput(output) - storageDeposit
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts
index 2697301f213..41405058b1e 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts
@@ -1,10 +1,11 @@
-import { Output, Subject } from '@core/wallet/types'
+import { Subject } from '@core/wallet/types'
+import { CommonOutput } from '@iota/wallet'
 import { getSenderFromOutput } from '../outputs/getSenderFromOutput'
 
 export function getSenderFromTransaction(
     isIncoming: boolean,
     accountAddress: string,
-    output: Output
+    output: CommonOutput
 ): Subject | undefined {
     if (isIncoming) {
         return getSenderFromOutput(output)

From a23c0dee6e6b2a809ada586e54d8866dbad4c9c2 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Wed, 9 Aug 2023 12:36:48 +0200
Subject: [PATCH 25/48] fix: Fix action "Create alias"

---
 .../popups/AliasConfirmationPopup.svelte       | 10 ++++++++--
 packages/desktop/electron/preload.js           |  3 ++-
 .../core/account/api/createAliasIfNecessary.ts |  2 +-
 .../account/interfaces/account.interface.ts    | 18 +++++-------------
 .../lib/core/profile-manager/api/index.ts      |  1 +
 .../shared/lib/tests/__mocks__/account.mock.ts |  5 ++++-
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/packages/desktop/components/popups/AliasConfirmationPopup.svelte b/packages/desktop/components/popups/AliasConfirmationPopup.svelte
index 6fe57268459..9777523ca2b 100644
--- a/packages/desktop/components/popups/AliasConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/AliasConfirmationPopup.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     import { Button, KeyValueBox, Text, FontWeight, TextType } from 'shared/components'
     import { selectedAccount, updateSelectedAccount } from '@core/account'
+    import { getClient } from '@core/profile-manager'
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth, getBaseToken } from '@core/profile'
     import {
@@ -11,9 +12,11 @@
         UNLOCK_CONDITION_STATE_CONTROLLER_ADDRESS,
         processAndAddToActivities,
     } from '@core/wallet'
+    import { PreparedTransaction } from '@iota/wallet/out/types'
     import { closePopup } from '@auxiliary/popup'
     import { onMount } from 'svelte'
     import { handleError } from '@core/error/handlers/handleError'
+    import { plainToInstance } from 'class-transformer'
 
     export let _onMount: (..._: any[]) => Promise<void> = async () => {}
 
@@ -44,7 +47,8 @@
 
     async function setStorageDeposit(aliasOutput): Promise<void> {
         try {
-            const { amount } = await $selectedAccount.buildAliasOutput(aliasOutput)
+            const client = await getClient()
+            const { amount } = await client.buildAliasOutput(aliasOutput)
             storageDeposit = formatTokenAmountPrecise(Number(amount), getBaseToken())
         } catch (err) {
             handleError(err)
@@ -54,7 +58,9 @@
     async function createAlias(): Promise<void> {
         try {
             updateSelectedAccount({ isTransferring: true })
-            const transaction = await $selectedAccount.createAliasOutput()
+            const transaction = await $selectedAccount
+                .prepareCreateAliasOutput()
+                .then((prepared) => plainToInstance(PreparedTransaction, prepared).send())
             await processAndAddToActivities(transaction, $selectedAccount)
             closePopup()
         } catch (err) {
diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index cffb4689f10..77efd3b5918 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -9,6 +9,7 @@
 const { ipcRenderer, contextBridge } = require('electron')
 const ElectronApi = require('./electronApi')
 const WalletApi = require('@iota/wallet')
+const { plainToInstance } = require('class-transformer')
 const fs = require('fs')
 
 const SEND_CRASH_REPORTS = window.process.argv.includes('--send-crash-reports=true')
@@ -131,7 +132,7 @@ try {
             const manager = profileManagers[managerId]
             const account = await manager.createAccount(payload)
             bindMethodsAcrossContextBridge(WalletApi.Account.prototype, account)
-            return account
+            return plainToInstance(WalletApi.Account, account)
         },
         deleteWallet(id) {
             if (id && id in profileManagers) {
diff --git a/packages/shared/lib/core/account/api/createAliasIfNecessary.ts b/packages/shared/lib/core/account/api/createAliasIfNecessary.ts
index ea6e0db3de3..bf9d068bf00 100644
--- a/packages/shared/lib/core/account/api/createAliasIfNecessary.ts
+++ b/packages/shared/lib/core/account/api/createAliasIfNecessary.ts
@@ -3,7 +3,7 @@ import { IAccountState } from '@core/account/interfaces'
 export async function createAliasIfNecessary(account: IAccountState): Promise<void> {
     const { aliases } = await account.getBalance()
     if (aliases.length === 0) {
-        await account.createAliasOutput()
+        await account.prepareCreateAliasOutput()
         await new Promise((resolve) => setTimeout(resolve, 7500))
     }
 }
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index bf0cff6c634..be2e60393b1 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -28,19 +28,13 @@ import type {
     SyncOptions,
     Transaction,
     TransactionOptions,
-    AliasOutput,
-    BasicOutput,
     FoundryOutput,
-    NftOutput,
     HexEncodedAmount,
     Output,
     HexEncodedString,
-    AliasOutputBuilderParams,
-    BasicOutputBuilderParams,
-    FoundryOutputBuilderParams,
-    NftOutputBuilderParams,
     INode,
     AccountAddress,
+    PreparedTransaction,
 } from '@iota/wallet/out/types'
 
 import { ParticipationEventType } from '@iota/wallet/out/types'
@@ -48,10 +42,6 @@ import { ParticipationEventType } from '@iota/wallet/out/types'
 export interface IAccount {
     addresses(): Promise<AccountAddress[]>
     addressesWithUnspentOutputs(): Promise<AddressWithUnspentOutputs[]>
-    buildAliasOutput(data: AliasOutputBuilderParams): Promise<AliasOutput>
-    buildBasicOutput(data: BasicOutputBuilderParams): Promise<BasicOutput>
-    buildFoundryOutput(data: FoundryOutputBuilderParams): Promise<FoundryOutput>
-    buildNftOutput(data: NftOutputBuilderParams): Promise<NftOutput>
     burnNativeToken(
         tokenId: string,
         burnAmount: HexEncodedAmount,
@@ -60,7 +50,10 @@ export interface IAccount {
     burnNft(nftId: string, transactionOptions?: TransactionOptions): Promise<Transaction>
     claimOutputs(outputIds: string[]): Promise<Transaction>
     consolidateOutputs(params: ConsolidationParams): Promise<Transaction>
-    createAliasOutput(params?: AliasOutputParams, transactionOptions?: TransactionOptions): Promise<Transaction>
+    prepareCreateAliasOutput(
+        params?: AliasOutputParams,
+        transactionOptions?: TransactionOptions
+    ): Promise<PreparedTransaction>
     meltNativeToken(
         tokenId: string,
         meltAmount: HexEncodedAmount,
@@ -125,5 +118,4 @@ export interface IAccount {
     vote(eventId?: string, answers?: number[]): Promise<Transaction>
     verifyEd25519Signature(signature: Ed25519Signature, message: HexEncodedString): Promise<boolean>
     verifySecp256k1EcdsaSignature(signature: Secp256k1EcdsaSignature, message: HexEncodedString): Promise<boolean>
-    minimumRequiredStorageDeposit(output: Output): Promise<number>
 }
diff --git a/packages/shared/lib/core/profile-manager/api/index.ts b/packages/shared/lib/core/profile-manager/api/index.ts
index 79e64fcf0b7..4935ed6cfa3 100644
--- a/packages/shared/lib/core/profile-manager/api/index.ts
+++ b/packages/shared/lib/core/profile-manager/api/index.ts
@@ -6,6 +6,7 @@ export * from './createAccount'
 export * from './generateMnemonic'
 export * from './getAccount'
 export * from './getAccounts'
+export * from './getClient'
 export * from './getLedgerNanoStatus'
 export * from './getNodeInfo'
 export * from './isStrongholdUnlocked'
diff --git a/packages/shared/lib/tests/__mocks__/account.mock.ts b/packages/shared/lib/tests/__mocks__/account.mock.ts
index a4b91f36f72..a474e3d2da8 100644
--- a/packages/shared/lib/tests/__mocks__/account.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/account.mock.ts
@@ -89,7 +89,10 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    createAliasOutput(params?: AliasOutputParams, transactionOptions?: TransactionOptions): Promise<Transaction> {
+    prepareCreateAliasOutput(
+        params?: AliasOutputParams,
+        transactionOptions?: TransactionOptions
+    ): Promise<Transaction> {
         throw new Error('Method not implemented.')
     }
 

From 6fae0054f5e11e5d32fd56917031549e5885365d Mon Sep 17 00:00:00 2001
From: marc2332 <mespinsanz@gmail.com>
Date: Thu, 10 Aug 2023 08:55:47 +0200
Subject: [PATCH 26/48] chore: Type and test fixes

---
 .../shared/lib/core/account/interfaces/account.interface.ts  | 1 +
 .../core/wallet/utils/outputs/preprocessGroupedOutputs.ts    | 4 ++--
 .../wallet/utils/transactions/getDirectionFromTransaction.ts | 5 +++--
 .../getNonRemainderBasicOutputsFromTransaction.ts            | 3 ++-
 packages/shared/lib/tests/setup.ts                           | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index be2e60393b1..f03010920ff 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -118,4 +118,5 @@ export interface IAccount {
     vote(eventId?: string, answers?: number[]): Promise<Transaction>
     verifyEd25519Signature(signature: Ed25519Signature, message: HexEncodedString): Promise<boolean>
     verifySecp256k1EcdsaSignature(signature: Secp256k1EcdsaSignature, message: HexEncodedString): Promise<boolean>
+    minimumRequiredStorageDeposit(output: Output): Promise<number>
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
index 935649daa51..e4f5f4669c3 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
@@ -1,4 +1,4 @@
-import { OutputData, OutputResponse, OutputType, UTXOInput } from '@iota/wallet/out/types'
+import { CommonOutput, OutputData, OutputResponse, OutputType, UTXOInput } from '@iota/wallet/out/types'
 import { MILLISECONDS_PER_SECOND } from '@core/utils/constants'
 import { IAccountState } from '@core/account/interfaces'
 import { InclusionState, ActivityDirection } from '../../enums'
@@ -48,7 +48,7 @@ function getDirectionForOutputs(
     }
     const output =
         nonRemainderOutputs[0].output.type !== OUTPUT_TYPE_TREASURY ? nonRemainderOutputs[0].output : undefined
-    const recipientAddress = getRecipientAddressFromOutput(output)
+    const recipientAddress = output ? getRecipientAddressFromOutput(output as CommonOutput) : undefined
     const senderAddress = wrappedInputs ? getSenderAddressFromInputs(wrappedInputs) : ''
 
     if (recipientAddress === accountAddress && recipientAddress === senderAddress) {
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts
index 704681cad29..ed662cfac61 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts
@@ -1,6 +1,7 @@
 import { IWrappedOutput } from '../../interfaces'
 import { getRecipientAddressFromOutput } from '../outputs/getRecipientAddressFromOutput'
 import { ActivityDirection } from '@core/wallet/enums'
+import { CommonOutput } from '@iota/wallet'
 
 export function getDirectionFromTransaction(
     wrappedOutputs: IWrappedOutput[],
@@ -8,7 +9,7 @@ export function getDirectionFromTransaction(
     accountAddress: string
 ): ActivityDirection {
     const containsOutput = wrappedOutputs.some((outputData) => {
-        const recipientAddress = getRecipientAddressFromOutput(outputData.output)
+        const recipientAddress = getRecipientAddressFromOutput(outputData.output as CommonOutput)
 
         if (incoming) {
             return accountAddress === recipientAddress
@@ -20,7 +21,7 @@ export function getDirectionFromTransaction(
         return incoming ? ActivityDirection.Incoming : ActivityDirection.Outgoing
     } else {
         const isSelfTransaction = wrappedOutputs.some(
-            (outputData) => accountAddress === getRecipientAddressFromOutput(outputData.output)
+            (outputData) => accountAddress === getRecipientAddressFromOutput(outputData.output as CommonOutput)
         )
         return isSelfTransaction ? ActivityDirection.SelfTransaction : ActivityDirection.Incoming
     }
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
index 3dca6673e37..bae8e65f912 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
@@ -1,6 +1,7 @@
 import { getRecipientAddressFromOutput } from '..'
 import { IWrappedOutput } from '@core/wallet/interfaces'
 import { ActivityDirection } from '@core/wallet/enums'
+import { CommonOutput } from '@iota/wallet'
 
 export function getNonRemainderBasicOutputsFromTransaction(
     wrappedOutputs: IWrappedOutput[],
@@ -8,7 +9,7 @@ export function getNonRemainderBasicOutputsFromTransaction(
     direction: ActivityDirection
 ): IWrappedOutput[] {
     return wrappedOutputs.filter((outputData) => {
-        const recipientAddress = getRecipientAddressFromOutput(outputData.output)
+        const recipientAddress = getRecipientAddressFromOutput(outputData.output as CommonOutput)
 
         if (direction === ActivityDirection.Incoming || direction === ActivityDirection.SelfTransaction) {
             return accountAddress === recipientAddress
diff --git a/packages/shared/lib/tests/setup.ts b/packages/shared/lib/tests/setup.ts
index b33de8af6c8..b21b69c0490 100644
--- a/packages/shared/lib/tests/setup.ts
+++ b/packages/shared/lib/tests/setup.ts
@@ -6,6 +6,7 @@
 import './__mocks__/api.mock'
 import './__mocks__/match-media.mock'
 import './__mocks__/platform.mock'
+import 'reflect-metadata'
 
 beforeAll(async () => {})
 afterAll(async () => {})

From 00e9c01f8b49723f41df7b23bc8c98b02e8bbcdd Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Thu, 10 Aug 2023 11:53:40 +0200
Subject: [PATCH 27/48] chore: Fix Mint Nft/Native token flows

---
 .../popups/MintNativeTokenConfirmationPopup.svelte |  4 +++-
 .../popups/MintNftConfirmationPopup.svelte         |  4 +++-
 packages/desktop/electron/preload.js               |  3 +--
 .../core/account/interfaces/account.interface.ts   |  8 ++++----
 .../lib/core/nfts/utils/buildNftFromNftOutput.ts   |  7 +++----
 .../events-handlers/handleNewOutputEvent.ts        |  9 ++++-----
 .../lib/core/wallet/actions/createNativeToken.ts   | 14 ++++++++++----
 packages/shared/lib/core/wallet/actions/mintNft.ts | 11 +++++++----
 .../lib/core/wallet/utils/buildNftOutputData.ts    |  4 ++--
 .../generateActivity/generateSingleNftActivity.ts  | 10 +++++++---
 .../wallet/utils/outputs/preprocessTransaction.ts  |  1 +
 11 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte b/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
index cf8679e8f5f..ca6fdebea74 100644
--- a/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
@@ -13,6 +13,7 @@
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { Button, KeyValueBox, Text, FontWeight, TextType } from 'shared/components'
     import { onMount } from 'svelte'
+    import { getClient } from '@core/profile-manager'
     import { selectedAccount } from '@core/account'
     import { handleError } from '@core/error/handlers/handleError'
 
@@ -33,7 +34,8 @@
                 metadata,
                 aliasId
             )
-            const preparedOutput = await $selectedAccount.buildFoundryOutput(outputData)
+            const client = await getClient()
+            const preparedOutput = await client.buildFoundryOutput(outputData)
             storageDeposit = formatTokenAmountPrecise(Number(preparedOutput.amount) ?? 0, getBaseToken())
         }
     }
diff --git a/packages/desktop/components/popups/MintNftConfirmationPopup.svelte b/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
index bab7511570c..f8b060b3abe 100644
--- a/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
@@ -2,6 +2,7 @@
     import { onMount } from 'svelte'
     import { Button, Text, FontWeight, NftImageOrIconBox, Tabs, KeyValueBox, NftSize } from 'shared/components'
     import { localize } from '@core/i18n'
+    import { getClient } from '@core/profile-manager'
     import { selectedAccount } from '@core/account'
     import { buildNftOutputData, formatTokenAmountPrecise, mintNft, mintNftDetails } from '@core/wallet'
     import { getBaseToken, checkActiveProfileAuth } from '@core/profile'
@@ -51,7 +52,8 @@
 
     async function prepareNftOutput(): Promise<void> {
         const outputData = buildNftOutputData(irc27Metadata, $selectedAccount.depositAddress)
-        const preparedOutput = await $selectedAccount.buildNftOutput(outputData)
+        const client = await getClient()
+        const preparedOutput = await client.buildNftOutput(outputData)
         storageDeposit = Number(preparedOutput.amount) ?? 0
         totalStorageDeposit = storageDeposit * quantity
     }
diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index 77efd3b5918..cffb4689f10 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -9,7 +9,6 @@
 const { ipcRenderer, contextBridge } = require('electron')
 const ElectronApi = require('./electronApi')
 const WalletApi = require('@iota/wallet')
-const { plainToInstance } = require('class-transformer')
 const fs = require('fs')
 
 const SEND_CRASH_REPORTS = window.process.argv.includes('--send-crash-reports=true')
@@ -132,7 +131,7 @@ try {
             const manager = profileManagers[managerId]
             const account = await manager.createAccount(payload)
             bindMethodsAcrossContextBridge(WalletApi.Account.prototype, account)
-            return plainToInstance(WalletApi.Account, account)
+            return account
         },
         deleteWallet(id) {
             if (id && id in profileManagers) {
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index f03010920ff..6d9edcc7e2c 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -35,6 +35,7 @@ import type {
     INode,
     AccountAddress,
     PreparedTransaction,
+    PreparedCreateNativeTokenTransaction,
 } from '@iota/wallet/out/types'
 
 import { ParticipationEventType } from '@iota/wallet/out/types'
@@ -85,11 +86,11 @@ export interface IAccount {
         transactionOptions?: TransactionOptions
     ): Promise<CreateNativeTokenTransaction>
     increaseVotingPower(amount: string): Promise<Transaction>
-    createNativeToken(
+    prepareCreateNativeToken(
         params: CreateNativeTokenParams,
         transactionOptions?: TransactionOptions
-    ): Promise<CreateNativeTokenTransaction>
-    mintNfts(params: MintNftParams[], transactionOptions?: TransactionOptions): Promise<Transaction>
+    ): Promise<PreparedCreateNativeTokenTransaction>
+    prepareMintNfts(params: MintNftParams[], transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
     outputs(filterOptions?: FilterOptions): Promise<OutputData[]>
     prepareOutput(params: OutputParams, transactionOptions?: TransactionOptions): Promise<Output>
     pendingTransactions(): Promise<Transaction[]>
@@ -118,5 +119,4 @@ export interface IAccount {
     vote(eventId?: string, answers?: number[]): Promise<Transaction>
     verifyEd25519Signature(signature: Ed25519Signature, message: HexEncodedString): Promise<boolean>
     verifySecp256k1EcdsaSignature(signature: Secp256k1EcdsaSignature, message: HexEncodedString): Promise<boolean>
-    minimumRequiredStorageDeposit(output: Output): Promise<number>
 }
diff --git a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
index ce577988f79..01c51d488c0 100644
--- a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
@@ -12,8 +12,7 @@ import { INft } from '../interfaces'
 import { parseNftMetadata } from './parseNftMetadata'
 import { composeUrlFromNftUri } from './composeUrlFromNftUri'
 import { getSpendableStatusFromUnspentNftOutput } from './getSpendableStatusFromUnspentNftOutput'
-import { ADDRESS_TYPE_NFT } from '@core/wallet/constants'
-import { Address, NftOutput } from '@iota/wallet/out/types'
+import { Address, AddressType, NftOutput } from '@iota/wallet/out/types'
 
 export function buildNftFromNftOutput(
     wrappedOutput: IWrappedOutput,
@@ -31,8 +30,8 @@ export function buildNftFromNftOutput(
         timeLockTime = status.timeLockTime
     }
 
-    const id = getNftId(nftOutput.getNftId(), wrappedOutput.outputId)
-    const address = getBech32AddressFromAddressTypes({ type: ADDRESS_TYPE_NFT, nftId: id } as unknown as Address)
+    const id = getNftId(nftOutput.nftId, wrappedOutput.outputId)
+    const address = getBech32AddressFromAddressTypes({ type: AddressType.Nft, nftId: id } as unknown as Address)
     const issuer = getIssuerFromNftOutput(nftOutput)
     const metadata = getMetadataFromNftOutput(nftOutput)
     const parsedMetadata = parseNftMetadata(metadata)
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
index bcfa178bbc3..4949c00478d 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
@@ -1,4 +1,4 @@
-import { AliasOutput, Event, NewOutputWalletEvent } from '@iota/wallet/out/types'
+import { AliasOutput, Event, NewOutputWalletEvent, OutputType } from '@iota/wallet/out/types'
 import { WalletEventType } from '@iota/wallet/out/types'
 
 import { syncBalance } from '@core/account/actions/syncBalance'
@@ -12,7 +12,6 @@ import {
     generateActivities,
     getOrRequestAssetFromPersistedAssets,
 } from '@core/wallet'
-import { OUTPUT_TYPE_ALIAS, OUTPUT_TYPE_NFT } from '@core/wallet/constants'
 import {
     addActivitiesToAccountActivitiesInAllAccountActivities,
     allAccountActivities,
@@ -40,10 +39,10 @@ export async function handleNewOutputEventInternal(accountIndex: number, payload
 
     const address = getBech32AddressFromAddressTypes(outputData?.address)
     const isNewAliasOutput =
-        output.type === OUTPUT_TYPE_ALIAS &&
+        output.type === OutputType.Alias &&
         output.stateIndex === 0 &&
         !get(allAccountActivities)[accountIndex].find((_activity) => _activity.id === outputData.outputId)
-    const isNftOutput = outputData.output.type === OUTPUT_TYPE_NFT
+    const isNftOutput = outputData.output.type === OutputType.Nft
 
     if ((account?.depositAddress === address && !outputData?.remainder) || isNewAliasOutput) {
         await syncBalance(account.index)
@@ -63,7 +62,7 @@ export async function handleNewOutputEventInternal(accountIndex: number, payload
     }
 
     if (isNftOutput) {
-        const wrappedOutput = outputData.output as unknown as IWrappedOutput
+        const wrappedOutput = outputData as unknown as IWrappedOutput
         const nft = buildNftFromNftOutput(wrappedOutput, account.depositAddress)
         addOrUpdateNftInAllAccountNfts(account.index, nft)
         void addNftsToDownloadQueue(accountIndex, [nft])
diff --git a/packages/shared/lib/core/wallet/actions/createNativeToken.ts b/packages/shared/lib/core/wallet/actions/createNativeToken.ts
index ac26b5b8231..2ce6ca03fb2 100644
--- a/packages/shared/lib/core/wallet/actions/createNativeToken.ts
+++ b/packages/shared/lib/core/wallet/actions/createNativeToken.ts
@@ -3,13 +3,14 @@ import { showAppNotification } from '@auxiliary/notification'
 import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { localize } from '@core/i18n'
 import { Converter } from '@core/utils'
-import { CreateNativeTokenParams } from '@iota/wallet/out/types'
+import { CreateNativeTokenParams, PreparedTransaction } from '@iota/wallet/out/types'
 import { DEFAULT_TRANSACTION_OPTIONS } from '../constants'
 import { VerifiedStatus } from '../enums'
 import { buildPersistedAssetFromMetadata } from '../helpers'
 import { IIrc30Metadata, IPersistedAsset } from '../interfaces'
 import { resetMintTokenDetails } from '../stores'
 import { addPersistedAsset } from '../stores/persisted-assets.store'
+import { plainToInstance } from 'class-transformer'
 import { processAndAddToActivities } from '../utils'
 
 export async function createNativeToken(
@@ -27,15 +28,20 @@ export async function createNativeToken(
             foundryMetadata: Converter.utf8ToHex(JSON.stringify(metadata)),
         }
 
-        const createNativeTokenTransaction = await account.createNativeToken(params, DEFAULT_TRANSACTION_OPTIONS)
+        const preparedNativeTokenTransaction = await account?.prepareCreateNativeToken(
+            params,
+            DEFAULT_TRANSACTION_OPTIONS
+        )
+        const preparedTransaction = plainToInstance(PreparedTransaction, preparedNativeTokenTransaction)
+        const transaction = await preparedTransaction?.send()
         const persistedAsset: IPersistedAsset = buildPersistedAssetFromMetadata(
-            createNativeTokenTransaction.tokenId,
+            preparedNativeTokenTransaction._tokenId,
             metadata,
             { verified: true, status: VerifiedStatus.SelfVerified }
         )
         addPersistedAsset(persistedAsset)
 
-        await processAndAddToActivities(createNativeTokenTransaction.transaction, account)
+        await processAndAddToActivities(transaction, account)
 
         showAppNotification({
             type: 'success',
diff --git a/packages/shared/lib/core/wallet/actions/mintNft.ts b/packages/shared/lib/core/wallet/actions/mintNft.ts
index 450ad61ce49..f925a027316 100644
--- a/packages/shared/lib/core/wallet/actions/mintNft.ts
+++ b/packages/shared/lib/core/wallet/actions/mintNft.ts
@@ -3,14 +3,15 @@ import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { localize } from '@core/i18n'
 import { addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput, IIrc27Metadata } from '@core/nfts'
 import { Converter } from '@core/utils'
-import { MintNftParams } from '@iota/wallet/out/types'
+import { MintNftParams, OutputType, PreparedTransaction } from '@iota/wallet/out/types'
 import { get } from 'svelte/store'
-import { DEFAULT_TRANSACTION_OPTIONS, OUTPUT_TYPE_NFT } from '../constants'
+import { DEFAULT_TRANSACTION_OPTIONS } from '../constants'
 import { ActivityAction } from '../enums'
 import { addActivityToAccountActivitiesInAllAccountActivities, resetMintNftDetails } from '../stores'
 import { NftActivity } from '../types'
 import { preprocessTransaction } from '../utils'
 import { generateSingleNftActivity } from '../utils/generateActivity/generateSingleNftActivity'
+import { plainToInstance } from 'class-transformer'
 
 export async function mintNft(metadata: IIrc27Metadata, quantity: number): Promise<void> {
     try {
@@ -24,7 +25,9 @@ export async function mintNft(metadata: IIrc27Metadata, quantity: number): Promi
         const allNftParams: MintNftParams[] = Array(quantity).fill(mintNftParams)
 
         // Mint NFT
-        const mintNftTransaction = await account.mintNfts(allNftParams, DEFAULT_TRANSACTION_OPTIONS)
+        const mintNftTransaction = await account
+            .prepareMintNfts(allNftParams, DEFAULT_TRANSACTION_OPTIONS)
+            .then((prepared) => plainToInstance(PreparedTransaction, prepared).send())
         resetMintNftDetails()
         showAppNotification({
             type: 'success',
@@ -37,7 +40,7 @@ export async function mintNft(metadata: IIrc27Metadata, quantity: number): Promi
 
         // Generate Activities
         for (const output of outputs) {
-            if (output.output.type === OUTPUT_TYPE_NFT) {
+            if (output.output.type === OutputType.Nft) {
                 // For each minted NFT, generate a new activity
                 const activity: NftActivity = (await generateSingleNftActivity(account, {
                     action: ActivityAction.Mint,
diff --git a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
index d3a67b022b4..a92a5516a8e 100644
--- a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
@@ -1,10 +1,10 @@
-import { AddressUnlockCondition, BuildNftOutputData, Ed25519Address, MetadataFeature } from '@iota/wallet/out/types'
+import { AddressUnlockCondition, Ed25519Address, MetadataFeature, NftOutputBuilderParams } from '@iota/wallet/out/types'
 import { Converter } from '@core/utils'
 import { EMPTY_HEX_ID } from '../constants'
 import { convertBech32ToHexAddress } from './convertBech32ToHexAddress'
 import { IIrc27Metadata } from '@core/nfts/interfaces'
 
-export function buildNftOutputData(metadata: IIrc27Metadata, address: string): BuildNftOutputData {
+export function buildNftOutputData(metadata: IIrc27Metadata, address: string): NftOutputBuilderParams {
     const addressUnlockCondition = new AddressUnlockCondition(new Ed25519Address(convertBech32ToHexAddress(address)))
 
     const unlockConditions: AddressUnlockCondition[] = [addressUnlockCondition]
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
index 0e5a05d9320..39ac4b02ec9 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
@@ -13,6 +13,7 @@ import {
     getTagFromOutput,
 } from './helper'
 import { NftOutput } from '@iota/wallet/out/types'
+import { getClient } from '@core/profile-manager'
 
 export async function generateSingleNftActivity(
     account: IAccountState,
@@ -28,7 +29,7 @@ export async function generateSingleNftActivity(
     const isAssetHidden = false
     const containsValue = true
 
-    const nftId = nftIdFromInput ? nftIdFromInput : getNftId(output.getNftId(), outputId)
+    const nftId = nftIdFromInput ? nftIdFromInput : getNftId(output.nftId, outputId)
     const metadata = getMetadataFromOutput(output)
     const tag = getTagFromOutput(output)
 
@@ -38,13 +39,16 @@ export async function generateSingleNftActivity(
     const { parsedLayer2Metadata, destinationNetwork } = getLayer2ActivityInformation(metadata, sendingInfo)
     const gasBudget = Number(parsedLayer2Metadata?.gasBudget ?? '0')
 
-    let { storageDeposit, giftedStorageDeposit } = await getStorageDepositFromOutput(account, output)
+    const storageDepositData = await getStorageDepositFromOutput(account, output)
+    const { storageDeposit } = storageDepositData
+    let { giftedStorageDeposit } = storageDepositData
     giftedStorageDeposit = action === ActivityAction.Burn ? 0 : giftedStorageDeposit
     giftedStorageDeposit = gasBudget === 0 ? giftedStorageDeposit : 0
 
     let surplus: number | undefined = undefined
     try {
-        const minimumRequiredStorageDeposit = await account.minimumRequiredStorageDeposit(output)
+        const client = await getClient()
+        const minimumRequiredStorageDeposit = await client.minimumRequiredStorageDeposit(output)
         surplus = Number(output.amount) - Number(minimumRequiredStorageDeposit)
         if (surplus && !storageDeposit) {
             giftedStorageDeposit = Number(minimumRequiredStorageDeposit)
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
index 4e8b426637c..ff4c521fdd5 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
@@ -15,6 +15,7 @@ export async function preprocessTransaction(
         transaction?.transactionId,
         regularTransactionEssence.outputs
     )
+
     const direction = getDirectionFromTransaction(outputs, transaction.incoming, account.depositAddress)
     const utxoInputs = regularTransactionEssence.inputs.map((i) => i as UTXOInput)
     const inputIds = await Promise.all(

From f95eec9442a10e94dfec3264820bbe97a89b9bc4 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Thu, 10 Aug 2023 13:37:06 +0200
Subject: [PATCH 28/48] chore: Fix one accessor on ExpirationUnlockCondition

---
 .../lib/core/wallet/utils/send/validateSendConfirmation.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
index 5e7df9aa4f7..61d36bfc44b 100644
--- a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
+++ b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
@@ -14,7 +14,7 @@ export async function validateSendConfirmation(account: IAccountState, output: C
     const expirationUnlockCondition = output.unlockConditions.find(
         (c) => c.type === UnlockConditionType.Expiration
     ) as ExpirationUnlockCondition
-    const expirationUnixTime = expirationUnlockCondition?.getUnixTime()
+    const expirationUnixTime = expirationUnlockCondition?.unixTime
     const expirationDateTime = expirationUnixTime ? convertUnixTimestampToDate(expirationUnixTime) : undefined
 
     const isNft = output.type === OutputType.Nft

From 5f28ee8ef0d474194cf3e1b49be804843726e66d Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Thu, 10 Aug 2023 13:50:09 +0200
Subject: [PATCH 29/48] chore: Rename dependency to @iota/sdk

---
 .../desktop/components/ProposalAnswer.svelte  |  2 +-
 .../components/ProposalQuestion.svelte        |  2 +-
 .../components/popups/AddProposalPopup.svelte |  2 +-
 .../popups/AliasConfirmationPopup.svelte      |  2 +-
 .../popups/BalanceBreakdownPopup.svelte       |  2 +-
 .../popups/NodeAuthRequiredPopup.svelte       |  2 +-
 packages/desktop/electron-builder-config.js   |  2 +-
 packages/desktop/electron/preload.js          |  2 +-
 .../views/ProposalDetailsView.svelte          |  2 +-
 packages/mobile/capacitor/capacitorApi.ts     |  2 +-
 .../drawers/BalanceBreakdownDrawer.svelte     |  2 +-
 .../addProposalsFromParticipationEventMap.ts  |  2 +-
 ...ccountsParticipationEventStatusForEvent.ts |  2 +-
 .../governance/actions/getVotingEvent.ts      |  2 +-
 .../initializeParticipationOverviews.ts       |  2 +-
 .../actions/registerParticipationEvent.ts     |  2 +-
 .../actions/registerParticipationEvents.ts    |  2 +-
 .../actions/registerProposalsForAccounts.ts   |  2 +-
 .../governance/actions/setVotingPower.ts      |  2 +-
 .../actions/stopVotingForProposal.ts          |  2 +-
 ...default-participation-overview.constant.ts |  2 +-
 .../interfaces/proposal-state.interface.ts    |  2 +-
 .../stores/participation-overviews.store.ts   |  2 +-
 ...lected-participation-event-status.store.ts |  2 +-
 ...ulateTotalVotesForTrackedParticipations.ts |  2 +-
 .../utils/createProposalFromEvent.ts          |  2 +-
 .../utils/getActiveParticipation.ts           |  2 +-
 .../utils/getParticipationsForProposal.ts     |  2 +-
 .../utils/getPercentagesFromAnswerStatuses.ts |  2 +-
 .../utils/getVotingParticipationEventIds.ts   |  4 ++--
 .../governance/utils/isParticipationOutput.ts |  2 +-
 .../governance/utils/isVotingForProposal.ts   |  2 +-
 .../getPercentagesFromAnswerStatuses.test.ts  |  2 +-
 ...sactionInclusionEventForShimmerClaiming.ts |  4 ++--
 ...ribeToWalletApiEventsForShimmerClaiming.ts |  2 +-
 ...-claiming-account-sync-options.constant.ts |  2 +-
 .../helpers/prepareShimmerClaimingAccount.ts  |  2 +-
 .../helpers/restoreBackupByCopyingFile.ts     |  2 +-
 .../shimmer-claiming-account.interface.ts     |  2 +-
 .../utils/sumTotalClaimedRewards.ts           |  2 +-
 .../core/account/actions/buildAccountState.ts |  2 +-
 .../shared/lib/core/account/api/getBalance.ts |  2 +-
 .../account/api/getParticipationOverview.ts   |  2 +-
 .../lib/core/account/api/prepareOutput.ts     |  2 +-
 .../default-sync-options.constant.ts          |  2 +-
 .../interfaces/account-balances.interface.ts  |  2 +-
 .../interfaces/account-state.interface.ts     |  2 +-
 .../account/interfaces/account.interface.ts   |  4 ++--
 .../persisted-account-data.interface.ts       |  2 +-
 .../core/account/utils/sumTotalFromOutputs.ts |  2 +-
 .../account/utils/syncAccountsInParallel.ts   |  2 +-
 .../account/utils/syncAccountsInSeries.ts     |  2 +-
 .../ledger/stores/ledger-nano-status.store.ts |  2 +-
 .../stores/ledger-prepared-output.store.ts    |  2 +-
 .../utils/determineLedgerConnectionState.ts   |  2 +-
 .../helpers/getNetworkStatusFromNodeInfo.ts   |  2 +-
 .../interfaces/client-options.interface.ts    |  2 +-
 .../node-info-response.interface.ts           |  2 +-
 .../core/network/stores/node-info.store.ts    |  2 +-
 .../nfts/actions/loadNftsForActiveProfile.ts  |  2 +-
 .../lib/core/nfts/interfaces/nft.interface.ts |  2 +-
 .../nfts/tests/buildNftFromNftOutput.test.ts  |  2 +-
 .../core/nfts/utils/buildNftFromNftOutput.ts  |  2 +-
 .../getSpendableStatusFromUnspentNftOutput.ts |  2 +-
 .../events-handlers/handleNewOutputEvent.ts   |  4 ++--
 .../events-handlers/handleSpentOutputEvent.ts |  4 ++--
 .../handleTransactionInclusionEvent.ts        |  4 ++--
 .../handleTransactionProgressEvent.ts         |  4 ++--
 .../actions/initialiseProfileManager.ts       |  4 ++--
 .../profile-manager/api/computeOutputId.ts    |  2 +-
 .../core/profile-manager/api/createAccount.ts |  2 +-
 .../lib/core/profile-manager/api/getClient.ts |  2 +-
 .../api/getLedgerNanoStatus.ts                |  2 +-
 .../api/startBackgroundSync.ts                |  2 +-
 .../interfaces/api.interface.ts               |  4 ++--
 .../interfaces/profile-manager.interface.ts   |  4 ++--
 .../recover-account-payload.interface.ts      |  2 +-
 ...let-api-event-payload-wrapper.interface.ts |  2 +-
 .../types/profile-manager-options.type.ts     |  2 +-
 .../types/transaction-progress-event.type.ts  |  2 +-
 .../types/wallet-api-event-handler.type.ts    |  2 +-
 .../types/wallet-api-event-map.type.ts        |  2 +-
 .../utils/getSecretManagerFromProfileType.ts  |  2 +-
 .../utils/validateWalletApiEvent.ts           |  4 ++--
 ...scribeToWalletApiEventsForActiveProfile.ts |  2 +-
 packages/shared/lib/core/utils/filter.ts      |  4 ++--
 .../activities/preprocessOutputsForAccount.ts |  2 +-
 .../core/wallet/actions/createNativeToken.ts  |  2 +-
 .../shared/lib/core/wallet/actions/mintNft.ts |  2 +-
 .../lib/core/wallet/actions/sendOutput.ts     |  2 +-
 .../setOutgoingAsyncActivitiesToClaimed.ts    |  2 +-
 .../default-transaction-options.constant.ts   |  2 +-
 .../processed-transaction.interface.ts        |  2 +-
 .../interfaces/wrapped-output.interface.ts    |  2 +-
 .../wallet/utils/buildFoundryOutputData.ts    |  2 +-
 .../core/wallet/utils/buildNftOutputData.ts   |  2 +-
 .../generateActivity/generateActivities.ts    |  2 +-
 .../generateActivitiesFromAliasOutputs.ts     |  2 +-
 .../generateActivitiesFromBasicOutputs.ts     |  2 +-
 .../generateActivitiesFromNftOutputs.ts       |  2 +-
 .../generateSingleAliasActivity.ts            |  2 +-
 .../generateSingleBasicActivity.ts            |  2 +-
 .../generateSingleConsolidationActivity.ts    |  2 +-
 .../generateSingleFoundryActivity.ts          |  2 +-
 .../generateSingleGovernanceActivity.ts       |  2 +-
 .../generateSingleNftActivity.ts              |  2 +-
 .../helper/getActivityTypeFromOutput.ts       |  2 +-
 .../helper/getAmountFromOutput.ts             |  2 +-
 .../helper/getAsyncDataFromOutput.ts          |  2 +-
 .../helper/getGovernanceInfo.ts               |  2 +-
 .../getGovernorAddressFromAliasOutput.ts      |  2 +-
 .../helper/getMetadataFromOutput.ts           |  2 +-
 .../helper/getSendingInformation.ts           |  2 +-
 ...etStateControllerAddressFromAliasOutput.ts |  2 +-
 .../helper/getStorageDepositFromOutput.ts     |  2 +-
 .../helper/getTagFromOutput.ts                |  2 +-
 .../helper/getTimelockDateFromOutput.ts       |  2 +-
 .../utils/getBech32AddressFromAddressTypes.ts |  2 +-
 .../utils/getHexAddressFromAddressTypes.ts    |  2 +-
 .../utils/getMetadataFromFoundryOutput.ts     |  2 +-
 .../core/wallet/utils/getOutputParameters.ts  |  2 +-
 .../getSenderAddressFromUnlockCondition.ts    |  2 +-
 .../outputs/getExpirationDateFromOutput.ts    |  2 +-
 .../core/wallet/utils/outputs/getFoundryId.ts |  2 +-
 .../utils/outputs/getIssuerFromNftOutput.ts   |  2 +-
 .../utils/outputs/getMetadataFromNftOutput.ts |  2 +-
 .../utils/outputs/getNativeTokenFromOutput.ts |  4 ++--
 .../outputs/getRecipientAddressFromOutput.ts  |  2 +-
 .../utils/outputs/getRecipientFromOutput.ts   |  2 +-
 .../utils/outputs/getSenderFromOutput.ts      |  2 +-
 .../outputs/getSerialNumberFromAliasOutput.ts |  2 +-
 .../wallet/utils/outputs/isOutputAsync.ts     |  2 +-
 .../utils/outputs/preprocessGroupedOutputs.ts |  2 +-
 .../utils/outputs/preprocessTransaction.ts    |  2 +-
 .../wallet/utils/processAndAddToActivities.ts |  2 +-
 .../utils/send/validateSendConfirmation.ts    |  2 +-
 .../activityOutputContainsValue.ts            |  2 +-
 .../getDirectionFromTransaction.ts            |  2 +-
 ...NonRemainderBasicOutputsFromTransaction.ts |  2 +-
 .../getSenderAddressFromInputs.ts             |  2 +-
 .../transactions/getSenderFromTransaction.ts  |  2 +-
 .../tests/__mocks__/account-balance.mock.ts   |  2 +-
 .../lib/tests/__mocks__/account.mock.ts       |  2 +-
 .../shared/lib/tests/__mocks__/api.mock.ts    |  2 +-
 .../tests/__mocks__/profile-manager.mock.ts   |  4 ++--
 packages/shared/package.json                  |  2 +-
 yarn.lock                                     | 24 +++++++++----------
 147 files changed, 172 insertions(+), 172 deletions(-)

diff --git a/packages/desktop/components/ProposalAnswer.svelte b/packages/desktop/components/ProposalAnswer.svelte
index 4962c9902a3..71d3a268d0e 100644
--- a/packages/desktop/components/ProposalAnswer.svelte
+++ b/packages/desktop/components/ProposalAnswer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import type { Answer } from '@iota/wallet/out/types'
+    import type { Answer } from '@iota/sdk/out/types'
 
     import { Icon, PingingBadge, Text, TooltipIcon } from '@ui'
     import { FontWeight, Position } from '@ui/enums'
diff --git a/packages/desktop/components/ProposalQuestion.svelte b/packages/desktop/components/ProposalQuestion.svelte
index db2f8985277..517a9686df0 100644
--- a/packages/desktop/components/ProposalQuestion.svelte
+++ b/packages/desktop/components/ProposalQuestion.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import type { AnswerStatus, Question } from '@iota/wallet/out/types'
+    import type { AnswerStatus, Question } from '@iota/sdk/out/types'
 
     import { ProposalAnswer } from '@components'
     import { Icon, Text, TooltipIcon } from '@ui'
diff --git a/packages/desktop/components/popups/AddProposalPopup.svelte b/packages/desktop/components/popups/AddProposalPopup.svelte
index 0e24513e113..af3edc1fb03 100644
--- a/packages/desktop/components/popups/AddProposalPopup.svelte
+++ b/packages/desktop/components/popups/AddProposalPopup.svelte
@@ -7,7 +7,7 @@
     import { localize } from '@core/i18n'
     import { activeAccounts, updateActiveAccountPersistedData } from '@core/profile'
     import { truncateString } from '@core/utils/string'
-    import type { Auth } from '@iota/wallet/out/types'
+    import type { Auth } from '@iota/sdk/out/types'
     import { Button, Checkbox, NodeInput, Text, TextInput, TextType } from 'shared/components'
     import { HTMLButtonType } from 'shared/components/enums'
 
diff --git a/packages/desktop/components/popups/AliasConfirmationPopup.svelte b/packages/desktop/components/popups/AliasConfirmationPopup.svelte
index 9777523ca2b..9ed56349202 100644
--- a/packages/desktop/components/popups/AliasConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/AliasConfirmationPopup.svelte
@@ -12,7 +12,7 @@
         UNLOCK_CONDITION_STATE_CONTROLLER_ADDRESS,
         processAndAddToActivities,
     } from '@core/wallet'
-    import { PreparedTransaction } from '@iota/wallet/out/types'
+    import { PreparedTransaction } from '@iota/sdk/out/types'
     import { closePopup } from '@auxiliary/popup'
     import { onMount } from 'svelte'
     import { handleError } from '@core/error/handlers/handleError'
diff --git a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
index 7a61736952d..0372d9c8d04 100644
--- a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
+++ b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
@@ -5,7 +5,7 @@
     import { checkActiveProfileAuth } from '@core/profile'
     import { consolidateOutputs } from '@core/wallet/actions/consolidateOutputs'
     import { getStorageDepositFromOutput } from '@core/wallet/utils/generateActivity/helper'
-    import { UnlockCondition, UnlockConditionType, OutputType, CommonOutput } from '@iota/wallet/out/types'
+    import { UnlockCondition, UnlockConditionType, OutputType, CommonOutput } from '@iota/sdk/out/types'
     import { TextHintVariant } from 'shared/components/enums'
     import { BalanceSummarySection, Button, FontWeight, Text, TextType } from 'shared/components'
 
diff --git a/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte b/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte
index 8a1e8c02011..372894c239b 100644
--- a/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte
+++ b/packages/desktop/components/popups/NodeAuthRequiredPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Button, HTMLButtonType, Text, TextInput, TextType } from 'shared/components'
-    import type { Auth } from '@iota/wallet/out/types'
+    import type { Auth } from '@iota/sdk/out/types'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
     import { closePopup } from '@auxiliary/popup'
diff --git a/packages/desktop/electron-builder-config.js b/packages/desktop/electron-builder-config.js
index 205b3c96d36..eda800663e7 100644
--- a/packages/desktop/electron-builder-config.js
+++ b/packages/desktop/electron-builder-config.js
@@ -46,7 +46,7 @@ const prodConfig = () => ({
     artifactName: 'firefly-desktop-${version}.${ext}',
     copyright: 'IOTA Foundation',
     directories: { buildResources: './public', output: './out' },
-    files: ['public/', 'package.json', '!node_modules/@iota/wallet/target/*'],
+    files: ['public/', 'package.json', '!node_modules/@iota/sdk/target/*'],
     appId: APP_ID,
     afterSign: async () => {
         // eslint-disable-next-line no-useless-catch
diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index cffb4689f10..1c82aef3acf 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -8,7 +8,7 @@
 
 const { ipcRenderer, contextBridge } = require('electron')
 const ElectronApi = require('./electronApi')
-const WalletApi = require('@iota/wallet')
+const WalletApi = require('@iota/sdk')
 const fs = require('fs')
 
 const SEND_CRASH_REPORTS = window.process.argv.includes('--send-crash-reports=true')
diff --git a/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte b/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
index 87f7eee1159..764d7c70603 100644
--- a/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
+++ b/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { VotingEventPayload, ParticipationEventType, TrackedParticipationOverview } from '@iota/wallet/out/types'
+    import { VotingEventPayload, ParticipationEventType, TrackedParticipationOverview } from '@iota/sdk/out/types'
 
     import { onMount, onDestroy } from 'svelte'
 
diff --git a/packages/mobile/capacitor/capacitorApi.ts b/packages/mobile/capacitor/capacitorApi.ts
index 856ebc9d752..ac2d53aa0af 100644
--- a/packages/mobile/capacitor/capacitorApi.ts
+++ b/packages/mobile/capacitor/capacitorApi.ts
@@ -10,7 +10,7 @@ import { DeepLinkManager } from './lib/deepLinkManager'
 import { NotificationManager } from './lib/notificationManager'
 import { PincodeManager } from './lib/pincodeManager'
 
-import { WalletApi } from '@iota/wallet-mobile'
+import { WalletApi } from '@iota/sdk-mobile'
 
 window['__WALLET__API__'] = WalletApi
 
diff --git a/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte b/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
index bbce6043e6b..86748367b3a 100644
--- a/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
+++ b/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { UnlockConditionType, UnlockCondition, OutputType, CommonOutput } from '@iota/wallet/out/types'
+    import { UnlockConditionType, UnlockCondition, OutputType, CommonOutput } from '@iota/sdk/out/types'
     import { BalanceSummarySection, Button } from '@ui'
 
     import { selectedAccount } from '@core/account'
diff --git a/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts b/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts
index 09936d9f289..85c5cec8743 100644
--- a/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts
+++ b/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts
@@ -1,4 +1,4 @@
-import { ParticipationEventMap, ParticipationEventWithNodes } from '@iota/wallet/out/types'
+import { ParticipationEventMap, ParticipationEventWithNodes } from '@iota/sdk/out/types'
 
 import { IAccountState } from '@core/account/interfaces'
 
diff --git a/packages/shared/lib/contexts/governance/actions/getAccountsParticipationEventStatusForEvent.ts b/packages/shared/lib/contexts/governance/actions/getAccountsParticipationEventStatusForEvent.ts
index 4816fd5bf04..685cf504298 100644
--- a/packages/shared/lib/contexts/governance/actions/getAccountsParticipationEventStatusForEvent.ts
+++ b/packages/shared/lib/contexts/governance/actions/getAccountsParticipationEventStatusForEvent.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 
-import type { ParticipationEventId, ParticipationEventStatus } from '@iota/wallet/out/types'
+import type { ParticipationEventId, ParticipationEventStatus } from '@iota/sdk/out/types'
 
 import { IAccount } from '@core/account/interfaces'
 import { selectedAccount } from '@core/account/stores'
diff --git a/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts b/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
index 3672cde974f..e3118e3c0a4 100644
--- a/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
+++ b/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import type { ParticipationEventId, ParticipationEventWithNodes } from '@iota/wallet/out/types'
+import type { ParticipationEventId, ParticipationEventWithNodes } from '@iota/sdk/out/types'
 import { selectedAccount } from '@core/account/stores'
 
 export function getVotingEvent(eventId: ParticipationEventId): Promise<ParticipationEventWithNodes> {
diff --git a/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts b/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts
index e9465343cc8..17bb8016ba7 100644
--- a/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts
+++ b/packages/shared/lib/contexts/governance/actions/initializeParticipationOverviews.ts
@@ -1,5 +1,5 @@
 import { activeAccounts } from '@core/profile'
-import { ParticipationOverview } from '@iota/wallet/out/types'
+import { ParticipationOverview } from '@iota/sdk/out/types'
 import { get } from 'svelte/store'
 import { DEFAULT_PARTICIPATION_OVERVIEW } from '../constants'
 import { allParticipationOverviews } from '../stores'
diff --git a/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts b/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
index 8cc03675fe0..88fc59dc36e 100644
--- a/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
@@ -3,7 +3,7 @@ import type {
     ParticipationEventWithNodes,
     ParticipationEventId,
     ParticipationEventRegistrationOptions,
-} from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
 import { IAccountState } from '@core/account'
 import { addOrUpdateProposalToRegisteredProposals } from '../stores'
 import { createProposalFromEvent } from '@contexts/governance'
diff --git a/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts b/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts
index ab50985bd32..6536a773f1b 100644
--- a/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts
@@ -1,4 +1,4 @@
-import { ParticipationEventMap, ParticipationEventRegistrationOptions } from '@iota/wallet/out/types'
+import { ParticipationEventMap, ParticipationEventRegistrationOptions } from '@iota/sdk/out/types'
 
 import { get } from 'svelte/store'
 
diff --git a/packages/shared/lib/contexts/governance/actions/registerProposalsForAccounts.ts b/packages/shared/lib/contexts/governance/actions/registerProposalsForAccounts.ts
index 9969eb70f42..17e1cd4b6b1 100644
--- a/packages/shared/lib/contexts/governance/actions/registerProposalsForAccounts.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerProposalsForAccounts.ts
@@ -1,4 +1,4 @@
-import { ParticipationEventRegistrationOptions } from '@iota/wallet/out/types'
+import { ParticipationEventRegistrationOptions } from '@iota/sdk/out/types'
 
 import { IAccountState } from '@core/account/interfaces'
 
diff --git a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
index 67b354fd001..6854b2781c3 100644
--- a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
+++ b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import { Transaction } from '@iota/wallet/out/types'
+import { Transaction } from '@iota/sdk/out/types'
 import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
 import { processAndAddToActivities } from '@core/wallet/utils'
 import { handleError } from '@core/error/handlers'
diff --git a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
index 011d4634223..4854f1b9f64 100644
--- a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
+++ b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import type { Transaction } from '@iota/wallet/out/types'
+import type { Transaction } from '@iota/sdk/out/types'
 import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
 import { showAppNotification } from '@auxiliary/notification/actions'
 import { localize } from '@core/i18n'
diff --git a/packages/shared/lib/contexts/governance/constants/default-participation-overview.constant.ts b/packages/shared/lib/contexts/governance/constants/default-participation-overview.constant.ts
index 9b663a085b0..49fdbbc699b 100644
--- a/packages/shared/lib/contexts/governance/constants/default-participation-overview.constant.ts
+++ b/packages/shared/lib/contexts/governance/constants/default-participation-overview.constant.ts
@@ -1,3 +1,3 @@
-import type { ParticipationOverview } from '@iota/wallet/out/types'
+import type { ParticipationOverview } from '@iota/sdk/out/types'
 
 export const DEFAULT_PARTICIPATION_OVERVIEW: ParticipationOverview = { participations: {} }
diff --git a/packages/shared/lib/contexts/governance/interfaces/proposal-state.interface.ts b/packages/shared/lib/contexts/governance/interfaces/proposal-state.interface.ts
index 99d1deddce2..196570d53e7 100644
--- a/packages/shared/lib/contexts/governance/interfaces/proposal-state.interface.ts
+++ b/packages/shared/lib/contexts/governance/interfaces/proposal-state.interface.ts
@@ -1,4 +1,4 @@
-import type { ParticipationEventStatus, Question } from '@iota/wallet/out/types'
+import type { ParticipationEventStatus, Question } from '@iota/sdk/out/types'
 import { IOrganization, ProposalError } from '..'
 import { ProposalStatus, ProposalType } from '../enums'
 
diff --git a/packages/shared/lib/contexts/governance/stores/participation-overviews.store.ts b/packages/shared/lib/contexts/governance/stores/participation-overviews.store.ts
index 61ee40d410a..22baa22b4ce 100644
--- a/packages/shared/lib/contexts/governance/stores/participation-overviews.store.ts
+++ b/packages/shared/lib/contexts/governance/stores/participation-overviews.store.ts
@@ -1,5 +1,5 @@
 import { derived, get, Readable, writable } from 'svelte/store'
-import type { ParticipationOverview } from '@iota/wallet/out/types'
+import type { ParticipationOverview } from '@iota/sdk/out/types'
 import { selectedAccountIndex } from '@core/account/stores'
 import { getParticipationOverview } from '@core/account/api/getParticipationOverview'
 import { DEFAULT_PARTICIPATION_OVERVIEW } from '../constants'
diff --git a/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts b/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
index fe186118535..dd526f16c3b 100644
--- a/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
+++ b/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
@@ -1,4 +1,4 @@
-import { ParticipationEventStatus } from '@iota/wallet/out/types'
+import { ParticipationEventStatus } from '@iota/sdk/out/types'
 import { get, writable } from 'svelte/store'
 import { selectedAccountIndex } from '@core/account/stores'
 import { getAccountsParticipationEventStatusForEvent } from '../actions'
diff --git a/packages/shared/lib/contexts/governance/utils/calculateTotalVotesForTrackedParticipations.ts b/packages/shared/lib/contexts/governance/utils/calculateTotalVotesForTrackedParticipations.ts
index c1d66e5ccd7..a907597bcda 100644
--- a/packages/shared/lib/contexts/governance/utils/calculateTotalVotesForTrackedParticipations.ts
+++ b/packages/shared/lib/contexts/governance/utils/calculateTotalVotesForTrackedParticipations.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import { TrackedParticipationOverview } from '@iota/wallet/out/types'
+import { TrackedParticipationOverview } from '@iota/sdk/out/types'
 import { networkStatus } from '@core/network/stores'
 import { MILESTONE_NOT_FOUND } from '@core/network/constants'
 
diff --git a/packages/shared/lib/contexts/governance/utils/createProposalFromEvent.ts b/packages/shared/lib/contexts/governance/utils/createProposalFromEvent.ts
index 4447bbff294..01f0ec0b08e 100644
--- a/packages/shared/lib/contexts/governance/utils/createProposalFromEvent.ts
+++ b/packages/shared/lib/contexts/governance/utils/createProposalFromEvent.ts
@@ -1,4 +1,4 @@
-import type { ParticipationEventWithNodes, VotingEventPayload } from '@iota/wallet/out/types'
+import type { ParticipationEventWithNodes, VotingEventPayload } from '@iota/sdk/out/types'
 import { OFFICIAL_NODE_URLS } from '@core/network/constants'
 import { IProposalMetadata } from '../interfaces'
 import { ProposalStatus, ProposalType } from '../enums'
diff --git a/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts b/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts
index 180bf89e52e..0a57b7c216f 100644
--- a/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts
+++ b/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import type { TrackedParticipationOverview } from '@iota/wallet/out/types'
+import type { TrackedParticipationOverview } from '@iota/sdk/out/types'
 import { participationOverviewForSelectedAccount } from '../stores/participation-overviews.store'
 
 export function getActiveParticipation(proposalId: string): TrackedParticipationOverview {
diff --git a/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts b/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
index c75707ee185..6bb0881ee46 100644
--- a/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
+++ b/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 
-import type { ParticipationOverview, TrackedParticipationOverview } from '@iota/wallet/out/types'
+import type { ParticipationOverview, TrackedParticipationOverview } from '@iota/sdk/out/types'
 
 import { allParticipationOverviews } from '@contexts/governance/stores'
 import { selectedAccountIndex } from '@core/account/stores'
diff --git a/packages/shared/lib/contexts/governance/utils/getPercentagesFromAnswerStatuses.ts b/packages/shared/lib/contexts/governance/utils/getPercentagesFromAnswerStatuses.ts
index 5d75c651cae..a037c0ff59e 100644
--- a/packages/shared/lib/contexts/governance/utils/getPercentagesFromAnswerStatuses.ts
+++ b/packages/shared/lib/contexts/governance/utils/getPercentagesFromAnswerStatuses.ts
@@ -1,5 +1,5 @@
 import { round } from '@core/utils/number'
-import type { AnswerStatus } from '@iota/wallet/out/types'
+import type { AnswerStatus } from '@iota/sdk/out/types'
 import { IProposalAnswerPercentages } from '../interfaces'
 
 export function getPercentagesFromAnswerStatuses(answerStatuses: AnswerStatus[]): IProposalAnswerPercentages {
diff --git a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
index aa7a9fc27f5..94f94345ba9 100644
--- a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
+++ b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
 
-import { INode, ParticipationEventId } from '@iota/wallet'
-import { ParticipationEventType } from '@iota/wallet/out/types'
+import { INode, ParticipationEventId } from '@iota/sdk'
+import { ParticipationEventType } from '@iota/sdk/out/types'
 
 import { selectedAccount } from '@core/account/stores'
 
diff --git a/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts b/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
index b71f2df7512..0cebdc9143e 100644
--- a/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
+++ b/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
@@ -1,5 +1,5 @@
 import { PARTICIPATE_TAG_HEX } from '../constants'
-import { CommonOutput, Output, TagFeature } from '@iota/wallet/out/types'
+import { CommonOutput, Output, TagFeature } from '@iota/sdk/out/types'
 
 export function isParticipationOutput(output: Output): boolean {
     if (output.type === 2) {
diff --git a/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts b/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts
index 705cd93343f..870018c7cfa 100644
--- a/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts
+++ b/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import type { TrackedParticipationOverview } from '@iota/wallet/out/types'
+import type { TrackedParticipationOverview } from '@iota/sdk/out/types'
 import { selectedAccountIndex } from '@core/account'
 import { getParticipationsForProposal } from './getParticipationsForProposal'
 
diff --git a/packages/shared/lib/contexts/governance/utils/tests/getPercentagesFromAnswerStatuses.test.ts b/packages/shared/lib/contexts/governance/utils/tests/getPercentagesFromAnswerStatuses.test.ts
index 18efe38d338..f377ba1e149 100644
--- a/packages/shared/lib/contexts/governance/utils/tests/getPercentagesFromAnswerStatuses.test.ts
+++ b/packages/shared/lib/contexts/governance/utils/tests/getPercentagesFromAnswerStatuses.test.ts
@@ -1,5 +1,5 @@
 import '@mocks/i18n.mock'
-import type { AnswerStatus } from '@iota/wallet/out/types'
+import type { AnswerStatus } from '@iota/sdk/out/types'
 
 import { getPercentagesFromAnswerStatuses } from '../getPercentagesFromAnswerStatuses'
 
diff --git a/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts b/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
index 77c6dfc3f9d..c5e1b157f9e 100644
--- a/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
 
-import { Event, TransactionInclusionWalletEvent } from '@iota/wallet/out/types'
-import { WalletEventType } from '@iota/wallet/out/types'
+import { Event, TransactionInclusionWalletEvent } from '@iota/sdk/out/types'
+import { WalletEventType } from '@iota/sdk/out/types'
 
 import { localize } from '@core/i18n'
 import { validateWalletApiEvent } from '@core/profile-manager'
diff --git a/packages/shared/lib/contexts/onboarding/actions/subscribeToWalletApiEventsForShimmerClaiming.ts b/packages/shared/lib/contexts/onboarding/actions/subscribeToWalletApiEventsForShimmerClaiming.ts
index 38df598f5a3..09381f36a97 100644
--- a/packages/shared/lib/contexts/onboarding/actions/subscribeToWalletApiEventsForShimmerClaiming.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/subscribeToWalletApiEventsForShimmerClaiming.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import { WalletEventType } from '@iota/wallet/out/types'
+import { WalletEventType } from '@iota/sdk/out/types'
 
 import { handleTransactionProgressEvent, subscribeToWalletApiEvents, WalletApiEventMap } from '@core/profile-manager'
 
diff --git a/packages/shared/lib/contexts/onboarding/constants/shimmer-claiming-account-sync-options.constant.ts b/packages/shared/lib/contexts/onboarding/constants/shimmer-claiming-account-sync-options.constant.ts
index b870dc590c2..323b2c6f500 100644
--- a/packages/shared/lib/contexts/onboarding/constants/shimmer-claiming-account-sync-options.constant.ts
+++ b/packages/shared/lib/contexts/onboarding/constants/shimmer-claiming-account-sync-options.constant.ts
@@ -1,4 +1,4 @@
-import type { SyncOptions } from '@iota/wallet/out/types'
+import type { SyncOptions } from '@iota/sdk/out/types'
 
 export const SHIMMER_CLAIMING_ACCOUNT_SYNC_OPTIONS: SyncOptions = {
     alias: {
diff --git a/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts b/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts
index 77e1163b0f4..65037bad03c 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 
-import { Transaction } from '@iota/wallet/out/types'
+import { Transaction } from '@iota/sdk/out/types'
 
 import { IAccount, sumTotalFromOutputs, syncAccountsInParallel, syncAccountsInSeries } from '@core/account'
 import { filterShimmerClaimingOutputs } from '@core/utils'
diff --git a/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts b/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
index 0f7a1a94540..5e691dd582d 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
@@ -1,6 +1,6 @@
 import { get, Writable } from 'svelte/store'
 
-import { IClientOptions } from '@iota/wallet/out/types'
+import { IClientOptions } from '@iota/sdk/out/types'
 
 import { ClientError, CLIENT_ERROR_REGEXES } from '@core/error'
 import { IProfileManager } from '@core/profile-manager'
diff --git a/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts b/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts
index edd0319968a..31b22a12bd7 100644
--- a/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts
+++ b/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts
@@ -1,4 +1,4 @@
-import { Transaction } from '@iota/wallet/out/types'
+import { Transaction } from '@iota/sdk/out/types'
 
 import { IAccount } from '@core/account'
 
diff --git a/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts b/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
index 739393f6710..5d3082bb4a8 100644
--- a/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
+++ b/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
@@ -1,7 +1,7 @@
 import { tryNumberOrZero } from '@core/utils'
 
 import { IShimmerClaimingAccount } from '../interfaces'
-import { Output, RegularTransactionEssence } from '@iota/wallet/out/types'
+import { Output, RegularTransactionEssence } from '@iota/sdk/out/types'
 
 export function sumTotalClaimedRewards(shimmerClaimingAccounts: IShimmerClaimingAccount[]): number {
     return shimmerClaimingAccounts?.reduce(
diff --git a/packages/shared/lib/core/account/actions/buildAccountState.ts b/packages/shared/lib/core/account/actions/buildAccountState.ts
index d0606222d58..30d13ae8ce0 100644
--- a/packages/shared/lib/core/account/actions/buildAccountState.ts
+++ b/packages/shared/lib/core/account/actions/buildAccountState.ts
@@ -1,4 +1,4 @@
-import { Balance } from '@iota/wallet/out/types'
+import { Balance } from '@iota/sdk/out/types'
 
 import { getDepositAddress } from '@core/account/utils'
 
diff --git a/packages/shared/lib/core/account/api/getBalance.ts b/packages/shared/lib/core/account/api/getBalance.ts
index 8b395bce1f7..468e6bf0b22 100644
--- a/packages/shared/lib/core/account/api/getBalance.ts
+++ b/packages/shared/lib/core/account/api/getBalance.ts
@@ -1,4 +1,4 @@
-import { Balance } from '@iota/wallet/out/types'
+import { Balance } from '@iota/sdk/out/types'
 import { getAccount } from '@core/profile-manager'
 
 export async function getBalance(index?: number): Promise<Balance> {
diff --git a/packages/shared/lib/core/account/api/getParticipationOverview.ts b/packages/shared/lib/core/account/api/getParticipationOverview.ts
index 8ab07e3b4c7..c883f785346 100644
--- a/packages/shared/lib/core/account/api/getParticipationOverview.ts
+++ b/packages/shared/lib/core/account/api/getParticipationOverview.ts
@@ -1,4 +1,4 @@
-import type { ParticipationOverview } from '@iota/wallet/out/types'
+import type { ParticipationOverview } from '@iota/sdk/out/types'
 
 import { getAccount } from '@core/profile-manager/api'
 
diff --git a/packages/shared/lib/core/account/api/prepareOutput.ts b/packages/shared/lib/core/account/api/prepareOutput.ts
index 518a7f73430..6c535d7c6d6 100644
--- a/packages/shared/lib/core/account/api/prepareOutput.ts
+++ b/packages/shared/lib/core/account/api/prepareOutput.ts
@@ -1,5 +1,5 @@
 import { getAccount } from '@core/profile-manager'
-import { Output, OutputParams, TransactionOptions } from '@iota/wallet/out/types'
+import { Output, OutputParams, TransactionOptions } from '@iota/sdk/out/types'
 
 export async function prepareOutput(
     accountIndex: number,
diff --git a/packages/shared/lib/core/account/constants/default-sync-options.constant.ts b/packages/shared/lib/core/account/constants/default-sync-options.constant.ts
index cb3b7dc33a6..f96cba73d38 100644
--- a/packages/shared/lib/core/account/constants/default-sync-options.constant.ts
+++ b/packages/shared/lib/core/account/constants/default-sync-options.constant.ts
@@ -1,4 +1,4 @@
-import type { SyncOptions } from '@iota/wallet/out/types'
+import type { SyncOptions } from '@iota/sdk/out/types'
 
 export const DEFAULT_SYNC_OPTIONS: SyncOptions = {
     account: {
diff --git a/packages/shared/lib/core/account/interfaces/account-balances.interface.ts b/packages/shared/lib/core/account/interfaces/account-balances.interface.ts
index e04ae1caa74..b81ba9cf4b2 100644
--- a/packages/shared/lib/core/account/interfaces/account-balances.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account-balances.interface.ts
@@ -1,4 +1,4 @@
-import { RequiredStorageDeposit } from '@iota/wallet/out/types'
+import { RequiredStorageDeposit } from '@iota/sdk/out/types'
 
 export interface IAccountBalances {
     aliases: unknown[]
diff --git a/packages/shared/lib/core/account/interfaces/account-state.interface.ts b/packages/shared/lib/core/account/interfaces/account-state.interface.ts
index 909ce19d818..9edc3ffc9a3 100644
--- a/packages/shared/lib/core/account/interfaces/account-state.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account-state.interface.ts
@@ -1,4 +1,4 @@
-import { Balance } from '@iota/wallet/out/types'
+import { Balance } from '@iota/sdk/out/types'
 import { IPersistedAccountData } from './persisted-account-data.interface'
 import { IAccount } from './account.interface'
 
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index 6d9edcc7e2c..0e13691e7a0 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -36,9 +36,9 @@ import type {
     AccountAddress,
     PreparedTransaction,
     PreparedCreateNativeTokenTransaction,
-} from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
 
-import { ParticipationEventType } from '@iota/wallet/out/types'
+import { ParticipationEventType } from '@iota/sdk/out/types'
 
 export interface IAccount {
     addresses(): Promise<AccountAddress[]>
diff --git a/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts b/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
index a927af9a489..f3052b8d0e1 100644
--- a/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
@@ -1,4 +1,4 @@
-import { ParticipationEventId } from '@iota/wallet/out/types'
+import { ParticipationEventId } from '@iota/sdk/out/types'
 
 export interface IPersistedAccountData {
     name: string
diff --git a/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts b/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts
index dc8fcf51f4e..021c8fff081 100644
--- a/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts
+++ b/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts
@@ -1,4 +1,4 @@
-import { OutputData } from '@iota/wallet/out/types'
+import { OutputData } from '@iota/sdk/out/types'
 
 export function sumTotalFromOutputs(outputs: OutputData[]): number {
     return outputs?.reduce((total: number, outputData: OutputData) => (total += Number(outputData?.output?.amount)), 0)
diff --git a/packages/shared/lib/core/account/utils/syncAccountsInParallel.ts b/packages/shared/lib/core/account/utils/syncAccountsInParallel.ts
index f0b96dfe5b7..1e256fc8321 100644
--- a/packages/shared/lib/core/account/utils/syncAccountsInParallel.ts
+++ b/packages/shared/lib/core/account/utils/syncAccountsInParallel.ts
@@ -1,4 +1,4 @@
-import { Balance, SyncOptions } from '@iota/wallet/out/types'
+import { Balance, SyncOptions } from '@iota/sdk/out/types'
 
 import { IAccount } from '../interfaces'
 
diff --git a/packages/shared/lib/core/account/utils/syncAccountsInSeries.ts b/packages/shared/lib/core/account/utils/syncAccountsInSeries.ts
index 00db6912a1f..a1dfa4d3d75 100644
--- a/packages/shared/lib/core/account/utils/syncAccountsInSeries.ts
+++ b/packages/shared/lib/core/account/utils/syncAccountsInSeries.ts
@@ -1,4 +1,4 @@
-import { Balance, SyncOptions } from '@iota/wallet/out/types'
+import { Balance, SyncOptions } from '@iota/sdk/out/types'
 
 import { IAccount } from '@core/account'
 
diff --git a/packages/shared/lib/core/ledger/stores/ledger-nano-status.store.ts b/packages/shared/lib/core/ledger/stores/ledger-nano-status.store.ts
index f03749dd7c8..69986350d5e 100644
--- a/packages/shared/lib/core/ledger/stores/ledger-nano-status.store.ts
+++ b/packages/shared/lib/core/ledger/stores/ledger-nano-status.store.ts
@@ -1,4 +1,4 @@
-import { LedgerNanoStatus } from '@iota/wallet/out/types'
+import { LedgerNanoStatus } from '@iota/sdk/out/types'
 import { writable } from 'svelte/store'
 
 const DEFAULT_LEDGER_STATUS: LedgerNanoStatus = {
diff --git a/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts b/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts
index 6ca6d637506..9e1b8fd00f6 100644
--- a/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts
+++ b/packages/shared/lib/core/ledger/stores/ledger-prepared-output.store.ts
@@ -1,4 +1,4 @@
-import { Output } from '@iota/wallet/out/types'
+import { Output } from '@iota/sdk/out/types'
 import { writable } from 'svelte/store'
 
 export const ledgerPreparedOutput = writable<Output>(null)
diff --git a/packages/shared/lib/core/ledger/utils/determineLedgerConnectionState.ts b/packages/shared/lib/core/ledger/utils/determineLedgerConnectionState.ts
index dbf2118f881..7ec0b55d4ef 100644
--- a/packages/shared/lib/core/ledger/utils/determineLedgerConnectionState.ts
+++ b/packages/shared/lib/core/ledger/utils/determineLedgerConnectionState.ts
@@ -1,6 +1,6 @@
 import { LedgerConnectionState } from '../interfaces'
 import { LedgerAppName } from '../enums'
-import { LedgerNanoStatus } from '@iota/wallet/out/types'
+import { LedgerNanoStatus } from '@iota/sdk/out/types'
 
 export function determineLedgerConnectionState(
     status: LedgerNanoStatus,
diff --git a/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts b/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts
index 399d20c78f7..0cc8e01b870 100644
--- a/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts
+++ b/packages/shared/lib/core/network/helpers/getNetworkStatusFromNodeInfo.ts
@@ -1,7 +1,7 @@
 import { MILLISECONDS_PER_SECOND, SECONDS_PER_MINUTE } from '@core/utils'
 import { NetworkHealth } from '../enums'
 import { INetworkStatus } from '../interfaces'
-import { INodeInfo } from '@iota/wallet/out/types'
+import { INodeInfo } from '@iota/sdk/out/types'
 
 /**
  * Update the network status store from the NodeInfo.
diff --git a/packages/shared/lib/core/network/interfaces/client-options.interface.ts b/packages/shared/lib/core/network/interfaces/client-options.interface.ts
index 3ee39e25874..c2e8bcbf866 100644
--- a/packages/shared/lib/core/network/interfaces/client-options.interface.ts
+++ b/packages/shared/lib/core/network/interfaces/client-options.interface.ts
@@ -1,4 +1,4 @@
-import { IClientOptions } from '@iota/wallet/out/types'
+import { IClientOptions } from '@iota/sdk/out/types'
 
 import { INode } from './node.interface'
 
diff --git a/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts b/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts
index 03c5682ad8c..c04b009c62f 100644
--- a/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts
+++ b/packages/shared/lib/core/network/interfaces/node-info-response.interface.ts
@@ -1,4 +1,4 @@
-import { INodeInfo } from '@iota/wallet/out/types'
+import { INodeInfo } from '@iota/sdk/out/types'
 
 export interface INodeInfoResponse {
     nodeInfo: INodeInfo
diff --git a/packages/shared/lib/core/network/stores/node-info.store.ts b/packages/shared/lib/core/network/stores/node-info.store.ts
index b47a3b008e2..8b6708bc65c 100644
--- a/packages/shared/lib/core/network/stores/node-info.store.ts
+++ b/packages/shared/lib/core/network/stores/node-info.store.ts
@@ -1,4 +1,4 @@
-import { INodeInfo } from '@iota/wallet/out/types'
+import { INodeInfo } from '@iota/sdk/out/types'
 import { writable } from 'svelte/store'
 
 export const nodeInfo = writable<INodeInfo | undefined>(undefined)
diff --git a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
index fac08a18912..df1cee3a1de 100644
--- a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
+++ b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
@@ -7,7 +7,7 @@ import { OUTPUT_TYPE_NFT } from '../../wallet/constants'
 import { INft } from '../interfaces'
 import { buildNftFromNftOutput } from '../utils'
 import { setAccountNftsInAllAccountNfts } from './setAccountNftsInAllAccountNfts'
-import { NftOutput } from '@iota/wallet/out/types'
+import { NftOutput } from '@iota/sdk/out/types'
 
 export async function loadNftsForActiveProfile(): Promise<void> {
     const allAccounts = get(activeAccounts)
diff --git a/packages/shared/lib/core/nfts/interfaces/nft.interface.ts b/packages/shared/lib/core/nfts/interfaces/nft.interface.ts
index 00986ff1532..34012823ff6 100644
--- a/packages/shared/lib/core/nfts/interfaces/nft.interface.ts
+++ b/packages/shared/lib/core/nfts/interfaces/nft.interface.ts
@@ -1,4 +1,4 @@
-import { Address } from '@iota/wallet/out/types'
+import { Address } from '@iota/sdk/out/types'
 import { NftDownloadMetadata, IIrc27Metadata } from '../interfaces'
 
 export interface INft {
diff --git a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
index 3bc7a28f920..a6717c65d81 100644
--- a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
+++ b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
@@ -11,7 +11,7 @@ import {
     NftOutput,
     TimelockUnlockCondition,
     UnlockCondition,
-} from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
 
 const accountAddress = 'rms1qr47ee0fhahukrzec088v9lngv7w5k2sn3jjtwvkcpjfgxhhsazlsurxrx9'
 
diff --git a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
index 01c51d488c0..dbff1ee2309 100644
--- a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
@@ -12,7 +12,7 @@ import { INft } from '../interfaces'
 import { parseNftMetadata } from './parseNftMetadata'
 import { composeUrlFromNftUri } from './composeUrlFromNftUri'
 import { getSpendableStatusFromUnspentNftOutput } from './getSpendableStatusFromUnspentNftOutput'
-import { Address, AddressType, NftOutput } from '@iota/wallet/out/types'
+import { Address, AddressType, NftOutput } from '@iota/sdk/out/types'
 
 export function buildNftFromNftOutput(
     wrappedOutput: IWrappedOutput,
diff --git a/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts b/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
index bbc20fb0145..cd113a7739e 100644
--- a/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
@@ -1,7 +1,7 @@
 import { UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN } from '@core/wallet/constants'
 import { getExpirationUnixTimeFromOutput, getRecipientAddressFromOutput, isOutputAsync } from '@core/wallet/utils'
 import { getTimelockDateFromOutput } from '@core/wallet/utils/generateActivity/helper'
-import { NftOutput } from '@iota/wallet/out/types'
+import { NftOutput } from '@iota/sdk/out/types'
 
 export function getSpendableStatusFromUnspentNftOutput(
     accountAddress: string,
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
index 4949c00478d..afb0ed1ff0c 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
@@ -1,5 +1,5 @@
-import { AliasOutput, Event, NewOutputWalletEvent, OutputType } from '@iota/wallet/out/types'
-import { WalletEventType } from '@iota/wallet/out/types'
+import { AliasOutput, Event, NewOutputWalletEvent, OutputType } from '@iota/sdk/out/types'
+import { WalletEventType } from '@iota/sdk/out/types'
 
 import { syncBalance } from '@core/account/actions/syncBalance'
 import { addNftsToDownloadQueue, addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput } from '@core/nfts'
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
index 07f76efbff1..2403a7d9214 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
@@ -1,5 +1,5 @@
-import { Event, SpentOutputWalletEvent } from '@iota/wallet/out/types'
-import { WalletEventType } from '@iota/wallet/out/types'
+import { Event, SpentOutputWalletEvent } from '@iota/sdk/out/types'
+import { WalletEventType } from '@iota/sdk/out/types'
 
 import { syncBalance } from '@core/account/actions/syncBalance'
 import { getNftByIdFromAllAccountNfts, updateNftInAllAccountNfts } from '@core/nfts'
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
index 31b20243daa..2d22a058630 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
@@ -1,6 +1,6 @@
 import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-import { Event, TransactionInclusionWalletEvent } from '@iota/wallet/out/types'
-import { WalletEventType } from '@iota/wallet/out/types'
+import { Event, TransactionInclusionWalletEvent } from '@iota/sdk/out/types'
+import { WalletEventType } from '@iota/sdk/out/types'
 
 import { updateParticipationOverview } from '@contexts/governance/stores'
 import { isAccountVoting } from '@contexts/governance/utils/isAccountVoting'
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
index d1c937b53ae..91e8099039d 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
-import { Event, TransactionProgressWalletEvent, PreparedTransactionEssenceHashProgress } from '@iota/wallet/out/types'
-import { WalletEventType, TransactionProgressType } from '@iota/wallet/out/types'
+import { Event, TransactionProgressWalletEvent, PreparedTransactionEssenceHashProgress } from '@iota/sdk/out/types'
+import { WalletEventType, TransactionProgressType } from '@iota/sdk/out/types'
 
 import { selectedAccountIndex } from '@core/account'
 import { ledgerNanoStatus } from '@core/ledger'
diff --git a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
index d67f7213ba5..9b9cc530198 100644
--- a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
+++ b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
@@ -1,5 +1,5 @@
-import { IClientOptions, SecretManagerType } from '@iota/wallet/out/types'
-import { CoinType } from '@iota/wallet/out/types'
+import { IClientOptions, SecretManagerType } from '@iota/sdk/out/types'
+import { CoinType } from '@iota/sdk/out/types'
 
 import { generateRandomId } from '@core/utils'
 
diff --git a/packages/shared/lib/core/profile-manager/api/computeOutputId.ts b/packages/shared/lib/core/profile-manager/api/computeOutputId.ts
index 44072a8a30a..872e6c59bf1 100644
--- a/packages/shared/lib/core/profile-manager/api/computeOutputId.ts
+++ b/packages/shared/lib/core/profile-manager/api/computeOutputId.ts
@@ -1,5 +1,5 @@
 import { api } from '../api'
-import { TransactionId, OutputId } from '@iota/wallet/out/types'
+import { TransactionId, OutputId } from '@iota/sdk/out/types'
 
 export function computeOutputId(id: TransactionId, index: number): Promise<OutputId> {
     return api.computeOutputId(id, index)
diff --git a/packages/shared/lib/core/profile-manager/api/createAccount.ts b/packages/shared/lib/core/profile-manager/api/createAccount.ts
index 24c33377484..693e3de83d1 100644
--- a/packages/shared/lib/core/profile-manager/api/createAccount.ts
+++ b/packages/shared/lib/core/profile-manager/api/createAccount.ts
@@ -1,6 +1,6 @@
 import { get, Writable } from 'svelte/store'
 
-import { CreateAccountPayload } from '@iota/wallet/out/types'
+import { CreateAccountPayload } from '@iota/sdk/out/types'
 
 import { IAccount } from '@core/account'
 
diff --git a/packages/shared/lib/core/profile-manager/api/getClient.ts b/packages/shared/lib/core/profile-manager/api/getClient.ts
index 9da4986b924..8767040b0ec 100644
--- a/packages/shared/lib/core/profile-manager/api/getClient.ts
+++ b/packages/shared/lib/core/profile-manager/api/getClient.ts
@@ -1,4 +1,4 @@
-import { Client } from '@iota/wallet/out/client'
+import { Client } from '@iota/sdk/out/client'
 import { api } from './api'
 import { get } from 'svelte/store'
 import { profileManager } from '../stores'
diff --git a/packages/shared/lib/core/profile-manager/api/getLedgerNanoStatus.ts b/packages/shared/lib/core/profile-manager/api/getLedgerNanoStatus.ts
index 55b4d219046..7d4eccf10b8 100644
--- a/packages/shared/lib/core/profile-manager/api/getLedgerNanoStatus.ts
+++ b/packages/shared/lib/core/profile-manager/api/getLedgerNanoStatus.ts
@@ -1,4 +1,4 @@
-import { LedgerNanoStatus } from '@iota/wallet/out/types'
+import { LedgerNanoStatus } from '@iota/sdk/out/types'
 import { get } from 'svelte/store'
 import { profileManager as _profileManager } from '@core/profile-manager/stores'
 
diff --git a/packages/shared/lib/core/profile-manager/api/startBackgroundSync.ts b/packages/shared/lib/core/profile-manager/api/startBackgroundSync.ts
index 6393afeb78f..9d7c303e7d7 100644
--- a/packages/shared/lib/core/profile-manager/api/startBackgroundSync.ts
+++ b/packages/shared/lib/core/profile-manager/api/startBackgroundSync.ts
@@ -1,4 +1,4 @@
-import { SyncOptions } from '@iota/wallet/out/types'
+import { SyncOptions } from '@iota/sdk/out/types'
 import { get } from 'svelte/store'
 import { profileManager } from '../stores'
 
diff --git a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
index 383900f28a0..0205b67c245 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
@@ -1,5 +1,5 @@
-import { WalletOptions, CreateAccountPayload, TransactionId, OutputId } from '@iota/wallet/out/types'
-import { AliasId, Client, FoundryId } from '@iota/wallet'
+import { WalletOptions, CreateAccountPayload, TransactionId, OutputId } from '@iota/sdk/out/types'
+import { AliasId, Client, FoundryId } from '@iota/sdk'
 import { IAuth } from '@core/network'
 import { INodeInfoResponse } from '@core/network/interfaces'
 
diff --git a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
index 0aff6017978..b8cc356c459 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
@@ -5,8 +5,8 @@ import type {
     INodeInfoWrapper,
     SyncOptions,
     WalletEvent,
-} from '@iota/wallet/out/types'
-import { WalletEventType } from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
+import { WalletEventType } from '@iota/sdk/out/types'
 
 import { IAccount } from '@core/account/interfaces'
 import { IAuth } from '@core/network/interfaces'
diff --git a/packages/shared/lib/core/profile-manager/interfaces/recover-account-payload.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/recover-account-payload.interface.ts
index 8aa19f26514..ad00bad51b3 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/recover-account-payload.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/recover-account-payload.interface.ts
@@ -1,4 +1,4 @@
-import type { SyncOptions } from '@iota/wallet/out/types'
+import type { SyncOptions } from '@iota/sdk/out/types'
 
 export interface RecoverAccountsPayload {
     accountStartIndex: number
diff --git a/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-payload-wrapper.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-payload-wrapper.interface.ts
index 994485f18fd..feedab8d0db 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-payload-wrapper.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-payload-wrapper.interface.ts
@@ -5,7 +5,7 @@ import {
     SpentOutputWalletEvent,
     TransactionInclusionWalletEvent,
     TransactionProgressWalletEvent,
-} from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
 
 export interface IWalletApiEventPayloadWrapper {
     accountIndex: number
diff --git a/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts b/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
index 4a93b3750ae..eeba13fe361 100644
--- a/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
+++ b/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
@@ -1,5 +1,5 @@
 import { ClientOptions } from '@core/network/interfaces'
-import { WalletOptions } from '@iota/wallet/out/types'
+import { WalletOptions } from '@iota/sdk/out/types'
 
 export type ProfileManagerOptions = Omit<WalletOptions, 'clientOptions'> & {
     clientOptions: ClientOptions
diff --git a/packages/shared/lib/core/profile-manager/types/transaction-progress-event.type.ts b/packages/shared/lib/core/profile-manager/types/transaction-progress-event.type.ts
index 45562272cc6..2a2ffa52554 100644
--- a/packages/shared/lib/core/profile-manager/types/transaction-progress-event.type.ts
+++ b/packages/shared/lib/core/profile-manager/types/transaction-progress-event.type.ts
@@ -6,7 +6,7 @@ import {
     SigningTransactionProgress,
     PerformingPowProgress,
     BroadcastingProgress,
-} from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
 
 export type TransactionProgressEventPayload =
     | SelectingInputsProgress
diff --git a/packages/shared/lib/core/profile-manager/types/wallet-api-event-handler.type.ts b/packages/shared/lib/core/profile-manager/types/wallet-api-event-handler.type.ts
index 4e88cc6fbec..79ae46bd2ee 100644
--- a/packages/shared/lib/core/profile-manager/types/wallet-api-event-handler.type.ts
+++ b/packages/shared/lib/core/profile-manager/types/wallet-api-event-handler.type.ts
@@ -1,3 +1,3 @@
-import { Event } from '@iota/wallet/out/types'
+import { Event } from '@iota/sdk/out/types'
 
 export type WalletApiEventHandler = (error: Error, rawEvent: Event) => void | Promise<void>
diff --git a/packages/shared/lib/core/profile-manager/types/wallet-api-event-map.type.ts b/packages/shared/lib/core/profile-manager/types/wallet-api-event-map.type.ts
index c7de97d1477..a9bc4456de5 100644
--- a/packages/shared/lib/core/profile-manager/types/wallet-api-event-map.type.ts
+++ b/packages/shared/lib/core/profile-manager/types/wallet-api-event-map.type.ts
@@ -1,4 +1,4 @@
-import { WalletEventType } from '@iota/wallet/out/types'
+import { WalletEventType } from '@iota/sdk/out/types'
 
 import { WalletApiEventHandler } from './wallet-api-event-handler.type'
 
diff --git a/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts b/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts
index 62d0303dbf9..032afa26000 100644
--- a/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts
+++ b/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts
@@ -1,4 +1,4 @@
-import { SecretManagerType } from '@iota/wallet/out/types'
+import { SecretManagerType } from '@iota/sdk/out/types'
 
 import { USE_LEDGER_SIMULATOR } from '@core/ledger'
 import { ProfileType } from '@core/profile'
diff --git a/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts b/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts
index 9d120269177..20b237dfdfe 100644
--- a/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts
+++ b/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts
@@ -1,7 +1,7 @@
 import { localize } from '@core/i18n'
 
-import { Event } from '@iota/wallet/out/types'
-import { WalletEventType } from '@iota/wallet/out/types'
+import { Event } from '@iota/sdk/out/types'
+import { WalletEventType } from '@iota/sdk/out/types'
 
 import { WalletApiEventError, WalletApiEventValidationError } from '../errors'
 import { IWalletApiEventPayloadWrapper } from '../interfaces'
diff --git a/packages/shared/lib/core/profile/actions/active-profile/subscribeToWalletApiEventsForActiveProfile.ts b/packages/shared/lib/core/profile/actions/active-profile/subscribeToWalletApiEventsForActiveProfile.ts
index daf1fc278c7..9e9f295b1b8 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/subscribeToWalletApiEventsForActiveProfile.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/subscribeToWalletApiEventsForActiveProfile.ts
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store'
-import { WalletEventType } from '@iota/wallet/out/types'
+import { WalletEventType } from '@iota/sdk/out/types'
 
 import {
     handleNewOutputEvent,
diff --git a/packages/shared/lib/core/utils/filter.ts b/packages/shared/lib/core/utils/filter.ts
index e323fe69cc0..0019cfef881 100644
--- a/packages/shared/lib/core/utils/filter.ts
+++ b/packages/shared/lib/core/utils/filter.ts
@@ -1,5 +1,5 @@
-import type { BasicOutput, OutputData } from '@iota/wallet/out/types'
-import { OutputType } from '@iota/wallet/out/types'
+import type { BasicOutput, OutputData } from '@iota/sdk/out/types'
+import { OutputType } from '@iota/sdk/out/types'
 
 export function filterBasicOutput(outputData: OutputData): boolean {
     return outputData?.output?.type === OutputType.Basic
diff --git a/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts b/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
index 7b0e088d35b..2de14be755e 100644
--- a/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
@@ -1,4 +1,4 @@
-import type { OutputData, OutputResponse, Transaction } from '@iota/wallet/out/types'
+import type { OutputData, OutputResponse, Transaction } from '@iota/sdk/out/types'
 
 import { IAccountState } from '@core/account/interfaces'
 
diff --git a/packages/shared/lib/core/wallet/actions/createNativeToken.ts b/packages/shared/lib/core/wallet/actions/createNativeToken.ts
index 2ce6ca03fb2..ab0a1c70527 100644
--- a/packages/shared/lib/core/wallet/actions/createNativeToken.ts
+++ b/packages/shared/lib/core/wallet/actions/createNativeToken.ts
@@ -3,7 +3,7 @@ import { showAppNotification } from '@auxiliary/notification'
 import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { localize } from '@core/i18n'
 import { Converter } from '@core/utils'
-import { CreateNativeTokenParams, PreparedTransaction } from '@iota/wallet/out/types'
+import { CreateNativeTokenParams, PreparedTransaction } from '@iota/sdk/out/types'
 import { DEFAULT_TRANSACTION_OPTIONS } from '../constants'
 import { VerifiedStatus } from '../enums'
 import { buildPersistedAssetFromMetadata } from '../helpers'
diff --git a/packages/shared/lib/core/wallet/actions/mintNft.ts b/packages/shared/lib/core/wallet/actions/mintNft.ts
index f925a027316..1830a9ccde5 100644
--- a/packages/shared/lib/core/wallet/actions/mintNft.ts
+++ b/packages/shared/lib/core/wallet/actions/mintNft.ts
@@ -3,7 +3,7 @@ import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { localize } from '@core/i18n'
 import { addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput, IIrc27Metadata } from '@core/nfts'
 import { Converter } from '@core/utils'
-import { MintNftParams, OutputType, PreparedTransaction } from '@iota/wallet/out/types'
+import { MintNftParams, OutputType, PreparedTransaction } from '@iota/sdk/out/types'
 import { get } from 'svelte/store'
 import { DEFAULT_TRANSACTION_OPTIONS } from '../constants'
 import { ActivityAction } from '../enums'
diff --git a/packages/shared/lib/core/wallet/actions/sendOutput.ts b/packages/shared/lib/core/wallet/actions/sendOutput.ts
index c58259ab9dc..ad5384c16fe 100644
--- a/packages/shared/lib/core/wallet/actions/sendOutput.ts
+++ b/packages/shared/lib/core/wallet/actions/sendOutput.ts
@@ -5,7 +5,7 @@ import { updateNftInAllAccountNfts } from '@core/nfts/actions'
 import { DEFAULT_TRANSACTION_OPTIONS } from '../constants'
 import { resetNewTokenTransactionDetails } from '../stores'
 import { processAndAddToActivities } from '../utils'
-import { NftOutput, Output, OutputType } from '@iota/wallet/out/types'
+import { NftOutput, Output, OutputType } from '@iota/sdk/out/types'
 
 export async function sendOutput(output: Output): Promise<void> {
     try {
diff --git a/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts b/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
index fc51400bce8..37cd3174514 100644
--- a/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
+++ b/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
@@ -1,5 +1,5 @@
 import { IAccountState } from '@core/account'
-import { BasicOutput, OutputData } from '@iota/wallet/out/types'
+import { BasicOutput, OutputData } from '@iota/sdk/out/types'
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
 import { get } from 'svelte/store'
 import { ActivityAsyncStatus, ActivityDirection } from '../enums'
diff --git a/packages/shared/lib/core/wallet/constants/default-transaction-options.constant.ts b/packages/shared/lib/core/wallet/constants/default-transaction-options.constant.ts
index 093a1975cf7..e6913f61bef 100644
--- a/packages/shared/lib/core/wallet/constants/default-transaction-options.constant.ts
+++ b/packages/shared/lib/core/wallet/constants/default-transaction-options.constant.ts
@@ -1,4 +1,4 @@
-import { TransactionOptions } from '@iota/wallet/out/types'
+import { TransactionOptions } from '@iota/sdk/out/types'
 
 export const DEFAULT_TRANSACTION_OPTIONS: TransactionOptions = {
     remainderValueStrategy: { strategy: 'ReuseAddress', value: null },
diff --git a/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts b/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts
index 23df1fa85d8..70add6741e7 100644
--- a/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/processed-transaction.interface.ts
@@ -1,6 +1,6 @@
 import { ActivityDirection, InclusionState } from '@core/wallet/enums'
 import { IWrappedOutput } from './wrapped-output.interface'
-import { UTXOInput } from '@iota/wallet/out/types'
+import { UTXOInput } from '@iota/sdk/out/types'
 
 export interface IProcessedTransaction {
     outputs: IWrappedOutput[]
diff --git a/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts b/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts
index ef5a1202246..c73f670f22d 100644
--- a/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/wrapped-output.interface.ts
@@ -1,4 +1,4 @@
-import { Output, OutputData } from '@iota/wallet/out/types'
+import { Output, OutputData } from '@iota/sdk/out/types'
 
 export interface IWrappedOutput extends Omit<Partial<OutputData>, 'output'> {
     outputId: string
diff --git a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
index 91aaa730b17..eeb9bf3acec 100644
--- a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
@@ -6,7 +6,7 @@ import {
     SimpleTokenScheme,
     MetadataFeature,
     Feature,
-} from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
 import { Converter } from '@core/utils'
 import { IIrc30Metadata } from '../interfaces'
 import { convertBech32ToHexAddress } from './convertBech32ToHexAddress'
diff --git a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
index a92a5516a8e..25c3f136e4d 100644
--- a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
@@ -1,4 +1,4 @@
-import { AddressUnlockCondition, Ed25519Address, MetadataFeature, NftOutputBuilderParams } from '@iota/wallet/out/types'
+import { AddressUnlockCondition, Ed25519Address, MetadataFeature, NftOutputBuilderParams } from '@iota/sdk/out/types'
 import { Converter } from '@core/utils'
 import { EMPTY_HEX_ID } from '../constants'
 import { convertBech32ToHexAddress } from './convertBech32ToHexAddress'
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
index 60a4b287677..8fc4763f322 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
@@ -12,7 +12,7 @@ import { generateActivitiesFromNftOutputs } from './generateActivitiesFromNftOut
 import { generateActivitiesFromAliasOutputs } from './generateActivitiesFromAliasOutputs'
 import { generateActivitiesFromFoundryOutputs } from './generateActivitiesFromFoundryOutputs'
 import { generateActivitiesFromBasicOutputs } from './generateActivitiesFromBasicOutputs'
-import { OutputType } from '@iota/wallet/out/types'
+import { OutputType } from '@iota/sdk/out/types'
 
 export async function generateActivities(
     processedTransaction: IProcessedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
index 4606f328144..9eec580d212 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
@@ -2,7 +2,7 @@ import { IAccountState } from '@core/account'
 import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction, OUTPUT_TYPE_ALIAS } from '@core/wallet'
 import { Activity, type AliasActivity } from '@core/wallet/types'
 import { generateSingleAliasActivity } from './generateSingleAliasActivity'
-import { AliasOutput } from '@iota/wallet/out/types'
+import { AliasOutput } from '@iota/sdk/out/types'
 
 export async function generateActivitiesFromAliasOutputs(
     processedTransaction: IProcessedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
index e8e3cf9c18d..9e8779d5079 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
@@ -12,7 +12,7 @@ import { Activity } from '@core/wallet/types'
 import { generateSingleBasicActivity } from './generateSingleBasicActivity'
 import { generateSingleConsolidationActivity } from './generateSingleConsolidationActivity'
 import { generateSingleNftActivity } from './generateSingleNftActivity'
-import { CommonOutput, NftOutput, OutputType } from '@iota/wallet/out/types'
+import { CommonOutput, NftOutput, OutputType } from '@iota/sdk/out/types'
 
 export async function generateActivitiesFromBasicOutputs(
     processedTransaction: IProcessedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
index 02f88925535..c1a31526478 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
@@ -2,7 +2,7 @@ import { IAccountState } from '@core/account'
 import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction } from '@core/wallet'
 import { Activity } from '@core/wallet'
 import { generateSingleNftActivity } from './generateSingleNftActivity'
-import { NftOutput, OutputType } from '@iota/wallet/out/types'
+import { NftOutput, OutputType } from '@iota/sdk/out/types'
 
 export async function generateActivitiesFromNftOutputs(
     processedTransaction: IProcessedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
index 1cc36e1df4a..27214073dab 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
@@ -14,7 +14,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { AliasOutput } from '@iota/wallet/out/types'
+import { AliasOutput } from '@iota/sdk/out/types'
 
 export async function generateSingleAliasActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
index cd62a38ded1..2e5c63b8d99 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
@@ -15,7 +15,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { BasicOutput } from '@iota/wallet/out/types'
+import { BasicOutput } from '@iota/sdk/out/types'
 
 export async function generateSingleBasicActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
index 24aad66d5bd..b17523998a3 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
@@ -10,7 +10,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { BasicOutput, OutputType } from '@iota/wallet/out/types'
+import { BasicOutput, OutputType } from '@iota/sdk/out/types'
 
 export async function generateSingleConsolidationActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
index e636ab1a77b..e5537ab0e31 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
@@ -18,7 +18,7 @@ import {
     ImmutableAliasAddressUnlockCondition,
     SimpleTokenScheme,
     UnlockConditionType,
-} from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
 
 export async function generateSingleFoundryActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
index 3bac9a54280..0ce0fe5351a 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
@@ -11,7 +11,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { BasicOutput } from '@iota/wallet/out/types'
+import { BasicOutput } from '@iota/sdk/out/types'
 
 export async function generateSingleGovernanceActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
index 39ac4b02ec9..5131715b2dd 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
@@ -12,7 +12,7 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { NftOutput } from '@iota/wallet/out/types'
+import { NftOutput } from '@iota/sdk/out/types'
 import { getClient } from '@core/profile-manager'
 
 export async function generateSingleNftActivity(
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
index 9c138dba36d..8db6e11214d 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getActivityTypeFromOutput.ts
@@ -1,7 +1,7 @@
 import { isParticipationOutput } from '@contexts/governance/utils'
 import { ActivityType } from '@core/wallet/enums'
 import { IWrappedOutput } from '@core/wallet/interfaces'
-import { OutputType } from '@iota/wallet/out/types'
+import { OutputType } from '@iota/sdk/out/types'
 
 export function getActivityTypeFromOutput(output: IWrappedOutput): ActivityType {
     switch (output.output.type) {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts
index 226e002ce0f..22b7b8c534f 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAmountFromOutput.ts
@@ -1,4 +1,4 @@
-import { Output } from '@iota/wallet/out/types'
+import { Output } from '@iota/sdk/out/types'
 
 export function getAmountFromOutput(output: Output): number {
     return Number(output?.amount ?? 0)
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
index 858fcad594d..fb6dbb7db83 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
@@ -5,7 +5,7 @@ import { getTimelockDateFromOutput } from './getTimelockDateFromOutput'
 import { isOutputAsync } from '../../outputs/isOutputAsync'
 import { getAsyncStatus } from './getAsyncStatus'
 import { getStorageDepositFromOutput } from './getStorageDepositFromOutput'
-import { CommonOutput, Output } from '@iota/wallet/out/types'
+import { CommonOutput, Output } from '@iota/sdk/out/types'
 
 export async function getAsyncDataFromOutput(
     output: Output,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts
index 96182416461..26b28e054e2 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernanceInfo.ts
@@ -4,7 +4,7 @@ import { IParticipation, IWrappedOutput } from '@core/wallet/interfaces'
 import { parseGovernanceMetadata } from '../../parseGovernanceMetadata'
 import { getAmountFromOutput } from './getAmountFromOutput'
 import { getMetadataFromOutput } from './getMetadataFromOutput'
-import { Output } from '@iota/wallet/out/types'
+import { Output } from '@iota/sdk/out/types'
 
 interface IGovernanceInfo {
     governanceAction: GovernanceAction
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
index e73d3322c8c..fb966f7f1cb 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getGovernorAddressFromAliasOutput.ts
@@ -1,5 +1,5 @@
 import { getBech32AddressFromAddressTypes } from '../../getBech32AddressFromAddressTypes'
-import { AliasOutput, GovernorAddressUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
+import { AliasOutput, GovernorAddressUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types'
 
 export function getGovernorAddressFromAliasOutput(output: AliasOutput): string {
     const governorUnlockCondition = output.unlockConditions.find(
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
index 1044571fb51..3d0679c5c3c 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getMetadataFromOutput.ts
@@ -2,7 +2,7 @@ import { isParticipationOutput } from '@contexts/governance/utils'
 import { EXTERNALLY_OWNED_ACCOUNT } from '@core/layer-2/constants'
 import { parseLayer2MetadataForTransfer } from '@core/layer-2/utils'
 import { containsControlCharacters, Converter } from '@core/utils'
-import { CommonOutput, FeatureType, MetadataFeature, Output, OutputType } from '@iota/wallet/out/types'
+import { CommonOutput, FeatureType, MetadataFeature, Output, OutputType } from '@iota/sdk/out/types'
 
 export function getMetadataFromOutput(output: Output): string | undefined {
     if (output.type === OutputType.Treasury) {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
index 224adf3bddb..8c367a9a675 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
@@ -6,7 +6,7 @@ import { getSubjectFromAddress } from '../../getSubjectFromAddress'
 import { isSubjectInternal } from '../../isSubjectInternal'
 import { getRecipientFromOutput } from '../../outputs'
 import { getSenderAddressFromInputs, getSenderFromTransaction } from '../../transactions'
-import { CommonOutput } from '@iota/wallet/out/types'
+import { CommonOutput } from '@iota/sdk/out/types'
 
 export function getSendingInformation(
     processedTransaction: IProcessedTransaction,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
index 27fb25eda97..fdb6f149e1d 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStateControllerAddressFromAliasOutput.ts
@@ -1,4 +1,4 @@
-import { AliasOutput, StateControllerAddressUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
+import { AliasOutput, StateControllerAddressUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types'
 import { getBech32AddressFromAddressTypes } from '../../getBech32AddressFromAddressTypes'
 
 export function getStateControllerAddressFromAliasOutput(output: AliasOutput): string {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
index dcf8d10c84d..d944fac3cb9 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
@@ -1,6 +1,6 @@
 import { IAccountState } from '@core/account/interfaces'
 import { getClient } from '@core/profile-manager/api/getClient'
-import { CommonOutput, StorageDepositReturnUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
+import { CommonOutput, StorageDepositReturnUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types'
 
 export async function getStorageDepositFromOutput(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
index b5e671282b5..e426198c07f 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTagFromOutput.ts
@@ -1,4 +1,4 @@
-import { CommonOutput, FeatureType, TagFeature } from '@iota/wallet/out/types'
+import { CommonOutput, FeatureType, TagFeature } from '@iota/sdk/out/types'
 import { Converter } from '@core/utils'
 
 export function getTagFromOutput(output: CommonOutput): string | undefined {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
index 80bbc9b7795..7960c32f8f1 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getTimelockDateFromOutput.ts
@@ -1,5 +1,5 @@
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
-import { CommonOutput, TimelockUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
+import { CommonOutput, TimelockUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types'
 
 export function getTimelockDateFromOutput(output: CommonOutput): Date | undefined {
     for (const unlockCondition of output.unlockConditions) {
diff --git a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
index ae3abcbd4ad..3cf43544417 100644
--- a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
@@ -1,5 +1,5 @@
 import { convertHexAddressToBech32 } from './convertHexAddressToBech32'
-import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/wallet/out/types'
+import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/sdk/out/types'
 
 export function getBech32AddressFromAddressTypes(address: Address): string | undefined {
     switch (address.type) {
diff --git a/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
index 8d59b148850..996dc789418 100644
--- a/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
@@ -1,4 +1,4 @@
-import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/wallet/out/types'
+import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/sdk/out/types'
 
 export function getHexAddressFromAddressTypes(address: Address): string {
     switch (address?.type) {
diff --git a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
index a5955a885bc..e9a12acd6e2 100644
--- a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
@@ -1,4 +1,4 @@
-import { FeatureType, FoundryOutput, MetadataFeature } from '@iota/wallet/out/types'
+import { FeatureType, FoundryOutput, MetadataFeature } from '@iota/sdk/out/types'
 
 export function getMetadataFromFoundryOutput(foundry: FoundryOutput): string {
     for (const feature of foundry?.getImmutableFeatures() ?? []) {
diff --git a/packages/shared/lib/core/wallet/utils/getOutputParameters.ts b/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
index ec71d5536c5..305611b2460 100644
--- a/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
+++ b/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
@@ -1,4 +1,4 @@
-import { OutputParams, Assets } from '@iota/wallet/out/types'
+import { OutputParams, Assets } from '@iota/sdk/out/types'
 import { convertDateToUnixTimestamp, Converter } from '@core/utils'
 import { NewTransactionType } from '../stores'
 import { getEstimatedGasForTransferFromTransactionDetails, getLayer2MetadataForTransfer } from '@core/layer-2/utils'
diff --git a/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts b/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
index 019bbb6efbb..d13e5460deb 100644
--- a/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
+++ b/packages/shared/lib/core/wallet/utils/getSenderAddressFromUnlockCondition.ts
@@ -4,7 +4,7 @@ import {
     ExpirationUnlockCondition,
     StorageDepositReturnUnlockCondition,
     UnlockConditionType,
-} from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
 import { getBech32AddressFromAddressTypes } from './getBech32AddressFromAddressTypes'
 
 export function getSenderAddressFromUnlockCondition(
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
index 2a3434db51a..ab8f6031a45 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getExpirationDateFromOutput.ts
@@ -1,4 +1,4 @@
-import { CommonOutput, ExpirationUnlockCondition, UnlockConditionType } from '@iota/wallet/out/types'
+import { CommonOutput, ExpirationUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types'
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
 
 export function getExpirationDateFromOutput(output: CommonOutput): Date | undefined {
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
index d2aaae3003a..2592a79b29a 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
@@ -6,7 +6,7 @@ import {
     FoundryOutput,
     ImmutableAliasAddressUnlockCondition,
     UnlockConditionType,
-} from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
 
 export function buildFoundryId(foundry: FoundryOutput): Promise<FoundryId> {
     const unlockCondition = foundry.unlockConditions[0]
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
index 302fa760e4b..1dcfb33e045 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getIssuerFromNftOutput.ts
@@ -1,4 +1,4 @@
-import { Address, FeatureType, IssuerFeature, NftOutput } from '@iota/wallet/out/types'
+import { Address, FeatureType, IssuerFeature, NftOutput } from '@iota/sdk/out/types'
 
 export function getIssuerFromNftOutput(output: NftOutput): Address {
     const metadata = output.immutableFeatures?.find((feature) => feature.type === FeatureType.Issuer) as IssuerFeature
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
index dc4e570b87a..6b635c9715f 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getMetadataFromNftOutput.ts
@@ -1,4 +1,4 @@
-import { FeatureType, MetadataFeature, NftOutput } from '@iota/wallet/out/types'
+import { FeatureType, MetadataFeature, NftOutput } from '@iota/sdk/out/types'
 
 export function getMetadataFromNftOutput(output: NftOutput): string {
     const metadata = output.immutableFeatures?.find(
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
index 77fbd0e9477..609e4f0fd59 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
@@ -1,6 +1,6 @@
 import { buildFoundryId } from './getFoundryId'
-import type { CommonOutput, FoundryOutput, INativeToken, SimpleTokenScheme } from '@iota/wallet/out/types'
-import { OutputType } from '@iota/wallet/out/types'
+import type { CommonOutput, FoundryOutput, INativeToken, SimpleTokenScheme } from '@iota/sdk/out/types'
+import { OutputType } from '@iota/sdk/out/types'
 
 export async function getNativeTokenFromOutput(output: CommonOutput): Promise<INativeToken | undefined> {
     if (output?.type === OutputType.Foundry) {
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts
index f349a45dadb..a83edfdcc4b 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts
@@ -1,4 +1,4 @@
-import { AddressUnlockCondition, CommonOutput } from '@iota/wallet/out/types'
+import { AddressUnlockCondition, CommonOutput } from '@iota/sdk/out/types'
 import { UNLOCK_CONDITION_ADDRESS } from '../../constants'
 import { getBech32AddressFromAddressTypes } from '../getBech32AddressFromAddressTypes'
 
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts
index 75090b954db..3a4fbf7f5b0 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts
@@ -1,7 +1,7 @@
 import { getRecipientAddressFromOutput } from './getRecipientAddressFromOutput'
 import { Subject } from '../../types'
 import { getSubjectFromAddress } from '../getSubjectFromAddress'
-import { CommonOutput } from '@iota/wallet'
+import { CommonOutput } from '@iota/sdk'
 
 export function getRecipientFromOutput(output: CommonOutput): Subject | undefined {
     const recipientAddress = getRecipientAddressFromOutput(output)
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts
index c6eabe54fe0..4ef9e02873a 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts
@@ -2,7 +2,7 @@ import { Subject } from '../../types'
 import { getBech32AddressFromAddressTypes } from '../getBech32AddressFromAddressTypes'
 import { UNLOCK_CONDITION_EXPIRATION, UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN } from '@core/wallet/constants'
 import { getSubjectFromAddress } from '../getSubjectFromAddress'
-import { CommonOutput, ExpirationUnlockCondition, StorageDepositReturnUnlockCondition } from '@iota/wallet'
+import { CommonOutput, ExpirationUnlockCondition, StorageDepositReturnUnlockCondition } from '@iota/sdk'
 
 export function getSenderFromOutput(output: CommonOutput): Subject | undefined {
     for (const unlockCondition of output.unlockConditions) {
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
index 936443027fa..cdd02ac0b1c 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
 import { selectedAccount } from '@core/account/stores'
 import { convertBech32ToHexAddress } from '@core/wallet/utils/convertBech32ToHexAddress'
-import { AliasOutput } from '@iota/wallet/out/types'
+import { AliasOutput } from '@iota/sdk/out/types'
 
 export async function getSerialNumberFromAliasOutput(aliasAddress: string): Promise<number> {
     const account = get(selectedAccount)
diff --git a/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts b/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
index 3805a3fa7f4..3436e33bf6a 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/isOutputAsync.ts
@@ -1,4 +1,4 @@
-import { CommonOutput, Output, OutputType, UnlockConditionType } from '@iota/wallet/out/types'
+import { CommonOutput, Output, OutputType, UnlockConditionType } from '@iota/sdk/out/types'
 
 const ASYNC_UNLOCK_CONDITION_TYPES = [
     UnlockConditionType.StorageDepositReturn,
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
index e4f5f4669c3..b7ea4dc66cd 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
@@ -1,4 +1,4 @@
-import { CommonOutput, OutputData, OutputResponse, OutputType, UTXOInput } from '@iota/wallet/out/types'
+import { CommonOutput, OutputData, OutputResponse, OutputType, UTXOInput } from '@iota/sdk/out/types'
 import { MILLISECONDS_PER_SECOND } from '@core/utils/constants'
 import { IAccountState } from '@core/account/interfaces'
 import { InclusionState, ActivityDirection } from '../../enums'
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
index ff4c521fdd5..8ce140d5172 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
@@ -1,5 +1,5 @@
 import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
-import { Output, RegularTransactionEssence, Transaction, UTXOInput } from '@iota/wallet/out/types'
+import { Output, RegularTransactionEssence, Transaction, UTXOInput } from '@iota/sdk/out/types'
 import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
 import { getDirectionFromTransaction } from '../transactions'
 import { IAccountState } from '@core/account'
diff --git a/packages/shared/lib/core/wallet/utils/processAndAddToActivities.ts b/packages/shared/lib/core/wallet/utils/processAndAddToActivities.ts
index 7bc403ef44e..df231654c5c 100644
--- a/packages/shared/lib/core/wallet/utils/processAndAddToActivities.ts
+++ b/packages/shared/lib/core/wallet/utils/processAndAddToActivities.ts
@@ -1,4 +1,4 @@
-import type { Transaction } from '@iota/wallet/out/types'
+import type { Transaction } from '@iota/sdk/out/types'
 
 import type { IAccountState } from '@core/account/interfaces'
 import { addActivitiesToAccountActivitiesInAllAccountActivities } from '../stores'
diff --git a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
index 61d36bfc44b..9e57208f2e8 100644
--- a/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
+++ b/packages/shared/lib/core/wallet/utils/send/validateSendConfirmation.ts
@@ -3,7 +3,7 @@ import { InsufficientFundsForStorageDepositError, InvalidExpirationDateTimeError
 import { convertUnixTimestampToDate, isValidExpirationDateTime } from '@core/utils'
 import { getStorageDepositFromOutput } from '../generateActivity/helper'
 import { IAccountState } from '@core/account/interfaces'
-import { CommonOutput, ExpirationUnlockCondition, OutputType, UnlockConditionType } from '@iota/wallet/out/types'
+import { CommonOutput, ExpirationUnlockCondition, OutputType, UnlockConditionType } from '@iota/sdk/out/types'
 
 export async function validateSendConfirmation(account: IAccountState, output: CommonOutput): Promise<void> {
     const parseNumber = (value: string) => parseInt(value, 10) ?? 0
diff --git a/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
index ed4d7d32045..e85994b2ab8 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
@@ -3,7 +3,7 @@ import { ActivityType } from '@core/wallet/enums'
 import { getNativeTokenFromOutput, isOutputAsync } from '..'
 import { IWrappedOutput } from '../../interfaces'
 import { getActivityTypeFromOutput, getAmountFromOutput, getStorageDepositFromOutput } from '../generateActivity/helper'
-import { BasicOutput } from '@iota/wallet/out/types'
+import { BasicOutput } from '@iota/sdk/out/types'
 
 export async function activityOutputContainsValue(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts
index ed662cfac61..3124aed018f 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts
@@ -1,7 +1,7 @@
 import { IWrappedOutput } from '../../interfaces'
 import { getRecipientAddressFromOutput } from '../outputs/getRecipientAddressFromOutput'
 import { ActivityDirection } from '@core/wallet/enums'
-import { CommonOutput } from '@iota/wallet'
+import { CommonOutput } from '@iota/sdk'
 
 export function getDirectionFromTransaction(
     wrappedOutputs: IWrappedOutput[],
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
index bae8e65f912..e39873199fa 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
@@ -1,7 +1,7 @@
 import { getRecipientAddressFromOutput } from '..'
 import { IWrappedOutput } from '@core/wallet/interfaces'
 import { ActivityDirection } from '@core/wallet/enums'
-import { CommonOutput } from '@iota/wallet'
+import { CommonOutput } from '@iota/sdk'
 
 export function getNonRemainderBasicOutputsFromTransaction(
     wrappedOutputs: IWrappedOutput[],
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
index e519879ef3e..862081278b3 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getSenderAddressFromInputs.ts
@@ -7,7 +7,7 @@ import {
     CommonOutput,
     ExpirationUnlockCondition,
     UnlockConditionType,
-} from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
 
 export function getSenderAddressFromInputs(inputs: IWrappedOutput[]): string | undefined {
     for (const input of inputs) {
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts
index 41405058b1e..211629f9d0e 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts
@@ -1,5 +1,5 @@
 import { Subject } from '@core/wallet/types'
-import { CommonOutput } from '@iota/wallet'
+import { CommonOutput } from '@iota/sdk'
 import { getSenderFromOutput } from '../outputs/getSenderFromOutput'
 
 export function getSenderFromTransaction(
diff --git a/packages/shared/lib/tests/__mocks__/account-balance.mock.ts b/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
index d0722cdcccd..236adf76b2d 100644
--- a/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/account-balance.mock.ts
@@ -1,4 +1,4 @@
-import { Balance } from '@iota/wallet/out/types'
+import { Balance } from '@iota/sdk/out/types'
 
 export const MOCK_ACCOUNT_BALANCE: Balance = {
     baseCoin: {
diff --git a/packages/shared/lib/tests/__mocks__/account.mock.ts b/packages/shared/lib/tests/__mocks__/account.mock.ts
index a474e3d2da8..b993a9f9471 100644
--- a/packages/shared/lib/tests/__mocks__/account.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/account.mock.ts
@@ -35,7 +35,7 @@ import {
     FoundryOutput,
     NftOutput,
     Output,
-} from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
 
 import { IAccount } from '../../core/account'
 
diff --git a/packages/shared/lib/tests/__mocks__/api.mock.ts b/packages/shared/lib/tests/__mocks__/api.mock.ts
index 289410e8dab..ea5a22f1776 100644
--- a/packages/shared/lib/tests/__mocks__/api.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/api.mock.ts
@@ -1,7 +1,7 @@
 import { AccountMock } from './account.mock'
 import { ProfileManagerMock } from './profile-manager.mock'
 
-import { WalletOptions, CreateAccountPayload } from '@iota/wallet/out/types'
+import { WalletOptions, CreateAccountPayload } from '@iota/sdk/out/types'
 
 import { IApi, RecoverAccountsPayload } from '@core/profile-manager'
 import { IAccount } from '@core/account'
diff --git a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts b/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
index 232a6a280ca..d48a3208c6a 100644
--- a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
@@ -9,8 +9,8 @@ import type {
     LedgerNanoStatus,
     GenerateAddressOptions,
     INode,
-} from '@iota/wallet/out/types'
-import { WalletEventType } from '@iota/wallet/out/types'
+} from '@iota/sdk/out/types'
+import { WalletEventType } from '@iota/sdk/out/types'
 
 import { IAccount } from '@core/account'
 import { IAuth, INodeInfoResponse } from '@core/network'
diff --git a/packages/shared/package.json b/packages/shared/package.json
index cd075cfed32..8d4bf3ccdad 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -11,7 +11,7 @@
         "@iota/transaction-converter": "^1.0.0-beta.30",
         "@iota/unit-converter": "^1.0.0-beta.30",
         "@iota/util.js": "^2.0.0-rc.1",
-        "@iota/wallet": "npm:@iota/sdk@1.0.4",
+        "@iota/sdk": "1.0.4",
         "@sveltejs/svelte-virtual-list": "^3.0.1",
         "big-integer": "^1.6.51",
         "big.js": "^6.0.3",
diff --git a/yarn.lock b/yarn.lock
index 04522660b55..3e9f651163a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -852,6 +852,18 @@
   resolved "https://registry.yarnpkg.com/@iota/pad/-/pad-1.0.0-beta.30.tgz#de19728f8f1b09c20e2365d0da34945006760082"
   integrity sha512-fnhPMPul18WunLq9Ni4rxzBFmhna6eaG8WroDg6GdQqSK/eN62uFHV8tpspJHXuCqwgCUVp6NpuUna7+B2OV9g==
 
+"@iota/sdk@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.4.tgz#47fa6f559a551a2bf3c2664f8840c48a497dde47"
+  integrity sha512-qjgxce/aOIFoWBDKU+fdcDiX4xbihMiigmsJqb5nK9I3vRPMOG3kxQ9eC7BPRNME3u8c8/sQgdQY9gzqywhZXA==
+  dependencies:
+    "@types/node" "^18.15.12"
+    cargo-cp-artifact "^0.1.6"
+    class-transformer "^0.5.1"
+    prebuild-install "^7.1.1"
+    reflect-metadata "^0.1.13"
+    typescript "^4.9.4"
+
 "@iota/signing@^1.0.0-beta.30":
   version "1.0.0-beta.30"
   resolved "https://registry.yarnpkg.com/@iota/signing/-/signing-1.0.0-beta.30.tgz#43bf82f9dd43bb3b98c63dd57ac9cde2554f1472"
@@ -905,18 +917,6 @@
   dependencies:
     big-integer "^1.6.51"
 
-"@iota/wallet@npm:@iota/sdk@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.4.tgz#47fa6f559a551a2bf3c2664f8840c48a497dde47"
-  integrity sha512-qjgxce/aOIFoWBDKU+fdcDiX4xbihMiigmsJqb5nK9I3vRPMOG3kxQ9eC7BPRNME3u8c8/sQgdQY9gzqywhZXA==
-  dependencies:
-    "@types/node" "^18.15.12"
-    cargo-cp-artifact "^0.1.6"
-    class-transformer "^0.5.1"
-    prebuild-install "^7.1.1"
-    reflect-metadata "^0.1.13"
-    typescript "^4.9.4"
-
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"

From 711bab89ca3c6195bec80c648dc2fb51023e80dc Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Thu, 10 Aug 2023 14:38:55 +0200
Subject: [PATCH 30/48] chore: Remove unused utils methods in favour of SDK
 Utils class (mapped in preload)

---
 .../popups/AliasConfirmationPopup.svelte      | 21 +++++----------
 packages/desktop/electron/preload.js          | 26 +++++++++----------
 .../drawers/BalanceBreakdownDrawer.svelte     |  4 +--
 .../components/inputs/AliasInput.svelte       |  4 +--
 .../utils/getVotingParticipationEventIds.ts   |  2 +-
 .../nfts/actions/loadNftsForActiveProfile.ts  |  9 +++----
 .../nfts/tests/buildNftFromNftOutput.test.ts  |  6 -----
 .../getSpendableStatusFromUnspentNftOutput.ts |  5 ++--
 .../interfaces/api.interface.ts               | 11 ++++++--
 .../shared/lib/core/wallet/constants/index.ts |  2 --
 .../wallet/constants/output-type.constants.ts |  6 -----
 .../constants/unlock-condition.constants.ts   | 14 ----------
 .../wallet/utils/buildFoundryOutputData.ts    |  4 +--
 .../core/wallet/utils/buildNftOutputData.ts   |  4 +--
 .../wallet/utils/convertBech32ToHexAddress.ts |  7 -----
 .../wallet/utils/convertHexAddressToBech32.ts | 10 -------
 .../generateActivitiesFromAliasOutputs.ts     |  6 ++---
 .../generateActivitiesFromFoundryOutputs.ts   |  5 ++--
 .../generateSingleAliasActivity.ts            |  9 ++++---
 .../generateSingleFoundryActivity.ts          |  8 +++---
 .../utils/getBech32AddressFromAddressTypes.ts | 10 ++++---
 .../lib/core/wallet/utils/hashOutputId.ts     |  7 -----
 .../shared/lib/core/wallet/utils/index.ts     |  3 ---
 .../lib/core/wallet/utils/outputs/getNftId.ts |  4 +--
 .../outputs/getRecipientAddressFromOutput.ts  |  5 ++--
 .../utils/outputs/getRecipientFromOutput.ts   |  2 +-
 .../utils/outputs/getSenderFromOutput.ts      | 12 ++++++---
 .../outputs/getSerialNumberFromAliasOutput.ts |  4 +--
 .../utils/outputs/preprocessGroupedOutputs.ts |  3 +--
 .../getDirectionFromTransaction.ts            |  2 +-
 ...NonRemainderBasicOutputsFromTransaction.ts |  2 +-
 .../transactions/getSenderFromTransaction.ts  |  2 +-
 32 files changed, 84 insertions(+), 135 deletions(-)
 delete mode 100644 packages/shared/lib/core/wallet/constants/output-type.constants.ts
 delete mode 100644 packages/shared/lib/core/wallet/constants/unlock-condition.constants.ts
 delete mode 100644 packages/shared/lib/core/wallet/utils/convertBech32ToHexAddress.ts
 delete mode 100644 packages/shared/lib/core/wallet/utils/convertHexAddressToBech32.ts
 delete mode 100644 packages/shared/lib/core/wallet/utils/hashOutputId.ts

diff --git a/packages/desktop/components/popups/AliasConfirmationPopup.svelte b/packages/desktop/components/popups/AliasConfirmationPopup.svelte
index 9ed56349202..fdcd164601a 100644
--- a/packages/desktop/components/popups/AliasConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/AliasConfirmationPopup.svelte
@@ -1,18 +1,11 @@
 <script lang="ts">
     import { Button, KeyValueBox, Text, FontWeight, TextType } from 'shared/components'
     import { selectedAccount, updateSelectedAccount } from '@core/account'
-    import { getClient } from '@core/profile-manager'
+    import { api, getClient } from '@core/profile-manager'
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth, getBaseToken } from '@core/profile'
-    import {
-        convertBech32ToHexAddress,
-        formatTokenAmountPrecise,
-        EMPTY_HEX_ID,
-        UNLOCK_CONDITION_GOVERNOR_ADDRESS,
-        UNLOCK_CONDITION_STATE_CONTROLLER_ADDRESS,
-        processAndAddToActivities,
-    } from '@core/wallet'
-    import { PreparedTransaction } from '@iota/sdk/out/types'
+    import { formatTokenAmountPrecise, EMPTY_HEX_ID, processAndAddToActivities } from '@core/wallet'
+    import { AliasOutput, UnlockConditionType, PreparedTransaction } from '@iota/sdk/out/types'
     import { closePopup } from '@auxiliary/popup'
     import { onMount } from 'svelte'
     import { handleError } from '@core/error/handlers/handleError'
@@ -24,18 +17,18 @@
 
     $: address = {
         type: 0,
-        pubKeyHash: convertBech32ToHexAddress($selectedAccount.depositAddress),
+        pubKeyHash: api.bech32ToHex($selectedAccount.depositAddress),
     }
     $: aliasOutput = address
         ? {
               aliasId: EMPTY_HEX_ID,
               unlockConditions: [
                   {
-                      type: UNLOCK_CONDITION_GOVERNOR_ADDRESS,
+                      type: UnlockConditionType.GovernorAddress,
                       address,
                   },
                   {
-                      type: UNLOCK_CONDITION_STATE_CONTROLLER_ADDRESS,
+                      type: UnlockConditionType.StateControllerAddress,
                       address,
                   },
               ],
@@ -45,7 +38,7 @@
     $: void setStorageDeposit(aliasOutput)
     $: isTransferring = $selectedAccount.isTransferring
 
-    async function setStorageDeposit(aliasOutput): Promise<void> {
+    async function setStorageDeposit(aliasOutput: AliasOutput): Promise<void> {
         try {
             const client = await getClient()
             const { amount } = await client.buildAliasOutput(aliasOutput)
diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index 1c82aef3acf..82f186116ac 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -8,7 +8,7 @@
 
 const { ipcRenderer, contextBridge } = require('electron')
 const ElectronApi = require('./electronApi')
-const WalletApi = require('@iota/sdk')
+const IotaSdk = require('@iota/sdk')
 const fs = require('fs')
 
 const SEND_CRASH_REPORTS = window.process.argv.includes('--send-crash-reports=true')
@@ -65,7 +65,7 @@ try {
                 levelFilter: 'debug',
                 targetExclusions: ['h2', 'hyper', 'rustls', 'message_handler'],
             }
-            WalletApi.initLogger(loggerOptions)
+            IotaSdk.initLogger(loggerOptions)
 
             deleteOldLogs(logDir, versionDetails.currentVersion)
         })
@@ -97,13 +97,13 @@ try {
     // This workaround exposes the classes through factory methods
     // The factory method also copies all the prototype methods to the object so that it gets passed through the bridge
 
-    const methodNames = Object.getOwnPropertyNames(WalletApi.Utils).filter(
+    const methodNames = Object.getOwnPropertyNames(IotaSdk.Utils).filter(
         (m) => !['length', 'name', 'prototype'].includes(m)
     )
     const methods = {}
 
     for (const name of methodNames) {
-        methods[name] = (...args) => WalletApi.Utils[name](...args)
+        methods[name] = (...args) => IotaSdk.Utils[name](...args)
     }
 
     contextBridge.exposeInMainWorld('__WALLET__API__', {
@@ -121,16 +121,16 @@ try {
             }
         },
         createWallet(id, options) {
-            const manager = new WalletApi.Wallet(options)
+            const manager = new IotaSdk.Wallet(options)
             manager.id = id
             profileManagers[id] = manager
-            bindMethodsAcrossContextBridge(WalletApi.Wallet.prototype, manager)
+            bindMethodsAcrossContextBridge(IotaSdk.Wallet.prototype, manager)
             return manager
         },
         async createAccount(managerId, payload) {
             const manager = profileManagers[managerId]
             const account = await manager.createAccount(payload)
-            bindMethodsAcrossContextBridge(WalletApi.Account.prototype, account)
+            bindMethodsAcrossContextBridge(IotaSdk.Account.prototype, account)
             return account
         },
         deleteWallet(id) {
@@ -141,32 +141,32 @@ try {
         async getAccount(managerId, index) {
             const manager = profileManagers[managerId]
             const account = await manager.getAccount(index)
-            bindMethodsAcrossContextBridge(WalletApi.Account.prototype, account)
+            bindMethodsAcrossContextBridge(IotaSdk.Account.prototype, account)
             return account
         },
         async getAccounts(managerId) {
             const manager = profileManagers[managerId]
             const accounts = await manager.getAccounts()
-            accounts.forEach((account) => bindMethodsAcrossContextBridge(WalletApi.Account.prototype, account))
+            accounts.forEach((account) => bindMethodsAcrossContextBridge(IotaSdk.Account.prototype, account))
             return accounts
         },
         async recoverAccounts(managerId, payload) {
             const manager = profileManagers[managerId]
             const accounts = await manager.recoverAccounts(...Object.values(payload))
-            accounts.forEach((account) => bindMethodsAcrossContextBridge(WalletApi.Account.prototype, account))
+            accounts.forEach((account) => bindMethodsAcrossContextBridge(IotaSdk.Account.prototype, account))
             return accounts
         },
         async getClient(managerId) {
             const manager = profileManagers[managerId]
             const client = await manager.getClient()
-            bindMethodsAcrossContextBridge(WalletApi.Client.prototype, client)
+            bindMethodsAcrossContextBridge(IotaSdk.Client.prototype, client)
 
             return client
         },
         async migrateStrongholdSnapshotV2ToV3(currentPath, newPath, currentPassword, newPassword) {
             const snapshotSaltV2 = 'wallet.rs'
             const snapshotRoundsV2 = 100
-            return WalletApi.migrateStrongholdSnapshotV2ToV3(
+            return IotaSdk.migrateStrongholdSnapshotV2ToV3(
                 currentPath,
                 newPath,
                 snapshotSaltV2,
@@ -191,7 +191,7 @@ function bindMethodsAcrossContextBridge(prototype, object) {
                     const txs = await method(arguments)
                     txs.forEach((tx) => {
                         // Or classToInstance?
-                        bindMethodsAcrossContextBridge(WalletApi.Transaction.prototype, tx)
+                        bindMethodsAcrossContextBridge(IotaSdk.Transaction.prototype, tx)
                     })
                     return txs
                 }
diff --git a/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte b/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
index 86748367b3a..9111b383b1c 100644
--- a/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
+++ b/packages/mobile/components/drawers/BalanceBreakdownDrawer.svelte
@@ -63,8 +63,8 @@
                         containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.StorageDepositReturn)
                     ) {
                         type = PendingFundsType.StorageDepositReturn
-                        // TODO-sdk the signature of this function has changed recently. Find a way to fix
-                        amount = getStorageDepositFromOutput(commonOutput).storageDeposit
+                        const storageDepositData = await getStorageDepositFromOutput($selectedAccount, commonOutput)
+                        amount = storageDepositData.storageDeposit
                     } else if (containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.Timelock)) {
                         type = PendingFundsType.Timelock
                         amount = Number(output.amount)
diff --git a/packages/shared/components/inputs/AliasInput.svelte b/packages/shared/components/inputs/AliasInput.svelte
index 956362843ba..0a4413888d7 100644
--- a/packages/shared/components/inputs/AliasInput.svelte
+++ b/packages/shared/components/inputs/AliasInput.svelte
@@ -4,8 +4,8 @@
     import { localize } from '@core/i18n'
     import { validateBech32Address } from '@core/utils/crypto'
     import { ADDRESS_TYPE_ALIAS } from '@core/wallet/constants'
-    import { convertHexAddressToBech32 } from '@core/wallet/utils'
     import { getNetworkHrp } from '@core/profile/actions'
+    import { api } from '@core/profile-manager'
 
     export let alias: string = ''
     export let error: string = ''
@@ -15,7 +15,7 @@
 
     const aliasOptions: IOption[] =
         $selectedAccount.balances?.aliases.map((hexAliasId, index) => {
-            const aliasId = convertHexAddressToBech32(ADDRESS_TYPE_ALIAS, hexAliasId)
+            const aliasId = api.aliasIdToBech32(hexAliasId, getNetworkHrp())
             return { key: 'Alias ' + (index + 1), value: aliasId }
         }) ?? []
 
diff --git a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
index 94f94345ba9..e00e2e1fa01 100644
--- a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
+++ b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
@@ -1,6 +1,6 @@
 import { get } from 'svelte/store'
 
-import { INode, ParticipationEventId } from '@iota/sdk'
+import { INode, ParticipationEventId } from '@iota/sdk/out/types'
 import { ParticipationEventType } from '@iota/sdk/out/types'
 
 import { selectedAccount } from '@core/account/stores'
diff --git a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
index df1cee3a1de..91727543741 100644
--- a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
+++ b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
@@ -3,11 +3,10 @@ import { activeAccounts } from '@core/profile/stores'
 import { getNftId } from '@core/wallet/utils'
 import { IWrappedOutput } from '@core/wallet/interfaces'
 import { get } from 'svelte/store'
-import { OUTPUT_TYPE_NFT } from '../../wallet/constants'
 import { INft } from '../interfaces'
 import { buildNftFromNftOutput } from '../utils'
 import { setAccountNftsInAllAccountNfts } from './setAccountNftsInAllAccountNfts'
-import { NftOutput } from '@iota/sdk/out/types'
+import { NftOutput, OutputType } from '@iota/sdk/out/types'
 
 export async function loadNftsForActiveProfile(): Promise<void> {
     const allAccounts = get(activeAccounts)
@@ -20,7 +19,7 @@ async function loadNftsForAccount(account: IAccountState): Promise<void> {
     const accountNfts: INft[] = []
     const unspentOutputs = await account.unspentOutputs()
     for (const outputData of unspentOutputs) {
-        if (outputData.output.type === OUTPUT_TYPE_NFT) {
+        if (outputData.output.type === OutputType.Nft) {
             const nft = buildNftFromNftOutput(outputData as IWrappedOutput, account.depositAddress)
             accountNfts.push(nft)
         }
@@ -28,10 +27,10 @@ async function loadNftsForAccount(account: IAccountState): Promise<void> {
 
     const allOutputs = await account.outputs()
     const sortedNftOutputs = allOutputs
-        .filter((output) => output.output.type === OUTPUT_TYPE_NFT)
+        .filter((output) => output.output.type === OutputType.Nft)
         .sort((a, b) => b.metadata.milestoneTimestampBooked - a.metadata.milestoneTimestampBooked)
     for (const outputData of sortedNftOutputs) {
-        if (outputData.output.type === OUTPUT_TYPE_NFT) {
+        if (outputData.output.type === OutputType.Nft) {
             const nftOutput = outputData.output as NftOutput
             const nftId = getNftId(nftOutput.nftId, outputData.outputId)
             if (!accountNfts.some((nft) => nft.id === nftId)) {
diff --git a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
index a6717c65d81..a93d1bcd517 100644
--- a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
+++ b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
@@ -46,12 +46,6 @@ const incomingExpiredTimelockedCondition: UnlockCondition[] = [
     new TimelockUnlockCondition(136367917),
 ]
 
-jest.mock('../../wallet/utils/convertHexAddressToBech32.ts', () => ({
-    convertHexAddressToBech32: jest.fn((addressType: number, hexAddress: string) => {
-        return hexAddress ? Bech32Helper.toBech32(addressType, Converter.hexToBytes(hexAddress), 'rms') : undefined
-    }),
-}))
-
 describe('File: buildNFtFromOutput.ts', () => {
     let outputData: IWrappedOutput
 
diff --git a/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts b/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
index cd113a7739e..971fed4f7c9 100644
--- a/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/getSpendableStatusFromUnspentNftOutput.ts
@@ -1,7 +1,6 @@
-import { UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN } from '@core/wallet/constants'
 import { getExpirationUnixTimeFromOutput, getRecipientAddressFromOutput, isOutputAsync } from '@core/wallet/utils'
 import { getTimelockDateFromOutput } from '@core/wallet/utils/generateActivity/helper'
-import { NftOutput } from '@iota/sdk/out/types'
+import { NftOutput, UnlockConditionType } from '@iota/sdk/out/types'
 
 export function getSpendableStatusFromUnspentNftOutput(
     accountAddress: string,
@@ -16,7 +15,7 @@ export function getSpendableStatusFromUnspentNftOutput(
         const timeLockUnixTime = getTimelockDateFromOutput(nftOutput)?.getTime()
         const isRecipient = getRecipientAddressFromOutput(nftOutput) === accountAddress
         const hasStorageDepositReturnUnlockCondition = nftOutput.unlockConditions.some(
-            (unlockCondition) => unlockCondition?.type === UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN
+            (unlockCondition) => unlockCondition?.type === UnlockConditionType.StorageDepositReturn
         )
         if (expirationUnixTime) {
             if (isRecipient) {
diff --git a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
index 0205b67c245..0b6ef67db50 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
@@ -1,5 +1,5 @@
 import { WalletOptions, CreateAccountPayload, TransactionId, OutputId } from '@iota/sdk/out/types'
-import { AliasId, Client, FoundryId } from '@iota/sdk'
+import { AliasId, Client, FoundryId, NftId } from '@iota/sdk'
 import { IAuth } from '@core/network'
 import { INodeInfoResponse } from '@core/network/interfaces'
 
@@ -26,6 +26,13 @@ export interface IApi {
     // Mapped from sdk#Utils
     generateMnemonic(): Promise<string>
     verifyMnemonic(mnemonic: string): Promise<void>
-    computeOutputId(id: TransactionId, index: number): Promise<OutputId>
+    hexToBech32(hex: string, bech32Hrp: string): string
+    bech32ToHex(bech32: string): string
+    computeAliasId(outputId: string): AliasId
     computeFoundryId(aliasId: AliasId, serialNumber: number, tokenSchemeType: number): Promise<FoundryId>
+    computeNftId(outputId: string): NftId
+    hexPublicKeyToBech32Address(hex: string, bech32Hrp: string): string
+    aliasIdToBech32(aliasId: string, bech32Hrp: string): string
+    nftIdToBech32(nftId: string, bech32Hrp: string): string
+    computeOutputId(id: TransactionId, index: number): Promise<OutputId>
 }
diff --git a/packages/shared/lib/core/wallet/constants/index.ts b/packages/shared/lib/core/wallet/constants/index.ts
index f16f864d701..e1ca520495d 100644
--- a/packages/shared/lib/core/wallet/constants/index.ts
+++ b/packages/shared/lib/core/wallet/constants/index.ts
@@ -11,6 +11,4 @@ export * from './max-asset-displayed-initials.constant'
 export * from './max-supported-decimals.constants'
 export * from './max-supported-erc20-decimals.constant'
 export * from './official-token-ids.constant'
-export * from './output-type.constants'
 export * from './reserved-tag-keywords.constant'
-export * from './unlock-condition.constants'
diff --git a/packages/shared/lib/core/wallet/constants/output-type.constants.ts b/packages/shared/lib/core/wallet/constants/output-type.constants.ts
deleted file mode 100644
index aa45c344ead..00000000000
--- a/packages/shared/lib/core/wallet/constants/output-type.constants.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-// TODO-sdk this should be gone (switch to OutputTypes.Basic etc...)
-export const OUTPUT_TYPE_TREASURY = 2
-export const OUTPUT_TYPE_BASIC = 3
-export const OUTPUT_TYPE_ALIAS = 4
-export const OUTPUT_TYPE_FOUNDRY = 5
-export const OUTPUT_TYPE_NFT = 6
diff --git a/packages/shared/lib/core/wallet/constants/unlock-condition.constants.ts b/packages/shared/lib/core/wallet/constants/unlock-condition.constants.ts
deleted file mode 100644
index 9936de35334..00000000000
--- a/packages/shared/lib/core/wallet/constants/unlock-condition.constants.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// TODO-sdk this should be gone (switch to iota/sdk etc...)
-export const UNLOCK_CONDITION_ADDRESS = 0
-export const UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN = 1
-export const UNLOCK_CONDITION_TIMELOCK = 2
-export const UNLOCK_CONDITION_EXPIRATION = 3
-export const UNLOCK_CONDITION_STATE_CONTROLLER_ADDRESS = 4
-export const UNLOCK_CONDITION_GOVERNOR_ADDRESS = 5
-export const UNLOCK_CONDITION_IMMUTABLE_ALIAS = 6
-
-export const ASYNC_UNLOCK_CONDITION_TYPES = [
-    UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN,
-    UNLOCK_CONDITION_EXPIRATION,
-    UNLOCK_CONDITION_TIMELOCK,
-]
diff --git a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
index eeb9bf3acec..f08eb7f17f6 100644
--- a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
@@ -9,8 +9,8 @@ import {
 } from '@iota/sdk/out/types'
 import { Converter } from '@core/utils'
 import { IIrc30Metadata } from '../interfaces'
-import { convertBech32ToHexAddress } from './convertBech32ToHexAddress'
 import { getSerialNumberFromAliasOutput } from './outputs/getSerialNumberFromAliasOutput'
+import { api } from '@core/profile-manager'
 
 export async function buildFoundryOutputData(
     totalSupply: number,
@@ -19,7 +19,7 @@ export async function buildFoundryOutputData(
     aliasId: string
 ): Promise<FoundryOutputBuilderParams> {
     const immutableAliasUnlockCondition = new ImmutableAliasAddressUnlockCondition(
-        new AliasAddress(convertBech32ToHexAddress(aliasId))
+        new AliasAddress(api.bech32ToHex(aliasId))
     )
 
     const unlockConditions: UnlockCondition[] = [immutableAliasUnlockCondition]
diff --git a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
index 25c3f136e4d..8c21c6355cb 100644
--- a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
@@ -1,11 +1,11 @@
 import { AddressUnlockCondition, Ed25519Address, MetadataFeature, NftOutputBuilderParams } from '@iota/sdk/out/types'
 import { Converter } from '@core/utils'
 import { EMPTY_HEX_ID } from '../constants'
-import { convertBech32ToHexAddress } from './convertBech32ToHexAddress'
 import { IIrc27Metadata } from '@core/nfts/interfaces'
+import { api } from '@core/profile-manager'
 
 export function buildNftOutputData(metadata: IIrc27Metadata, address: string): NftOutputBuilderParams {
-    const addressUnlockCondition = new AddressUnlockCondition(new Ed25519Address(convertBech32ToHexAddress(address)))
+    const addressUnlockCondition = new AddressUnlockCondition(new Ed25519Address(api.bech32ToHex(address)))
 
     const unlockConditions: AddressUnlockCondition[] = [addressUnlockCondition]
 
diff --git a/packages/shared/lib/core/wallet/utils/convertBech32ToHexAddress.ts b/packages/shared/lib/core/wallet/utils/convertBech32ToHexAddress.ts
deleted file mode 100644
index 32d59b05ee4..00000000000
--- a/packages/shared/lib/core/wallet/utils/convertBech32ToHexAddress.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { getNetworkHrp } from '@core/profile'
-import { Converter } from '@core/utils/convert'
-import { Bech32Helper } from '@core/utils/crypto'
-
-export function convertBech32ToHexAddress(bech32: string): string {
-    return bech32 ? Converter.bytesToHex(Bech32Helper.fromBech32(bech32, getNetworkHrp()).addressBytes) : undefined
-}
diff --git a/packages/shared/lib/core/wallet/utils/convertHexAddressToBech32.ts b/packages/shared/lib/core/wallet/utils/convertHexAddressToBech32.ts
deleted file mode 100644
index f35522428da..00000000000
--- a/packages/shared/lib/core/wallet/utils/convertHexAddressToBech32.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { getNetworkHrp } from '@core/profile'
-import { Converter } from '@core/utils/convert'
-import { Bech32Helper } from '@core/utils/crypto'
-
-// TODO-sdk replace in favour of utils
-export function convertHexAddressToBech32(addressType: number, hexAddress: string): string | undefined {
-    return hexAddress
-        ? Bech32Helper.toBech32(addressType, Converter.hexToBytes(hexAddress), getNetworkHrp())
-        : undefined
-}
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
index 9eec580d212..017d591b116 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
@@ -1,8 +1,8 @@
 import { IAccountState } from '@core/account'
-import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction, OUTPUT_TYPE_ALIAS } from '@core/wallet'
+import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction } from '@core/wallet'
 import { Activity, type AliasActivity } from '@core/wallet/types'
 import { generateSingleAliasActivity } from './generateSingleAliasActivity'
-import { AliasOutput } from '@iota/sdk/out/types'
+import { AliasOutput, OutputType } from '@iota/sdk/out/types'
 
 export async function generateActivitiesFromAliasOutputs(
     processedTransaction: IProcessedTransaction,
@@ -11,7 +11,7 @@ export async function generateActivitiesFromAliasOutputs(
     const outputs = processedTransaction.outputs
     const activities: AliasActivity[] = []
 
-    const aliasOutputs = outputs.filter((output) => output.output.type === OUTPUT_TYPE_ALIAS)
+    const aliasOutputs = outputs.filter((output) => output.output.type === OutputType.Alias)
     for (const aliasOutput of aliasOutputs) {
         const output = aliasOutput.output as AliasOutput
         const activity = await generateSingleAliasActivity(account, {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromFoundryOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromFoundryOutputs.ts
index 5954f66921d..af048ec6d54 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromFoundryOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromFoundryOutputs.ts
@@ -1,7 +1,8 @@
 import { IAccountState } from '@core/account'
-import { ActivityAction, IProcessedTransaction, OUTPUT_TYPE_FOUNDRY } from '@core/wallet'
+import { ActivityAction, IProcessedTransaction } from '@core/wallet'
 import { Activity } from '@core/wallet/types'
 import { generateSingleFoundryActivity } from './generateSingleFoundryActivity'
+import { OutputType } from '@iota/sdk/out/types'
 
 export async function generateActivitiesFromFoundryOutputs(
     processedTransaction: IProcessedTransaction,
@@ -10,7 +11,7 @@ export async function generateActivitiesFromFoundryOutputs(
     const outputs = processedTransaction.outputs
     const activities = []
 
-    const foundryOutputs = outputs.filter((output) => output.output.type === OUTPUT_TYPE_FOUNDRY)
+    const foundryOutputs = outputs.filter((output) => output.output.type === OutputType.Foundry)
     for (const foundryOutput of foundryOutputs) {
         activities.push(
             await generateSingleFoundryActivity(account, {
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
index 27214073dab..24133b4b05b 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
@@ -1,9 +1,8 @@
 import { IAccountState } from '@core/account'
-import { ADDRESS_TYPE_ALIAS, EMPTY_HEX_ID } from '@core/wallet/constants'
+import { EMPTY_HEX_ID } from '@core/wallet/constants'
 import { ActivityType } from '@core/wallet/enums'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { AliasActivity } from '@core/wallet/types'
-import { convertHexAddressToBech32, hashOutputId } from '..'
 import {
     getAmountFromOutput,
     getAsyncDataFromOutput,
@@ -15,6 +14,8 @@ import {
     getTagFromOutput,
 } from './helper'
 import { AliasOutput } from '@iota/sdk/out/types'
+import { api } from '@core/profile-manager'
+import { getNetworkHrp } from '@core/profile'
 
 export async function generateSingleAliasActivity(
     account: IAccountState,
@@ -67,6 +68,6 @@ export async function generateSingleAliasActivity(
 
 function getAliasId(output: AliasOutput, outputId: string): string {
     const isNewAlias = output.aliasId === EMPTY_HEX_ID
-    const aliasId = isNewAlias ? hashOutputId(outputId) : output.aliasId
-    return convertHexAddressToBech32(ADDRESS_TYPE_ALIAS, aliasId)
+    const aliasId = isNewAlias ? api.computeAliasId(outputId) : output.aliasId
+    return api.aliasIdToBech32(aliasId, getNetworkHrp())
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
index e5537ab0e31..bedb7b56dcf 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
@@ -1,9 +1,9 @@
 import { IAccountState } from '@core/account'
-import { getCoinType } from '@core/profile'
+import { getCoinType, getNetworkHrp } from '@core/profile'
 import { ActivityType } from '@core/wallet/enums'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { FoundryActivity } from '@core/wallet/types'
-import { convertHexAddressToBech32, getNativeTokenFromOutput } from '..'
+import { getNativeTokenFromOutput } from '..'
 import {
     getAmountFromOutput,
     getAsyncDataFromOutput,
@@ -12,13 +12,13 @@ import {
     getTagFromOutput,
 } from './helper'
 import {
-    AddressType,
     AliasAddress,
     FoundryOutput,
     ImmutableAliasAddressUnlockCondition,
     SimpleTokenScheme,
     UnlockConditionType,
 } from '@iota/sdk/out/types'
+import { api } from '@core/profile-manager'
 
 export async function generateSingleFoundryActivity(
     account: IAccountState,
@@ -37,7 +37,7 @@ export async function generateSingleFoundryActivity(
         (unlockCondition) => unlockCondition.type === UnlockConditionType.ImmutableAliasAddress
     ) as ImmutableAliasAddressUnlockCondition
     const aliasId = (addressUnlockCondition?.address as AliasAddress)?.aliasId
-    const aliasAddress = aliasId ? convertHexAddressToBech32(AddressType.Alias, aliasId) : undefined
+    const aliasAddress = aliasId ? api.aliasIdToBech32(aliasId, getNetworkHrp()) : undefined
 
     const isHidden = false
     const isAssetHidden = false
diff --git a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
index 3cf43544417..b8895a6d226 100644
--- a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
@@ -1,13 +1,15 @@
-import { convertHexAddressToBech32 } from './convertHexAddressToBech32'
+import { api } from '@core/profile-manager'
 import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/sdk/out/types'
+import { getNetworkHrp } from '@core/profile'
 
 export function getBech32AddressFromAddressTypes(address: Address): string | undefined {
+    const hrp = getNetworkHrp()
     switch (address.type) {
         case AddressType.Ed25519:
-            return convertHexAddressToBech32(AddressType.Ed25519, (address as Ed25519Address).pubKeyHash)
+            return api.hexPublicKeyToBech32Address((address as Ed25519Address).pubKeyHash, hrp)
         case AddressType.Alias:
-            return convertHexAddressToBech32(AddressType.Alias, (address as AliasAddress).aliasId)
+            return api.aliasIdToBech32((address as AliasAddress).aliasId, hrp)
         case AddressType.Nft:
-            return convertHexAddressToBech32(AddressType.Nft, (address as NftAddress).nftId)
+            return api.nftIdToBech32((address as NftAddress).nftId, hrp)
     }
 }
diff --git a/packages/shared/lib/core/wallet/utils/hashOutputId.ts b/packages/shared/lib/core/wallet/utils/hashOutputId.ts
deleted file mode 100644
index 0b340763dc0..00000000000
--- a/packages/shared/lib/core/wallet/utils/hashOutputId.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Converter } from '@core/utils'
-import { Blake2b } from '@iota/crypto.js'
-
-// TODO-sdk Replace/remove in favour of sdk Utils
-export function hashOutputId(outputId: string): string {
-    return Converter.bytesToHex(Blake2b.sum256(Converter.hexToBytes(outputId)))
-}
diff --git a/packages/shared/lib/core/wallet/utils/index.ts b/packages/shared/lib/core/wallet/utils/index.ts
index 84b009969f4..e00f03065be 100644
--- a/packages/shared/lib/core/wallet/utils/index.ts
+++ b/packages/shared/lib/core/wallet/utils/index.ts
@@ -1,8 +1,6 @@
 // Files
 export * from './buildFoundryOutputData'
 export * from './buildNftOutputData'
-export * from './convertBech32ToHexAddress'
-export * from './convertHexAddressToBech32'
 export * from './convertToRawAmount'
 export * from './formatTokenAmountBestMatch'
 export * from './formatTokenAmountDefault'
@@ -20,7 +18,6 @@ export * from './getSenderAddressFromUnlockCondition'
 export * from './getSubjectFromAddress'
 export * from './getTokenFromSelectedAccount'
 export * from './getUnitFromTokenMetadata'
-export * from './hashOutputId'
 export * from './isReservedTagKeyword'
 export * from './isSubjectInternal'
 export * from './parseGovernanceMetadata'
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts b/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts
index 50aeb86c0fc..c6765888f97 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts
@@ -1,8 +1,8 @@
 import { EMPTY_HEX_ID } from '@core/wallet/constants'
-import { hashOutputId } from '../hashOutputId'
+import { api } from '@core/profile-manager'
 
 export function getNftId(nftId: string, outputId: string): string {
     const isNewNft = nftId === EMPTY_HEX_ID
-    const realNftId = isNewNft ? hashOutputId(outputId) : nftId
+    const realNftId = isNewNft ? api.computeNftId(outputId) : nftId
     return realNftId
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts
index a83edfdcc4b..c0a277de691 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getRecipientAddressFromOutput.ts
@@ -1,10 +1,9 @@
-import { AddressUnlockCondition, CommonOutput } from '@iota/sdk/out/types'
-import { UNLOCK_CONDITION_ADDRESS } from '../../constants'
+import { AddressUnlockCondition, CommonOutput, UnlockConditionType } from '@iota/sdk/out/types'
 import { getBech32AddressFromAddressTypes } from '../getBech32AddressFromAddressTypes'
 
 export function getRecipientAddressFromOutput(output: CommonOutput): string | undefined {
     for (const unlockCondition of output.unlockConditions) {
-        if (unlockCondition.type === UNLOCK_CONDITION_ADDRESS) {
+        if (unlockCondition.type === UnlockConditionType.Address) {
             const addressUnlockCondition = unlockCondition as AddressUnlockCondition
             return getBech32AddressFromAddressTypes(addressUnlockCondition.address)
         }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts
index 3a4fbf7f5b0..86d607357b8 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getRecipientFromOutput.ts
@@ -1,7 +1,7 @@
 import { getRecipientAddressFromOutput } from './getRecipientAddressFromOutput'
 import { Subject } from '../../types'
 import { getSubjectFromAddress } from '../getSubjectFromAddress'
-import { CommonOutput } from '@iota/sdk'
+import { CommonOutput } from '@iota/sdk/out/types'
 
 export function getRecipientFromOutput(output: CommonOutput): Subject | undefined {
     const recipientAddress = getRecipientAddressFromOutput(output)
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts
index 4ef9e02873a..f19feb95303 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts
@@ -1,14 +1,18 @@
 import { Subject } from '../../types'
 import { getBech32AddressFromAddressTypes } from '../getBech32AddressFromAddressTypes'
-import { UNLOCK_CONDITION_EXPIRATION, UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN } from '@core/wallet/constants'
 import { getSubjectFromAddress } from '../getSubjectFromAddress'
-import { CommonOutput, ExpirationUnlockCondition, StorageDepositReturnUnlockCondition } from '@iota/sdk'
+import {
+    CommonOutput,
+    ExpirationUnlockCondition,
+    StorageDepositReturnUnlockCondition,
+    UnlockConditionType,
+} from '@iota/sdk/out/types'
 
 export function getSenderFromOutput(output: CommonOutput): Subject | undefined {
     for (const unlockCondition of output.unlockConditions) {
         if (
-            unlockCondition?.type === UNLOCK_CONDITION_STORAGE_DEPOSIT_RETURN ||
-            unlockCondition?.type === UNLOCK_CONDITION_EXPIRATION
+            unlockCondition?.type === UnlockConditionType.StorageDepositReturn ||
+            unlockCondition?.type === UnlockConditionType.Expiration
         ) {
             const storageOrExpirationUnlockCondition = unlockCondition as
                 | StorageDepositReturnUnlockCondition
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
index cdd02ac0b1c..84490c58cf6 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
@@ -1,14 +1,14 @@
 import { get } from 'svelte/store'
 import { selectedAccount } from '@core/account/stores'
-import { convertBech32ToHexAddress } from '@core/wallet/utils/convertBech32ToHexAddress'
 import { AliasOutput } from '@iota/sdk/out/types'
+import { api } from '@core/profile-manager'
 
 export async function getSerialNumberFromAliasOutput(aliasAddress: string): Promise<number> {
     const account = get(selectedAccount)
     if (!account) {
         throw new Error('Account is undefined')
     }
-    const aliasId = convertBech32ToHexAddress(aliasAddress)
+    const aliasId = api.bech32ToHex(aliasAddress)
 
     const [aliasOutput] = await account.unspentOutputs({ aliasIds: [aliasId] })
 
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
index b7ea4dc66cd..2ff80f8f314 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
@@ -2,7 +2,6 @@ import { CommonOutput, OutputData, OutputResponse, OutputType, UTXOInput } from
 import { MILLISECONDS_PER_SECOND } from '@core/utils/constants'
 import { IAccountState } from '@core/account/interfaces'
 import { InclusionState, ActivityDirection } from '../../enums'
-import { OUTPUT_TYPE_TREASURY } from '../../constants'
 import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
 import { getRecipientAddressFromOutput } from './getRecipientAddressFromOutput'
 import { getSenderAddressFromInputs } from '../transactions'
@@ -47,7 +46,7 @@ function getDirectionForOutputs(
         return ActivityDirection.Outgoing
     }
     const output =
-        nonRemainderOutputs[0].output.type !== OUTPUT_TYPE_TREASURY ? nonRemainderOutputs[0].output : undefined
+        nonRemainderOutputs[0].output.type !== OutputType.Treasury ? nonRemainderOutputs[0].output : undefined
     const recipientAddress = output ? getRecipientAddressFromOutput(output as CommonOutput) : undefined
     const senderAddress = wrappedInputs ? getSenderAddressFromInputs(wrappedInputs) : ''
 
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts
index 3124aed018f..621bace89ee 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromTransaction.ts
@@ -1,7 +1,7 @@
 import { IWrappedOutput } from '../../interfaces'
 import { getRecipientAddressFromOutput } from '../outputs/getRecipientAddressFromOutput'
 import { ActivityDirection } from '@core/wallet/enums'
-import { CommonOutput } from '@iota/sdk'
+import { CommonOutput } from '@iota/sdk/out/types'
 
 export function getDirectionFromTransaction(
     wrappedOutputs: IWrappedOutput[],
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
index e39873199fa..4155d5930ca 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
@@ -1,7 +1,7 @@
 import { getRecipientAddressFromOutput } from '..'
 import { IWrappedOutput } from '@core/wallet/interfaces'
 import { ActivityDirection } from '@core/wallet/enums'
-import { CommonOutput } from '@iota/sdk'
+import { CommonOutput } from '@iota/sdk/out/types'
 
 export function getNonRemainderBasicOutputsFromTransaction(
     wrappedOutputs: IWrappedOutput[],
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts
index 211629f9d0e..f933da4d727 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getSenderFromTransaction.ts
@@ -1,5 +1,5 @@
 import { Subject } from '@core/wallet/types'
-import { CommonOutput } from '@iota/sdk'
+import { CommonOutput } from '@iota/sdk/out/types'
 import { getSenderFromOutput } from '../outputs/getSenderFromOutput'
 
 export function getSenderFromTransaction(

From 7b43c0a0d327174d8c44994e8beba4e3768e0f01 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Fri, 11 Aug 2023 12:40:37 +0200
Subject: [PATCH 31/48] chore: Fix some failing tests

---
 .../nfts/tests/buildNftFromNftOutput.test.ts  | 68 +++++++++++++------
 .../interfaces/profile-manager.interface.ts   |  2 -
 .../core/profile-manager/tests/api.test.ts    | 11 +--
 .../shared/lib/tests/__mocks__/api.mock.ts    | 11 +++
 .../tests/__mocks__/profile-manager.mock.ts   | 16 +----
 5 files changed, 67 insertions(+), 41 deletions(-)

diff --git a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
index a93d1bcd517..e17a0c4db29 100644
--- a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
+++ b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
@@ -1,14 +1,12 @@
+import { getClient } from '@core/profile-manager'
 import { IWrappedOutput } from '../../wallet/interfaces'
 import { buildNftFromNftOutput } from '../utils/buildNftFromNftOutput'
-import { Converter } from '../../utils/convert'
-import { Bech32Helper } from '../../utils/crypto'
 import {
     AddressUnlockCondition,
     Ed25519Address,
     Feature,
     IssuerFeature,
     MetadataFeature,
-    NftOutput,
     TimelockUnlockCondition,
     UnlockCondition,
 } from '@iota/sdk/out/types'
@@ -48,10 +46,15 @@ const incomingExpiredTimelockedCondition: UnlockCondition[] = [
 
 describe('File: buildNFtFromOutput.ts', () => {
     let outputData: IWrappedOutput
+    const client = () => getClient()
 
-    it('should classify default nft as spendable', () => {
-        const nftOutput = new NftOutput(amount, nftId, incomingUnlockConditions)
-        nftOutput.setImmutableFeatures(immutableFeatures)
+    it('should classify default nft as spendable', async () => {
+        const nftOutput = await client().buildNftOutput({
+            amount,
+            nftId,
+            unlockConditions: incomingUnlockConditions,
+            immutableFeatures,
+        })
 
         outputData = {
             outputId,
@@ -62,9 +65,13 @@ describe('File: buildNFtFromOutput.ts', () => {
         expect(nft.isSpendable).toBe(true)
     })
 
-    it('should correctly classify nft as timelocked', () => {
-        const nftOutput = new NftOutput(amount, nftId, incomingTimelockedCondition)
-        nftOutput.setImmutableFeatures(immutableFeatures)
+    it('should correctly classify nft as timelocked', async () => {
+        const nftOutput = await client().buildNftOutput({
+            amount,
+            nftId,
+            unlockConditions: incomingTimelockedCondition,
+            immutableFeatures,
+        })
 
         outputData = {
             outputId,
@@ -75,9 +82,13 @@ describe('File: buildNFtFromOutput.ts', () => {
         expect(nft.timelockTime).toBe(2876367917000)
     })
 
-    it('should correctly classify expired timelocked nft', () => {
-        const nftOutput = new NftOutput(amount, nftId, incomingExpiredTimelockedCondition)
-        nftOutput.setImmutableFeatures(immutableFeatures)
+    it('should correctly classify expired timelocked nft', async () => {
+        const nftOutput = await client().buildNftOutput({
+            amount,
+            nftId,
+            unlockConditions: incomingExpiredTimelockedCondition,
+            immutableFeatures,
+        })
 
         outputData = {
             outputId,
@@ -88,8 +99,12 @@ describe('File: buildNFtFromOutput.ts', () => {
         expect(nft.timelockTime).toBe(136367917000)
     })
 
-    it('should ignore parsing spendable state and timelock', () => {
-        let nftOutput = new NftOutput(amount, nftId, incomingUnlockConditions)
+    it('should ignore parsing spendable state and timelock', async () => {
+        let nftOutput = await client().buildNftOutput({
+            amount,
+            nftId,
+            unlockConditions: incomingUnlockConditions,
+        })
 
         outputData = {
             outputId,
@@ -100,7 +115,11 @@ describe('File: buildNFtFromOutput.ts', () => {
         expect(nft.isSpendable).toBe(false)
         expect(nft.timelockTime).toBe(undefined)
 
-        nftOutput = new NftOutput(amount, nftId, incomingTimelockedCondition)
+        nftOutput = await client().buildNftOutput({
+            amount,
+            nftId,
+            unlockConditions: incomingTimelockedCondition,
+        })
 
         outputData = {
             outputId,
@@ -110,8 +129,12 @@ describe('File: buildNFtFromOutput.ts', () => {
         expect(nft.isSpendable).toBe(false)
         expect(nft.timelockTime).toBe(undefined)
 
-        nftOutput = new NftOutput(amount, nftId, incomingExpiredTimelockedCondition)
-        nftOutput.setImmutableFeatures(immutableFeatures)
+        nftOutput = await client().buildNftOutput({
+            amount,
+            nftId,
+            unlockConditions: incomingExpiredTimelockedCondition,
+            immutableFeatures,
+        })
 
         outputData = {
             outputId,
@@ -122,10 +145,13 @@ describe('File: buildNFtFromOutput.ts', () => {
         expect(nft.timelockTime).toBe(undefined)
     })
 
-    it('should parse the metadata correctly', () => {
-        let nftOutput = new NftOutput(amount, nftId, incomingUnlockConditions)
-
-        nftOutput.setImmutableFeatures(immutableFeatures)
+    it('should parse the metadata correctly', async () => {
+        let nftOutput = await client().buildNftOutput({
+            amount,
+            nftId,
+            unlockConditions: incomingUnlockConditions,
+            immutableFeatures,
+        })
 
         outputData = {
             outputId,
diff --git a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
index b8cc356c459..5ede6a224d0 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
@@ -27,7 +27,6 @@ export interface IProfileManager {
         options?: GenerateAddressOptions,
         bech32Hrp?: string
     ): Promise<string>
-    generateMnemonic(): Promise<string>
     getAccountIndexes(): Promise<number[]>
     getAccount(accountIndex: number): Promise<IAccount>
     getAccounts(): Promise<IAccount[]>
@@ -50,6 +49,5 @@ export interface IProfileManager {
     startBackgroundSync(options?: SyncOptions, intervalInMilliseconds?: number): Promise<void>
     stopBackgroundSync(): Promise<void>
     storeMnemonic(mnemonic: string): Promise<void>
-    verifyMnemonic(mnemonic: string): Promise<void>
     updateNodeAuth(url: string, auth?: IAuth): Promise<void>
 }
diff --git a/packages/shared/lib/core/profile-manager/tests/api.test.ts b/packages/shared/lib/core/profile-manager/tests/api.test.ts
index d42c6914cc4..d36ab23f511 100644
--- a/packages/shared/lib/core/profile-manager/tests/api.test.ts
+++ b/packages/shared/lib/core/profile-manager/tests/api.test.ts
@@ -1,17 +1,20 @@
 import '@mocks/crypto.mock'
-import { MOCK_MNEMONIC, ProfileManagerMock } from '@mocks/profile-manager.mock'
+import { ProfileManagerMock } from '@mocks/profile-manager.mock'
+import { MOCK_MNEMONIC } from '@mocks/api.mock'
 
 import { get } from 'svelte/store'
 
-import { generateRandomId } from '@core/utils'
+import { generateRandomId } from '../../../core/utils/'
 
 import { destroyProfileManager } from '../actions'
 import { generateMnemonic, setStrongholdPassword, storeMnemonic, verifyMnemonic, backup, restoreBackup } from '../api'
 import { profileManager } from '../stores'
+import { IApi } from '../interfaces'
 
 describe('File: api.test.ts', () => {
     let profileManagerMock: ProfileManagerMock
     let spy: jest.SpyInstance
+    const api: IApi = window['__WALLET__API__']
 
     const password = 'password'
 
@@ -32,7 +35,7 @@ describe('File: api.test.ts', () => {
 
     describe('Function: generateMnemonic', () => {
         it('should execute generateMnemonic correctly', async () => {
-            spy = jest.spyOn(profileManagerMock, 'generateMnemonic')
+            spy = jest.spyOn(api, 'generateMnemonic')
             const actual = await generateMnemonic()
             expect(actual).toEqual(MOCK_MNEMONIC)
             expect(spy).toHaveBeenCalledTimes(1)
@@ -62,7 +65,7 @@ describe('File: api.test.ts', () => {
 
     describe('Function: verifyMnemonic', () => {
         it('should call verifyMnemonic', async () => {
-            spy = jest.spyOn(profileManagerMock, 'verifyMnemonic')
+            spy = jest.spyOn(api, 'verifyMnemonic')
             await verifyMnemonic(MOCK_MNEMONIC)
             expect(spy).toBeCalledWith(MOCK_MNEMONIC)
             expect(spy).toBeCalledTimes(1)
diff --git a/packages/shared/lib/tests/__mocks__/api.mock.ts b/packages/shared/lib/tests/__mocks__/api.mock.ts
index ea5a22f1776..317d51ecf04 100644
--- a/packages/shared/lib/tests/__mocks__/api.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/api.mock.ts
@@ -6,6 +6,9 @@ import { WalletOptions, CreateAccountPayload } from '@iota/sdk/out/types'
 import { IApi, RecoverAccountsPayload } from '@core/profile-manager'
 import { IAccount } from '@core/account'
 
+export const MOCK_MNEMONIC =
+    'term aisle loyal cradle talent buddy crater express asthma load antique game better head position master aspect print more wine sword speed joy story'
+
 const profileManagers = {}
 
 const api: IApi = {
@@ -51,6 +54,14 @@ const api: IApi = {
             resolve()
         })
     },
+
+    generateMnemonic(): Promise<string> {
+        return Promise.resolve(MOCK_MNEMONIC)
+    },
+
+    verifyMnemonic(mnemonic: string): Promise<void> {
+        return Promise.resolve()
+    },
 }
 
 window['__WALLET__API__'] = api
diff --git a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts b/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
index d48a3208c6a..7350259677a 100644
--- a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
@@ -4,11 +4,10 @@ import type {
     AccountId,
     CreateAccountPayload,
     SyncOptions,
-    ClientOptions,
+    IClientOptions,
     WalletEvent,
     LedgerNanoStatus,
     GenerateAddressOptions,
-    INode,
 } from '@iota/sdk/out/types'
 import { WalletEventType } from '@iota/sdk/out/types'
 
@@ -16,9 +15,6 @@ import { IAccount } from '@core/account'
 import { IAuth, INodeInfoResponse } from '@core/network'
 import { IProfileManager, WalletApiEventHandler } from '@core/profile-manager'
 
-export const MOCK_MNEMONIC =
-    'term aisle loyal cradle talent buddy crater express asthma load antique game better head position master aspect print more wine sword speed joy story'
-
 export class ProfileManagerMock implements IProfileManager {
     id: string
 
@@ -58,10 +54,6 @@ export class ProfileManagerMock implements IProfileManager {
         throw new Error('Method not implemented.')
     }
 
-    generateMnemonic(): Promise<string> {
-        return Promise.resolve(MOCK_MNEMONIC)
-    }
-
     generateEd25519Address(
         accountIndex: number,
         internal: boolean,
@@ -180,7 +172,7 @@ export class ProfileManagerMock implements IProfileManager {
         return Promise.resolve()
     }
 
-    setClientOptions(options: ClientOptions): Promise<void> {
+    setClientOptions(options: IClientOptions): Promise<void> {
         return Promise.resolve()
     }
 
@@ -204,10 +196,6 @@ export class ProfileManagerMock implements IProfileManager {
         return Promise.resolve()
     }
 
-    verifyMnemonic(mnemonic: string): Promise<void> {
-        return Promise.resolve()
-    }
-
     updateNodeAuth(url: string, auth?: IAuth): Promise<void> {
         return Promise.resolve()
     }

From faf364eb3033b7b537d4da34e2c14d22a0a765a8 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Tue, 15 Aug 2023 09:56:53 +0200
Subject: [PATCH 32/48] chore: Fix getOutputParameters test

---
 .../lib/core/wallet/tests/getOutputParameters.test.ts       | 6 +++---
 .../shared/lib/core/wallet/utils/getOutputParameters.ts     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/shared/lib/core/wallet/tests/getOutputParameters.test.ts b/packages/shared/lib/core/wallet/tests/getOutputParameters.test.ts
index 72fd5328a97..0f12fca88fa 100644
--- a/packages/shared/lib/core/wallet/tests/getOutputParameters.test.ts
+++ b/packages/shared/lib/core/wallet/tests/getOutputParameters.test.ts
@@ -167,7 +167,7 @@ describe('File: getOutputParameters.ts', () => {
             assets: {
                 nativeTokens: [
                     {
-                        amount: '0x3b9aca00',
+                        amount: BigInt(1000000000),
                         id: nativeTokenAsset.id,
                     },
                 ],
@@ -216,7 +216,7 @@ describe('File: getOutputParameters.ts', () => {
             assets: {
                 nativeTokens: [
                     {
-                        amount: '0x3b9aca00',
+                        amount: BigInt(1000000000),
                         id: nativeTokenAsset.id,
                     },
                 ],
@@ -295,7 +295,7 @@ describe('File: getOutputParameters.ts', () => {
             assets: {
                 nativeTokens: [
                     {
-                        amount: '0x3b9aca00',
+                        amount: BigInt(1000000000),
                         id: nativeTokenAsset.id,
                     },
                 ],
diff --git a/packages/shared/lib/core/wallet/utils/getOutputParameters.ts b/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
index 305611b2460..195abc288ff 100644
--- a/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
+++ b/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
@@ -81,7 +81,7 @@ function getAssetFromTransactionDetails(transactionDetails: NewTransactionDetail
                 nativeTokens: [
                     {
                         id: nativeTokenId,
-                        amount: BigInt(bigAmount),
+                        amount: bigAmount,
                     },
                 ],
             }

From f65fc2613bda53ffb9515e90c38f21165b65aca9 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Tue, 15 Aug 2023 11:08:55 +0200
Subject: [PATCH 33/48] chore: Fix failing tests

---
 .../nfts/tests/buildNftFromNftOutput.test.ts  | 35 +++++++++++++------
 .../core/nfts/utils/buildNftFromNftOutput.ts  |  2 +-
 .../utils/getBech32AddressFromAddressTypes.ts |  2 +-
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
index e17a0c4db29..203e4357383 100644
--- a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
+++ b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
@@ -1,4 +1,3 @@
-import { getClient } from '@core/profile-manager'
 import { IWrappedOutput } from '../../wallet/interfaces'
 import { buildNftFromNftOutput } from '../utils/buildNftFromNftOutput'
 import {
@@ -10,6 +9,7 @@ import {
     TimelockUnlockCondition,
     UnlockCondition,
 } from '@iota/sdk/out/types'
+import { Address, AddressType, AliasAddress, Client, NftAddress, Utils } from '@iota/sdk'
 
 const accountAddress = 'rms1qr47ee0fhahukrzec088v9lngv7w5k2sn3jjtwvkcpjfgxhhsazlsurxrx9'
 
@@ -44,12 +44,27 @@ const incomingExpiredTimelockedCondition: UnlockCondition[] = [
     new TimelockUnlockCondition(136367917),
 ]
 
-describe('File: buildNFtFromOutput.ts', () => {
+// i think that we need to mock this function as api won't work in tests (contextBridge) but
+// we can use Utils directly here without breaking the build
+jest.mock('../../../../lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts', () => ({
+    getBech32AddressFromAddressTypes: jest.fn((address: Address) => {
+        switch (address.type) {
+            case AddressType.Ed25519:
+                return Utils.hexToBech32((address as Ed25519Address).pubKeyHash, 'rms')
+            case AddressType.Alias:
+                return Utils.aliasIdToBech32((address as AliasAddress).aliasId, 'rms')
+            case AddressType.Nft:
+                return Utils.nftIdToBech32((address as NftAddress).nftId, 'rms')
+        }
+    }),
+}))
+
+describe('File: buildNftFromOutput.ts', () => {
     let outputData: IWrappedOutput
-    const client = () => getClient()
+    let client: Client = new Client({})
 
     it('should classify default nft as spendable', async () => {
-        const nftOutput = await client().buildNftOutput({
+        const nftOutput = await client.buildNftOutput({
             amount,
             nftId,
             unlockConditions: incomingUnlockConditions,
@@ -66,7 +81,7 @@ describe('File: buildNFtFromOutput.ts', () => {
     })
 
     it('should correctly classify nft as timelocked', async () => {
-        const nftOutput = await client().buildNftOutput({
+        const nftOutput = await client.buildNftOutput({
             amount,
             nftId,
             unlockConditions: incomingTimelockedCondition,
@@ -83,7 +98,7 @@ describe('File: buildNFtFromOutput.ts', () => {
     })
 
     it('should correctly classify expired timelocked nft', async () => {
-        const nftOutput = await client().buildNftOutput({
+        const nftOutput = await client.buildNftOutput({
             amount,
             nftId,
             unlockConditions: incomingExpiredTimelockedCondition,
@@ -100,7 +115,7 @@ describe('File: buildNFtFromOutput.ts', () => {
     })
 
     it('should ignore parsing spendable state and timelock', async () => {
-        let nftOutput = await client().buildNftOutput({
+        let nftOutput = await client.buildNftOutput({
             amount,
             nftId,
             unlockConditions: incomingUnlockConditions,
@@ -115,7 +130,7 @@ describe('File: buildNFtFromOutput.ts', () => {
         expect(nft.isSpendable).toBe(false)
         expect(nft.timelockTime).toBe(undefined)
 
-        nftOutput = await client().buildNftOutput({
+        nftOutput = await client.buildNftOutput({
             amount,
             nftId,
             unlockConditions: incomingTimelockedCondition,
@@ -129,7 +144,7 @@ describe('File: buildNFtFromOutput.ts', () => {
         expect(nft.isSpendable).toBe(false)
         expect(nft.timelockTime).toBe(undefined)
 
-        nftOutput = await client().buildNftOutput({
+        nftOutput = await client.buildNftOutput({
             amount,
             nftId,
             unlockConditions: incomingExpiredTimelockedCondition,
@@ -146,7 +161,7 @@ describe('File: buildNFtFromOutput.ts', () => {
     })
 
     it('should parse the metadata correctly', async () => {
-        let nftOutput = await client().buildNftOutput({
+        let nftOutput = await client.buildNftOutput({
             amount,
             nftId,
             unlockConditions: incomingUnlockConditions,
diff --git a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
index dbff1ee2309..cf488444dc1 100644
--- a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
+++ b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
@@ -35,7 +35,7 @@ export function buildNftFromNftOutput(
     const issuer = getIssuerFromNftOutput(nftOutput)
     const metadata = getMetadataFromNftOutput(nftOutput)
     const parsedMetadata = parseNftMetadata(metadata)
-    const composedUrl = composeUrlFromNftUri(parsedMetadata.uri)
+    const composedUrl = composeUrlFromNftUri(parsedMetadata?.uri)
     const filePath = `${get(activeProfileId)}/nfts/${id}`
     const storageDeposit = Number(nftOutput.amount)
 
diff --git a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
index b8895a6d226..be0ec2603bc 100644
--- a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
@@ -6,7 +6,7 @@ export function getBech32AddressFromAddressTypes(address: Address): string | und
     const hrp = getNetworkHrp()
     switch (address.type) {
         case AddressType.Ed25519:
-            return api.hexPublicKeyToBech32Address((address as Ed25519Address).pubKeyHash, hrp)
+            return api.hexToBech32((address as Ed25519Address).pubKeyHash, hrp)
         case AddressType.Alias:
             return api.aliasIdToBech32((address as AliasAddress).aliasId, hrp)
         case AddressType.Nft:

From 24af73c3f30b45b7ac6bda129c1c5365acc4ba6f Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Tue, 15 Aug 2023 13:00:26 +0200
Subject: [PATCH 34/48] chore: Fix imports in buildNFtFromNftOutput.test

---
 .../shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
index 203e4357383..3227e8b87da 100644
--- a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
+++ b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
@@ -9,7 +9,8 @@ import {
     TimelockUnlockCondition,
     UnlockCondition,
 } from '@iota/sdk/out/types'
-import { Address, AddressType, AliasAddress, Client, NftAddress, Utils } from '@iota/sdk'
+import { Address, AddressType, AliasAddress, NftAddress } from '@iota/sdk/out/types'
+import { Client, Utils } from '@iota/sdk'
 
 const accountAddress = 'rms1qr47ee0fhahukrzec088v9lngv7w5k2sn3jjtwvkcpjfgxhhsazlsurxrx9'
 

From 4ef5560b868968d1b8e410c582ad4dc4fe8f974c Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Tue, 15 Aug 2023 14:34:26 +0200
Subject: [PATCH 35/48] chore: Fix buildNftFromNftOutput.test again (prevent
 use of Client/Utils from sdk with mock, as we can't use them in tests)

---
 .../nfts/tests/buildNftFromNftOutput.test.ts  | 189 +++++++++---------
 1 file changed, 98 insertions(+), 91 deletions(-)

diff --git a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
index 3227e8b87da..febd7901b3a 100644
--- a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
+++ b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
@@ -1,3 +1,4 @@
+import { plainToInstance } from 'class-transformer'
 import { IWrappedOutput } from '../../wallet/interfaces'
 import { buildNftFromNftOutput } from '../utils/buildNftFromNftOutput'
 import {
@@ -6,11 +7,11 @@ import {
     Feature,
     IssuerFeature,
     MetadataFeature,
+    NftOutputBuilderParams,
     TimelockUnlockCondition,
     UnlockCondition,
 } from '@iota/sdk/out/types'
-import { Address, AddressType, AliasAddress, NftAddress } from '@iota/sdk/out/types'
-import { Client, Utils } from '@iota/sdk'
+import { Address, AddressType, NftOutput } from '@iota/sdk/out/types'
 
 const accountAddress = 'rms1qr47ee0fhahukrzec088v9lngv7w5k2sn3jjtwvkcpjfgxhhsazlsurxrx9'
 
@@ -18,63 +19,78 @@ const outputId = '0x16cc2007c1f0120b4832f89950ac5099f804c9730f54c4c1865f485b7b12
 const amount = '68900'
 const nftId = '0xd17971b9baf1b80356bcc42715447acd01fb6aadb7ebfa8d0af2b07f911325a0'
 
-const immutableFeatures: Feature[] = [
-    new IssuerFeature(new Ed25519Address('0x20dceb927cfdc2cea642fbf77aed81f42400145b5a4fd906f1aa40af1c31afb1')),
-    new MetadataFeature(
-        '0x7b227374616e64617264223a224952433237222c2276657273696f6e223a2276312e30222c226e616d65223a227364617364222c2274797065223a22696d6167652f706e67222c22757269223a2268747470733a2f2f697066732e696f2f697066732f516d51717a4d546176516754346634543576365057427037584e4b746f506d43396a766e313257505433676b5345227d'
-    ),
-]
-
-const incomingUnlockConditions: UnlockCondition[] = [
-    new AddressUnlockCondition(
-        new Ed25519Address('0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8')
-    ),
-]
-
-const incomingTimelockedCondition: UnlockCondition[] = [
-    new AddressUnlockCondition(
-        new Ed25519Address('0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8')
-    ),
-    new TimelockUnlockCondition(2876367917),
-]
-
-const incomingExpiredTimelockedCondition: UnlockCondition[] = [
-    new AddressUnlockCondition(
-        new Ed25519Address('0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8')
-    ),
-    new TimelockUnlockCondition(136367917),
-]
-
-// i think that we need to mock this function as api won't work in tests (contextBridge) but
-// we can use Utils directly here without breaking the build
+function buildImmutableFeatures() {
+    return [
+        new IssuerFeature(new Ed25519Address('0x20dceb927cfdc2cea642fbf77aed81f42400145b5a4fd906f1aa40af1c31afb1')),
+        new MetadataFeature(
+            '0x7b227374616e64617264223a224952433237222c2276657273696f6e223a2276312e30222c226e616d65223a227364617364222c2274797065223a22696d6167652f706e67222c22757269223a2268747470733a2f2f697066732e696f2f697066732f516d51717a4d546176516754346634543576365057427037584e4b746f506d43396a766e313257505433676b5345227d'
+        ),
+    ]
+}
+
+function buildIncomingUnlockConditions() {
+    return [
+        new AddressUnlockCondition(
+            new Ed25519Address('0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8')
+        ),
+    ]
+}
+
+function buildIncomingTimelockedCondition() {
+    return [
+        new AddressUnlockCondition(
+            new Ed25519Address('0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8')
+        ),
+        new TimelockUnlockCondition(2876367917),
+    ]
+}
+
+function buildIncomingExpiredTimelockedCondition() {
+    return [
+        new AddressUnlockCondition(
+            new Ed25519Address('0xebece5e9bf6fcb0c59c3ce7617f3433cea59509c6525b996c064941af78745f8')
+        ),
+        new TimelockUnlockCondition(136367917),
+    ]
+}
+
+function buildNftOutput(params: NftOutputBuilderParams) {
+    return plainToInstance(NftOutput, {
+        nftId: params.nftId,
+        amount: params.amount,
+        nativeTokens: params.nativeTokens,
+        unlockConditions: params.unlockConditions,
+        features: params.features,
+        immutableFeatures: params.immutableFeatures,
+    })
+}
+
+// we can't use api (preload) or Utils, so we hardcode the function mock test specific
 jest.mock('../../../../lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts', () => ({
     getBech32AddressFromAddressTypes: jest.fn((address: Address) => {
         switch (address.type) {
             case AddressType.Ed25519:
-                return Utils.hexToBech32((address as Ed25519Address).pubKeyHash, 'rms')
+                return accountAddress
             case AddressType.Alias:
-                return Utils.aliasIdToBech32((address as AliasAddress).aliasId, 'rms')
+                return undefined
             case AddressType.Nft:
-                return Utils.nftIdToBech32((address as NftAddress).nftId, 'rms')
+                return undefined
         }
     }),
 }))
 
 describe('File: buildNftFromOutput.ts', () => {
     let outputData: IWrappedOutput
-    let client: Client = new Client({})
 
     it('should classify default nft as spendable', async () => {
-        const nftOutput = await client.buildNftOutput({
-            amount,
-            nftId,
-            unlockConditions: incomingUnlockConditions,
-            immutableFeatures,
-        })
-
         outputData = {
             outputId,
-            output: nftOutput,
+            output: buildNftOutput({
+                amount,
+                nftId,
+                unlockConditions: buildIncomingUnlockConditions(),
+                immutableFeatures: buildImmutableFeatures(),
+            }),
         }
 
         let nft = buildNftFromNftOutput(outputData, accountAddress, true)
@@ -82,16 +98,14 @@ describe('File: buildNftFromOutput.ts', () => {
     })
 
     it('should correctly classify nft as timelocked', async () => {
-        const nftOutput = await client.buildNftOutput({
-            amount,
-            nftId,
-            unlockConditions: incomingTimelockedCondition,
-            immutableFeatures,
-        })
-
         outputData = {
             outputId,
-            output: nftOutput,
+            output: buildNftOutput({
+                amount,
+                nftId,
+                unlockConditions: buildIncomingTimelockedCondition(),
+                immutableFeatures: buildImmutableFeatures(),
+            }),
         }
         const nft = buildNftFromNftOutput(outputData, accountAddress)
         expect(nft.isSpendable).toBe(true)
@@ -99,16 +113,14 @@ describe('File: buildNftFromOutput.ts', () => {
     })
 
     it('should correctly classify expired timelocked nft', async () => {
-        const nftOutput = await client.buildNftOutput({
-            amount,
-            nftId,
-            unlockConditions: incomingExpiredTimelockedCondition,
-            immutableFeatures,
-        })
-
         outputData = {
             outputId,
-            output: nftOutput,
+            output: buildNftOutput({
+                amount,
+                nftId,
+                unlockConditions: buildIncomingExpiredTimelockedCondition(),
+                immutableFeatures: buildImmutableFeatures(),
+            }),
         }
         const nft = buildNftFromNftOutput(outputData, accountAddress)
         expect(nft.isSpendable).toBe(true)
@@ -116,64 +128,58 @@ describe('File: buildNftFromOutput.ts', () => {
     })
 
     it('should ignore parsing spendable state and timelock', async () => {
-        let nftOutput = await client.buildNftOutput({
-            amount,
-            nftId,
-            unlockConditions: incomingUnlockConditions,
-        })
-
-        outputData = {
+        let outputData = {
             outputId,
-            output: nftOutput,
+            output: buildNftOutput({
+                amount,
+                nftId,
+                unlockConditions: buildIncomingUnlockConditions(),
+            }),
         }
 
         let nft = buildNftFromNftOutput(outputData, accountAddress, false)
         expect(nft.isSpendable).toBe(false)
         expect(nft.timelockTime).toBe(undefined)
 
-        nftOutput = await client.buildNftOutput({
-            amount,
-            nftId,
-            unlockConditions: incomingTimelockedCondition,
-        })
-
         outputData = {
             outputId,
-            output: nftOutput,
+            output: buildNftOutput({
+                amount,
+                nftId,
+                unlockConditions: buildIncomingTimelockedCondition(),
+            }),
         }
         nft = buildNftFromNftOutput(outputData, accountAddress, false)
         expect(nft.isSpendable).toBe(false)
         expect(nft.timelockTime).toBe(undefined)
 
-        nftOutput = await client.buildNftOutput({
-            amount,
-            nftId,
-            unlockConditions: incomingExpiredTimelockedCondition,
-            immutableFeatures,
-        })
-
         outputData = {
             outputId,
-            output: nftOutput,
+            output: buildNftOutput({
+                amount,
+                nftId,
+                unlockConditions: buildIncomingExpiredTimelockedCondition(),
+                immutableFeatures: buildImmutableFeatures(),
+            }),
         }
+
         nft = buildNftFromNftOutput(outputData, accountAddress, false)
         expect(nft.isSpendable).toBe(false)
         expect(nft.timelockTime).toBe(undefined)
     })
 
     it('should parse the metadata correctly', async () => {
-        let nftOutput = await client.buildNftOutput({
-            amount,
-            nftId,
-            unlockConditions: incomingUnlockConditions,
-            immutableFeatures,
-        })
-
         outputData = {
             outputId,
-            output: nftOutput,
+            output: buildNftOutput({
+                amount,
+                nftId,
+                unlockConditions: buildIncomingUnlockConditions(),
+                immutableFeatures: buildImmutableFeatures(),
+            }),
         }
-        let nft = buildNftFromNftOutput(outputData, accountAddress)
+
+        const nft = buildNftFromNftOutput(outputData, accountAddress)
 
         let expectedParsedMetadata = {
             standard: 'IRC27',
@@ -186,6 +192,7 @@ describe('File: buildNftFromOutput.ts', () => {
             issuerName: undefined,
             royalties: undefined,
         }
+
         expect(nft.parsedMetadata).toStrictEqual(expectedParsedMetadata)
     })
 })

From 063ce2f75766b1807ad3b71e463b8db37ac1fe19 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Tue, 15 Aug 2023 14:39:01 +0200
Subject: [PATCH 36/48] chore: Improve buildNftFromNftOutput.test. Remove
 unneeded async in tests

---
 .../lib/core/nfts/tests/buildNftFromNftOutput.test.ts  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
index febd7901b3a..7b0fb040c29 100644
--- a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
+++ b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
@@ -82,7 +82,7 @@ jest.mock('../../../../lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
 describe('File: buildNftFromOutput.ts', () => {
     let outputData: IWrappedOutput
 
-    it('should classify default nft as spendable', async () => {
+    it('should classify default nft as spendable', () => {
         outputData = {
             outputId,
             output: buildNftOutput({
@@ -97,7 +97,7 @@ describe('File: buildNftFromOutput.ts', () => {
         expect(nft.isSpendable).toBe(true)
     })
 
-    it('should correctly classify nft as timelocked', async () => {
+    it('should correctly classify nft as timelocked', () => {
         outputData = {
             outputId,
             output: buildNftOutput({
@@ -112,7 +112,7 @@ describe('File: buildNftFromOutput.ts', () => {
         expect(nft.timelockTime).toBe(2876367917000)
     })
 
-    it('should correctly classify expired timelocked nft', async () => {
+    it('should correctly classify expired timelocked nft', () => {
         outputData = {
             outputId,
             output: buildNftOutput({
@@ -127,7 +127,7 @@ describe('File: buildNftFromOutput.ts', () => {
         expect(nft.timelockTime).toBe(136367917000)
     })
 
-    it('should ignore parsing spendable state and timelock', async () => {
+    it('should ignore parsing spendable state and timelock', () => {
         let outputData = {
             outputId,
             output: buildNftOutput({
@@ -168,7 +168,7 @@ describe('File: buildNftFromOutput.ts', () => {
         expect(nft.timelockTime).toBe(undefined)
     })
 
-    it('should parse the metadata correctly', async () => {
+    it('should parse the metadata correctly', () => {
         outputData = {
             outputId,
             output: buildNftOutput({

From c45377748ad535cf3938fe21a02fb6eb6439d0e8 Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Wed, 16 Aug 2023 13:49:23 +0200
Subject: [PATCH 37/48] fix: imports and types

---
 .../governance/utils/getVotingParticipationEventIds.ts   | 3 +--
 .../contexts/governance/utils/isParticipationOutput.ts   | 6 +++---
 .../handleTransactionInclusionEventForShimmerClaiming.ts | 3 +--
 .../core/account/interfaces/account-state.interface.ts   | 2 +-
 .../lib/core/account/interfaces/account.interface.ts     | 3 +--
 .../core/network/interfaces/client-options.interface.ts  | 1 -
 .../lib/core/network/interfaces/node-info.interface.ts   | 0
 .../lib/core/nfts/tests/buildNftFromNftOutput.test.ts    | 2 --
 .../actions/events-handlers/handleNewOutputEvent.ts      | 5 ++---
 .../actions/events-handlers/handleSpentOutputEvent.ts    | 3 +--
 .../events-handlers/handleTransactionInclusionEvent.ts   | 3 +--
 .../events-handlers/handleTransactionProgressEvent.ts    | 9 +++++++--
 .../profile-manager/actions/initialiseProfileManager.ts  | 3 +--
 .../interfaces/profile-manager.interface.ts              | 2 +-
 .../core/profile-manager/utils/validateWalletApiEvent.ts | 3 +--
 .../generateActivity/generateSingleAliasActivity.ts      | 4 ++--
 .../generateActivity/generateSingleFoundryActivity.ts    | 2 +-
 .../utils/generateActivity/generateSingleNftActivity.ts  | 2 +-
 .../wallet/utils/outputs/getNativeTokenFromOutput.ts     | 2 +-
 .../utils/outputs/getSerialNumberFromAliasOutput.ts      | 2 +-
 .../shared/lib/tests/__mocks__/profile-manager.mock.ts   | 2 +-
 21 files changed, 28 insertions(+), 34 deletions(-)
 delete mode 100644 packages/shared/lib/core/network/interfaces/node-info.interface.ts

diff --git a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
index e00e2e1fa01..2365b071d57 100644
--- a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
+++ b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
@@ -1,7 +1,6 @@
 import { get } from 'svelte/store'
 
-import { INode, ParticipationEventId } from '@iota/sdk/out/types'
-import { ParticipationEventType } from '@iota/sdk/out/types'
+import { INode, ParticipationEventId, ParticipationEventType } from '@iota/sdk/out/types'
 
 import { selectedAccount } from '@core/account/stores'
 
diff --git a/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts b/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
index 0cebdc9143e..383ca6e3553 100644
--- a/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
+++ b/packages/shared/lib/contexts/governance/utils/isParticipationOutput.ts
@@ -1,12 +1,12 @@
 import { PARTICIPATE_TAG_HEX } from '../constants'
-import { CommonOutput, Output, TagFeature } from '@iota/sdk/out/types'
+import { CommonOutput, Output, TagFeature, OutputType, FeatureType } from '@iota/sdk/out/types'
 
 export function isParticipationOutput(output: Output): boolean {
-    if (output.type === 2) {
+    if (output.type === OutputType.Treasury) {
         return false
     }
 
     const commonOutput = output as CommonOutput
-    const outputFeature = commonOutput?.features?.find((feature) => feature.type === 3) as TagFeature
+    const outputFeature = commonOutput?.features?.find((feature) => feature.type === FeatureType.Tag) as TagFeature
     return outputFeature?.tag === PARTICIPATE_TAG_HEX
 }
diff --git a/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts b/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
index c5e1b157f9e..30a2f973a0d 100644
--- a/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
@@ -1,7 +1,6 @@
 import { get } from 'svelte/store'
 
-import { Event, TransactionInclusionWalletEvent } from '@iota/sdk/out/types'
-import { WalletEventType } from '@iota/sdk/out/types'
+import { Event, TransactionInclusionWalletEvent, WalletEventType } from '@iota/sdk/out/types'
 
 import { localize } from '@core/i18n'
 import { validateWalletApiEvent } from '@core/profile-manager'
diff --git a/packages/shared/lib/core/account/interfaces/account-state.interface.ts b/packages/shared/lib/core/account/interfaces/account-state.interface.ts
index 9edc3ffc9a3..c884fb70b73 100644
--- a/packages/shared/lib/core/account/interfaces/account-state.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account-state.interface.ts
@@ -1,6 +1,6 @@
 import { Balance } from '@iota/sdk/out/types'
-import { IPersistedAccountData } from './persisted-account-data.interface'
 import { IAccount } from './account.interface'
+import { IPersistedAccountData } from './persisted-account-data.interface'
 
 export interface IAccountState extends IAccount, IPersistedAccountData {
     index: number
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index 0e13691e7a0..9d16a12dc23 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -36,10 +36,9 @@ import type {
     AccountAddress,
     PreparedTransaction,
     PreparedCreateNativeTokenTransaction,
+    ParticipationEventType,
 } from '@iota/sdk/out/types'
 
-import { ParticipationEventType } from '@iota/sdk/out/types'
-
 export interface IAccount {
     addresses(): Promise<AccountAddress[]>
     addressesWithUnspentOutputs(): Promise<AddressWithUnspentOutputs[]>
diff --git a/packages/shared/lib/core/network/interfaces/client-options.interface.ts b/packages/shared/lib/core/network/interfaces/client-options.interface.ts
index c2e8bcbf866..203f5b5aa1d 100644
--- a/packages/shared/lib/core/network/interfaces/client-options.interface.ts
+++ b/packages/shared/lib/core/network/interfaces/client-options.interface.ts
@@ -5,5 +5,4 @@ import { INode } from './node.interface'
 export interface ClientOptions extends Omit<IClientOptions, 'nodes' | 'primaryNode'> {
     primaryNode?: INode
     nodes?: INode[]
-    localPow?: boolean
 }
diff --git a/packages/shared/lib/core/network/interfaces/node-info.interface.ts b/packages/shared/lib/core/network/interfaces/node-info.interface.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
index 7b0fb040c29..c1ada6fbe8d 100644
--- a/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
+++ b/packages/shared/lib/core/nfts/tests/buildNftFromNftOutput.test.ts
@@ -4,12 +4,10 @@ import { buildNftFromNftOutput } from '../utils/buildNftFromNftOutput'
 import {
     AddressUnlockCondition,
     Ed25519Address,
-    Feature,
     IssuerFeature,
     MetadataFeature,
     NftOutputBuilderParams,
     TimelockUnlockCondition,
-    UnlockCondition,
 } from '@iota/sdk/out/types'
 import { Address, AddressType, NftOutput } from '@iota/sdk/out/types'
 
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
index afb0ed1ff0c..7c88bd3c1d3 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
@@ -1,5 +1,4 @@
-import { AliasOutput, Event, NewOutputWalletEvent, OutputType } from '@iota/sdk/out/types'
-import { WalletEventType } from '@iota/sdk/out/types'
+import { AliasOutput, Event, NewOutputWalletEvent, OutputType, WalletEventType } from '@iota/sdk/out/types'
 
 import { syncBalance } from '@core/account/actions/syncBalance'
 import { addNftsToDownloadQueue, addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput } from '@core/nfts'
@@ -42,7 +41,7 @@ export async function handleNewOutputEventInternal(accountIndex: number, payload
         output.type === OutputType.Alias &&
         output.stateIndex === 0 &&
         !get(allAccountActivities)[accountIndex].find((_activity) => _activity.id === outputData.outputId)
-    const isNftOutput = outputData.output.type === OutputType.Nft
+    const isNftOutput = output.type === OutputType.Nft
 
     if ((account?.depositAddress === address && !outputData?.remainder) || isNewAliasOutput) {
         await syncBalance(account.index)
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
index 2403a7d9214..35557e86dcf 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
@@ -1,5 +1,4 @@
-import { Event, SpentOutputWalletEvent } from '@iota/sdk/out/types'
-import { WalletEventType } from '@iota/sdk/out/types'
+import { Event, SpentOutputWalletEvent, WalletEventType } from '@iota/sdk/out/types'
 
 import { syncBalance } from '@core/account/actions/syncBalance'
 import { getNftByIdFromAllAccountNfts, updateNftInAllAccountNfts } from '@core/nfts'
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
index 2d22a058630..58532c47602 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
@@ -1,6 +1,5 @@
 import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-import { Event, TransactionInclusionWalletEvent } from '@iota/sdk/out/types'
-import { WalletEventType } from '@iota/sdk/out/types'
+import { Event, TransactionInclusionWalletEvent, WalletEventType } from '@iota/sdk/out/types'
 
 import { updateParticipationOverview } from '@contexts/governance/stores'
 import { isAccountVoting } from '@contexts/governance/utils/isAccountVoting'
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
index 91e8099039d..d8e814a0590 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
+++ b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
@@ -1,6 +1,11 @@
 import { get } from 'svelte/store'
-import { Event, TransactionProgressWalletEvent, PreparedTransactionEssenceHashProgress } from '@iota/sdk/out/types'
-import { WalletEventType, TransactionProgressType } from '@iota/sdk/out/types'
+import {
+    Event,
+    TransactionProgressWalletEvent,
+    PreparedTransactionEssenceHashProgress,
+    WalletEventType,
+    TransactionProgressType,
+} from '@iota/sdk/out/types'
 
 import { selectedAccountIndex } from '@core/account'
 import { ledgerNanoStatus } from '@core/ledger'
diff --git a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
index 9b9cc530198..3b652ab4275 100644
--- a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
+++ b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
@@ -1,5 +1,4 @@
-import { IClientOptions, SecretManagerType } from '@iota/sdk/out/types'
-import { CoinType } from '@iota/sdk/out/types'
+import { IClientOptions, CoinType, SecretManagerType } from '@iota/sdk/out/types'
 
 import { generateRandomId } from '@core/utils'
 
diff --git a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
index 5ede6a224d0..39dc8785504 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
+++ b/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
@@ -5,8 +5,8 @@ import type {
     INodeInfoWrapper,
     SyncOptions,
     WalletEvent,
+    WalletEventType,
 } from '@iota/sdk/out/types'
-import { WalletEventType } from '@iota/sdk/out/types'
 
 import { IAccount } from '@core/account/interfaces'
 import { IAuth } from '@core/network/interfaces'
diff --git a/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts b/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts
index 20b237dfdfe..6147b01e134 100644
--- a/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts
+++ b/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts
@@ -1,7 +1,6 @@
 import { localize } from '@core/i18n'
 
-import { Event } from '@iota/sdk/out/types'
-import { WalletEventType } from '@iota/sdk/out/types'
+import { Event, WalletEventType } from '@iota/sdk/out/types'
 
 import { WalletApiEventError, WalletApiEventValidationError } from '../errors'
 import { IWalletApiEventPayloadWrapper } from '../interfaces'
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
index 24133b4b05b..e2ca35244bf 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
@@ -3,6 +3,8 @@ import { EMPTY_HEX_ID } from '@core/wallet/constants'
 import { ActivityType } from '@core/wallet/enums'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { AliasActivity } from '@core/wallet/types'
+import { api } from '@core/profile-manager'
+import { getNetworkHrp } from '@core/profile'
 import {
     getAmountFromOutput,
     getAsyncDataFromOutput,
@@ -14,8 +16,6 @@ import {
     getTagFromOutput,
 } from './helper'
 import { AliasOutput } from '@iota/sdk/out/types'
-import { api } from '@core/profile-manager'
-import { getNetworkHrp } from '@core/profile'
 
 export async function generateSingleAliasActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
index bedb7b56dcf..2bd1adc3593 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
@@ -1,5 +1,6 @@
 import { IAccountState } from '@core/account'
 import { getCoinType, getNetworkHrp } from '@core/profile'
+import { api } from '@core/profile-manager'
 import { ActivityType } from '@core/wallet/enums'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { FoundryActivity } from '@core/wallet/types'
@@ -18,7 +19,6 @@ import {
     SimpleTokenScheme,
     UnlockConditionType,
 } from '@iota/sdk/out/types'
-import { api } from '@core/profile-manager'
 
 export async function generateSingleFoundryActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
index 5131715b2dd..395eea20b60 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
@@ -3,6 +3,7 @@ import { handleError } from '@core/error/handlers'
 import { ActivityAction, ActivityType } from '@core/wallet/enums'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { NftActivity } from '@core/wallet/types'
+import { getClient } from '@core/profile-manager'
 import { getNftId } from '../outputs/getNftId'
 import {
     getAsyncDataFromOutput,
@@ -13,7 +14,6 @@ import {
     getTagFromOutput,
 } from './helper'
 import { NftOutput } from '@iota/sdk/out/types'
-import { getClient } from '@core/profile-manager'
 
 export async function generateSingleNftActivity(
     account: IAccountState,
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
index 609e4f0fd59..92692afc1f9 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getNativeTokenFromOutput.ts
@@ -6,7 +6,7 @@ export async function getNativeTokenFromOutput(output: CommonOutput): Promise<IN
     if (output?.type === OutputType.Foundry) {
         const foundryOutput = output as FoundryOutput
         return {
-            id: await buildFoundryId(output as FoundryOutput),
+            id: await buildFoundryId(foundryOutput),
             amount: (foundryOutput.tokenScheme as SimpleTokenScheme).mintedTokens,
         }
     }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
index 84490c58cf6..5a9022854cb 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
 import { selectedAccount } from '@core/account/stores'
-import { AliasOutput } from '@iota/sdk/out/types'
 import { api } from '@core/profile-manager'
+import { AliasOutput } from '@iota/sdk/out/types'
 
 export async function getSerialNumberFromAliasOutput(aliasAddress: string): Promise<number> {
     const account = get(selectedAccount)
diff --git a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts b/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
index 7350259677a..31f2a330838 100644
--- a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
@@ -8,8 +8,8 @@ import type {
     WalletEvent,
     LedgerNanoStatus,
     GenerateAddressOptions,
+    WalletEventType,
 } from '@iota/sdk/out/types'
-import { WalletEventType } from '@iota/sdk/out/types'
 
 import { IAccount } from '@core/account'
 import { IAuth, INodeInfoResponse } from '@core/network'

From 4b09793e235acf9b94874bc8e49f4112754eb410 Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Wed, 16 Aug 2023 17:11:35 +0200
Subject: [PATCH 38/48] fix: leftover Output imports @core/wallet/types

---
 .../components/popups/BalanceBreakdownPopup.svelte  |  3 ++-
 .../popups/send/SendConfirmationPopup.svelte        |  7 ++++---
 .../components/drawers/send/SendRouter.svelte       | 13 ++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
index 0372d9c8d04..038d88f0329 100644
--- a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
+++ b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
@@ -61,7 +61,8 @@
                         containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.StorageDepositReturn)
                     ) {
                         type = PendingFundsType.StorageDepositReturn
-                        amount = (await getStorageDepositFromOutput($selectedAccount, output))?.storageDeposit
+                        amount = (await getStorageDepositFromOutput($selectedAccount, output as CommonOutput))
+                            ?.storageDeposit
                     } else if (containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.Timelock)) {
                         type = PendingFundsType.Timelock
                         amount = Number(output.amount)
diff --git a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
index 04f1d319bd2..c68f4e9bcaf 100644
--- a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
@@ -24,7 +24,8 @@
     import { sendOutput } from '@core/wallet/actions'
     import { DEFAULT_TRANSACTION_OPTIONS } from '@core/wallet/constants'
     import { getOutputParameters, validateSendConfirmation, getAddressFromSubject } from '@core/wallet/utils'
-    import { Activity, NewTokenTransactionDetails, Output } from '@core/wallet/types'
+    import { Activity, NewTokenTransactionDetails } from '@core/wallet/types'
+    import { CommonOutput, Output } from '@iota/sdk/out/types'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { ledgerPreparedOutput } from '@core/ledger'
     import { getStorageDepositFromOutput } from '@core/wallet/utils/generateActivity/helper'
@@ -145,7 +146,7 @@
 
     async function updateStorageDeposit(): Promise<void> {
         const { storageDeposit: _storageDeposit, giftedStorageDeposit: _giftedStorageDeposit } =
-            await getStorageDepositFromOutput($selectedAccount, preparedOutput)
+            await getStorageDepositFromOutput($selectedAccount, preparedOutput as CommonOutput)
         storageDeposit = minimumStorageDeposit = _storageDeposit > 0 ? _storageDeposit : _giftedStorageDeposit
         if (isBaseTokenTransfer) {
             const rawAmount = Number((transactionDetails as NewTokenTransactionDetails).rawAmount)
@@ -166,7 +167,7 @@
 
     async function onConfirmClick(): Promise<void> {
         try {
-            await validateSendConfirmation($selectedAccount, preparedOutput)
+            await validateSendConfirmation($selectedAccount, preparedOutput as CommonOutput)
 
             if ($isActiveLedgerProfile) {
                 ledgerPreparedOutput.set(preparedOutput)
diff --git a/packages/mobile/components/drawers/send/SendRouter.svelte b/packages/mobile/components/drawers/send/SendRouter.svelte
index e121507ad6e..b0518321f91 100644
--- a/packages/mobile/components/drawers/send/SendRouter.svelte
+++ b/packages/mobile/components/drawers/send/SendRouter.svelte
@@ -14,11 +14,12 @@
         getOutputParameters,
         newTransactionDetails,
         NewTransactionType,
-        Output,
         sendOutput,
         updateNewTransactionDetails,
         validateSendConfirmation,
     } from '@core/wallet'
+    import { CommonOutput, Output } from '@iota/sdk/out/types'
+
     import { getStorageDepositFromOutput } from '@core/wallet/utils/generateActivity/helper'
 
     import { sendRoute, SendRoute, sendRouter } from '@/routers'
@@ -42,7 +43,7 @@
     async function sendTransaction(): Promise<void> {
         try {
             await prepareTransactionOutput()
-            validateSendConfirmation(preparedOutput)
+            validateSendConfirmation($selectedAccount, preparedOutput as CommonOutput)
 
             updateNewTransactionDetails({
                 type: $newTransactionDetails.type,
@@ -67,17 +68,15 @@
         }
         const outputParams = await getOutputParameters(transactionDetails)
         preparedOutput = await prepareOutput($selectedAccount.index, outputParams, DEFAULT_TRANSACTION_OPTIONS)
-        setStorageDeposit(preparedOutput, Number(surplus))
+        await setStorageDeposit(preparedOutput, Number(surplus))
         if (!initialExpirationDate) {
             initialExpirationDate = getInitialExpirationDate()
         }
     }
 
-    function setStorageDeposit(preparedOutput: Output, surplus?: number): void {
-        const rawAmount =
-            transactionDetails.type === NewTransactionType.TokenTransfer ? transactionDetails.rawAmount : '0'
+    async function setStorageDeposit(preparedOutput: Output, surplus?: number): Promise<void> {
         const { storageDeposit: _storageDeposit, giftedStorageDeposit: _giftedStorageDeposit } =
-            getStorageDepositFromOutput(preparedOutput, rawAmount)
+            await getStorageDepositFromOutput($selectedAccount, preparedOutput as CommonOutput)
         if (surplus > _storageDeposit) {
             visibleSurplus = Number(surplus)
         }

From 27e0792f038cc31694e89f51aedee40871f16d21 Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Fri, 18 Aug 2023 14:06:39 +0200
Subject: [PATCH 39/48] chore: bump sdk version to 1.0.5

---
 packages/shared/package.json | 2 +-
 yarn.lock                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/shared/package.json b/packages/shared/package.json
index 8d4bf3ccdad..bdb51c5008b 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -11,7 +11,7 @@
         "@iota/transaction-converter": "^1.0.0-beta.30",
         "@iota/unit-converter": "^1.0.0-beta.30",
         "@iota/util.js": "^2.0.0-rc.1",
-        "@iota/sdk": "1.0.4",
+        "@iota/sdk": "1.0.5",
         "@sveltejs/svelte-virtual-list": "^3.0.1",
         "big-integer": "^1.6.51",
         "big.js": "^6.0.3",
diff --git a/yarn.lock b/yarn.lock
index 3e9f651163a..82660b40316 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -852,10 +852,10 @@
   resolved "https://registry.yarnpkg.com/@iota/pad/-/pad-1.0.0-beta.30.tgz#de19728f8f1b09c20e2365d0da34945006760082"
   integrity sha512-fnhPMPul18WunLq9Ni4rxzBFmhna6eaG8WroDg6GdQqSK/eN62uFHV8tpspJHXuCqwgCUVp6NpuUna7+B2OV9g==
 
-"@iota/sdk@1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.4.tgz#47fa6f559a551a2bf3c2664f8840c48a497dde47"
-  integrity sha512-qjgxce/aOIFoWBDKU+fdcDiX4xbihMiigmsJqb5nK9I3vRPMOG3kxQ9eC7BPRNME3u8c8/sQgdQY9gzqywhZXA==
+"@iota/sdk@1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.5.tgz#fe22acd17862e11d6b4d4a666ae180a6004f6405"
+  integrity sha512-rcj1gQ/hd6vKr9KKEx10EoQUmjbdnaBlYYA0mN+Op7bA0t0occ7UTlYx64X+hoAe7U8V9ExT+da2d3jfVYKG6A==
   dependencies:
     "@types/node" "^18.15.12"
     cargo-cp-artifact "^0.1.6"

From b6333f281e33b9338108602fed3129af18202c0c Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Mon, 21 Aug 2023 09:01:14 +0200
Subject: [PATCH 40/48] fix: resolve conflict in yarn.lock

---
 yarn.lock | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 782913ae558..82660b40316 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -917,19 +917,6 @@
   dependencies:
     big-integer "^1.6.51"
 
-<<<<<<< HEAD
-=======
-"@iota/wallet@2.0.3-rc.44":
-  version "2.0.3-rc.44"
-  resolved "https://registry.yarnpkg.com/@iota/wallet/-/wallet-2.0.3-rc.44.tgz#5d724638a23c68e5f0f61861660ac4ed321a0a54"
-  integrity sha512-/o1o9yH83nY16nvqLfcMtSZPy92Ca0m5+MtKjnR2V0u5UCwUu6GH3cSauIuWrT4rFJoaKZF3CAPcc2raJ/5YDg==
-  dependencies:
-    "@iota/types" "^1.0.0-beta.15"
-    cargo-cp-artifact "^0.1.6"
-    prebuild-install "^7.1.1"
-    typescript "^4.9.4"
-
->>>>>>> develop
 "@isaacs/cliui@^8.0.2":
   version "8.0.2"
   resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550"

From e87a02f0e5747df3a79d2d53e3d8054f2d24f9e2 Mon Sep 17 00:00:00 2001
From: Branko Bosnic <brankobosnic1@gmail.com>
Date: Mon, 21 Aug 2023 14:56:07 +0200
Subject: [PATCH 41/48] fix: sync IAccount interface with SDK Account Class

---
 .../governance/actions/setVotingPower.ts      |  18 ++-
 .../actions/stopVotingForProposal.ts          |   9 +-
 .../lib/contexts/governance/actions/vote.ts   |   7 +-
 .../account/interfaces/account.interface.ts   |  67 +++++-----
 .../lib/core/wallet/actions/burnAsset.ts      |  10 +-
 .../shared/lib/core/wallet/actions/burnNft.ts |   7 +-
 .../core/wallet/actions/consolidateOutputs.ts |  10 +-
 .../lib/tests/__mocks__/account.mock.ts       | 121 ++++++------------
 8 files changed, 121 insertions(+), 128 deletions(-)

diff --git a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
index 6854b2781c3..839169b5989 100644
--- a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
+++ b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
@@ -1,5 +1,6 @@
+import { PreparedTransaction, Transaction } from '@iota/sdk/out/types'
+import { plainToInstance } from 'class-transformer'
 import { get } from 'svelte/store'
-import { Transaction } from '@iota/sdk/out/types'
 import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
 import { processAndAddToActivities } from '@core/wallet/utils'
 import { handleError } from '@core/error/handlers'
@@ -20,13 +21,24 @@ export async function setVotingPower(rawAmount: string): Promise<void> {
         updateSelectedAccount({ hasVotingPowerTransactionInProgress: true, isTransferring: true })
 
         let transaction: Transaction
+        let preparedTransaction: PreparedTransaction
 
         if (amount < votingPower) {
             const amountToDecrease = votingPower - amount
-            transaction = await account.decreaseVotingPower(amountToDecrease.toString())
+            const prepareDecreaseVotingPowerTransaction = await account?.prepareDecreaseVotingPower(
+                amountToDecrease.toString()
+            )
+            preparedTransaction = plainToInstance(PreparedTransaction, prepareDecreaseVotingPowerTransaction)
+
+            transaction = await preparedTransaction?.send()
         } else {
             const amountToIncrease = amount - votingPower
-            transaction = await account.increaseVotingPower(amountToIncrease.toString())
+            const prepareIncreaseVotingPowerTransaction = await account?.prepareIncreaseVotingPower(
+                amountToIncrease.toString()
+            )
+            preparedTransaction = plainToInstance(PreparedTransaction, prepareIncreaseVotingPowerTransaction)
+
+            transaction = await preparedTransaction?.send()
         }
 
         await processAndAddToActivities(transaction, account)
diff --git a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
index 4854f1b9f64..ee8f488985a 100644
--- a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
+++ b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
@@ -1,16 +1,19 @@
+import { PreparedTransaction, type Transaction } from '@iota/sdk/out/types'
+import { plainToInstance } from 'class-transformer'
 import { get } from 'svelte/store'
-import type { Transaction } from '@iota/sdk/out/types'
 import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
 import { showAppNotification } from '@auxiliary/notification/actions'
 import { localize } from '@core/i18n'
 import { handleError } from '@core/error/handlers'
 import { processAndAddToActivities } from '@core/wallet/utils'
 
-export async function stopVotingForProposal(eventId: string): Promise<Transaction> {
+export async function stopVotingForProposal(eventId: string): Promise<Transaction | undefined> {
     const account = get(selectedAccount)
     try {
         updateSelectedAccount({ hasVotingTransactionInProgress: true })
-        const transaction = await account?.stopParticipating(eventId)
+        const prepareStopParticipatingTransaction = await account?.prepareStopParticipating(eventId)
+        const preparedTransaction = plainToInstance(PreparedTransaction, prepareStopParticipatingTransaction)
+        const transaction = await preparedTransaction?.send()
 
         await processAndAddToActivities(transaction, account)
 
diff --git a/packages/shared/lib/contexts/governance/actions/vote.ts b/packages/shared/lib/contexts/governance/actions/vote.ts
index d29d6371714..cb85e0135ef 100644
--- a/packages/shared/lib/contexts/governance/actions/vote.ts
+++ b/packages/shared/lib/contexts/governance/actions/vote.ts
@@ -1,3 +1,6 @@
+import { PreparedTransaction } from '@iota/sdk/out/types'
+import { plainToInstance } from 'class-transformer'
+
 import { get } from 'svelte/store'
 import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
 import { showAppNotification } from '@auxiliary/notification/actions'
@@ -9,8 +12,10 @@ export async function vote(eventId?: string, answers?: number[]): Promise<void>
     const account = get(selectedAccount)
     try {
         updateSelectedAccount({ hasVotingTransactionInProgress: true })
+        const prepareVoteTransaction = await account?.prepareVote(eventId, answers)
+        const preparedTransaction = plainToInstance(PreparedTransaction, prepareVoteTransaction)
+        const transaction = await preparedTransaction?.send()
 
-        const transaction = await account.vote(eventId, answers)
         await processAndAddToActivities(transaction, account)
 
         showAppNotification({
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
index 9d16a12dc23..81fcafcb0af 100644
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ b/packages/shared/lib/core/account/interfaces/account.interface.ts
@@ -1,13 +1,10 @@
 import type {
     AccountMetadata,
-    Address,
     AddressWithUnspentOutputs,
     AliasOutputParams,
     Balance,
     CreateNativeTokenParams,
-    CreateNativeTokenTransaction,
     ConsolidationParams,
-    Ed25519Signature,
     FilterOptions,
     GenerateAddressOptions,
     MintNftParams,
@@ -20,7 +17,6 @@ import type {
     ParticipationEventWithNodes,
     ParticipationOverview,
     PreparedTransactionData,
-    Secp256k1EcdsaSignature,
     SendNativeTokensParams,
     SendNftParams,
     SendParams,
@@ -31,41 +27,41 @@ import type {
     FoundryOutput,
     HexEncodedAmount,
     Output,
-    HexEncodedString,
     INode,
     AccountAddress,
     PreparedTransaction,
     PreparedCreateNativeTokenTransaction,
     ParticipationEventType,
+    ParticipationEventId,
+    Burn,
 } from '@iota/sdk/out/types'
 
 export interface IAccount {
     addresses(): Promise<AccountAddress[]>
     addressesWithUnspentOutputs(): Promise<AddressWithUnspentOutputs[]>
-    burnNativeToken(
+    prepareBurn(burn: Burn, transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
+    prepareBurnNativeToken(
         tokenId: string,
         burnAmount: HexEncodedAmount,
         transactionOptions?: TransactionOptions
-    ): Promise<Transaction>
-    burnNft(nftId: string, transactionOptions?: TransactionOptions): Promise<Transaction>
+    ): Promise<PreparedTransaction>
+    prepareBurnNft(nftId: string, transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
     claimOutputs(outputIds: string[]): Promise<Transaction>
-    consolidateOutputs(params: ConsolidationParams): Promise<Transaction>
+    prepareConsolidateOutputs(params: ConsolidationParams): Promise<PreparedTransaction>
     prepareCreateAliasOutput(
         params?: AliasOutputParams,
         transactionOptions?: TransactionOptions
     ): Promise<PreparedTransaction>
-    meltNativeToken(
+    prepareMeltNativeToken(
         tokenId: string,
         meltAmount: HexEncodedAmount,
         transactionOptions?: TransactionOptions
     ): Promise<Transaction>
-    decreaseVotingPower(amount: string): Promise<Transaction>
+    prepareDecreaseVotingPower(amount: string): Promise<PreparedTransaction>
     deregisterParticipationEvent(eventId: string): Promise<void>
-    destroyAlias(aliasId: string, transactionOptions?: TransactionOptions): Promise<Transaction>
-    destroyFoundry(foundryId: string, transactionOptions?: TransactionOptions): Promise<Transaction>
-    generateEd25519Address(options?: GenerateAddressOptions): Promise<Address>
-    generateEd25519Addresses(amount: number, options?: GenerateAddressOptions): Promise<Address[]>
-    generateEvmAddresses(generateAddressesOptions: GenerateAddressOptions): Promise<string[]>
+    prepareDestroyAlias(aliasId: string, transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
+    prepareDestroyFoundry(foundryId: string, transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
+    generateEd25519Addresses(amount: number, options?: GenerateAddressOptions): Promise<AccountAddress[]>
     getBalance(): Promise<Balance>
     getFoundryOutput(tokenId: string): Promise<FoundryOutput>
     getIncomingTransaction(transactionId: string): Promise<Transaction>
@@ -73,18 +69,18 @@ export interface IAccount {
     getOutput(outputId: string): Promise<OutputData>
     claimableOutputs(outputs: OutputsToClaim): Promise<string[]>
     getParticipationEvent(eventId: string): Promise<ParticipationEventWithNodes>
-    getParticipationEventIds(node: INode, eventType?: ParticipationEventType): Promise<string[]>
-    getParticipationEvents(): Promise<{ [eventId: string]: ParticipationEventWithNodes }>
+    getParticipationEventIds(node: INode, eventType?: ParticipationEventType): Promise<ParticipationEventId[]>
+    getParticipationEvents(): Promise<ParticipationEventMap>
     getParticipationEventStatus(eventId: string): Promise<ParticipationEventStatus>
     getParticipationOverview(eventIds?: string[]): Promise<ParticipationOverview>
     getTransaction(transactionId: string): Promise<Transaction>
     incomingTransactions(): Promise<Transaction[]>
-    mintNativeToken(
+    prepareMintNativeToken(
         tokenId: string,
         mintAmount: HexEncodedAmount,
         transactionOptions?: TransactionOptions
-    ): Promise<CreateNativeTokenTransaction>
-    increaseVotingPower(amount: string): Promise<Transaction>
+    ): Promise<PreparedTransaction>
+    prepareIncreaseVotingPower(amount: string): Promise<PreparedTransaction>
     prepareCreateNativeToken(
         params: CreateNativeTokenParams,
         transactionOptions?: TransactionOptions
@@ -93,29 +89,26 @@ export interface IAccount {
     outputs(filterOptions?: FilterOptions): Promise<OutputData[]>
     prepareOutput(params: OutputParams, transactionOptions?: TransactionOptions): Promise<Output>
     pendingTransactions(): Promise<Transaction[]>
-    prepareSend(params: SendParams[], options?: TransactionOptions): Promise<PreparedTransactionData>
-    prepareTransaction(outputs: Output[], options?: TransactionOptions): Promise<PreparedTransactionData>
+    prepareSend(params: SendParams[], options?: TransactionOptions): Promise<PreparedTransaction>
+    prepareTransaction(outputs: Output[], options?: TransactionOptions): Promise<PreparedTransaction>
     registerParticipationEvents(options: ParticipationEventRegistrationOptions): Promise<ParticipationEventMap>
-    retryTransactionUntilIncluded(
-        transactionId: string,
-        interval?: number,
-        maxAttempts?: number
-    ): Promise<PreparedTransactionData>
-    requestFundsFromFaucet(url: string, address: string): Promise<string>
-    sendAmount(params: SendParams[], transactionOptions?: TransactionOptions): Promise<Transaction>
-    sendNativeTokens(params: SendNativeTokensParams[], transactionOptions?: TransactionOptions): Promise<Transaction>
-    sendNft(params: SendNftParams[], transactionOptions?: TransactionOptions): Promise<Transaction>
+    retryTransactionUntilIncluded(transactionId: string, interval?: number, maxAttempts?: number): Promise<string>
+    send(amount: bigint | string, address: string, transactionOptions?: TransactionOptions): Promise<Transaction>
+    sendWithParams(params: SendParams[], transactionOptions?: TransactionOptions): Promise<Transaction>
+    prepareSendNativeTokens(
+        params: SendNativeTokensParams[],
+        transactionOptions?: TransactionOptions
+    ): Promise<PreparedTransaction>
+    prepareSendNft(params: SendNftParams[], transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
     sendOutputs(outputs: Output[], transactionOptions?: TransactionOptions): Promise<Transaction>
     setAlias(alias: string): Promise<void>
     setDefaultSyncOptions(options: SyncOptions): Promise<void>
-    signSecp256k1Ecdsa(message: HexEncodedString, chain: number[]): Promise<Secp256k1EcdsaSignature>
     signTransactionEssence(preparedTransactionData: PreparedTransactionData): Promise<SignedTransactionEssence>
-    stopParticipating(eventId: string): Promise<Transaction>
+    prepareStopParticipating(eventId: string): Promise<PreparedTransaction>
+    signAndSubmitTransaction(preparedTransactionData: PreparedTransactionData): Promise<Transaction>
     submitAndStoreTransaction(signedTransactionData: SignedTransactionEssence): Promise<Transaction>
     sync(options?: SyncOptions): Promise<Balance>
     transactions(): Promise<Transaction[]>
     unspentOutputs(filterOptions?: FilterOptions): Promise<OutputData[]>
-    vote(eventId?: string, answers?: number[]): Promise<Transaction>
-    verifyEd25519Signature(signature: Ed25519Signature, message: HexEncodedString): Promise<boolean>
-    verifySecp256k1EcdsaSignature(signature: Secp256k1EcdsaSignature, message: HexEncodedString): Promise<boolean>
+    prepareVote(eventId?: string, answers?: number[]): Promise<PreparedTransaction>
 }
diff --git a/packages/shared/lib/core/wallet/actions/burnAsset.ts b/packages/shared/lib/core/wallet/actions/burnAsset.ts
index 0d004ac635d..ca025f47ba1 100644
--- a/packages/shared/lib/core/wallet/actions/burnAsset.ts
+++ b/packages/shared/lib/core/wallet/actions/burnAsset.ts
@@ -1,3 +1,6 @@
+import { PreparedTransaction } from '@iota/sdk/out/types'
+import { plainToInstance } from 'class-transformer'
+
 import { get } from 'svelte/store'
 import { showAppNotification } from '@auxiliary/notification'
 import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
@@ -10,7 +13,12 @@ export async function burnAsset(assetId: string, rawAmount: string): Promise<voi
     const account = get(selectedAccount)
     try {
         updateSelectedAccount({ isTransferring: true })
-        const burnTokenTransaction = await account.burnNativeToken(assetId, Converter.decimalToHex(Number(rawAmount)))
+        const prepareBurnNativeTokenTransaction = await account?.prepareBurnNativeToken(
+            assetId,
+            Converter.decimalToHex(Number(rawAmount))
+        )
+        const preparedTransaction = plainToInstance(PreparedTransaction, prepareBurnNativeTokenTransaction)
+        const burnTokenTransaction = await preparedTransaction?.send()
 
         await processAndAddToActivities(burnTokenTransaction, account)
 
diff --git a/packages/shared/lib/core/wallet/actions/burnNft.ts b/packages/shared/lib/core/wallet/actions/burnNft.ts
index 80c66bde448..47a8d8b11c7 100644
--- a/packages/shared/lib/core/wallet/actions/burnNft.ts
+++ b/packages/shared/lib/core/wallet/actions/burnNft.ts
@@ -1,3 +1,6 @@
+import { PreparedTransaction } from '@iota/sdk/out/types'
+import { plainToInstance } from 'class-transformer'
+
 import { showAppNotification } from '@auxiliary/notification'
 import { selectedAccount, updateSelectedAccount } from '@core/account/stores/selected-account.store'
 import { localize } from '@core/i18n'
@@ -10,7 +13,9 @@ export async function burnNft(nftId: string): Promise<void> {
     const account = get(selectedAccount)
     try {
         updateSelectedAccount({ isTransferring: true })
-        const burnNftTransaction = await account.burnNft(nftId)
+        const prepareBurnNftTransaction = await account?.prepareBurnNft(nftId)
+        const preparedTransaction = plainToInstance(PreparedTransaction, prepareBurnNftTransaction)
+        const burnNftTransaction = await preparedTransaction?.send()
 
         // Generate Activity
         await processAndAddToActivities(burnNftTransaction, account)
diff --git a/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts b/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts
index b4695b636bd..47aa03da966 100644
--- a/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts
+++ b/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts
@@ -1,14 +1,22 @@
 import { get } from 'svelte/store'
+import { PreparedTransaction } from '@iota/sdk/out/types'
 import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { handleError } from '@core/error/handlers'
 import { processAndAddToActivities } from '../utils'
+import { plainToInstance } from 'class-transformer'
 
 export async function consolidateOutputs(): Promise<void> {
     const account = get(selectedAccount)
     try {
         updateSelectedAccount({ isTransferring: true })
 
-        const transaction = await account.consolidateOutputs({ force: false, outputThreshold: 2 })
+        const preparedConsolidateOutputsTransaction = await account?.prepareConsolidateOutputs({
+            force: false,
+            outputThreshold: 2,
+        })
+        const preparedTransaction = plainToInstance(PreparedTransaction, preparedConsolidateOutputsTransaction)
+        const transaction = await preparedTransaction?.send()
+
         await processAndAddToActivities(transaction, account)
     } catch (err) {
         handleError(err)
diff --git a/packages/shared/lib/tests/__mocks__/account.mock.ts b/packages/shared/lib/tests/__mocks__/account.mock.ts
index b993a9f9471..c252e7f9c18 100644
--- a/packages/shared/lib/tests/__mocks__/account.mock.ts
+++ b/packages/shared/lib/tests/__mocks__/account.mock.ts
@@ -1,18 +1,12 @@
 import {
     Balance,
     AccountMetadata,
-    Address,
     SendNativeTokensParams,
     SendNftParams,
     SendParams,
     AliasOutputParams,
-    AliasOutputBuilderParams,
-    BasicOutputBuilderParams,
-    FoundryOutputBuilderParams,
-    NftOutputBuilderParams,
     ConsolidationParams,
     FilterOptions,
-    CreateNativeTokenTransaction,
     INode,
     OutputData,
     OutputParams,
@@ -22,19 +16,17 @@ import {
     ParticipationEventType,
     ParticipationEventWithNodes,
     ParticipationOverview,
+    PreparedTransaction,
     PreparedTransactionData,
     SignedTransactionEssence,
     Transaction,
     TransactionOptions,
-    Secp256k1EcdsaSignature,
-    GenerateAddressOptions,
     SyncOptions,
-    Ed25519Signature,
-    AliasOutput,
-    BasicOutput,
     FoundryOutput,
-    NftOutput,
     Output,
+    AccountAddress,
+    PreparedCreateNativeTokenTransaction,
+    Burn,
 } from '@iota/sdk/out/types'
 
 import { IAccount } from '../../core/account'
@@ -53,35 +45,23 @@ export class AccountMock implements IAccount {
         return Promise.resolve([])
     }
 
-    buildAliasOutput(data: AliasOutputBuilderParams): Promise<AliasOutput> {
-        throw new Error('Method not implemented.')
-    }
-
-    buildBasicOutput(data: BasicOutputBuilderParams): Promise<BasicOutput> {
-        throw new Error('Method not implemented.')
-    }
-
-    buildFoundryOutput(data: FoundryOutputBuilderParams): Promise<FoundryOutput> {
-        throw new Error('Method not implemented.')
-    }
-
-    buildNftOutput(data: NftOutputBuilderParams): Promise<NftOutput> {
-        throw new Error('Method not implemented.')
-    }
-
-    burnNativeToken(
+    prepareBurnNativeToken(
         tokenId: string,
         burnAmount: string,
         transactionOptions?: TransactionOptions
-    ): Promise<Transaction> {
+    ): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
-    burnNft(nftId: string, transactionOptions?: TransactionOptions): Promise<Transaction> {
+    prepareBurn(burn: Burn, transactionOptions?: TransactionOptions): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
-    consolidateOutputs(params: ConsolidationParams): Promise<Transaction> {
+    prepareBurnNft(nftId: string, transactionOptions?: TransactionOptions): Promise<PreparedTransaction> {
+        throw new Error('Method not implemented.')
+    }
+
+    prepareConsolidateOutputs(params: ConsolidationParams): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
@@ -92,11 +72,11 @@ export class AccountMock implements IAccount {
     prepareCreateAliasOutput(
         params?: AliasOutputParams,
         transactionOptions?: TransactionOptions
-    ): Promise<Transaction> {
+    ): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
-    meltNativeToken(
+    prepareMeltNativeToken(
         tokenId: string,
         meltAmount: string,
         transactionOptions?: TransactionOptions
@@ -104,7 +84,7 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    decreaseVotingPower(amount: string): Promise<Transaction> {
+    prepareDecreaseVotingPower(amount: string): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
@@ -112,15 +92,11 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    destroyAlias(aliasId: string, transactionOptions?: TransactionOptions): Promise<Transaction> {
-        throw new Error('Method not implemented.')
-    }
-
-    destroyFoundry(foundryId: string, transactionOptions?: TransactionOptions): Promise<Transaction> {
+    prepareDestroyAlias(aliasId: string, transactionOptions?: TransactionOptions): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
-    generateEvmAddresses(generateAddressesOptions: GenerateAddressOptions): Promise<string[]> {
+    prepareDestroyFoundry(foundryId: string, transactionOptions?: TransactionOptions): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
@@ -203,51 +179,43 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    mintNativeToken(
+    prepareMintNativeToken(
         tokenId: string,
         mintAmount: string,
         transactionOptions?: TransactionOptions
-    ): Promise<CreateNativeTokenTransaction> {
-        throw new Error('Method not implemented.')
-    }
-
-    increaseVotingPower(amount: string): Promise<Transaction> {
+    ): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
-    minimumRequiredStorageDeposit(output: Output): Promise<string> {
+    prepareIncreaseVotingPower(amount: string): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
-    outputs(filterOptions?: FilterOptions): Promise<[]> {
+    outputs(filterOptions?: FilterOptions): Promise<OutputData[]> {
         return Promise.resolve([])
     }
 
-    pendingTransactions(): Promise<[]> {
+    pendingTransactions(): Promise<Transaction[]> {
         return Promise.resolve([])
     }
 
-    prepareSend(params: SendParams[], options?: TransactionOptions): Promise<PreparedTransactionData> {
+    prepareSend(params: SendParams[], options?: TransactionOptions): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
-    prepareTransaction(outputs: Output[], options?: TransactionOptions): Promise<PreparedTransactionData> {
+    prepareTransaction(outputs: Output[], options?: TransactionOptions): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
-    generateEd25519Address(): Promise<Address> {
-        return Promise.resolve(MOCK_ADDRESS)
-    }
-
-    generateEd25519Addresses(): Promise<Address[]> {
+    generateEd25519Addresses(): Promise<AccountAddress[]> {
         return Promise.resolve([MOCK_ADDRESS])
     }
 
-    mintNativeToken(params, transferOptions): Promise<CreateNativeTokenTransaction> {
+    prepareCreateNativeToken(params, transferOptions): Promise<PreparedCreateNativeTokenTransaction> {
         throw new Error('Method not implemented.')
     }
 
-    mintNfts(params, transferOptions): Promise<Transaction> {
+    prepareMintNfts(params, transferOptions): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
@@ -265,31 +233,30 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    retryTransactionUntilIncluded(
-        transactionId: string,
-        interval?: number,
-        maxAttempts?: number
-    ): Promise<PreparedTransactionData> {
+    retryTransactionUntilIncluded(transactionId: string, interval?: number, maxAttempts?: number): Promise<string> {
         throw new Error('Method not implemented.')
     }
 
-    requestFundsFromFaucet(url: string, address: string): Promise<string> {
+    setDefaultSyncOptions(options: SyncOptions): Promise<void> {
         throw new Error('Method not implemented.')
     }
 
-    setDefaultSyncOptions(options: SyncOptions): Promise<void> {
+    send(amount: bigint | string, address: string, transactionOptions?: TransactionOptions): Promise<Transaction> {
         throw new Error('Method not implemented.')
     }
 
-    sendAmount(params: SendParams[], transactionOptions?: TransactionOptions): Promise<Transaction> {
+    sendWithParams(params: SendParams[], options?: TransactionOptions): Promise<Transaction> {
         throw new Error('Method not implemented.')
     }
 
-    sendNativeTokens(params: SendNativeTokensParams[], transactionOptions?: TransactionOptions): Promise<Transaction> {
+    prepareSendNativeTokens(
+        params: SendNativeTokensParams[],
+        transactionOptions?: TransactionOptions
+    ): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
-    sendNft(params: SendNftParams[], transactionOptions?: TransactionOptions): Promise<Transaction> {
+    prepareSendNft(params: SendNftParams[], transactionOptions?: TransactionOptions): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
@@ -301,15 +268,15 @@ export class AccountMock implements IAccount {
         throw new Error('Method not implemented.')
     }
 
-    signSecp256k1Ecdsa(message: string, chain: number[]): Promise<Secp256k1EcdsaSignature> {
+    signTransactionEssence(preparedTransactionData: PreparedTransactionData): Promise<SignedTransactionEssence> {
         throw new Error('Method not implemented.')
     }
 
-    signTransactionEssence(preparedTransactionData: PreparedTransactionData): Promise<SignedTransactionEssence> {
+    prepareStopParticipating(eventId: string): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 
-    stopParticipating(eventId: string): Promise<Transaction> {
+    signAndSubmitTransaction(preparedTransactionData: PreparedTransactionData): Promise<Transaction> {
         throw new Error('Method not implemented.')
     }
 
@@ -329,15 +296,7 @@ export class AccountMock implements IAccount {
         return Promise.resolve([])
     }
 
-    verifyEd25519Signature(signature: Ed25519Signature, message: string): Promise<boolean> {
-        throw new Error('Method not implemented.')
-    }
-
-    verifySecp256k1EcdsaSignature(signature: Secp256k1EcdsaSignature, message: string): Promise<boolean> {
-        throw new Error('Method not implemented.')
-    }
-
-    vote(eventId?: string, answers?: number[]): Promise<Transaction> {
+    prepareVote(eventId?: string, answers?: number[]): Promise<PreparedTransaction> {
         throw new Error('Method not implemented.')
     }
 }

From 99796a0594489c6d7d407fe76f79e172b52dcc3c Mon Sep 17 00:00:00 2001
From: marc2332 <mespinsanz@gmail.com>
Date: Mon, 21 Aug 2023 15:20:08 +0200
Subject: [PATCH 42/48] chore: Revert manual binding instantiation experiment

---
 packages/desktop/electron/preload.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index 82f186116ac..f2576c31d73 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -185,19 +185,7 @@ function bindMethodsAcrossContextBridge(prototype, object) {
     const prototypeProperties = Object.getOwnPropertyNames(prototype)
     prototypeProperties.forEach((key) => {
         if (key !== 'constructor') {
-            if (key === 'incomingTransactions') {
-                const method = object[key].bind(object)
-                object[key] = async function () {
-                    const txs = await method(arguments)
-                    txs.forEach((tx) => {
-                        // Or classToInstance?
-                        bindMethodsAcrossContextBridge(IotaSdk.Transaction.prototype, tx)
-                    })
-                    return txs
-                }
-            } else {
-                object[key] = object[key].bind(object)
-            }
+            object[key] = object[key].bind(object)
         }
     })
 }

From 46f8ef569c54aece808c756ad46d5d55a32bdfa4 Mon Sep 17 00:00:00 2001
From: marc2332 <mespinsanz@gmail.com>
Date: Mon, 21 Aug 2023 16:31:16 +0200
Subject: [PATCH 43/48] chore: Simplify code

---
 .../core/wallet/utils/outputs/getFoundryId.ts   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
index 2592a79b29a..a4b7bb93ce2 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
@@ -9,12 +9,17 @@ import {
 } from '@iota/sdk/out/types'
 
 export function buildFoundryId(foundry: FoundryOutput): Promise<FoundryId> {
-    const unlockCondition = foundry.unlockConditions[0]
-    const aliasId =
-        unlockCondition.type === UnlockConditionType.ImmutableAliasAddress &&
-        (unlockCondition as ImmutableAliasAddressUnlockCondition).address.type === AddressType.Alias
-            ? ((unlockCondition as ImmutableAliasAddressUnlockCondition).address as AliasAddress).aliasId
-            : ''
+    const unlockCondition = foundry.unlockConditions[0] as ImmutableAliasAddressUnlockCondition
+    const isImmutableAliasAddress = unlockCondition.type === UnlockConditionType.ImmutableAliasAddress
+
+    let aliasId = ''
+
+    if (isImmutableAliasAddress) {
+        const hasAliasAddress = unlockCondition.address.type === AddressType.Alias
+        if (hasAliasAddress) {
+            aliasId = (unlockCondition.address as AliasAddress).aliasId
+        }
+    }
 
     return api.computeFoundryId(aliasId, foundry.serialNumber, foundry.tokenScheme.type)
 }

From d89598663d095199931c6f8a7962412a8a3aacf1 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Mon, 28 Aug 2023 13:19:48 +0200
Subject: [PATCH 44/48] chore: Bump @iota/sdk version

---
 packages/shared/package.json | 2 +-
 yarn.lock                    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/shared/package.json b/packages/shared/package.json
index bdb51c5008b..1b33948bc90 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -11,7 +11,7 @@
         "@iota/transaction-converter": "^1.0.0-beta.30",
         "@iota/unit-converter": "^1.0.0-beta.30",
         "@iota/util.js": "^2.0.0-rc.1",
-        "@iota/sdk": "1.0.5",
+        "@iota/sdk": "1.0.6",
         "@sveltejs/svelte-virtual-list": "^3.0.1",
         "big-integer": "^1.6.51",
         "big.js": "^6.0.3",
diff --git a/yarn.lock b/yarn.lock
index 52c2c945ded..fe0846c75ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -687,10 +687,10 @@
   resolved "https://registry.yarnpkg.com/@iota/pad/-/pad-1.0.0-beta.30.tgz#de19728f8f1b09c20e2365d0da34945006760082"
   integrity sha512-fnhPMPul18WunLq9Ni4rxzBFmhna6eaG8WroDg6GdQqSK/eN62uFHV8tpspJHXuCqwgCUVp6NpuUna7+B2OV9g==
 
-"@iota/sdk@1.0.5":
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.5.tgz#fe22acd17862e11d6b4d4a666ae180a6004f6405"
-  integrity sha512-rcj1gQ/hd6vKr9KKEx10EoQUmjbdnaBlYYA0mN+Op7bA0t0occ7UTlYx64X+hoAe7U8V9ExT+da2d3jfVYKG6A==
+"@iota/sdk@1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.0.6.tgz#5e9b7510b6b7739a55a5911d790d58f83883729f"
+  integrity sha512-9QHD3BDQreZ/lYBE2FZlwz/4TXdIzsurpzbPX7XDoF8QF7h9gkaV/k/fZ7xIKYROLCqf6aTdaZVPbzyhTfU7xg==
   dependencies:
     "@types/node" "^18.15.12"
     cargo-cp-artifact "^0.1.6"

From 57babc7b174890f809bcc404e1a2f6a40d5866e9 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Mon, 28 Aug 2023 13:43:20 +0200
Subject: [PATCH 45/48] chore: Remove docs section about @iota/wallet

---
 .../development/releases.md                   | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/docs/standard-operating-procedures/development/releases.md b/docs/standard-operating-procedures/development/releases.md
index 5aed6070b72..03796993aba 100644
--- a/docs/standard-operating-procedures/development/releases.md
+++ b/docs/standard-operating-procedures/development/releases.md
@@ -31,7 +31,6 @@ This SOP is only applicable to maintainers of this repository, that are responsi
 * [Regular Releases](#regular-releases)
 * [Milestone Releases](#milestone-releases)
 * [Hotfix Releases](#hotfix-releases)
-* [@iota/wallet (NPM) release](#iotawallet-npm-release)
 
 ## External References
 
@@ -287,23 +286,3 @@ After the hotfix has been released we can then merge the release branch into bot
 * Do **not** use squash and merge at this point as we will loose the commit history used for the changelog
 * Do **not** delete the release branch, as it will be used as the base for hotfixes in the future
 
-## @iota/wallet (NPM) Release
-
-The Firefly team is partly responsible for the npm package release of the [wallet.rs bindings](https://github.com/iotaledger/wallet.rs/tree/production/bindings/nodejs). The package serves
-as the backend of the application. The following steps describe the release process of the wallet.rs bindings.
-
-### 1. Opening changelog PR
-
-To trigger the release process, you add a markdown file describing the type of release (major/minor/patch) together with a description of what changed.
-The GitHub action expects the file to be under `wallet.rs/.changes`. More information can be found [here](https://github.com/iotaledger/wallet.rs/tree/production/.changes#readme).
-
-[Here](https://github.com/iotaledger/wallet.rs/pull/1212) is an example PR.
-
-The merge of this PR triggers the action described in the following step.
-
-### 2. Merge the release PR
-
-Upon merging the PR from the previous step, GitHub actions automatically opens a new PR. This PR deletes the previously added .md file and updates
-the package.json file and appends the changelog message to the changelog file. Merging this PR triggers the automatic release of the npm package.
-
-[Here](https://github.com/iotaledger/wallet.rs/pull/1216) is an example PR.

From 4e5c8ff8df1199a79223eb14c01382e4bbc2f76f Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Mon, 28 Aug 2023 20:48:04 +0200
Subject: [PATCH 46/48] fix: Fix method not found on FoundryOutput (use
 readonly field directly)

---
 .../lib/core/wallet/utils/getMetadataFromFoundryOutput.ts    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
index e9a12acd6e2..4c2ce3b4791 100644
--- a/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/getMetadataFromFoundryOutput.ts
@@ -1,16 +1,17 @@
 import { FeatureType, FoundryOutput, MetadataFeature } from '@iota/sdk/out/types'
 
 export function getMetadataFromFoundryOutput(foundry: FoundryOutput): string {
-    for (const feature of foundry?.getImmutableFeatures() ?? []) {
+    for (const feature of foundry?.immutableFeatures ?? []) {
         if (feature?.type === FeatureType.Metadata) {
             return (feature as MetadataFeature).data
         }
     }
 
-    for (const feature of foundry?.getFeatures() ?? []) {
+    for (const feature of foundry?.features ?? []) {
         if (feature?.type === FeatureType.Metadata) {
             return (feature as MetadataFeature).data
         }
     }
+
     return undefined
 }

From c5418c6c64c640d46dfd77dd1f8cc863fa137446 Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Mon, 28 Aug 2023 20:55:59 +0200
Subject: [PATCH 47/48] chore: Add comment explaining reflect-metadata

---
 packages/desktop/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/desktop/index.js b/packages/desktop/index.js
index 7471c3dec68..641c06d4c33 100644
--- a/packages/desktop/index.js
+++ b/packages/desktop/index.js
@@ -1,3 +1,4 @@
+// needed for features from @iota/sdk which use reflection (decorators)
 import 'reflect-metadata'
 import App from './App.svelte'
 import { Electron } from './lib/electron'

From 3e44f747db183301b657d7e5e5e9b0643471e46b Mon Sep 17 00:00:00 2001
From: Mario Sarcevic <mario.sarcevic@iota.org>
Date: Mon, 28 Aug 2023 21:15:46 +0200
Subject: [PATCH 48/48] chore: Refactor move computeOutputId

---
 packages/shared/lib/core/profile-manager/api/index.ts           | 1 -
 .../api => wallet/utils/outputs}/computeOutputId.ts             | 2 +-
 packages/shared/lib/core/wallet/utils/outputs/index.ts          | 1 +
 .../lib/core/wallet/utils/outputs/preprocessTransaction.ts      | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename packages/shared/lib/core/{profile-manager/api => wallet/utils/outputs}/computeOutputId.ts (81%)

diff --git a/packages/shared/lib/core/profile-manager/api/index.ts b/packages/shared/lib/core/profile-manager/api/index.ts
index 4935ed6cfa3..10c123085b7 100644
--- a/packages/shared/lib/core/profile-manager/api/index.ts
+++ b/packages/shared/lib/core/profile-manager/api/index.ts
@@ -19,4 +19,3 @@ export * from './setStrongholdPasswordClearInterval'
 export * from './startBackgroundSync'
 export * from './storeMnemonic'
 export * from './verifyMnemonic'
-export * from './computeOutputId'
diff --git a/packages/shared/lib/core/profile-manager/api/computeOutputId.ts b/packages/shared/lib/core/wallet/utils/outputs/computeOutputId.ts
similarity index 81%
rename from packages/shared/lib/core/profile-manager/api/computeOutputId.ts
rename to packages/shared/lib/core/wallet/utils/outputs/computeOutputId.ts
index 872e6c59bf1..48de27dc013 100644
--- a/packages/shared/lib/core/profile-manager/api/computeOutputId.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/computeOutputId.ts
@@ -1,4 +1,4 @@
-import { api } from '../api'
+import { api } from '@core/profile-manager'
 import { TransactionId, OutputId } from '@iota/sdk/out/types'
 
 export function computeOutputId(id: TransactionId, index: number): Promise<OutputId> {
diff --git a/packages/shared/lib/core/wallet/utils/outputs/index.ts b/packages/shared/lib/core/wallet/utils/outputs/index.ts
index 5f4890d9064..3cf0d8ba021 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/index.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/index.ts
@@ -1,3 +1,4 @@
+export * from './computeOutputId'
 export * from './getExpirationDateFromOutput'
 export * from './getFormattedAmountFromActivity'
 export * from './getFormattedVotingPowerFromGovernanceActivity'
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
index 8ce140d5172..ceea3713244 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessTransaction.ts
@@ -1,9 +1,9 @@
 import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
 import { Output, RegularTransactionEssence, Transaction, UTXOInput } from '@iota/sdk/out/types'
+import { computeOutputId } from './computeOutputId'
 import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
 import { getDirectionFromTransaction } from '../transactions'
 import { IAccountState } from '@core/account'
-import { computeOutputId } from '@core/profile-manager'
 
 export async function preprocessTransaction(
     transaction: Transaction,