From a151a7e1a1f9671cd25b8c0bbbaf305c37406d89 Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Fri, 23 Feb 2024 10:57:12 +0000
Subject: [PATCH 1/8] temp: initial work

---
 .../views/ConnectedChainsDrawer.svelte        |  2 +
 .../account-summary/AccountSummaryPane.svelte | 10 +--
 .../components/AccountEvmChainSummary.svelte  | 13 ++--
 .../default-chain-configurations.constant.ts  | 66 ++++++++++++-------
 .../constants/default-coin-type.constant.ts   |  1 +
 .../core/network/enums/evm-chain-id.enum.ts   |  1 +
 .../enums/supported-network-id.enum.ts        |  1 +
 ...ildPersistedNetworkFromNodeInfoResponse.ts |  3 +-
 .../utils/getDefaultPersistedNetwork.ts       |  3 +-
 9 files changed, 60 insertions(+), 40 deletions(-)

diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte
index 193ac500e5..992f2499c6 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte
@@ -11,6 +11,8 @@
 
     export let drawerRouter: Router<NetworkConfigRoute>
 
+        $: console.log($network.getChains())
+
     function onL1NetworkCardClick(): void {
         $networkConfigRouter.goTo(NetworkConfigRoute.NetworkSettings)
     }
diff --git a/packages/desktop/views/dashboard/wallet/panes/account-summary/AccountSummaryPane.svelte b/packages/desktop/views/dashboard/wallet/panes/account-summary/AccountSummaryPane.svelte
index 4359fa79fe..bc02cd0705 100644
--- a/packages/desktop/views/dashboard/wallet/panes/account-summary/AccountSummaryPane.svelte
+++ b/packages/desktop/views/dashboard/wallet/panes/account-summary/AccountSummaryPane.svelte
@@ -7,12 +7,12 @@
     export let account: IAccountState
 
     const stardustNetworkId = getActiveNetworkId()
-    const evmChainNetworkId = $network.getChains()[0]?.getConfiguration()?.id
+    const chains = $network.getChains()
 </script>
 
 <Pane
     classes="
-        w-full flex shrink-0 grid {evmChainNetworkId ? 'grid-cols-3' : 'grid-cols-2'}
+        w-full flex shrink-0 grid {chains.length > 0 ? chains.length > 1 ? 'grid-cols-4' : 'grid-cols-3' : 'grid-cols-2'}
         bg-surface dark:bg-surface-dark 
         border border-solid border-stroke dark:border-stroke-dark 
         divide-x divide-solid divide-stroke dark:divide-stroke-dark 
@@ -21,7 +21,7 @@
 >
     <AccountSummary />
     <AccountStardustNetworkSummary {account} networkId={stardustNetworkId} />
