Merge remote-tracking branch 'origin/develop' into release/desktop-sh…

…immer-2.1.16
iotaledger · Jun 24, 2024 · ed6e157 · ed6e157
2 parents 8e28a5d + 4aa921d
commit ed6e157
Show file tree

Hide file tree

Showing 11 changed files with 1,142 additions and 1,124 deletions.
diff --git a/package.json b/package.json
@@ -5,10 +5,10 @@
         "packages/shared"
     ],
     "devDependencies": {
-        "@babel/eslint-parser": "^7.22.15",
+        "@babel/eslint-parser": "^7.24.7",
         "@types/node": "^18.15.11",
         "@typescript-eslint/eslint-plugin": "^5.58.0",
-        "@typescript-eslint/parser": "^5.57.1",
+        "@typescript-eslint/parser": "^5.62.0",
         "eslint": "^8.42.0",
         "eslint-plugin-security": "^1.4.0",
         "eslint-plugin-svelte3": "^4.0.0",

diff --git a/packages/desktop/components/modals/AccountActionsMenu.svelte b/packages/desktop/components/modals/AccountActionsMenu.svelte
@@ -84,7 +84,7 @@
                 onClick={onViewAddressHistoryClick}
             />
         {/if}
-        {#if $activeProfile?.network?.id === NetworkId.Shimmer || $activeProfile?.network?.id === NetworkId.ShimmerTestnet || $activeProfile?.network?.id === NetworkId.IotaTestnet}
+        {#if $activeProfile?.network?.id === NetworkId.Shimmer || $activeProfile?.network?.id === NetworkId.ShimmerTestnet || $activeProfile?.network?.id === NetworkId.IotaTestnet || $activeProfile?.network?.id === NetworkId.Iota}
             <MenuItem icon={Icon.Transfer} title={localize('actions.withdrawFromL2')} onClick={onWithdrawFromL2Click} />
         {/if}
         <MenuItem icon={Icon.Customize} title={localize('actions.customizeAcount')} onClick={onCustomiseAccountClick} />

diff --git a/packages/desktop/package.json b/packages/desktop/package.json
@@ -56,7 +56,7 @@
         "node-loader": "^2.0.0",
         "npm-run-all": "^4.1.5",
         "postcss-url": "^10.1.2",
-        "ts-node": "^10.9.1",
+        "ts-node": "^10.9.2",
         "typescript": "^5.0.3",
         "webpack": "^5.89.0",
         "webpack-cli": "^5.1.4",

diff --git a/packages/shared/lib/core/layer-2/enums/destination-network.enum.ts b/packages/shared/lib/core/layer-2/enums/destination-network.enum.ts
@@ -3,4 +3,5 @@ export enum DestinationNetwork {
     Shimmer = 'Shimmer',
     ShimmerEvm = 'ShimmerEVM',
     ShimmerEvmTestnet = 'ShimmerEVM Testnet',
+    IOTAEVM = 'IOTA EVM',
 }
diff --git a/packages/shared/lib/core/network/constants/default-chain-configurations.constant.ts b/packages/shared/lib/core/network/constants/default-chain-configurations.constant.ts
@@ -22,6 +22,15 @@ export const DEFAULT_CHAIN_CONFIGURATIONS: Readonly<{ [id in NetworkId]?: ChainM
             'https://api.evm.testnet.shimmer.network/v1/chains/rms1ppp00k5mmd2m8my8ukkp58nd3rskw6rx8l09aj35984k74uuc5u2cywn3ex',
         archiveEndpoint: 'https://archive.evm.testnet.shimmer.network',
     },
+    [NetworkId.Iota]: {
+        type: ChainType.Iscp,
+        name: DestinationNetwork.IOTAEVM,
+        chainId: ChainId.IOTAEVM,
+        aliasAddress: 'iota1pzt3mstq6khgc3tl0mwuzk3eqddkryqnpdxmk4nr25re2466uxwm28qqxu5',
+        iscpEndpoint:
+            'https://api.evm.iotaledger.net/v1/chains/iota1pzt3mstq6khgc3tl0mwuzk3eqddkryqnpdxmk4nr25re2466uxwm28qqxu5',
+        archiveEndpoint: 'https://archive.evm.iotaledger.net',
+    },
     [NetworkId.IotaTestnet]: {
         type: ChainType.Iscp,
         name: DestinationNetwork.IotaEvmTestnet,

diff --git a/packages/shared/lib/core/network/enums/chain-id.enum.ts b/packages/shared/lib/core/network/enums/chain-id.enum.ts
@@ -2,5 +2,6 @@ export enum ChainId {
     Layer1 = 0,
     ShimmerEVM = 148,
     ShimmerEVMTestnet = 1073,
+    IOTAEVM = 8822,
     IotaEVMTestnet = 1075,
 }
diff --git a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts
@@ -74,6 +74,7 @@ const persistedProfileMigrationsMap: Record<number, (existingProfile: unknown) =
     15: persistedProfileMigrationToV16,
     16: persistedProfileMigrationToV17,
     17: persistedProfileMigrationToV18,
+    18: persistedProfileMigrationToV19,
 }
 
 function persistedProfileMigrationToV4(existingProfile: unknown): void {
@@ -332,7 +333,6 @@ function persistedProfileMigrationToV17(existingProfile: IPersistedProfile): voi
     existingProfile.network.chains = newChains
     saveProfile(existingProfile)
 }
-
 /*
  * Migration 18
  * Change from 1 testnet to 2: Shimmer Testnet (what we knew as Testnet) & IOTA Testnet.
@@ -345,3 +345,10 @@ function persistedProfileMigrationToV18(existingProfile: IPersistedProfile): voi
     }
     saveProfile(existingProfile)
 }
+
+function persistedProfileMigrationToV19(existingProfile: IPersistedProfile): void {
+    const defaultChainConfig = DEFAULT_CHAIN_CONFIGURATIONS[existingProfile.network.id]
+    const newChains: IIscpChainMetadata[] = defaultChainConfig ? [defaultChainConfig] : []
+    existingProfile.network.chains = newChains
+    saveProfile(existingProfile)
+}
diff --git a/packages/shared/lib/core/profile/constants/profile-version.constant.ts b/packages/shared/lib/core/profile/constants/profile-version.constant.ts
@@ -1 +1 @@
-export const PROFILE_VERSION = 18
+export const PROFILE_VERSION = 19
diff --git a/packages/shared/locales/tr.json b/packages/shared/locales/tr.json
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -36,13 +36,13 @@
         "jest-environment-jsdom": "^29.5.0",
         "postcss": "^8.4.31",
         "postcss-cli": "^11.0.0",
-        "prettier": "3.2.5",
+        "prettier": "3.3.2",
         "prettier-plugin-svelte": "^3.0.3",
         "sass": "^1.76.0",
-        "svelte-check": "^3.4.5",
+        "svelte-check": "^3.8.1",
         "svelte-loader": "^3.1.9",
         "svelte-preprocess": "^5.0.4",
-        "tailwindcss": "^3.3.2",
+        "tailwindcss": "^3.4.4",
         "tslib": "^2.0.1",
         "typescript": "^5.0.3",
         "valid-url": "^1.0.9",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const PROFILE_VERSION = 18
		export const PROFILE_VERSION = 19