Merge pull request #8564 from iotaledger/release/desktop-shimmer-2.1.16

begonaalvarezd · web-flow · commit 2f93e2c86b22 · 2024-08-06T10:29:22.000+02:00
release: desktop shimmer 2.1.16
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/packages/desktop/package.json b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
     "name": "desktop",
     "productName": "Firefly Shimmer",
-    "version": "2.1.15",
+    "version": "2.1.16",
     "description": "Official wallet application of Shimmer",
     "main": "public/build/main.js",
     "repository": "git@github.com:iotaledger/firefly.git",
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'
@@ -75,6 +76,7 @@ const persistedProfileMigrationsMap: Record<number, (existingProfile: unknown) =
     16: persistedProfileMigrationToV17,
     17: persistedProfileMigrationToV18,
     18: persistedProfileMigrationToV19,
+    19: persistedProfileMigrationToV20,
 }
 
 function persistedProfileMigrationToV4(existingProfile: unknown): void {
@@ -352,3 +354,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

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "desktop",`
`3`	`3`	`"productName": "Firefly Shimmer",`
`4`		`- "version": "2.1.15",`
	`4`	`+ "version": "2.1.16",`
`5`	`5`	`"description": "Official wallet application of Shimmer",`
`6`	`6`	`"main": "public/build/main.js",`
`7`	`7`	`"repository": "[email protected]:iotaledger/firefly.git",`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ export const OFFICIAL_NODE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = {`
`4`	`4`	`[NetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],`
`5`	`5`	`[NetworkId.IotaTestnet]: ['https://api.testnet.iotaledger.net'],`
`6`	`6`	`[NetworkId.IotaAlphanet]: ['https://api.iota-alphanet.iotaledger.net'],`
`7`		`- [NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'],`
	`7`	`+ [NetworkId.Shimmer]: ['https://api.shimmer.network'],`
`8`	`8`	`[NetworkId.ShimmerTestnet]: ['https://api.testnet.shimmer.network'],`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ describe('File: network.ts', () => {`
`24`	`24`	`[NetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],`
`25`	`25`	`[NetworkId.IotaTestnet]: ['https://api.testnet.iotaledger.net'],`
`26`	`26`	`[NetworkId.IotaAlphanet]: ['https://api.iota-alphanet.iotaledger.net'],`
`27`		`- [NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'],`
	`27`	`+ [NetworkId.Shimmer]: ['https://api.shimmer.network'],`
`28`	`28`	`[NetworkId.ShimmerTestnet]: ['https://api.testnet.shimmer.network'],`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export const PROFILE_VERSION = 19`
	`1`	`+export const PROFILE_VERSION = 20`