Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: desktop shimmer 2.1.16 #8564

Merged
merged 6 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build-and-release-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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') }
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build-desktop-test.v1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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') }
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-desktop-test.v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
required: true
type: choice
options:
- macos-11
- macos-12
- ubuntu-20.04
- windows-2019
stage:
Expand Down Expand Up @@ -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: |
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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') }
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/package.json
Original file line number Diff line number Diff line change
@@ -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": "[email protected]:iotaledger/firefly.git",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
}
2 changes: 1 addition & 1 deletion packages/shared/lib/core/network/tests/network.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
DEFAULT_CHAIN_CONFIGURATIONS,
DEFAULT_MAX_PARALLEL_API_REQUESTS,
getDefaultPersistedNetwork,
getOfficialNodes,
IIscpChainMetadata,
NetworkId,
} from '@core/network'
Expand Down Expand Up @@ -75,6 +76,7 @@ const persistedProfileMigrationsMap: Record<number, (existingProfile: unknown) =
16: persistedProfileMigrationToV17,
17: persistedProfileMigrationToV18,
18: persistedProfileMigrationToV19,
19: persistedProfileMigrationToV20,
}

function persistedProfileMigrationToV4(existingProfile: unknown): void {
Expand Down Expand Up @@ -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)
}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const PROFILE_VERSION = 19
export const PROFILE_VERSION = 20
Loading