Merge pull request #8592 from iotaledger/release/desktop-iota-2.0.12

release: desktop iota 2.0.12
iotaledger · Aug 6, 2024 · 0faac35 · 0faac35
2 parents 7a11f58 + d7a1c4f
commit 0faac35
Show file tree

Hide file tree

Showing 58 changed files with 2,381 additions and 1,552 deletions.
diff --git a/.github/workflows/build-and-release-desktop.yml b/.github/workflows/build-and-release-desktop.yml
@@ -57,7 +57,7 @@ jobs:
         needs: [setup]
         strategy:
             matrix:
-                os: [ubuntu-20.04, macos-11, windows-2019]
+                os: [ubuntu-20.04, macos-12, windows-2019]
             fail-fast: true
         env:
             VERSION: ${{ needs.setup.outputs.version }}
@@ -96,7 +96,7 @@ jobs:
 
             - name: Set deployment target (macOS)
               run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV # TODO: set this to 10.12 once rocksDB issue is fixed
-              if: matrix.os == 'macos-11'
+              if: matrix.os == 'macos-12'
 
             - name: Install required packages (Linux)
               run: |
@@ -146,7 +146,7 @@ jobs:
                   APPLE_ID: ${{ secrets.APPLE_ID }}
                   APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
               working-directory: packages/desktop
-              if: matrix.os == 'macos-11'
+              if: matrix.os == 'macos-12'
 
             - name: Build Electron app (Windows)
               run: yarn compile:${env:STAGE}:win
@@ -185,7 +185,7 @@ jobs:
             - name: Compute checksums (macOS)
               run: for i in `ls | grep 'firefly-*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done
               working-directory: packages/desktop/out
-              if: matrix.os == 'macos-11'
+              if: matrix.os == 'macos-12'
 
             - name: Compute checksums (Windows)
               run: Get-ChildItem "." -Filter firefly-* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') }
@@ -224,7 +224,7 @@ jobs:
             - name: Downloading artifacts
               uses: actions/download-artifact@v2
               with:
-                  name: firefly-desktop-macos-11
+                  name: firefly-desktop-macos-12
                   path: assets
 
             - name: Downloading artifacts

diff --git a/.github/workflows/build-desktop-test.v1.yml b/.github/workflows/build-desktop-test.v1.yml
@@ -11,7 +11,7 @@ jobs:
     if: ${{ always() }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, macos-11, windows-2019]
+        os: [ubuntu-18.04, macos-12, windows-2019]
       fail-fast: true
     env:
       VERSION: '1.7.2-test'
@@ -51,7 +51,7 @@ jobs:
 
       - name: Set deployment target (macOS)
         run: echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
 
       - name: Install required packages (Linux)
         run: |
@@ -83,7 +83,7 @@ jobs:
       - name: Install Sentry CLI
         # Yarn has issues putting binaries in the PATH on Windows
         run: npm i -g @sentry/cli
-        if: ${{ startsWith(github.ref, 'refs/tags/desktop') && matrix.os != 'macos-11' }}
+        if: ${{ startsWith(github.ref, 'refs/tags/desktop') && matrix.os != 'macos-12' }}
 
       #    - name: Strip backend debug info and upload to Sentry (Linux)
       #      run: |
@@ -131,7 +131,7 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
         working-directory: packages/desktop
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
 
       - name: Build Electron app (Windows)
         run: yarn compile:${env:STAGE}:win
@@ -170,7 +170,7 @@ jobs:
       - name: Compute checksums (macOS)
         run: for i in `ls | grep 'firefly-desktop*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done
         working-directory: packages/desktop/out
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
 
       - name: Compute checksums (Windows)
         run: Get-ChildItem "." -Filter firefly-desktop* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') }

diff --git a/.github/workflows/build-desktop-test.v2.yml b/.github/workflows/build-desktop-test.v2.yml
@@ -11,7 +11,7 @@ jobs:
     if: ${{ always() }}
     strategy:
       matrix:
-        os: [ ubuntu-20.04, macos-11, windows-2019 ]
+        os: [ ubuntu-20.04, macos-12, windows-2019 ]
       fail-fast: true
     env:
       VERSION: '2.1.3-test'
@@ -50,7 +50,7 @@ jobs:
 
       - name: Set deployment target (macOS)
         run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV # TODO: set this to 10.12 once rocksDB issue is fixed
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
 
       - name: Install required packages (Linux)
         run: |
@@ -100,7 +100,7 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
         working-directory: packages/desktop
-        if: matrix.os == 'macos-11'
+        if: matrix.os == 'macos-12'
 
       - name: Build Electron app (Windows)
         run: yarn compile:${env:STAGE}:win

diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
@@ -11,7 +11,7 @@ on:
                 required: true
                 type: choice
                 options:
-                    - macos-11
+                    - macos-12
                     - ubuntu-20.04
                     - windows-2019
             stage:
@@ -68,7 +68,7 @@ jobs:
 
             - name: Set deployment target (macOS)
               run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV # TODO: set this to 10.12 once rocksDB issue is fixed
