From 7146def90da5965654da2901c7060586afa86ac0 Mon Sep 17 00:00:00 2001 From: cpl121 Date: Wed, 3 Apr 2024 19:25:56 +0200 Subject: [PATCH 1/5] feat: prepare release process for canary iota 2.0 testnet version --- .../workflows/build-and-release-desktop.yml | 58 +++++++++---------- .github/workflows/build-desktop.yml | 2 +- README.md | 2 +- packages/desktop/package.json | 6 +- packages/desktop/product.js | 16 ++--- .../constants/official-node-urls.constant.ts | 3 +- packages/shared/package.json | 2 +- 7 files changed, 45 insertions(+), 44 deletions(-) diff --git a/.github/workflows/build-and-release-desktop.yml b/.github/workflows/build-and-release-desktop.yml index feb727c3365..4b42bfb2fd6 100644 --- a/.github/workflows/build-and-release-desktop.yml +++ b/.github/workflows/build-and-release-desktop.yml @@ -1,13 +1,13 @@ name: Build and Release Desktop env: - NETWORK: Shimmer + NETWORK: Canary NETWORK_CODE: shimmer on: push: tags: - - desktop-shimmer-* + - desktop-canary-* workflow_dispatch: inputs: debugElectronBuilder: @@ -39,7 +39,7 @@ jobs: - id: set_outputs name: Set outputs for version, release name, and stage run: | - VERSION=${GITHUB_REF#refs/*/desktop-shimmer-} + VERSION=${GITHUB_REF#refs/*/desktop-canary-} RELEASE_NAME=$(echo $VERSION | perl -0777 -pe 's/^([0-9]\d*\.[0-9]\d*\.[0-9]\d*)(?:-([a-z]*)-(\d*))?$/$1 \u$2 $3/') STAGE=$(echo $VERSION | perl -0777 -pe 's/^([0-9]\d*\.[0-9]\d*\.[0-9]\d*)(?:-([a-z]*)-([0-9]\d*(\.[0-9]\d*)*))?$/$2/') @@ -118,10 +118,10 @@ jobs: # Increase network timeout threshold to reduce build failures on Windows run: yarn --network-timeout 1000000 - - 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 == 'windows-2019' }} + # - 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 == 'windows-2019' }} - name: Set productName run: node scripts/fix-productName.js @@ -131,12 +131,12 @@ jobs: run: yarn build:${STAGE} working-directory: packages/desktop shell: bash - env: - HARDCODE_NODE_ENV: true - SENTRY: ${{ startsWith(github.ref, 'refs/tags/desktop') }} - SENTRY_DSN: ${{ secrets.SENTRY_DSN_PROD_DESKTOP }} - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} + # env: + # HARDCODE_NODE_ENV: true + # SENTRY: ${{ startsWith(github.ref, 'refs/tags/desktop') }} + # SENTRY_DSN: ${{ secrets.SENTRY_DSN_PROD_DESKTOP }} + # SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} + # AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} - name: Build Electron app (macOS) run: yarn compile:${STAGE}:mac @@ -198,7 +198,7 @@ jobs: name: firefly-desktop-${{ matrix.os }} path: | packages/desktop/out/firefly-* - packages/desktop/out/shimmer* + packages/desktop/out/canary* release: runs-on: ubuntu-latest @@ -305,18 +305,18 @@ jobs: asset_name: firefly-${{ env.NETWORK_CODE }}-desktop-${{ env.VERSION }}.AppImage.asc asset_content_type: application/pgp-signature - - name: Upload to S3 - run: | - aws s3 cp assets/ s3://iotaledger-files/4a1ddea1-10c1-4f1d-83f0-e14903931a46/releases/ --recursive --include "*" --exclude "*.sha256" --exclude "*.blockmap" --exclude "*.asc" --acl public-read - aws s3 cp assets/ s3://iotaledger-files/firefly/releases/ --recursive --include "*" --exclude "*.sha256" --exclude "*.blockmap" --exclude "*.asc" --acl public-read - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_DEFAULT_REGION: eu-central-1 - - - name: Invalidate CloudFront cache for auto-update files - run: aws cloudfront create-invalidation --distribution-id E32G4HRED4PO65 --paths "/shimmer*" - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_DEFAULT_REGION: eu-central-1 \ No newline at end of file + # - name: Upload to S3 + # run: | + # aws s3 cp assets/ s3://iotaledger-files/4a1ddea1-10c1-4f1d-83f0-e14903931a46/releases/ --recursive --include "*" --exclude "*.sha256" --exclude "*.blockmap" --exclude "*.asc" --acl public-read + # aws s3 cp assets/ s3://iotaledger-files/firefly/releases/ --recursive --include "*" --exclude "*.sha256" --exclude "*.blockmap" --exclude "*.asc" --acl public-read + # env: + # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # AWS_DEFAULT_REGION: eu-central-1 + + # - name: Invalidate CloudFront cache for auto-update files + # run: aws cloudfront create-invalidation --distribution-id E32G4HRED4PO65 --paths "/shimmer*" + # env: + # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # AWS_DEFAULT_REGION: eu-central-1 \ No newline at end of file diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index e60bbc772f4..b0d6e0b3d98 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -1,7 +1,7 @@ name: Build Desktop (v2) env: - NETWORK_CODE: shimmer + NETWORK_CODE: canary on: workflow_dispatch: diff --git a/README.md b/README.md index 2f770bcb2a4..f80ff079f76 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ -

Firefly Shimmer

+

Firefly Canary

Discord diff --git a/packages/desktop/package.json b/packages/desktop/package.json index d1c9d8e344c..bff026f1a7b 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,8 +1,8 @@ { "name": "desktop", - "productName": "Firefly Shimmer", - "version": "2.1.12", - "description": "Official wallet application of Shimmer", + "productName": "Firefly Canary", + "version": "3.0.0-alpha-1", + "description": "Official wallet application of Canary", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git", "author": "IOTA Foundation ", diff --git a/packages/desktop/product.js b/packages/desktop/product.js index 778f152fc0d..8dadc5f6761 100644 --- a/packages/desktop/product.js +++ b/packages/desktop/product.js @@ -1,6 +1,6 @@ /* eslint-disable */ -const PRODUCT_NAME = 'Firefly Shimmer' -const NETWORK = 'shimmer' +const PRODUCT_NAME = 'Firefly Canary' +const NETWORK = 'canary' const STAGE = process.env.STAGE || 'alpha' const APP_ID = getAppId() @@ -51,11 +51,11 @@ function getAppProtocol() { } /** - * If stage = 'prod' -> 'org.iota.firefly-shimmer' - * If stage = 'alpha' -> 'org.iota.firefly-shimmer.alpha' + * If stage = 'prod' -> 'org.iota.firefly-canary' + * If stage = 'alpha' -> 'org.iota.firefly-canary.alpha' */ function getAppId() { - const defaultAppId = 'org.iota.firefly-shimmer' + const defaultAppId = 'org.iota.firefly-canary' if (STAGE === 'prod') { return defaultAppId } @@ -65,11 +65,11 @@ function getAppId() { function getChannelName() { switch (STAGE) { case 'alpha': - return 'shimmer-alpha' + return 'canary-alpha' case 'beta': - return 'shimmer-beta' + return 'canary-beta' default: - return 'shimmer' + return 'canary' } } 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 index f4674b99460..61c950cd7f7 100644 --- 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,5 +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.IotaAlphanet]: ['https://api.iota-alphanet.iotaledger.net'], [NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'], - [NetworkId.Testnet]: ['https://api.testnet.shimmer.network'], + // [NetworkId.Testnet]: ['https://api.testnet.shimmer.network'], + [NetworkId.Testnet]: ['https://api.iota2-alphanet.iotaledger.net'], } diff --git a/packages/shared/package.json b/packages/shared/package.json index f060d84c6d7..8db84b686b1 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -5,7 +5,7 @@ "license": "Apache-2.0", "dependencies": { "@iota/crypto.js": "^1.8.6", - "@iota/sdk": "1.1.5", + "@iota/sdk": "^2.0.0-alpha.1", "@iota/unit-converter": "^1.0.0-beta.30", "@iota/util.js": "^2.0.0-rc.1", "@sveltejs/svelte-virtual-list": "^3.0.1", From b3aba2c655071e362d161802ffc4770410f0d6de Mon Sep 17 00:00:00 2001 From: cpl121 Date: Wed, 3 Apr 2024 23:35:21 +0200 Subject: [PATCH 2/5] fix: error --- .../lib/core/network/constants/official-node-urls.constant.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index 61c950cd7f7..f4674b99460 100644 --- 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,5 @@ export const OFFICIAL_NODE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = { [NetworkId.Iota]: ['https://api.stardust-mainnet.iotaledger.net', 'https://iota-node.tanglebay.com'], [NetworkId.IotaAlphanet]: ['https://api.iota-alphanet.iotaledger.net'], [NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'], - // [NetworkId.Testnet]: ['https://api.testnet.shimmer.network'], - [NetworkId.Testnet]: ['https://api.iota2-alphanet.iotaledger.net'], + [NetworkId.Testnet]: ['https://api.testnet.shimmer.network'], } From 48afb8dbb5032729c394024509b7756b08d2cc37 Mon Sep 17 00:00:00 2001 From: cpl121 Date: Mon, 13 May 2024 11:27:31 +0200 Subject: [PATCH 3/5] feat: uncomment autoupdate feature --- .../workflows/build-and-release-desktop.yml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build-and-release-desktop.yml b/.github/workflows/build-and-release-desktop.yml index 4b42bfb2fd6..ba8e995bba2 100644 --- a/.github/workflows/build-and-release-desktop.yml +++ b/.github/workflows/build-and-release-desktop.yml @@ -2,7 +2,7 @@ name: Build and Release Desktop env: NETWORK: Canary - NETWORK_CODE: shimmer + NETWORK_CODE: canary on: push: @@ -118,10 +118,10 @@ jobs: # Increase network timeout threshold to reduce build failures on Windows run: yarn --network-timeout 1000000 - # - 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 == 'windows-2019' }} + - 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 == 'windows-2019' }} - name: Set productName run: node scripts/fix-productName.js @@ -131,12 +131,12 @@ jobs: run: yarn build:${STAGE} working-directory: packages/desktop shell: bash - # env: - # HARDCODE_NODE_ENV: true - # SENTRY: ${{ startsWith(github.ref, 'refs/tags/desktop') }} - # SENTRY_DSN: ${{ secrets.SENTRY_DSN_PROD_DESKTOP }} - # SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - # AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} + env: + HARDCODE_NODE_ENV: true + SENTRY: ${{ startsWith(github.ref, 'refs/tags/desktop') }} + SENTRY_DSN: ${{ secrets.SENTRY_DSN_PROD_DESKTOP }} + SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} + AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }} - name: Build Electron app (macOS) run: yarn compile:${STAGE}:mac @@ -305,18 +305,18 @@ jobs: asset_name: firefly-${{ env.NETWORK_CODE }}-desktop-${{ env.VERSION }}.AppImage.asc asset_content_type: application/pgp-signature - # - name: Upload to S3 - # run: | - # aws s3 cp assets/ s3://iotaledger-files/4a1ddea1-10c1-4f1d-83f0-e14903931a46/releases/ --recursive --include "*" --exclude "*.sha256" --exclude "*.blockmap" --exclude "*.asc" --acl public-read - # aws s3 cp assets/ s3://iotaledger-files/firefly/releases/ --recursive --include "*" --exclude "*.sha256" --exclude "*.blockmap" --exclude "*.asc" --acl public-read - # env: - # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - # AWS_DEFAULT_REGION: eu-central-1 - - # - name: Invalidate CloudFront cache for auto-update files - # run: aws cloudfront create-invalidation --distribution-id E32G4HRED4PO65 --paths "/shimmer*" - # env: - # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - # AWS_DEFAULT_REGION: eu-central-1 \ No newline at end of file + - name: Upload to S3 + run: | + aws s3 cp assets/ s3://iotaledger-files/4a1ddea1-10c1-4f1d-83f0-e14903931a46/releases/ --recursive --include "*" --exclude "*.sha256" --exclude "*.blockmap" --exclude "*.asc" --acl public-read + aws s3 cp assets/ s3://iotaledger-files/firefly/releases/ --recursive --include "*" --exclude "*.sha256" --exclude "*.blockmap" --exclude "*.asc" --acl public-read + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_DEFAULT_REGION: eu-central-1 + + - name: Invalidate CloudFront cache for auto-update files + run: aws cloudfront create-invalidation --distribution-id E32G4HRED4PO65 --paths "/canary*" + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + AWS_DEFAULT_REGION: eu-central-1 \ No newline at end of file From 07b66291adbd44c4b1fda33f7fd80080efefe60e Mon Sep 17 00:00:00 2001 From: cpl121 Date: Mon, 13 May 2024 11:36:03 +0200 Subject: [PATCH 4/5] feat: update protocol --- packages/desktop/product.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/desktop/product.js b/packages/desktop/product.js index 8dadc5f6761..b7221db9c97 100644 --- a/packages/desktop/product.js +++ b/packages/desktop/product.js @@ -47,7 +47,7 @@ function getAppName(isPackaged = true) { * If network = 'shimmer' -> 'firefly' */ function getAppProtocol() { - return STAGE === 'prod' ? 'firefly' : `firefly-${STAGE.toLowerCase()}` + return STAGE === 'prod' ? 'canary' : `canary-${STAGE.toLowerCase()}` } /** From 2056b0354cc793f817c7340e6ccd6e4061009260 Mon Sep 17 00:00:00 2001 From: marc2332 Date: Mon, 13 May 2024 13:42:38 +0200 Subject: [PATCH 5/5] 3.0.0 --- packages/desktop/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 7194429f9b1..12d3ed25d88 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Firefly Canary", - "version": "4.0.0-beta-1", + "version": "3.0.0-beta-1", "description": "Official wallet application of IOTA Canary", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git",