Skip to content

Commit 2f93e2c

Browse files
begonaalvarezdbegonaalvarezd
authored
Merge pull request #8564 from iotaledger/release/desktop-shimmer-2.1.16
release: desktop shimmer 2.1.16
2 parents 4aa921d + 871c126 commit 2f93e2c

File tree

9 files changed

+43
-21
lines changed

9 files changed

+43
-21
lines changed

‎.github/workflows/build-and-release-desktop.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
needs: [setup]
5858
strategy:
5959
matrix:
60-
os: [ubuntu-20.04, macos-11, windows-2019]
60+
os: [ubuntu-20.04, macos-12, windows-2019]
6161
fail-fast: true
6262
env:
6363
VERSION: ${{ needs.setup.outputs.version }}
@@ -96,7 +96,7 @@ jobs:
9696

9797
- name: Set deployment target (macOS)
9898
run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV # TODO: set this to 10.12 once rocksDB issue is fixed
99-
if: matrix.os == 'macos-11'
99+
if: matrix.os == 'macos-12'
100100

101101
- name: Install required packages (Linux)
102102
run: |
@@ -146,7 +146,7 @@ jobs:
146146
APPLE_ID: ${{ secrets.APPLE_ID }}
147147
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
148148
working-directory: packages/desktop
149-
if: matrix.os == 'macos-11'
149+
if: matrix.os == 'macos-12'
150150

151151
- name: Build Electron app (Windows)
152152
run: yarn compile:${env:STAGE}:win
@@ -185,7 +185,7 @@ jobs:
185185
- name: Compute checksums (macOS)
186186
run: for i in `ls | grep 'firefly-*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done
187187
working-directory: packages/desktop/out
188-
if: matrix.os == 'macos-11'
188+
if: matrix.os == 'macos-12'
189189

190190
- name: Compute checksums (Windows)
191191
run: Get-ChildItem "." -Filter firefly-* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') }
@@ -224,7 +224,7 @@ jobs:
224224
- name: Downloading artifacts
225225
uses: actions/download-artifact@v2
226226
with:
227-
name: firefly-desktop-macos-11
227+
name: firefly-desktop-macos-12
228228
path: assets
229229

230230
- name: Downloading artifacts

‎.github/workflows/build-desktop-test.v1.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
if: ${{ always() }}
1212
strategy:
1313
matrix:
14-
os: [ubuntu-18.04, macos-11, windows-2019]
14+
os: [ubuntu-18.04, macos-12, windows-2019]
1515
fail-fast: true
1616
env:
1717
VERSION: '1.7.2-test'
@@ -51,7 +51,7 @@ jobs:
5151

5252
- name: Set deployment target (macOS)
5353
run: echo "MACOSX_DEPLOYMENT_TARGET=10.12" >> $GITHUB_ENV
54-
if: matrix.os == 'macos-11'
54+
if: matrix.os == 'macos-12'
5555

5656
- name: Install required packages (Linux)
5757
run: |
@@ -83,7 +83,7 @@ jobs:
8383
- name: Install Sentry CLI
8484
# Yarn has issues putting binaries in the PATH on Windows
8585
run: npm i -g @sentry/cli
86-
if: ${{ startsWith(github.ref, 'refs/tags/desktop') && matrix.os != 'macos-11' }}
86+
if: ${{ startsWith(github.ref, 'refs/tags/desktop') && matrix.os != 'macos-12' }}
8787

8888
# - name: Strip backend debug info and upload to Sentry (Linux)
8989
# run: |
@@ -131,7 +131,7 @@ jobs:
131131
APPLE_ID: ${{ secrets.APPLE_ID }}
132132
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
133133
working-directory: packages/desktop
134-
if: matrix.os == 'macos-11'
134+
if: matrix.os == 'macos-12'
135135

136136
- name: Build Electron app (Windows)
137137
run: yarn compile:${env:STAGE}:win
@@ -170,7 +170,7 @@ jobs:
170170
- name: Compute checksums (macOS)
171171
run: for i in `ls | grep 'firefly-desktop*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done
172172
working-directory: packages/desktop/out
173-
if: matrix.os == 'macos-11'
173+
if: matrix.os == 'macos-12'
174174

175175
- name: Compute checksums (Windows)
176176
run: Get-ChildItem "." -Filter firefly-desktop* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') }

‎.github/workflows/build-desktop-test.v2.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
if: ${{ always() }}
1212
strategy:
1313
matrix:
14-
os: [ ubuntu-20.04, macos-11, windows-2019 ]
14+
os: [ ubuntu-20.04, macos-12, windows-2019 ]
1515
fail-fast: true
1616
env:
1717
VERSION: '2.1.3-test'
@@ -50,7 +50,7 @@ jobs:
5050

5151
- name: Set deployment target (macOS)
5252
run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV # TODO: set this to 10.12 once rocksDB issue is fixed
53-
if: matrix.os == 'macos-11'
53+
if: matrix.os == 'macos-12'
5454

5555
- name: Install required packages (Linux)
5656
run: |
@@ -100,7 +100,7 @@ jobs:
100100
APPLE_ID: ${{ secrets.APPLE_ID }}
101101
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
102102
working-directory: packages/desktop
103-
if: matrix.os == 'macos-11'
103+
if: matrix.os == 'macos-12'
104104