-              if: matrix.os == 'macos-11'
+              if: matrix.os == 'macos-12'
 
             - name: Install required packages (Linux)
               run: |
@@ -118,7 +118,7 @@ jobs:
                   APPLE_ID: ${{ secrets.APPLE_ID }}
                   APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
               working-directory: packages/desktop
-              if: matrix.os == 'macos-11'
+              if: matrix.os == 'macos-12'
 
             - name: Build Electron app (Windows)
               run: yarn compile:${env:STAGE}:win
@@ -157,7 +157,7 @@ jobs:
             - name: Compute checksums (macOS)
               run: for i in `ls | grep 'firefly-*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done
               working-directory: packages/desktop/out
-              if: matrix.os == 'macos-11'
+              if: matrix.os == 'macos-12'
 
             - name: Compute checksums (Windows)
               run: Get-ChildItem "." -Filter firefly-* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') }

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/package.json b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
     "name": "desktop",
     "productName": "Firefly IOTA",
-    "version": "2.0.11",
+    "version": "2.0.12",
     "description": "Official wallet application of Shimmer",
     "main": "public/build/main.js",
     "repository": "[email protected]:iotaledger/firefly.git",
@@ -44,10 +44,10 @@
     "devDependencies": {
         "@sentry/webpack-plugin": "^2.8.0",
         "@tsconfig/svelte": "^4.0.1",
-        "@types/webpack": "^5.28.1",
-        "copy-webpack-plugin": "^11.0.0",
+        "@types/webpack": "^5.28.5",
+        "copy-webpack-plugin": "^12.0.2",
         "cross-env": "^7.0.2",
-        "css-loader": "^6.7.3",
+        "css-loader": "^7.1.1",
         "electron": "27.0.2",
         "electron-builder": "^24.6.4",
         "esbuild-loader": "^4.0.2",
@@ -56,10 +56,10 @@
         "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.82.0",
+        "webpack": "^5.89.0",
         "webpack-cli": "^5.1.4",
-        "webpack-dev-server": "^4.0.0"
+        "webpack-dev-server": "^5.0.4"
     }
 }
diff --git a/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte b/packages/shared/components/labels/TogglableAssetBalanceLabel.svelte
@@ -3,12 +3,15 @@
     import { formatTokenAmountBestMatch, IAsset } from '@core/wallet'
     import { formatCurrency, localize } from '@core/i18n'
     import { getMarketAmountFromAssetValue } from '@core/market/utils'
+    import { NetworkId } from '@core/network'
+    import { activeProfile } from '@core/profile'
 
     export let asset: IAsset
 
     $: availableMarketValue = getMarketAmountFromAssetValue(asset?.balance?.available, asset)
     $: totalMarketValue = getMarketAmountFromAssetValue(asset?.balance?.total, asset)
     $: disabled = Number.isNaN(totalMarketValue) || Number.isNaN(availableMarketValue)
+    $: isCustomNetwork = $activeProfile?.network?.id === NetworkId.Custom
 
     let isToggled = false
     function toggle(): void {
@@ -20,16 +23,17 @@
     <button on:click={toggle} type="button" {disabled}>
         <div class="flex flex-col flex-wrap items-start space-y-1">
             <Text type={TextType.h1} fontWeight={FontWeight.semibold}>
-                {isToggled
+                {isToggled && !isCustomNetwork
                     ? formatCurrency(totalMarketValue)
                     : formatTokenAmountBestMatch(asset?.balance?.total, asset?.metadata)}
             </Text>
             <Text type={TextType.p} fontWeight={FontWeight.medium} color="gray-600" darkColor="gray-500">
                 {localize('general.availableBalanceWithValue', {
                     values: {
-                        balance: isToggled
-                            ? formatCurrency(availableMarketValue)
-                            : formatTokenAmountBestMatch(asset?.balance?.available, asset?.metadata),
+                        balance:
+                            isToggled && !isCustomNetwork
+                                ? formatCurrency(availableMarketValue)
+                                : formatTokenAmountBestMatch(asset?.balance?.available, asset?.metadata),
                     },
                 })}
             </Text>

diff --git a/packages/shared/lib/core/network/constants/official-node-urls.constant.ts b/packages/shared/lib/core/network/constants/official-node-urls.constant.ts
@@ -4,6 +4,6 @@ export const OFFICIAL_NODE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = {
     [NetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],
     [NetworkId.IotaTestnet]: ['https://api.testnet.iotaledger.net'],
     [NetworkId.IotaAlphanet]: ['https://api.iota-alphanet.iotaledger.net'],
-    [NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'],
+    [NetworkId.Shimmer]: ['https://api.shimmer.network'],
     [NetworkId.ShimmerTestnet]: ['https://api.testnet.shimmer.network'],
 }
diff --git a/packages/shared/lib/core/network/tests/network.test.ts b/packages/shared/lib/core/network/tests/network.test.ts
@@ -24,7 +24,7 @@ describe('File: network.ts', () => {
         [NetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],
         [NetworkId.IotaTestnet]: ['https://api.testnet.iotaledger.net'],
         [NetworkId.IotaAlphanet]: ['https://api.iota-alphanet.iotaledger.net'],
-        [NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'],
+        [NetworkId.Shimmer]: ['https://api.shimmer.network'],
         [NetworkId.ShimmerTestnet]: ['https://api.testnet.shimmer.network'],
     }
 

diff --git a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts
@@ -4,6 +4,7 @@ import {
     DEFAULT_CHAIN_CONFIGURATIONS,
     DEFAULT_MAX_PARALLEL_API_REQUESTS,
     getDefaultPersistedNetwork,
+    getOfficialNodes,
     IIscpChainMetadata,
     NetworkId,
 } from '@core/network'
@@ -81,6 +82,7 @@ const persistedProfileMigrationsMap: Record<number, (existingProfile: unknown) =
     16: persistedProfileMigrationToV17,
     17: persistedProfileMigrationToV18,
     18: persistedProfileMigrationToV19,
+    19: persistedProfileMigrationToV20,
 }
 
 function persistedProfileMigrationToV4(existingProfile: unknown): void {
@@ -371,3 +373,23 @@ function persistedProfileMigrationToV19(existingProfile: IPersistedProfile): voi
     existingProfile.network.chains = newChains
     saveProfile(existingProfile)
 }
+
+/*
+ * Migration 20
+ * Remove Tanglebay SMR node from the list of nodes.
+ */
+function persistedProfileMigrationToV20(existingProfile: IPersistedProfile): void {
+    const DEPRECATED_NODE_URL = 'https://shimmer-node.tanglebay.com'
+    const OFFICIAL_NODES = getOfficialNodes(existingProfile.network.id)
+
+    const nodes = existingProfile.clientOptions.nodes ?? []
+    existingProfile.clientOptions.nodes = nodes.filter((node) => node.url !== DEPRECATED_NODE_URL)
+    if (!existingProfile.clientOptions.nodes?.length) {
+        existingProfile.clientOptions.nodes = OFFICIAL_NODES
+    }
+    const primaryNode = existingProfile.clientOptions.primaryNode
+    if (primaryNode?.url === DEPRECATED_NODE_URL) {
+        existingProfile.clientOptions.primaryNode = undefined
+    }
+    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 = 19
+export const PROFILE_VERSION = 20
diff --git a/packages/shared/locales/af.json b/packages/shared/locales/af.json
@@ -30,14 +30,18 @@
                         "title": "Shimmer",
                         "body": "Staging network for IOTA"
                     },
-                    "testnet": {
-                        "title": "Testnet",
-                        "body": "Public beta network for Shimmer"
+                    "shimmerTestnet": {
+                        "title": "Shimmer Testnet",
+                        "body": "Public testnet network for Shimmer"
                     },
                     "iota": {
                         "title": "IOTA",
                         "body": "IOTA Mainnet"
                     },
+                    "iotaTestnet": {
+                        "title": "IOTA Testnet",
+                        "body": "Public testnet network for Mainnet"
+                    },
                     "iotaAlphanet": {
                         "title": "IOTA Alphanet",
                         "body": "IOTA Alphanet"
@@ -1245,22 +1249,24 @@
             "iota": "Restore IOTA profile",
             "iotaAlphanet": "Restore IOTA Alphanet profile",
             "shimmer": "Restore Shimmer profile",
-            "testnet": "Restore Testnet profile",
+            "iotaTestnet": "Restore IOTA Testnet profile",
+            "shimmerTestnet": "Restore Shimmer Testnet profile",
             "custom": "Restore Custom Network profile"
         },
         "restoreWalletDescription": {
             "iota": "Restore an existing IOTA profile",
             "iotaAlphanet": "Restore an existing IOTA Alphanet profile",
             "shimmer": "Restore an existing Shimmer profile",
-            "testnet": "Restore an existing Testnet profile",
+            "iotaTestnet": "Restore an existing IOTA Testnet profile",
+            "shimmerTestnet": "Restore an existing Shimmer Testnet profile",
             "custom": "Restore an existing Custom Network profile"
         },
         "refreshNftMedia": {
             "title": "Refresh NFT media",
             "description": "Do you want to delete and re-download all NFT media for this account?"
         },
         "createWallet": "Create a new {network} profile",
-        "createWalletDescription": "Create a fresh profile running on {network, select, iota {Chrysalis} shimmer {Shimmer} testnet {Testnet} custom {Custom Network} other {Unknown}}",
+        "createWalletDescription": "Create a fresh profile running on {network, select, iota {Chrysalis} shimmer {Shimmer} shimmerTestnet {Shimmer Testnet} iotaTestnet {IOTA Testnet} custom {Custom Network} other {Unknown}}",
         "claimShimmer": "Claim Shimmer staking rewards",
         "claimShimmerDescription": "Import IOTA profile and claim staking rewards",
         "migrateFromLegacy": "Migrate from Legacy",