-    {#if evmChainNetworkId}
-        <AccountEvmChainSummary {account} networkId={evmChainNetworkId} />
-    {/if}
+    {#each chains as chain}
+        <AccountEvmChainSummary {account} {chain} />
+    {/each}
 </Pane>
diff --git a/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountEvmChainSummary.svelte b/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountEvmChainSummary.svelte
index fd690f62c6..22b259d2e7 100644
--- a/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountEvmChainSummary.svelte
+++ b/packages/desktop/views/dashboard/wallet/panes/account-summary/components/AccountEvmChainSummary.svelte
@@ -1,22 +1,23 @@
 <script lang="ts">
-    import { getNetwork, NetworkHealth, NetworkId } from '@core/network'
     import { getAddressFromAccountForNetwork, IAccountState } from '@core/account'
-    import { formatTokenAmountBestMatch, ITokenWithBalance } from '@core/token'
     import { formatCurrency } from '@core/i18n'
     import { getFiatValueFromTokenAmount } from '@core/market/actions'
+    import { IChain, NetworkHealth, NetworkId } from '@core/network'
+    import { ownedNfts, selectedAccountNfts } from '@core/nfts/stores'
+    import { formatTokenAmountBestMatch, ITokenWithBalance } from '@core/token'
     import { selectedAccountTokens } from '@core/token/stores'
-    import AccountNetworkSummary from './AccountNetworkSummary.svelte'
     import type { IAccountNetworkSummaryProps } from '../interfaces'
-    import { ownedNfts, selectedAccountNfts } from '@core/nfts/stores'
+    import AccountNetworkSummary from './AccountNetworkSummary.svelte'
 
     export let account: IAccountState
-    export let networkId: NetworkId
+    export let chain: IChain
+
+    $: networkId = chain?.getConfiguration()?.id as NetworkId 
 
     let props: IAccountNetworkSummaryProps | undefined
     $: $selectedAccountTokens, $selectedAccountNfts, account, (props = buildAccountEvmChainSummaryProps())
 
     function buildAccountEvmChainSummaryProps(): IAccountNetworkSummaryProps | undefined {
-        const chain = getNetwork()?.getChain(networkId)
         const tokens = $selectedAccountTokens?.[networkId]
         const evmChainBaseToken: ITokenWithBalance = tokens?.baseCoin
         const tokenBalance = formatTokenAmountBestMatch(
diff --git a/packages/shared/src/lib/core/network/constants/default-chain-configurations.constant.ts b/packages/shared/src/lib/core/network/constants/default-chain-configurations.constant.ts
index 5193fce118..66448c66b3 100644
--- a/packages/shared/src/lib/core/network/constants/default-chain-configurations.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-chain-configurations.constant.ts
@@ -2,29 +2,45 @@ import { DEFAULT_COIN_TYPE } from '../constants'
 import { ChainType, EvmChainId, NetworkNamespace, StardustNetworkId, SupportedNetworkId } from '../enums'
 import { ChainConfiguration } from '../types'
 
-export const DEFAULT_CHAIN_CONFIGURATIONS: Readonly<{ [id in StardustNetworkId]?: ChainConfiguration }> = {
-    [SupportedNetworkId.Shimmer]: {
-        id: SupportedNetworkId.ShimmerEvm,
-        type: ChainType.Iscp,
-        name: 'Shimmer EVM',
-        chainId: EvmChainId.ShimmerEvm,
-        namespace: NetworkNamespace.Evm,
-        coinType: DEFAULT_COIN_TYPE[SupportedNetworkId.ShimmerEvm],
-        aliasAddress: 'smr1prxvwqvwf7nru5q5xvh5thwg54zsm2y4wfnk6yk56hj3exxkg92mx20wl3s',
-        rpcEndpoint: 'https://json-rpc.evm.shimmer.network/',
-        apiEndpoint: 'https://api.evm.shimmer.network/',
-        explorerUrl: 'https://explorer.evm.shimmer.network/',
-    },
-    [SupportedNetworkId.Testnet]: {
-        id: SupportedNetworkId.TestnetEvm,
-        type: ChainType.Iscp,
-        name: 'Testnet EVM',
-        chainId: EvmChainId.TestnetEvm,
-        namespace: NetworkNamespace.Evm,
-        coinType: DEFAULT_COIN_TYPE[SupportedNetworkId.TestnetEvm],
-        aliasAddress: 'rms1ppp00k5mmd2m8my8ukkp58nd3rskw6rx8l09aj35984k74uuc5u2cywn3ex',
-        rpcEndpoint: 'https://json-rpc.evm.testnet.shimmer.network/',
-        apiEndpoint: 'https://api.evm.testnet.shimmer.network/',
-        explorerUrl: 'https://explorer.evm.testnet.shimmer.network/',
-    },
+export const DEFAULT_CHAIN_CONFIGURATIONS: Readonly<{ [id in StardustNetworkId]?: ChainConfiguration[] }> = {
+    [SupportedNetworkId.Shimmer]: [
+        {
+            id: SupportedNetworkId.ShimmerEvm,
+            type: ChainType.Iscp,
+            name: 'Shimmer EVM',
+            chainId: EvmChainId.ShimmerEvm,
+            namespace: NetworkNamespace.Evm,
+            coinType: DEFAULT_COIN_TYPE[SupportedNetworkId.ShimmerEvm],
+            aliasAddress: 'smr1prxvwqvwf7nru5q5xvh5thwg54zsm2y4wfnk6yk56hj3exxkg92mx20wl3s',
+            rpcEndpoint: 'https://json-rpc.evm.shimmer.network/',
+            apiEndpoint: 'https://api.evm.shimmer.network/',
+            explorerUrl: 'https://explorer.evm.shimmer.network/',
+        },
+    ],
+    [SupportedNetworkId.Testnet]: [
+        {
+            id: SupportedNetworkId.TestnetEvm,
+            type: ChainType.Iscp,
+            name: 'Testnet EVM',
+            chainId: EvmChainId.TestnetEvm,
+            namespace: NetworkNamespace.Evm,
+            coinType: DEFAULT_COIN_TYPE[SupportedNetworkId.TestnetEvm],
+            aliasAddress: 'rms1ppp00k5mmd2m8my8ukkp58nd3rskw6rx8l09aj35984k74uuc5u2cywn3ex',
+            rpcEndpoint: 'https://json-rpc.evm.testnet.shimmer.network/',
+            apiEndpoint: 'https://api.evm.testnet.shimmer.network/',
+            explorerUrl: 'https://explorer.evm.testnet.shimmer.network/',
+        },
+        {
+            id: SupportedNetworkId.TestnetKycEvm,
+            type: ChainType.Iscp,
+            name: 'Testnet KYC EVM',
+            chainId: EvmChainId.TestnetKycEvm,
+            namespace: NetworkNamespace.Evm,
+            coinType: DEFAULT_COIN_TYPE[SupportedNetworkId.TestnetKycEvm],
+            aliasAddress: 'rms1pzhlaz2aalpsktkqacayyl2xr6s3rsa5h69lmc7mleq4wnaryejkgnprd6k',
+            rpcEndpoint: 'https://fpgaonkrwz.dune.spyce5.com/wasp/api/',
+            apiEndpoint: 'https://fpgaonkrwz.dune.spyce5.com/wasp/api/',
+            explorerUrl: undefined,
+        },
+    ],
 }
diff --git a/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts b/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts
index 006d9ff222..84e143afca 100644
--- a/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts
@@ -11,4 +11,5 @@ export const DEFAULT_COIN_TYPE: Readonly<{ [id in SupportedNetworkId]: number }>
     [SupportedNetworkId.Testnet]: TEST_COIN_TYPE,
     [SupportedNetworkId.ShimmerEvm]: ETHEREUM_COIN_TYPE,
     [SupportedNetworkId.TestnetEvm]: ETHEREUM_COIN_TYPE,
+    [SupportedNetworkId.TestnetKycEvm]: ETHEREUM_COIN_TYPE,
 }
diff --git a/packages/shared/src/lib/core/network/enums/evm-chain-id.enum.ts b/packages/shared/src/lib/core/network/enums/evm-chain-id.enum.ts
index f08d509b71..16fd1e6cce 100644
--- a/packages/shared/src/lib/core/network/enums/evm-chain-id.enum.ts
+++ b/packages/shared/src/lib/core/network/enums/evm-chain-id.enum.ts
@@ -1,4 +1,5 @@
 export enum EvmChainId {
     ShimmerEvm = '148',
     TestnetEvm = '1073',
+    TestnetKycEvm = '1074',
 }
diff --git a/packages/shared/src/lib/core/network/enums/supported-network-id.enum.ts b/packages/shared/src/lib/core/network/enums/supported-network-id.enum.ts
index 3bb8372fa1..35c06109ff 100644
--- a/packages/shared/src/lib/core/network/enums/supported-network-id.enum.ts
+++ b/packages/shared/src/lib/core/network/enums/supported-network-id.enum.ts
@@ -11,6 +11,7 @@ export enum StardustNetworkId {
 export enum EvmNetworkId {
     ShimmerEvm = `${NetworkNamespace.Evm}:${EvmChainId.ShimmerEvm}`,
     TestnetEvm = `${NetworkNamespace.Evm}:${EvmChainId.TestnetEvm}`,
+    TestnetKycEvm = `${NetworkNamespace.Evm}:${EvmChainId.TestnetKycEvm}`,
 }
 
 export const SupportedNetworkId = { ...StardustNetworkId, ...EvmNetworkId }
diff --git a/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts b/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
index a070a817b6..258ec0c951 100644
--- a/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
+++ b/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
@@ -15,8 +15,7 @@ export function buildPersistedNetworkFromNodeInfoResponse(
     const name = DEFAULT_NETWORK_METADATA[id]?.name ?? networkName ?? localize('general.unknown')
     const _coinType = coinType ?? DEFAULT_COIN_TYPE[id] ?? TEST_COIN_TYPE
 
-    const configuration = DEFAULT_CHAIN_CONFIGURATIONS?.[id]
-    const chainConfigurations = configuration ? [configuration] : []
+    const chainConfigurations = DEFAULT_CHAIN_CONFIGURATIONS?.[id] ?? []
     return {
         id,
         name,
diff --git a/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts b/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts
index f6a5462ce3..5176e14e74 100644
--- a/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts
+++ b/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts
@@ -4,8 +4,7 @@ import { IPersistedNetwork } from '../interfaces'
 
 export function getDefaultPersistedNetwork(networkId: NetworkId): IPersistedNetwork {
     const network = structuredClone(DEFAULT_NETWORK_METADATA?.[networkId])
-    const configuration = structuredClone(DEFAULT_CHAIN_CONFIGURATIONS?.[networkId])
-    const chainConfigurations = configuration ? [configuration] : []
+    const chainConfigurations = structuredClone(DEFAULT_CHAIN_CONFIGURATIONS?.[networkId]) ?? []
     if (network) {
         return {
             ...network,

From a4fed7346d40f40991d4ec45ad0c07ec23d96d3d Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Fri, 23 Feb 2024 12:46:01 +0000
Subject: [PATCH 2/8] Update test app chain config

Co-authored-by: Tuditi <Tuditi@users.noreply.github.com>
---
 .../network-config/views/ConnectedChainsDrawer.svelte       | 2 --
 .../constants/default-chain-configurations.constant.ts      | 6 +++---
 .../shared/src/lib/core/network/enums/evm-chain-id.enum.ts  | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte
index 992f2499c6..193ac500e5 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte
@@ -11,8 +11,6 @@
 
     export let drawerRouter: Router<NetworkConfigRoute>
 
-        $: console.log($network.getChains())
-
     function onL1NetworkCardClick(): void {
         $networkConfigRouter.goTo(NetworkConfigRoute.NetworkSettings)
     }
diff --git a/packages/shared/src/lib/core/network/constants/default-chain-configurations.constant.ts b/packages/shared/src/lib/core/network/constants/default-chain-configurations.constant.ts
index 66448c66b3..15b6633c4a 100644
--- a/packages/shared/src/lib/core/network/constants/default-chain-configurations.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-chain-configurations.constant.ts
@@ -37,9 +37,9 @@ export const DEFAULT_CHAIN_CONFIGURATIONS: Readonly<{ [id in StardustNetworkId]?
             chainId: EvmChainId.TestnetKycEvm,
             namespace: NetworkNamespace.Evm,
             coinType: DEFAULT_COIN_TYPE[SupportedNetworkId.TestnetKycEvm],
-            aliasAddress: 'rms1pzhlaz2aalpsktkqacayyl2xr6s3rsa5h69lmc7mleq4wnaryejkgnprd6k',
-            rpcEndpoint: 'https://fpgaonkrwz.dune.spyce5.com/wasp/api/',
-            apiEndpoint: 'https://fpgaonkrwz.dune.spyce5.com/wasp/api/',
+            aliasAddress: 'rms1pqva79scq8k0dz0hdhjvwh0v80pya4z66egruvkssdkxc3fmzy2z60adm9x',
+            rpcEndpoint: 'https://fervent-lichterman.dune.spyce5.com/wasp/api/',
+            apiEndpoint: 'https://fervent-lichterman.dune.spyce5.com/wasp/api/',
             explorerUrl: undefined,
         },
     ],
diff --git a/packages/shared/src/lib/core/network/enums/evm-chain-id.enum.ts b/packages/shared/src/lib/core/network/enums/evm-chain-id.enum.ts
index 16fd1e6cce..0563323b70 100644
--- a/packages/shared/src/lib/core/network/enums/evm-chain-id.enum.ts
+++ b/packages/shared/src/lib/core/network/enums/evm-chain-id.enum.ts
@@ -1,5 +1,5 @@
 export enum EvmChainId {
     ShimmerEvm = '148',
     TestnetEvm = '1073',
-    TestnetKycEvm = '1074',
+    TestnetKycEvm = '54432',
 }

From c257f2a1b7360cf626a543bb506840db3d50ccbd Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole@bloomwallet.io>
Date: Fri, 23 Feb 2024 13:00:48 +0000
Subject: [PATCH 3/8] fix: calculate gas price in glow

---
 .../src/lib/core/layer-2/helpers/calculateGasFeeInGlow.ts    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/shared/src/lib/core/layer-2/helpers/calculateGasFeeInGlow.ts b/packages/shared/src/lib/core/layer-2/helpers/calculateGasFeeInGlow.ts
index a4a32e44e9..44c0efefff 100644
--- a/packages/shared/src/lib/core/layer-2/helpers/calculateGasFeeInGlow.ts
+++ b/packages/shared/src/lib/core/layer-2/helpers/calculateGasFeeInGlow.ts
@@ -4,8 +4,9 @@ import { Converter } from '@core/utils'
 
 export function calculateGasFeeInGlow(gasAmount: BigIntLike, gasPriceInWei: BigIntLike | undefined): bigint {
     if (gasAmount && gasPriceInWei) {
-        const gasPriceInGlow = BigInt(Number(gasPriceInWei)) / WEI_PER_GLOW
-        return Converter.bigIntLikeToBigInt(gasAmount) * gasPriceInGlow
+        const totalPriceInWei = Converter.bigIntLikeToBigInt(gasAmount) * Converter.bigIntLikeToBigInt(gasPriceInWei)
+        const totalPriceInGlow = totalPriceInWei / WEI_PER_GLOW
+        return totalPriceInGlow
     } else {
         return BigInt(0)
     }

From 3a71c77e711c7e3cb1878fd5e47c9b89e1601856 Mon Sep 17 00:00:00 2001
From: Tuditi <daviddetroch@pm.me>
Date: Tue, 9 Apr 2024 16:33:20 +0200
Subject: [PATCH 4/8] feat: add chainId

---
 .../views/components/AddIscpChainForm.svelte  | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
index bb9c4691d8..b50934b93c 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
@@ -9,6 +9,7 @@
         NetworkId,
         EvmChainId,
         NetworkNamespace,
+        getNetwork,
     } from '@core/network'
     import { activeProfile } from '@core/profile/stores'
     import { getNetworkHrp } from '@core/profile/actions'
@@ -23,7 +24,8 @@
     let aliasAddressError = ''
     let rpcEndpointError = ''
     let explorerUrlError = ''
-    $: submitDisabled = !chain.name || !chain.aliasAddress || !chain.rpcEndpoint
+    const chainIdError = ''
+    $: submitDisabled = !chain.name || !chain.id || !chain.aliasAddress || !chain.rpcEndpoint
 
     const chain: IIscpChainConfiguration = {
         type: ChainType.Iscp,
@@ -93,16 +95,24 @@
     function onSubmitClick(): void {
         resetErrors()
         validate()
-        const hasError = !!nameError || !!aliasAddressError || !!rpcEndpointError || !!explorerUrlError
-        if (!hasError) {
-            // TODO: https://github.com/iotaledger/firefly/issues/6375
+        const hasError =
+            !!nameError || !!aliasAddressError || !!rpcEndpointError || !!chainIdError || !!explorerUrlError
+        if (hasError) {
+            return
         }
+        getNetwork()?.addChain(chain)
     }
 </script>
 
 <add-iscp-chain class="h-full flex flex-col justify-between">
     <form id="add-chain-form" class="flex flex-col gap-3" on:submit|preventDefault={onSubmitClick}>
         <Input bind:value={chain.name} placeholder={localize('general.name')} disabled={isBusy} error={nameError} />
+        <Input
+            bind:value={chain.id}
+            placeholder={localize(`${localeKey}.chainId`)}
+            disabled={isBusy}
+            error={chainIdError}
+        />
         <Input
             bind:value={chain.aliasAddress}
             placeholder={localize(`${localeKey}.aliasAddress`)}
@@ -117,7 +127,7 @@
         />
         <Input
             bind:value={chain.explorerUrl}
-            placeholder={localize(`${localeKey}.explorerEndpoint`)}
+            placeholder={localize(`${localeKey}.explorerUrl`)}
             disabled={isBusy}
             error={explorerUrlError}
         />

From 8c417f000f099616e1c1e0da42e9d87c03bcef8e Mon Sep 17 00:00:00 2001
From: Tuditi <daviddetroch@pm.me>
Date: Tue, 9 Apr 2024 17:38:39 +0200
Subject: [PATCH 5/8] ui: rebrand form

---
 .../views/AddChainDrawer.svelte               |  4 +---
 .../views/ConnectedChainsDrawer.svelte        | 21 ++++++++---------
 .../views/components/AddIscpChainForm.svelte  | 23 +++++++++----------
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/AddChainDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/AddChainDrawer.svelte
index ec557da678..e789b65c34 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/AddChainDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/AddChainDrawer.svelte
@@ -9,7 +9,5 @@
 </script>
 
 <DrawerTemplate title={localize('views.dashboard.drawers.networkConfig.addChain.title')} {drawerRouter}>
-    <add-chain-drawer>
-        <AddIscpChainForm />
-    </add-chain-drawer>
+    <AddIscpChainForm />
 </DrawerTemplate>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte
index 193ac500e5..e8388b2b1d 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/ConnectedChainsDrawer.svelte
@@ -1,13 +1,12 @@
 <script lang="ts">
-    import { Icon as IconEnum } from '@auxiliary/icon'
     import { DrawerTemplate, NetworkCard } from '@components'
     import { localize } from '@core/i18n'
     import { IChain, clearSelectedChain, network, networkStatus, setSelectedChain } from '@core/network'
     import { Router } from '@core/router'
     import networkFeatures from '@features/network.features'
-    import { Icon } from '@ui'
     import { onMount } from 'svelte'
     import { NetworkConfigRoute, networkConfigRouter } from '../'
+    import { Button, IconName } from '@bloomwalletio/ui'
 
     export let drawerRouter: Router<NetworkConfigRoute>
 
@@ -54,15 +53,15 @@
                 {/each}
             {/key}
         </div>
+    </connected-chains-drawer>
+    <div slot="footer" class="flex justify-center">
         {#if networkFeatures.config.addChain.enabled}
-            <button
-                type="button"
-                class="flex flex-row items-center justify-center w-full space-x-2 bg-transparent text-blue-500 px-8 py-3 text-15 rounded-lg"
-                on:click|stopPropagation={onAddChainClick}
-            >
-                <Icon icon={IconEnum.Plus} height={12} />
-                {localize('actions.addChain')}
-            </button>
+            <Button
+                variant="text"
+                icon={IconName.Plus}
+                text={localize('actions.addChain')}
+                on:click={onAddChainClick}
+            />
         {/if}
-    </connected-chains-drawer>
+    </div>
 </DrawerTemplate>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
index b50934b93c..a93c0ed5d6 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
@@ -14,8 +14,7 @@
     import { activeProfile } from '@core/profile/stores'
     import { getNetworkHrp } from '@core/profile/actions'
     import { isValidHexAddress, isValidHttpsUrl, validateBech32Address } from '@core/utils'
-    import { Button } from '@bloomwalletio/ui'
-    import { Input } from '@ui'
+    import { Button, TextInput } from '@bloomwalletio/ui'
 
     const localeKey = 'views.dashboard.drawers.networkConfig.chain'
 
@@ -105,29 +104,29 @@
 </script>
 
 <add-iscp-chain class="h-full flex flex-col justify-between">
-    <form id="add-chain-form" class="flex flex-col gap-3" on:submit|preventDefault={onSubmitClick}>
-        <Input bind:value={chain.name} placeholder={localize('general.name')} disabled={isBusy} error={nameError} />
-        <Input
+    <form id="add-chain-form" class="flex flex-col gap-4 px-6" on:submit|preventDefault={onSubmitClick}>
+        <TextInput bind:value={chain.name} label={localize('general.name')} disabled={isBusy} error={nameError} />
+        <TextInput
             bind:value={chain.id}
-            placeholder={localize(`${localeKey}.chainId`)}
+            label={localize(`${localeKey}.chainId`)}
             disabled={isBusy}
             error={chainIdError}
         />
-        <Input
+        <TextInput
             bind:value={chain.aliasAddress}
-            placeholder={localize(`${localeKey}.aliasAddress`)}
+            label={localize(`${localeKey}.aliasAddress`)}
             disabled={isBusy}
             error={aliasAddressError}
         />
-        <Input
+        <TextInput
             bind:value={chain.rpcEndpoint}
-            placeholder={localize(`${localeKey}.rpcEndpoint`)}
+            label={localize(`${localeKey}.rpcEndpoint`)}
             disabled={isBusy}
             error={rpcEndpointError}
         />
-        <Input
+        <TextInput
             bind:value={chain.explorerUrl}
-            placeholder={localize(`${localeKey}.explorerUrl`)}
+            label={localize(`${localeKey}.explorerUrl`)}
             disabled={isBusy}
             error={explorerUrlError}
         />

From e6357eee5bf4d6a202a74eecfbb4fd068b408231 Mon Sep 17 00:00:00 2001
From: Tuditi <daviddetroch@pm.me>
Date: Wed, 10 Apr 2024 11:14:48 +0200
Subject: [PATCH 6/8] chore: cleanup form

---
 .../views/AddChainDrawer.svelte               |  9 +++++-
 .../views/components/AddIscpChainForm.svelte  | 31 ++++++-------------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/AddChainDrawer.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/AddChainDrawer.svelte
index e789b65c34..f9be38eaa6 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/AddChainDrawer.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/AddChainDrawer.svelte
@@ -4,10 +4,17 @@
     import { Router } from '@core/router'
     import { NetworkConfigRoute } from '../'
     import { AddIscpChainForm } from './components'
+    import { Button } from '@bloomwalletio/ui'
 
     export let drawerRouter: Router<NetworkConfigRoute>
+
+    let form: AddIscpChainForm
+    let disabled: boolean
 </script>
 
 <DrawerTemplate title={localize('views.dashboard.drawers.networkConfig.addChain.title')} {drawerRouter}>
-    <AddIscpChainForm />
+    <AddIscpChainForm bind:this={form} bind:disabled />
+    <div slot="footer">
+        <Button text={localize('actions.addChain')} on:click={form.onSubmitClick} width="full" {disabled} />
+    </div>
 </DrawerTemplate>
diff --git a/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte b/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
index a93c0ed5d6..00bef08ece 100644
--- a/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
+++ b/packages/desktop/views/dashboard/drawers/network-config/views/components/AddIscpChainForm.svelte
@@ -14,17 +14,19 @@
     import { activeProfile } from '@core/profile/stores'
     import { getNetworkHrp } from '@core/profile/actions'
     import { isValidHexAddress, isValidHttpsUrl, validateBech32Address } from '@core/utils'
-    import { Button, TextInput } from '@bloomwalletio/ui'
+    import { TextInput } from '@bloomwalletio/ui'
+
+    export let disabled: boolean = false
 
     const localeKey = 'views.dashboard.drawers.networkConfig.chain'
 
-    const isBusy = false
     let nameError = ''
     let aliasAddressError = ''
     let rpcEndpointError = ''
     let explorerUrlError = ''
     const chainIdError = ''
-    $: submitDisabled = !chain.name || !chain.id || !chain.aliasAddress || !chain.rpcEndpoint
+
+    $: disabled = !chain.name || !chain.id || !chain.aliasAddress || !chain.rpcEndpoint
 
     const chain: IIscpChainConfiguration = {
         type: ChainType.Iscp,
@@ -35,6 +37,7 @@
         aliasAddress: '',
         rpcEndpoint: '',
         apiEndpoint: '',
+        explorerUrl: '',
         coinType: ETHEREUM_COIN_TYPE,
     }
 
@@ -91,7 +94,7 @@
         explorerUrlError = ''
     }
 
-    function onSubmitClick(): void {
+    export function onSubmitClick(): void {
         resetErrors()
         validate()
         const hasError =
@@ -105,38 +108,22 @@
 
 <add-iscp-chain class="h-full flex flex-col justify-between">
     <form id="add-chain-form" class="flex flex-col gap-4 px-6" on:submit|preventDefault={onSubmitClick}>
-        <TextInput bind:value={chain.name} label={localize('general.name')} disabled={isBusy} error={nameError} />
-        <TextInput
-            bind:value={chain.id}
-            label={localize(`${localeKey}.chainId`)}
-            disabled={isBusy}
-            error={chainIdError}
-        />
+        <TextInput bind:value={chain.name} label={localize('general.name')} error={nameError} />
+        <TextInput bind:value={chain.id} label={localize(`${localeKey}.chainId`)} error={chainIdError} />
         <TextInput
             bind:value={chain.aliasAddress}
             label={localize(`${localeKey}.aliasAddress`)}
-            disabled={isBusy}
             error={aliasAddressError}
         />
         <TextInput
             bind:value={chain.rpcEndpoint}
             label={localize(`${localeKey}.rpcEndpoint`)}
-            disabled={isBusy}
             error={rpcEndpointError}
         />
         <TextInput
             bind:value={chain.explorerUrl}
             label={localize(`${localeKey}.explorerUrl`)}
-            disabled={isBusy}
             error={explorerUrlError}
         />
     </form>
-    <Button
-        type="submit"
-        form="add-chain-form"
-        width="full"
-        disabled={submitDisabled || isBusy}
-        busy={isBusy}
-        text={localize('actions.addChain')}
-    />
 </add-iscp-chain>

From 19750fc3227838e69f67af05a7c63fd293ae6885 Mon Sep 17 00:00:00 2001
From: Tuditi <daviddetroch@pm.me>
Date: Wed, 10 Apr 2024 14:06:57 +0200
Subject: [PATCH 7/8] fix: don't query explorer if none exists

---
 .../src/lib/core/layer-2/actions/checkForUntrackedTokens.ts     | 2 +-
 .../shared/src/lib/core/nfts/actions/checkForUntrackedNfts.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/shared/src/lib/core/layer-2/actions/checkForUntrackedTokens.ts b/packages/shared/src/lib/core/layer-2/actions/checkForUntrackedTokens.ts
index 82acca0bef..73f97f96b6 100644
--- a/packages/shared/src/lib/core/layer-2/actions/checkForUntrackedTokens.ts
+++ b/packages/shared/src/lib/core/layer-2/actions/checkForUntrackedTokens.ts
@@ -10,7 +10,7 @@ export function checkForUntrackedTokens(account: IAccountState, addPreviouslyUnt
     const chains = getNetwork()?.getChains()
     chains?.forEach(async (chain) => {
         const evmAddress = account.evmAddresses[chain.coinType]
-        if (!evmAddress) {
+        if (!evmAddress || !chain.explorerUrl) {
             return
         }
         const networkId = chain.id
diff --git a/packages/shared/src/lib/core/nfts/actions/checkForUntrackedNfts.ts b/packages/shared/src/lib/core/nfts/actions/checkForUntrackedNfts.ts
index be323a1f12..6cc7277bd3 100644
--- a/packages/shared/src/lib/core/nfts/actions/checkForUntrackedNfts.ts
+++ b/packages/shared/src/lib/core/nfts/actions/checkForUntrackedNfts.ts
@@ -24,7 +24,7 @@ export async function checkForUntrackedNfts(account: IAccountState): Promise<voi
 
     for (const chain of chains) {
         const evmAddress = account.evmAddresses[chain.coinType]
-        if (!evmAddress) {
+        if (!evmAddress || !chain.explorerUrl) {
             return
         }
         const blockscoutApi = new BlockscoutApi(chain.id)

From 79554db5aeed45c9fcce733a51883ec7e3a0c67b Mon Sep 17 00:00:00 2001
From: Tuditi <daviddetroch@pm.me>
Date: Tue, 16 Apr 2024 12:38:46 +0200
Subject: [PATCH 8/8] --wip-- [skip ci]

---
 .../src/components/inputs/NetworkInput.svelte |  4 +-
 .../filter-items/NetworkFilterItem.svelte     |  4 +-
 .../organisms/NodeConfigurationForm.svelte    |  4 +-
 .../firefly-stardust-migrations.ts            |  6 +-
 ...edProfileFromThirdPartyPersistedProfile.ts | 14 ++-
 ...vertOnboardingProfileToPersistedProfile.ts |  2 +-
 .../base-token-contract-address.constant.ts   |  6 +-
 .../getAndUpdateShimmerEvmTokensMetadata.ts   |  4 +-
 ...shimmer-evm-address-to-coingecko-id-map.ts |  4 +-
 .../network/actions/getNameFromNetworkId.ts   |  6 +-
 .../core/network/classes/iscp-chain.class.ts  | 94 ++++++++++++-------
 .../network/classes/stardust-network.class.ts | 46 ++++++---
 .../constants/default-coin-type.constant.ts   |  2 +
 .../default-explorer-urls.constant.ts         |  2 +
 ...urations-per-stardust-network.constant.ts} | 18 ++--
 ...t-l1-evm-network-configuration.constant.ts | 31 ++++++
 ...ult-stardust-network-metadata.constant.ts} |  7 +-
 .../src/lib/core/network/constants/index.ts   |  6 +-
 .../supported-network-id.constant.ts          | 11 ++-
 .../lib/core/network/enums/chain-id.enum.ts   |  2 +
 .../evm-network-configuration.interface.ts    |  2 +-
 .../interfaces/evm-network.interface.ts       | 11 ++-
 .../interfaces/persisted-network.interface.ts | 12 ++-
 .../interfaces/stardust-network.interface.ts  | 10 +-
 .../lib/core/network/stores/networks.store.ts | 17 +---
 ...ildPersistedNetworkFromNodeInfoResponse.ts | 13 +--
 .../utils/getDefaultPersistedNetwork.ts       | 11 ++-
 .../active-profile/checkActiveProfileAuth.ts  |  6 +-
 .../interfaces/persisted-profile.interface.ts |  4 +-
 .../core/wallet/utils/getOutputParameters.ts  |  4 +-
 30 files changed, 235 insertions(+), 128 deletions(-)
 rename packages/shared/src/lib/core/network/constants/{default-evm-network-configurations.constant.ts => default-isc-network-configurations-per-stardust-network.constant.ts} (77%)
 create mode 100644 packages/shared/src/lib/core/network/constants/default-l1-evm-network-configuration.constant.ts
 rename packages/shared/src/lib/core/network/constants/{default-network-metadata.constant.ts => default-stardust-network-metadata.constant.ts} (86%)

diff --git a/packages/shared/src/components/inputs/NetworkInput.svelte b/packages/shared/src/components/inputs/NetworkInput.svelte
index bb959710f8..828f1b2661 100644
--- a/packages/shared/src/components/inputs/NetworkInput.svelte
+++ b/packages/shared/src/components/inputs/NetworkInput.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { IOption, SelectInput } from '@bloomwalletio/ui'
     import { localize } from '@core/i18n'
-    import { NetworkId, getEvmNetworks, getL1Network } from '@core/network'
+    import { NetworkId, getEvmNetworks, getStardustNetwork } from '@core/network'
 
     export let networkId: NetworkId | undefined
     export let error: string | undefined
@@ -28,7 +28,7 @@
     function getNetworkOptions(showLayer2: boolean): IOption[] {
         const options: IOption[] = []
         if (showLayer1) {
-            const l1Network = getL1Network()
+            const l1Network = getStardustNetwork()
             options.push({ label: l1Network.name, value: l1Network.id })
         }
 
diff --git a/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte b/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte
index c279ec330f..e18c2db093 100644
--- a/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte
+++ b/packages/shared/src/components/molecules/filter-items/NetworkFilterItem.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { getIscpChains, getL1Network } from '@core/network'
+    import { getIscpChains, getStardustNetwork } from '@core/network'
     import { NetworkFilterUnit } from '@core/utils/interfaces/filter'
     import features from '@features/features'
     import { IOption, SelectInput } from '@bloomwalletio/ui'
@@ -10,7 +10,7 @@
     let selected: IOption | undefined = options.find((option) => option.value === filterUnit.selected) ?? options?.[0]
 
     function getOptions(): IOption[] {
-        const l1Network = getL1Network()
+        const l1Network = getStardustNetwork()
 
         const iscpChains = features?.network?.layer2?.enabled ? getIscpChains() : []
 
diff --git a/packages/shared/src/components/organisms/NodeConfigurationForm.svelte b/packages/shared/src/components/organisms/NodeConfigurationForm.svelte
index 87de8e20f3..b97070c484 100644
--- a/packages/shared/src/components/organisms/NodeConfigurationForm.svelte
+++ b/packages/shared/src/components/organisms/NodeConfigurationForm.svelte
@@ -2,7 +2,7 @@
     import { OnboardingNetworkType } from '@contexts/onboarding'
     import { localize } from '@core/i18n'
     import { INode } from '@iota/sdk/out/types'
-    import { DEFAULT_NETWORK_METADATA, EMPTY_NODE } from '@core/network/constants'
+    import { DEFAULT_STARDUST_NETWORK_METADATA, EMPTY_NODE } from '@core/network/constants'
     import { IClientOptions, INodeInfoResponse } from '@core/network/interfaces'
     import { nodeInfo } from '@core/network/stores'
     import {
@@ -47,7 +47,7 @@
         })
 
     function getNetworkTypeOptions(): IOption[] {
-        const options = Object.values(DEFAULT_NETWORK_METADATA).map((network) => ({
+        const options = Object.values(DEFAULT_STARDUST_NETWORK_METADATA).map((network) => ({
             label: network?.name,
             value: getOnboardingNetworkTypeFromNetworkId(network?.id),
         }))
diff --git a/packages/shared/src/lib/auxiliary/third-party/migrations/firefly-stardust/firefly-stardust-migrations.ts b/packages/shared/src/lib/auxiliary/third-party/migrations/firefly-stardust/firefly-stardust-migrations.ts
index 86965e5d4c..394884d181 100644
--- a/packages/shared/src/lib/auxiliary/third-party/migrations/firefly-stardust/firefly-stardust-migrations.ts
+++ b/packages/shared/src/lib/auxiliary/third-party/migrations/firefly-stardust/firefly-stardust-migrations.ts
@@ -1,7 +1,7 @@
 // @ts-nocheck - This file is not being type checked because the migrations and types are not defined in our code base
 
 import {
-    DEFAULT_EVM_NETWORK_CONFIGURATIONS,
+    DEFAULT_ISC_NETWORK_CONFIGURATIONS_PER_STARDUST_NETWORK,
     IIscpEvmNetworkMetadata,
     getDefaultPersistedNetwork,
     getNetworkIdFromOnboardingNetworkType,
@@ -240,7 +240,9 @@ export function fireflyStardustProfileMigrationToV13(existingProfile: unknown):
 
         const newNetwork = oldNetwork as unknown as IThirdPartyPersistedNetwork
         const maybeDefaultChainConfig =
-            DEFAULT_EVM_NETWORK_CONFIGURATIONS[getNetworkIdFromOnboardingNetworkType(existingProfile.network.id)]
+            DEFAULT_ISC_NETWORK_CONFIGURATIONS_PER_STARDUST_NETWORK[
+                getNetworkIdFromOnboardingNetworkType(existingProfile.network.id)
+            ]
 
         const defaultChainConfig: IIscpEvmNetworkMetadata[] = maybeDefaultChainConfig ? [maybeDefaultChainConfig] : []
 
diff --git a/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts b/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts
index fa9d7393f6..3bb3526bb5 100644
--- a/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts
+++ b/packages/shared/src/lib/auxiliary/third-party/utils/buildPersistedProfileFromThirdPartyPersistedProfile.ts
@@ -1,8 +1,8 @@
 import { IPersistedAccountData } from '@core/account'
 import { MarketCurrency } from '@core/market'
 import {
-    DEFAULT_EVM_NETWORK_CONFIGURATIONS,
-    IPersistedNetwork,
+    DEFAULT_ISC_NETWORK_CONFIGURATIONS_PER_STARDUST_NETWORK,
+    IPersistedStardustNetwork,
     NetworkNamespace,
     StardustNetworkId,
 } from '@core/network'
@@ -69,11 +69,15 @@ export function buildPersistedProfileFromThirdPartyPersistedProfile(
     return persistedProfile
 }
 
-function buildPersistedNetworkFromThirdPartyPersistedNetwork(network: IThirdPartyPersistedNetwork): IPersistedNetwork {
+function buildPersistedNetworkFromThirdPartyPersistedNetwork(
+    network: IThirdPartyPersistedNetwork
+): IPersistedStardustNetwork {
     const networkId: StardustNetworkId =
         NETWORK_NAME_TO_STARDUST_NETWORK_ID_MAP[network.protocol.networkName] ??
         `${NetworkNamespace.Stardust}:${network.protocol.networkName}`
-    const defaultChainConfigurations = structuredClone(DEFAULT_EVM_NETWORK_CONFIGURATIONS?.[networkId])
+    const defaultChainConfigurations = structuredClone(
+        DEFAULT_ISC_NETWORK_CONFIGURATIONS_PER_STARDUST_NETWORK?.[networkId]
+    )
 
     return {
         id: networkId,
@@ -83,7 +87,7 @@ function buildPersistedNetworkFromThirdPartyPersistedNetwork(network: IThirdPart
         coinType: network.coinType,
         protocol: network.protocol,
         baseToken: network.baseToken,
-        chainConfigurations: defaultChainConfigurations ? [defaultChainConfigurations] : [],
+        chainConfigurations: defaultChainConfigurations ? defaultChainConfigurations : [],
     }
 }
 
diff --git a/packages/shared/src/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts b/packages/shared/src/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts
index 7435c411c4..06251f4572 100644
--- a/packages/shared/src/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts
+++ b/packages/shared/src/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts
@@ -13,7 +13,7 @@ export function convertOnboardingProfileToPersistedProfile(
         ...structuredClone(DEFAULT_PERSISTED_PROFILE_OBJECT),
         ...(onboardingProfile?.id && { id: onboardingProfile.id }),
         ...(onboardingProfile?.name && { name: onboardingProfile.name }),
-        ...(onboardingProfile?.network && { network: onboardingProfile.network }),
+        network: onboardingProfile.network,
         ...(onboardingProfile?.type && { type: onboardingProfile.type }),
         ...(onboardingProfile?.lastStrongholdBackupTime && {
             lastStrongholdBackupTime: onboardingProfile.lastStrongholdBackupTime,
diff --git a/packages/shared/src/lib/core/layer-2/constants/base-token-contract-address.constant.ts b/packages/shared/src/lib/core/layer-2/constants/base-token-contract-address.constant.ts
index ed4512369d..2e68abf10e 100644
--- a/packages/shared/src/lib/core/layer-2/constants/base-token-contract-address.constant.ts
+++ b/packages/shared/src/lib/core/layer-2/constants/base-token-contract-address.constant.ts
@@ -1,7 +1,7 @@
 import { EvmNetworkId } from '@core/network'
-import { SupportedEvmNetworkId } from '@core/network/constants/supported-network-id.constant'
+import { SupportedIscNetworkId } from '@core/network/constants/supported-network-id.constant'
 
 export const BASE_TOKEN_CONTRACT_ADDRESS: Readonly<{ [id in EvmNetworkId]?: string }> = {
-    [SupportedEvmNetworkId.ShimmerEvm]: '0x1074010000000000000000000000000000000000',
-    [SupportedEvmNetworkId.TestnetEvm]: '0x1074010000000000000000000000000000000000',
+    [SupportedIscNetworkId.ShimmerEvm]: '0x1074010000000000000000000000000000000000',
+    [SupportedIscNetworkId.TestnetEvm]: '0x1074010000000000000000000000000000000000',
 }
diff --git a/packages/shared/src/lib/core/market/actions/getAndUpdateShimmerEvmTokensMetadata.ts b/packages/shared/src/lib/core/market/actions/getAndUpdateShimmerEvmTokensMetadata.ts
index d9c44b9b6f..34975fc948 100644
--- a/packages/shared/src/lib/core/market/actions/getAndUpdateShimmerEvmTokensMetadata.ts
+++ b/packages/shared/src/lib/core/market/actions/getAndUpdateShimmerEvmTokensMetadata.ts
@@ -2,12 +2,12 @@ import { get } from 'svelte/store'
 import { CoinGeckoApi } from '../apis'
 import { coinGeckoTokensMetadata } from '../stores'
 import { CoinGeckoNetworkId } from '../enums'
-import { SupportedEvmNetworkId } from '@core/network'
+import { SupportedIscNetworkId } from '@core/network'
 
 export async function getAndUpdateShimmerEvmTokensMetadata(): Promise<void> {
     try {
         const coinGeckoShimmerEvmTokens = await CoinGeckoApi.getFilteredCoinsList(CoinGeckoNetworkId.ShimmerEVM)
-        const networkId = SupportedEvmNetworkId.ShimmerEvm
+        const networkId = SupportedIscNetworkId.ShimmerEvm
         const tokenMetadataPromises = coinGeckoShimmerEvmTokens.map(async (token) => {
             const tokenAddress = token.platforms[CoinGeckoNetworkId.ShimmerEVM]
             if (get(coinGeckoTokensMetadata)?.[networkId]?.[tokenAddress]) {
diff --git a/packages/shared/src/lib/core/market/stores/shimmer-evm-address-to-coingecko-id-map.ts b/packages/shared/src/lib/core/market/stores/shimmer-evm-address-to-coingecko-id-map.ts
index b7ba83aab5..6b96136ae9 100644
--- a/packages/shared/src/lib/core/market/stores/shimmer-evm-address-to-coingecko-id-map.ts
+++ b/packages/shared/src/lib/core/market/stores/shimmer-evm-address-to-coingecko-id-map.ts
@@ -1,11 +1,11 @@
 import { derived, Readable } from 'svelte/store'
 import { coinGeckoTokensMetadata } from './coingecko-tokens-metadata.store'
-import { SupportedEvmNetworkId } from '@core/network/constants'
+import { SupportedIscNetworkId } from '@core/network/constants'
 
 export const shimmerEvmAddressToCoinGeckoIdMap: Readable<Record<string, string>> = derived(
     coinGeckoTokensMetadata,
     ($coinGeckoTokensMetadata) => {
-        const shimmerEvmNetworkId = SupportedEvmNetworkId.ShimmerEvm
+        const shimmerEvmNetworkId = SupportedIscNetworkId.ShimmerEvm
         const shimmerEvmTokens = $coinGeckoTokensMetadata?.[shimmerEvmNetworkId] ?? {}
         const shimmerEvmTokensAddresses = Object.entries(shimmerEvmTokens ?? {}).reduce(
             (acc, [tokenAddress, token]) => {
diff --git a/packages/shared/src/lib/core/network/actions/getNameFromNetworkId.ts b/packages/shared/src/lib/core/network/actions/getNameFromNetworkId.ts
index e5ec9d985c..185e6f4d7f 100644
--- a/packages/shared/src/lib/core/network/actions/getNameFromNetworkId.ts
+++ b/packages/shared/src/lib/core/network/actions/getNameFromNetworkId.ts
@@ -1,4 +1,4 @@
-import { DEFAULT_EVM_NETWORK_CONFIGURATIONS } from '../constants'
+import { DEFAULT_ISC_NETWORK_CONFIGURATIONS_PER_STARDUST_NETWORK } from '../constants'
 import { getNetwork } from '../stores'
 import { NetworkId } from '../types'
 
@@ -8,5 +8,7 @@ export function getNameFromNetworkId(networkId: NetworkId): string | undefined {
         return networkName
     }
 
-    return Object.values(DEFAULT_EVM_NETWORK_CONFIGURATIONS).find((config) => config?.id === networkId)?.name
+    return Object.values(DEFAULT_ISC_NETWORK_CONFIGURATIONS_PER_STARDUST_NETWORK).find(
+        (config) => config?.id === networkId
+    )?.name
 }
diff --git a/packages/shared/src/lib/core/network/classes/iscp-chain.class.ts b/packages/shared/src/lib/core/network/classes/iscp-chain.class.ts
index fbcd50e860..86dfbe29e0 100644
--- a/packages/shared/src/lib/core/network/classes/iscp-chain.class.ts
+++ b/packages/shared/src/lib/core/network/classes/iscp-chain.class.ts
@@ -8,6 +8,7 @@ import { Contract } from '@core/layer-2/types'
 
 import { EvmNetworkType, NetworkHealth, NetworkNamespace, ChainId } from '../enums'
 import {
+    IBaseEvmNetworkConfiguration,
     IBlock,
     IEvmNetwork,
     IEvmNetworkStatus,
@@ -19,22 +20,17 @@ import { CoinType } from '@iota/sdk/out/types'
 import { ChainMetadata, EvmNetworkId, Web3Provider } from '../types'
 import { Converter } from '@core/utils'
 
-export class IscpChain implements IEvmNetwork {
+export class EvmNetwork implements IEvmNetwork {
     public readonly provider: Web3Provider
-    private readonly _chainApi: string
-
     public readonly id: EvmNetworkId
     public readonly namespace: NetworkNamespace.Evm
     public readonly chainId: ChainId
-    public readonly type: EvmNetworkType.Iscp
+    public readonly type: EvmNetworkType
     public readonly coinType: CoinType
     public readonly name: string
     public readonly explorerUrl: string | undefined
     public readonly rpcEndpoint: string
-    public readonly apiEndpoint: string
-    public readonly aliasAddress: string
 
-    private _metadata: IIscpEvmNetworkMetadata | undefined
     constructor({
         id,
         namespace,
@@ -44,18 +40,9 @@ export class IscpChain implements IEvmNetwork {
         name,
         explorerUrl,
         rpcEndpoint,
-        aliasAddress,
-        apiEndpoint,
-    }: IIscpEvmNetworkConfiguration) {
+    }: IBaseEvmNetworkConfiguration) {
         try {
-            /**
-             * NOTE: We can assume that the data inside this payload has already
-             * been validated.
-             */
-            const evmJsonRpcPath = this.buildEvmJsonRpcPath(aliasAddress)
-
-            this.provider = new Web3(`${rpcEndpoint}/${evmJsonRpcPath}`)
-
+            this.provider = new Web3(rpcEndpoint)
             this.id = id
             this.namespace = namespace
             this.chainId = chainId
@@ -64,22 +51,15 @@ export class IscpChain implements IEvmNetwork {
             this.name = name
             this.explorerUrl = explorerUrl
             this.rpcEndpoint = rpcEndpoint
-            this.aliasAddress = aliasAddress
-            this.apiEndpoint = apiEndpoint
-
-            this._chainApi = `${apiEndpoint}v1/chains/${aliasAddress}`
         } catch (err) {
             console.error(err)
-            throw new Error('Failed to construct ISCP Chain!')
+            throw new Error('Failed to construct EVM Chain!')
         }
     }
 
-    private buildEvmJsonRpcPath(aliasAddress: string): string {
-        /**
-         * NOTE: This is according to the WASP node API specification,
-         * which can be found here: https://editor.swagger.io/?url=https://raw.githubusercontent.com/iotaledger/wasp/develop/clients/apiclient/api/openapi.yaml.
-         */
-        return `v1/chains/${aliasAddress}/evm`
+    async getLatestBlock(): Promise<IBlock> {
+        const number = await this.provider.eth.getBlockNumber()
+        return this.provider.eth.getBlock(number)
     }
 
     getStatus(): IEvmNetworkStatus {
@@ -93,6 +73,57 @@ export class IscpChain implements IEvmNetwork {
         }
         return new this.provider.eth.Contract(abi, address)
     }
+}
+
+export class IscpChain extends EvmNetwork {
+    private readonly _chainApi: string
+
+    public readonly apiEndpoint: string
+    public readonly aliasAddress: string
+
+    private _metadata: IIscpEvmNetworkMetadata | undefined
+    constructor({
+        id,
+        namespace,
+        chainId,
+        type,
+        coinType,
+        name,
+        explorerUrl,
+        rpcEndpoint,
+        aliasAddress,
+        apiEndpoint,
+    }: IIscpEvmNetworkConfiguration) {
+        try {
+            /**
+             * NOTE: We can assume that the data inside this payload has already
+             * been validated.
+             */
+            /**
+             * NOTE2: This is according to the WASP node API specification,
+             * which can be found here: https://editor.swagger.io/?url=https://raw.githubusercontent.com/iotaledger/wasp/develop/clients/apiclient/api/openapi.yaml.
+             */
+            rpcEndpoint = `${rpcEndpoint}/v1/chains/${aliasAddress}/evm`
+            super({
+                id,
+                namespace,
+                chainId,
+                type,
+                coinType,
+                name,
+                explorerUrl,
+                rpcEndpoint,
+            })
+
+            this.aliasAddress = aliasAddress
+            this.apiEndpoint = apiEndpoint
+
+            this._chainApi = `${apiEndpoint}v1/chains/${aliasAddress}`
+        } catch (err) {
+            console.error(err)
+            throw new Error('Failed to construct ISCP Chain!')
+        }
+    }
 
     getMetadata(): Promise<ChainMetadata> {
         if (this._metadata) {
@@ -114,11 +145,6 @@ export class IscpChain implements IEvmNetwork {
         return (await response.json()) as IIscpEvmNetworkMetadata
     }
 
-    async getLatestBlock(): Promise<IBlock> {
-        const number = await this.provider.eth.getBlockNumber()
-        return this.provider.eth.getBlock(number)
-    }
-
     async getGasEstimate(hex: string): Promise<bigint> {
         const URL = `${this._chainApi}/estimategas-onledger`
         const body = JSON.stringify({ outputBytes: hex })
diff --git a/packages/shared/src/lib/core/network/classes/stardust-network.class.ts b/packages/shared/src/lib/core/network/classes/stardust-network.class.ts
index 9fcfc313a9..31d3e3c486 100644
--- a/packages/shared/src/lib/core/network/classes/stardust-network.class.ts
+++ b/packages/shared/src/lib/core/network/classes/stardust-network.class.ts
@@ -1,13 +1,21 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 
 import { get } from 'svelte/store'
-import { activeProfile, updateActiveProfile } from '@core/profile/stores'
+import { updateActiveProfile } from '@core/profile/stores'
 import { NetworkNamespace } from '../enums'
-import { IEvmNetwork, IIscpEvmNetworkConfiguration, INetworkStatus, IStardustNetwork } from '../interfaces'
-import { networkStatus } from '../stores'
-import { EvmNetworkConfiguration, NetworkId, NetworkMetadata, StardustNetworkId } from '../types'
+import {
+    IEvmNetwork,
+    IIscpEvmNetworkConfiguration,
+    INetworkStatus,
+    IPersistedStardustNetwork,
+    IProtocol,
+    IStardustNetwork,
+} from '../interfaces'
+import { getStardustNetwork, networkStatus } from '../stores'
+import { EvmNetworkConfiguration, NetworkId, StardustNetworkId } from '../types'
 
 import { IscpChain } from './iscp-chain.class'
+import { IBaseToken } from '@core/token'
 
 export class StardustNetwork implements IStardustNetwork {
     public readonly id: StardustNetworkId
@@ -15,24 +23,31 @@ export class StardustNetwork implements IStardustNetwork {
     public readonly coinType: number
     public readonly namespace: NetworkNamespace.Stardust
     public readonly bech32Hrp: string
+    public readonly protocol: IProtocol
+    public readonly chainConfigurations: IIscpEvmNetworkConfiguration[]
+    public readonly baseToken: IBaseToken
+    public readonly
 
-    constructor(metadata: NetworkMetadata) {
-        this.id = metadata.id
-        this.name = metadata.name
-        this.coinType = metadata.coinType
-        this.namespace = metadata.namespace
-        this.bech32Hrp = metadata.protocol.bech32Hrp
+    constructor(persistedNetwork: IPersistedStardustNetwork) {
+        this.id = persistedNetwork.id
+        this.name = persistedNetwork.name
+        this.coinType = persistedNetwork.coinType
+        this.namespace = persistedNetwork.namespace
+        this.bech32Hrp = persistedNetwork.protocol.bech32Hrp
+        this.protocol = persistedNetwork.protocol
+        this.chainConfigurations = persistedNetwork.chainConfigurations
+        this.baseToken = persistedNetwork.baseToken
     }
 
     getStatus(): INetworkStatus {
         return get(networkStatus)
     }
 
-    addChain(chainConfiguration: EvmNetworkConfiguration): IEvmNetwork {
+    addChain(chainConfiguration: IIscpEvmNetworkConfiguration): IEvmNetwork {
         if (this.isChainAlreadyAdded(chainConfiguration)) {
             throw new Error('This evm network has already been added.')
         } else {
-            const network = get(activeProfile)?.network
+            const network = getStardustNetwork()
             network.chainConfigurations.push(chainConfiguration)
             /**
              * NOTE: Updating the active profile will cause the network store object to be
@@ -41,12 +56,13 @@ export class StardustNetwork implements IStardustNetwork {
              */
             updateActiveProfile({ network })
 
-            return new IscpChain(<IIscpEvmNetworkConfiguration>chainConfiguration)
+            return new IscpChain(chainConfiguration)
         }
     }
 
     private isChainAlreadyAdded(chainConfiguration: EvmNetworkConfiguration): boolean {
-        const network = get(activeProfile)?.network
+        const network = getStardustNetwork()
+
         return network.chainConfigurations.some((evmNetwork) => {
             const hasSameName = evmNetwork.name === chainConfiguration.name
             const hasSameId = evmNetwork.id === chainConfiguration.id
@@ -59,7 +75,7 @@ export class StardustNetwork implements IStardustNetwork {
     }
 
     removeChain(networkId: NetworkId): void {
-        const network = get(activeProfile).network
+        const network = getStardustNetwork()
         const newChains = network.chainConfigurations.filter(
             (chainConfiguration) => chainConfiguration.id !== networkId
         )
diff --git a/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts b/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts
index 01136053c6..fa0800cc44 100644
--- a/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-coin-type.constant.ts
@@ -13,4 +13,6 @@ export const DEFAULT_COIN_TYPE: Readonly<{ [id in NetworkId]?: number }> = {
     [SupportedNetworkId.ShimmerEvm]: ETHEREUM_COIN_TYPE,
     [SupportedNetworkId.TestnetEvm]: ETHEREUM_COIN_TYPE,
     [SupportedNetworkId.TestnetKycEvm]: ETHEREUM_COIN_TYPE,
+    [SupportedNetworkId.Ethereum]: ETHEREUM_COIN_TYPE,
+    [SupportedNetworkId.Sepolia]: ETHEREUM_COIN_TYPE,
 }
diff --git a/packages/shared/src/lib/core/network/constants/default-explorer-urls.constant.ts b/packages/shared/src/lib/core/network/constants/default-explorer-urls.constant.ts
index 8e713e8e71..b37f493469 100644
--- a/packages/shared/src/lib/core/network/constants/default-explorer-urls.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-explorer-urls.constant.ts
@@ -5,6 +5,8 @@ export const DEFAULT_EXPLORER_URLS: Readonly<{ [key in NetworkId]?: string }> =
     [SupportedNetworkId.Iota]: 'https://explorer.iota.org',
     [SupportedNetworkId.Shimmer]: 'https://explorer.shimmer.network',
     [SupportedNetworkId.Testnet]: 'https://explorer.shimmer.network',
+    [SupportedNetworkId.Ethereum]: 'https://eth.blockscout.com',
     [SupportedNetworkId.ShimmerEvm]: 'https://explorer.evm.shimmer.network',
     [SupportedNetworkId.TestnetEvm]: 'https://explorer.evm.testnet.shimmer.network',
+    [SupportedNetworkId.Sepolia]: 'https://eth-sepolia.blockscout.com',
 }
diff --git a/packages/shared/src/lib/core/network/constants/default-evm-network-configurations.constant.ts b/packages/shared/src/lib/core/network/constants/default-isc-network-configurations-per-stardust-network.constant.ts
similarity index 77%
rename from packages/shared/src/lib/core/network/constants/default-evm-network-configurations.constant.ts
rename to packages/shared/src/lib/core/network/constants/default-isc-network-configurations-per-stardust-network.constant.ts
index 125eaf2651..46db50ca7a 100644
--- a/packages/shared/src/lib/core/network/constants/default-evm-network-configurations.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-isc-network-configurations-per-stardust-network.constant.ts
@@ -2,17 +2,19 @@ import { EvmNetworkType, NetworkNamespace, ChainId } from '../enums'
 import { IIscpEvmNetworkConfiguration } from '../interfaces'
 import { EvmNetworkConfiguration, StardustNetworkId } from '../types'
 import { DEFAULT_COIN_TYPE } from './default-coin-type.constant'
-import { SupportedEvmNetworkId, SupportedNetworkId } from './supported-network-id.constant'
+import { SupportedIscNetworkId, SupportedNetworkId } from './supported-network-id.constant'
 
-export const DEFAULT_CHAIN_CONFIGURATIONS: Readonly<{ [id in StardustNetworkId]?: EvmNetworkConfiguration[] }> = {
+export const DEFAULT_ISC_NETWORK_CONFIGURATIONS_PER_STARDUST_NETWORK: Readonly<{
+    [id in StardustNetworkId]?: IIscpEvmNetworkConfiguration[]
+}> = {
     [SupportedNetworkId.Shimmer]: [
         {
-            id: SupportedEvmNetworkId.ShimmerEvm,
+            id: SupportedIscNetworkId.ShimmerEvm,
             type: EvmNetworkType.Iscp,
             name: 'Shimmer EVM',
             chainId: ChainId.ShimmerEvm,
             namespace: NetworkNamespace.Evm,
-            coinType: DEFAULT_COIN_TYPE[SupportedEvmNetworkId.ShimmerEvm],
+            coinType: DEFAULT_COIN_TYPE[SupportedIscNetworkId.ShimmerEvm],
             aliasAddress: 'smr1prxvwqvwf7nru5q5xvh5thwg54zsm2y4wfnk6yk56hj3exxkg92mx20wl3s',
             rpcEndpoint: 'https://json-rpc.evm.shimmer.network/',
             apiEndpoint: 'https://api.evm.shimmer.network/',
@@ -21,24 +23,24 @@ export const DEFAULT_CHAIN_CONFIGURATIONS: Readonly<{ [id in StardustNetworkId]?
     ],
     [SupportedNetworkId.Testnet]: [
         {
-            id: SupportedEvmNetworkId.TestnetEvm,
+            id: SupportedIscNetworkId.TestnetEvm,
             type: EvmNetworkType.Iscp,
             name: 'Testnet EVM',
             chainId: ChainId.TestnetEvm,
             namespace: NetworkNamespace.Evm,
-            coinType: DEFAULT_COIN_TYPE[SupportedEvmNetworkId.TestnetEvm],
+            coinType: DEFAULT_COIN_TYPE[SupportedIscNetworkId.TestnetEvm],
             aliasAddress: 'rms1ppp00k5mmd2m8my8ukkp58nd3rskw6rx8l09aj35984k74uuc5u2cywn3ex',
             rpcEndpoint: 'https://json-rpc.evm.testnet.shimmer.network/',
             apiEndpoint: 'https://api.evm.testnet.shimmer.network/',
             explorerUrl: 'https://explorer.evm.testnet.shimmer.network/',
         } as IIscpEvmNetworkConfiguration,
         {
-            id: SupportedEvmNetworkId.TestnetKycEvm,
+            id: SupportedIscNetworkId.TestnetKycEvm,
             type: EvmNetworkType.Iscp,
             name: 'Testnet KYC EVM',
             chainId: ChainId.TestnetKycEvm,
             namespace: NetworkNamespace.Evm,
-            coinType: DEFAULT_COIN_TYPE[SupportedEvmNetworkId.TestnetKycEvm],
+            coinType: DEFAULT_COIN_TYPE[SupportedIscNetworkId.TestnetKycEvm],
             aliasAddress: 'rms1pqva79scq8k0dz0hdhjvwh0v80pya4z66egruvkssdkxc3fmzy2z60adm9x',
             rpcEndpoint: 'https://fervent-lichterman.dune.spyce5.com/wasp/api/',
             apiEndpoint: 'https://fervent-lichterman.dune.spyce5.com/wasp/api/',
diff --git a/packages/shared/src/lib/core/network/constants/default-l1-evm-network-configuration.constant.ts b/packages/shared/src/lib/core/network/constants/default-l1-evm-network-configuration.constant.ts
new file mode 100644
index 0000000000..bac0a15dbd
--- /dev/null
+++ b/packages/shared/src/lib/core/network/constants/default-l1-evm-network-configuration.constant.ts
@@ -0,0 +1,31 @@
+import { ChainId } from '../enums'
+import { IPureEvmNetworkConfiguration } from '../interfaces'
+import { EvmNetworkId } from '../types'
+import { DEFAULT_COIN_TYPE } from './default-coin-type.constant'
+import { SupportedNetworkId } from './supported-network-id.constant'
+import { DEFAULT_EXPLORER_URLS } from '@core/network/constants/default-explorer-urls.constant'
+
+export const DEFAULT_L1_EVM_NETWORK_CONFIGURATION: Readonly<{
+    [key in EvmNetworkId]: IPureEvmNetworkConfiguration
+}> = {
+    [SupportedNetworkId.Ethereum]: <IPureEvmNetworkConfiguration>{
+        name: 'Ethereum',
+        symbol: 'ETH',
+        ticker: 'ETH',
+        id: SupportedNetworkId.Ethereum,
+        chainId: ChainId.Ethereum,
+        coinType: DEFAULT_COIN_TYPE[SupportedNetworkId.Ethereum],
+        explorerUrl: DEFAULT_EXPLORER_URLS[SupportedNetworkId.Ethereum],
+        rpcEndpoint: 'https://ethereum-rpc.publicnode.com',
+    },
+    [SupportedNetworkId.Sepolia]: <IPureEvmNetworkConfiguration>{
+        name: 'Sepolia Testnet',
+        symbol: 'ETH',
+        ticker: 'ETH',
+        id: SupportedNetworkId.Sepolia,
+        chainId: ChainId.Sepolia,
+        coinType: DEFAULT_COIN_TYPE[SupportedNetworkId.Sepolia],
+        explorerUrl: DEFAULT_EXPLORER_URLS[SupportedNetworkId.Sepolia],
+        rpcEndpoint: 'https://ethereum-sepolia-rpc.publicnode.com',
+    },
+}
diff --git a/packages/shared/src/lib/core/network/constants/default-network-metadata.constant.ts b/packages/shared/src/lib/core/network/constants/default-stardust-network-metadata.constant.ts
similarity index 86%
rename from packages/shared/src/lib/core/network/constants/default-network-metadata.constant.ts
rename to packages/shared/src/lib/core/network/constants/default-stardust-network-metadata.constant.ts
index a48a81ede3..006dce47c0 100644
--- a/packages/shared/src/lib/core/network/constants/default-network-metadata.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/default-stardust-network-metadata.constant.ts
@@ -1,13 +1,14 @@
 import { NetworkNamespace, StardustNetworkName } from '../enums'
 import { IStardustNetworkMetadata } from '../interfaces'
-import { NetworkMetadata, StardustNetworkId } from '../types'
+import { StardustNetworkId } from '../types'
 import { DEFAULT_BASE_TOKEN } from './default-base-token.constant'
 import { DEFAULT_COIN_TYPE } from './default-coin-type.constant'
 import { DEFAULT_PROTOCOL } from './default-protocol.constant'
 import { SupportedNetworkId } from './supported-network-id.constant'
 
-// TODO: Should this be reverted back to a object with all metadata for any network (or evmNetwork?)
-export const DEFAULT_NETWORK_METADATA: Readonly<{ [key in StardustNetworkId]?: NetworkMetadata }> = {
+export const DEFAULT_STARDUST_NETWORK_METADATA: Readonly<{
+    [key in StardustNetworkId]: IStardustNetworkMetadata
+}> = {
     [SupportedNetworkId.Iota]: <IStardustNetworkMetadata>{
         id: SupportedNetworkId.Iota,
         name: 'IOTA',
diff --git a/packages/shared/src/lib/core/network/constants/index.ts b/packages/shared/src/lib/core/network/constants/index.ts
index 2c95827689..80e045a573 100644
--- a/packages/shared/src/lib/core/network/constants/index.ts
+++ b/packages/shared/src/lib/core/network/constants/index.ts
@@ -3,13 +3,15 @@
  * break the dependency flow. It MUST be exported first!
  */
 export * from './default-coin-type.constant'
+
 export * from './default-bech32-hrp.constant'
 export * from './network-statuses-poll-interval.constant'
 export * from './default-base-token.constant'
-export * from './default-evm-network-configurations.constant'
+export * from './default-isc-network-configurations-per-stardust-network.constant'
+export * from './default-l1-evm-network-configuration.constant'
 export * from './default-explorer-urls.constant'
 export * from './default-protocol.constant'
-export * from './default-network-metadata.constant'
+export * from './default-stardust-network-metadata.constant'
 export * from './default-node-urls.constant'
 export * from './empty-node.constant'
 export * from './explorer-endpoints.constant'
diff --git a/packages/shared/src/lib/core/network/constants/supported-network-id.constant.ts b/packages/shared/src/lib/core/network/constants/supported-network-id.constant.ts
index 7a3227fbb0..653cd8771e 100644
--- a/packages/shared/src/lib/core/network/constants/supported-network-id.constant.ts
+++ b/packages/shared/src/lib/core/network/constants/supported-network-id.constant.ts
@@ -9,10 +9,17 @@ export const SupportedStardustNetworkId: Record<string, StardustNetworkId> = {
     Testnet: `${NetworkNamespace.Stardust}:${StardustNetworkName.Testnet}`,
 }
 
-export const SupportedEvmNetworkId: Record<string, EvmNetworkId> = {
+export const SupportedL1EvmNetworkId = {
+    Ethereum: `${NetworkNamespace.Evm}:${ChainId.Ethereum}`,
+    Sepolia: `${NetworkNamespace.Evm}:${ChainId.Sepolia}`,
+}
+
+export const SupportedL1NetworkIds = { ...SupportedStardustNetworkId, ...SupportedL1EvmNetworkId }
+
+export const SupportedIscNetworkId: Record<string, EvmNetworkId> = {
     ShimmerEvm: `${NetworkNamespace.Evm}:${ChainId.ShimmerEvm}`,
     TestnetEvm: `${NetworkNamespace.Evm}:${ChainId.TestnetEvm}`,
     TestnetKycEvm: `${NetworkNamespace.Evm}:${ChainId.TestnetKycEvm}`,
 }
 
-export const SupportedNetworkId = { ...SupportedStardustNetworkId, ...SupportedEvmNetworkId }
+export const SupportedNetworkId = { ...SupportedStardustNetworkId, ...SupportedIscNetworkId }
diff --git a/packages/shared/src/lib/core/network/enums/chain-id.enum.ts b/packages/shared/src/lib/core/network/enums/chain-id.enum.ts
index 8344cbeb4b..c1dd323f0c 100644
--- a/packages/shared/src/lib/core/network/enums/chain-id.enum.ts
+++ b/packages/shared/src/lib/core/network/enums/chain-id.enum.ts
@@ -1,5 +1,7 @@
 export enum ChainId {
+    Ethereum = '1',
     ShimmerEvm = '148',
     TestnetEvm = '1073',
     TestnetKycEvm = '54432',
+    Sepolia = '11155111',
 }
diff --git a/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts b/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts
index 4e07b110af..0f62cdc2ac 100644
--- a/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/evm-network-configuration.interface.ts
@@ -14,7 +14,7 @@ export interface IPureEvmNetworkConfiguration extends IBaseEvmNetworkConfigurati
     ticker: string
 }
 
-interface IBaseEvmNetworkConfiguration {
+export interface IBaseEvmNetworkConfiguration {
     id: EvmNetworkId
     namespace: NetworkNamespace.Evm
     chainId: ChainId
diff --git a/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
index ac0ffe8b91..2e3ad382aa 100644
--- a/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/evm-network.interface.ts
@@ -7,6 +7,13 @@ import { IEvmNetworkStatus } from './evm-network-status.interface'
 import { EvmNetworkType, ChainId, NetworkNamespace } from '../enums'
 import { IBaseNetwork } from './base-network.interface'
 
+export interface IIscpEvmNetwork extends IEvmNetwork {
+    apiEndpoint: string
+    aliasAddress: string
+    getMetadata(): Promise<ChainMetadata>
+    getGasEstimate(hex: string): Promise<bigint>
+}
+
 export interface IEvmNetwork extends IBaseNetwork {
     id: EvmNetworkId
     namespace: NetworkNamespace.Evm
@@ -14,15 +21,11 @@ export interface IEvmNetwork extends IBaseNetwork {
     type: EvmNetworkType
     explorerUrl: string | undefined
     rpcEndpoint: string
-    apiEndpoint: string
-    aliasAddress: string
 
     provider: Web3Provider
 
     getStatus(): IEvmNetworkStatus
 
-    getMetadata(): Promise<ChainMetadata>
     getContract(type: ContractType, address: string): Contract
     getLatestBlock(): Promise<IBlock>
-    getGasEstimate(hex: string): Promise<bigint>
 }
diff --git a/packages/shared/src/lib/core/network/interfaces/persisted-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/persisted-network.interface.ts
index 51037a1561..165bf49d77 100644
--- a/packages/shared/src/lib/core/network/interfaces/persisted-network.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/persisted-network.interface.ts
@@ -1,5 +1,11 @@
-import { EvmNetworkConfiguration, NetworkMetadata } from '../types'
+import {
+    IIscpEvmNetworkConfiguration,
+    IPureEvmNetworkConfiguration,
+    IStardustNetworkMetadata,
+} from '@core/network/interfaces'
 
-export interface IPersistedNetwork extends NetworkMetadata {
-    chainConfigurations: EvmNetworkConfiguration[]
+export interface IPersistedStardustNetwork extends IStardustNetworkMetadata {
+    chainConfigurations: IIscpEvmNetworkConfiguration[]
 }
+
+export type IPersistedNetwork = IPersistedStardustNetwork | IPureEvmNetworkConfiguration
diff --git a/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts b/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts
index 02400fe937..a1512e5d21 100644
--- a/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts
+++ b/packages/shared/src/lib/core/network/interfaces/stardust-network.interface.ts
@@ -1,16 +1,16 @@
-import { IBaseNetwork } from './base-network.interface'
 import { NetworkNamespace } from '../enums'
-import { EvmNetworkConfiguration, NetworkId } from '../types'
+import { NetworkId } from '../types'
 import { IEvmNetwork } from './evm-network.interface'
 import { INetworkStatus } from './network-status.interface'
+import { IIscpEvmNetworkConfiguration, IPersistedStardustNetwork } from '@core/network'
 
-export interface IStardustNetwork extends IBaseNetwork {
+export interface IStardustNetwork extends IPersistedStardustNetwork {
     namespace: NetworkNamespace.Stardust
     bech32Hrp: string
 
     getStatus(): INetworkStatus
 
-    addChain(chainConfiguration: EvmNetworkConfiguration): IEvmNetwork
-    editChain(networkId: NetworkId, payload: Partial<EvmNetworkConfiguration>): Promise<void>
+    addChain(chainConfiguration: IIscpEvmNetworkConfiguration): IEvmNetwork
+    editChain(networkId: NetworkId, payload: Partial<IIscpEvmNetworkConfiguration>): Promise<void>
     removeChain(networkId: NetworkId): void
 }
diff --git a/packages/shared/src/lib/core/network/stores/networks.store.ts b/packages/shared/src/lib/core/network/stores/networks.store.ts
index bd200d4dad..2c8d95c54b 100644
--- a/packages/shared/src/lib/core/network/stores/networks.store.ts
+++ b/packages/shared/src/lib/core/network/stores/networks.store.ts
@@ -3,7 +3,7 @@ import { Readable, derived, get } from 'svelte/store'
 import { activeProfile } from '@core/profile/stores'
 
 import { IscpChain, StardustNetwork } from '../classes'
-import { IEvmNetwork, IStardustNetwork } from '../interfaces'
+import { IEvmNetwork, IIscpEvmNetwork, IStardustNetwork } from '../interfaces'
 import { Network, NetworkId } from '../types'
 import { EvmNetworkType, NetworkNamespace } from '../enums'
 
@@ -12,16 +12,9 @@ export const networks: Readable<Network[] | undefined> = derived([activeProfile]
         const stardustNetwork = new StardustNetwork($activeProfile.network)
         const chains = $activeProfile.network.chainConfigurations
             .map((chainConfiguration) => {
-                switch (chainConfiguration.type) {
-                    case EvmNetworkType.Iscp:
-                        return new IscpChain(chainConfiguration)
-                    case EvmNetworkType.PureEvm:
-                        return undefined
-                    default:
-                        return undefined
-                }
+                return new IscpChain(chainConfiguration)
             })
-            .filter(Boolean) as IEvmNetwork[]
+            .filter(Boolean) as IscpChain[]
         return [stardustNetwork, ...chains]
     } else {
         return undefined
@@ -32,7 +25,7 @@ export function getNetwork(networkId: NetworkId): Network | undefined {
     return get(networks)?.find((network) => network.id === networkId)
 }
 
-export function getL1Network(): IStardustNetwork {
+export function getStardustNetwork(): IStardustNetwork {
     const l1Network = get(networks)?.find(
         (network) => network.namespace === NetworkNamespace.Stardust
     ) as IStardustNetwork
@@ -46,7 +39,7 @@ export function getEvmNetworks(): IEvmNetwork[] {
     return (get(networks)?.filter((network) => network.namespace === NetworkNamespace.Evm) as IEvmNetwork[]) ?? []
 }
 
-export function getEvmNetwork(networkId: NetworkId): IEvmNetwork | undefined {
+export function getEvmNetwork(networkId: NetworkId): IIscpEvmNetwork | undefined {
     return get(networks)?.find(
         (network) => network.namespace === NetworkNamespace.Evm && network.id === networkId
     ) as IEvmNetwork
diff --git a/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts b/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
index 5ee59474f3..bee876dc0c 100644
--- a/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
+++ b/packages/shared/src/lib/core/network/utils/buildPersistedNetworkFromNodeInfoResponse.ts
@@ -1,26 +1,27 @@
 import { localize } from '@core/i18n'
 import {
-    DEFAULT_EVM_NETWORK_CONFIGURATIONS,
+    DEFAULT_ISC_NETWORK_CONFIGURATIONS_PER_STARDUST_NETWORK,
     DEFAULT_COIN_TYPE,
-    DEFAULT_NETWORK_METADATA,
+    DEFAULT_STARDUST_NETWORK_METADATA,
     TEST_COIN_TYPE,
 } from '../constants'
 import { TokenStandard } from '@core/token/enums'
-import { INodeInfoResponse, IPersistedNetwork } from '../interfaces'
+import { INodeInfoResponse, IPersistedStardustNetwork } from '../interfaces'
 import { NetworkNamespace } from '../enums'
 import { StardustNetworkId } from '../types'
 
+// TODO: Rename to reflect return type
 export function buildPersistedNetworkFromNodeInfoResponse(
     nodeInfoResponse: INodeInfoResponse,
     coinType?: number
-): IPersistedNetwork {
+): IPersistedStardustNetwork {
     const networkName = nodeInfoResponse?.nodeInfo?.protocol.networkName
     const id: StardustNetworkId = `${NetworkNamespace.Stardust}:${networkName}`
     const namespace = NetworkNamespace.Stardust
-    const name = DEFAULT_NETWORK_METADATA[id]?.name ?? networkName ?? localize('general.unknown')
+    const name = DEFAULT_STARDUST_NETWORK_METADATA[id]?.name ?? networkName ?? localize('general.unknown')
     const _coinType = coinType ?? DEFAULT_COIN_TYPE[id] ?? TEST_COIN_TYPE
 
-    const chainConfigurations = DEFAULT_EVM_NETWORK_CONFIGURATIONS?.[id] ?? []
+    const chainConfigurations = DEFAULT_ISC_NETWORK_CONFIGURATIONS_PER_STARDUST_NETWORK?.[id] ?? []
     return {
         id,
         name,
diff --git a/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts b/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts
index 8adf62b0c2..8cbf9c79dd 100644
--- a/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts
+++ b/packages/shared/src/lib/core/network/utils/getDefaultPersistedNetwork.ts
@@ -1,10 +1,15 @@
-import { DEFAULT_EVM_NETWORK_CONFIGURATIONS, DEFAULT_NETWORK_METADATA } from '../constants'
+import {
+    DEFAULT_ISC_NETWORK_CONFIGURATIONS_PER_STARDUST_NETWORK,
+    DEFAULT_STARDUST_NETWORK_METADATA,
+} from '../constants'
 import { StardustNetworkId } from '../types'
 import { IPersistedNetwork } from '../interfaces'
 
 export function getDefaultPersistedNetwork(networkId: StardustNetworkId): IPersistedNetwork {
-    const network = structuredClone(DEFAULT_NETWORK_METADATA?.[networkId])
-    const chainConfigurations = structuredClone(DEFAULT_EVM_NETWORK_CONFIGURATIONS?.[networkId] ?? [])
+    const network = structuredClone(DEFAULT_STARDUST_NETWORK_METADATA?.[networkId])
+    const chainConfigurations = structuredClone(
+        DEFAULT_ISC_NETWORK_CONFIGURATIONS_PER_STARDUST_NETWORK?.[networkId] ?? []
+    )
     if (network) {
         return {
             ...network,
diff --git a/packages/shared/src/lib/core/profile/actions/active-profile/checkActiveProfileAuth.ts b/packages/shared/src/lib/core/profile/actions/active-profile/checkActiveProfileAuth.ts
index 2f4c6f98c0..bfd4bda0b8 100644
--- a/packages/shared/src/lib/core/profile/actions/active-profile/checkActiveProfileAuth.ts
+++ b/packages/shared/src/lib/core/profile/actions/active-profile/checkActiveProfileAuth.ts
@@ -1,12 +1,12 @@
 import { checkOrConnectLedger } from '@core/ledger/actions'
 import { LedgerAppName } from '@core/ledger/enums'
-import { SupportedNetworkId } from '@core/network'
-import { activeProfile, isActiveLedgerProfile, isSoftwareProfile } from '@core/profile/stores'
+import { getStardustNetwork, SupportedNetworkId } from '@core/network'
+import { isActiveLedgerProfile, isSoftwareProfile } from '@core/profile/stores'
 import { checkOrUnlockStronghold } from '@core/stronghold/actions'
 import { get } from 'svelte/store'
 
 export async function checkActiveProfileAuth(
-    ledgerAppName: LedgerAppName = get(activeProfile)?.network?.id === SupportedNetworkId.Iota
+    ledgerAppName: LedgerAppName = getStardustNetwork()?.id === SupportedNetworkId.Iota
         ? LedgerAppName.Iota
         : LedgerAppName.Shimmer
 ): Promise<void> {
diff --git a/packages/shared/src/lib/core/profile/interfaces/persisted-profile.interface.ts b/packages/shared/src/lib/core/profile/interfaces/persisted-profile.interface.ts
index 8a0f11d0d4..8a600592a6 100644
--- a/packages/shared/src/lib/core/profile/interfaces/persisted-profile.interface.ts
+++ b/packages/shared/src/lib/core/profile/interfaces/persisted-profile.interface.ts
@@ -1,5 +1,5 @@
 import { IPersistedAccountData } from '@core/account/interfaces'
-import { IClientOptions, IPersistedNetwork } from '@core/network/interfaces'
+import { IClientOptions, IPersistedStardustNetwork } from '@core/network/interfaces'
 import { Nft } from '@core/nfts/interfaces'
 import { StrongholdVersion } from '@core/stronghold/enums'
 import { ProfileType } from '../enums'
@@ -15,7 +15,7 @@ export interface IPersistedProfile {
     version: number
     name: string
     type: ProfileType
-    network: IPersistedNetwork
+    network: IPersistedStardustNetwork
     lastStrongholdBackupTime?: Date
     settings: IProfileSettings
     accountPersistedData: {
diff --git a/packages/shared/src/lib/core/wallet/utils/getOutputParameters.ts b/packages/shared/src/lib/core/wallet/utils/getOutputParameters.ts
index b4edc4113a..8fbf6fdfa4 100644
--- a/packages/shared/src/lib/core/wallet/utils/getOutputParameters.ts
+++ b/packages/shared/src/lib/core/wallet/utils/getOutputParameters.ts
@@ -1,6 +1,6 @@
 import { OutputParams, Assets } from '@iota/sdk/out/types'
 import { getLayer2MetadataForTransfer } from '@core/layer-2/actions'
-import { EvmNetworkType, IEvmNetwork, getEvmNetwork, isEvmNetwork } from '@core/network'
+import { EvmNetworkType, IEvmNetwork, IIscpEvmNetwork, getEvmNetwork, isEvmNetwork } from '@core/network'
 import { BASE_TOKEN_ID } from '@core/token'
 import { Converter, convertDateToUnixTimestamp } from '@core/utils'
 import { SendFlowParameters, Subject } from '@core/wallet/types'
@@ -49,7 +49,7 @@ export function getOutputParameters(sendFlowParameters: SendFlowParameters, send
     }
 }
 
-function getDestinationAddress(recipient: Subject | undefined, evmNetwork: IEvmNetwork | undefined): string {
+function getDestinationAddress(recipient: Subject | undefined, evmNetwork: IIscpEvmNetwork | undefined): string {
     if (evmNetwork?.type === EvmNetworkType.Iscp) {
         return evmNetwork.aliasAddress
     }