105105
- name: Build Electron app (Windows)
106106
run: yarn compile:${env:STAGE}:win

‎.github/workflows/build-desktop.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
required: true
1212
type: choice
1313
options:
14-
- macos-11
14+
- macos-12
1515
- ubuntu-20.04
1616
- windows-2019
1717
stage:
@@ -68,7 +68,7 @@ jobs:
6868

6969
- name: Set deployment target (macOS)
7070
run: echo "MACOSX_DEPLOYMENT_TARGET=10.14" >> $GITHUB_ENV # TODO: set this to 10.12 once rocksDB issue is fixed
71-
if: matrix.os == 'macos-11'
71+
if: matrix.os == 'macos-12'
7272

7373
- name: Install required packages (Linux)
7474
run: |
@@ -118,7 +118,7 @@ jobs:
118118
APPLE_ID: ${{ secrets.APPLE_ID }}
119119
APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
120120
working-directory: packages/desktop
121-
if: matrix.os == 'macos-11'
121+
if: matrix.os == 'macos-12'
122122

123123
- name: Build Electron app (Windows)
124124
run: yarn compile:${env:STAGE}:win
@@ -157,7 +157,7 @@ jobs:
157157
- name: Compute checksums (macOS)
158158
run: for i in `ls | grep 'firefly-*'` ; do shasum -a 256 $i | awk {'print $1'} > $i.sha256 ; done
159159
working-directory: packages/desktop/out
160-
if: matrix.os == 'macos-11'
160+
if: matrix.os == 'macos-12'
161161

162162
- name: Compute checksums (Windows)
163163
run: Get-ChildItem "." -Filter firefly-* | Foreach-Object { $(Get-FileHash -Path $_.FullName -Algorithm SHA256).Hash | Set-Content ($_.FullName + '.sha256') }

‎packages/desktop/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "desktop",
33
"productName": "Firefly Shimmer",
4-
"version": "2.1.15",
4+
"version": "2.1.16",
55
"description": "Official wallet application of Shimmer",
66
"main": "public/build/main.js",
77
"repository": "[email protected]:iotaledger/firefly.git",

‎packages/shared/lib/core/network/constants/official-node-urls.constant.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ export const OFFICIAL_NODE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = {
44
[NetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],
55
[NetworkId.IotaTestnet]: ['https://api.testnet.iotaledger.net'],
66
[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'],
88
[NetworkId.ShimmerTestnet]: ['https://api.testnet.shimmer.network'],
99
}

‎packages/shared/lib/core/network/tests/network.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('File: network.ts', () => {
2424
[NetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'],
2525
[NetworkId.IotaTestnet]: ['https://api.testnet.iotaledger.net'],
2626
[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'],
2828
[NetworkId.ShimmerTestnet]: ['https://api.testnet.shimmer.network'],
2929
}
3030

‎packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts

+22
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
DEFAULT_CHAIN_CONFIGURATIONS,
55
DEFAULT_MAX_PARALLEL_API_REQUESTS,
66
getDefaultPersistedNetwork,
7+
getOfficialNodes,
78
IIscpChainMetadata,
89
NetworkId,
910
} from '@core/network'
@@ -75,6 +76,7 @@ const persistedProfileMigrationsMap: Record<number, (existingProfile: unknown) =
7576
16: persistedProfileMigrationToV17,
7677
17: persistedProfileMigrationToV18,
7778
18: persistedProfileMigrationToV19,
79+
19: persistedProfileMigrationToV20,
7880
}
7981

8082
function persistedProfileMigrationToV4(existingProfile: unknown): void {
@@ -352,3 +354,23 @@ function persistedProfileMigrationToV19(existingProfile: IPersistedProfile): voi
352354
existingProfile.network.chains = newChains
353355
saveProfile(existingProfile)
354356
}
357+
358+
/*
359+
* Migration 20
360+
* Remove Tanglebay SMR node from the list of nodes.
361+
*/
362+
function persistedProfileMigrationToV20(existingProfile: IPersistedProfile): void {
363+
const DEPRECATED_NODE_URL = 'https://shimmer-node.tanglebay.com'
364+
const OFFICIAL_NODES = getOfficialNodes(existingProfile.network.id)
365+
366+
const nodes = existingProfile.clientOptions.nodes ?? []
367+
existingProfile.clientOptions.nodes = nodes.filter((node) => node.url !== DEPRECATED_NODE_URL)
368+
if (!existingProfile.clientOptions.nodes?.length) {
369+
existingProfile.clientOptions.nodes = OFFICIAL_NODES
370+
}
371+
const primaryNode = existingProfile.clientOptions.primaryNode
372+
if (primaryNode?.url === DEPRECATED_NODE_URL) {
373+
existingProfile.clientOptions.primaryNode = undefined
374+
}
375+
saveProfile(existingProfile)
376+
}

‎packages/shared/lib/core/profile/constants/profile-version.constant.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export const PROFILE_VERSION = 19
1+
export const PROFILE_VERSION = 20

0 commit comments

Comments
 (0)