From 6bbd25a38ef5c6dabefc72f0bc6c89d095f6d237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Mon, 31 Jul 2023 11:26:15 +0200 Subject: [PATCH 1/8] chore: bump version to 2.1.5-alpha-1 --- 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 19e42b06dd9..aadee59390f 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Firefly Shimmer", - "version": "2.1.4", + "version": "2.1.5-alpha-1", "description": "Official wallet application of Shimmer", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git", From fc2783806d2de2e2ae006332bbadbc1ffe9c5cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Mon, 31 Jul 2023 18:58:34 +0200 Subject: [PATCH 2/8] chore: upgrade bindings to rc43 --- packages/shared/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/shared/package.json b/packages/shared/package.json index ede6849c055..2d35b85e046 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -11,7 +11,7 @@ "@iota/transaction-converter": "^1.0.0-beta.30", "@iota/unit-converter": "^1.0.0-beta.30", "@iota/util.js": "^2.0.0-rc.1", - "@iota/wallet": "2.0.3-rc.42", + "@iota/wallet": "2.0.3-rc.43", "@sveltejs/svelte-virtual-list": "^3.0.1", "big-integer": "^1.6.51", "big.js": "^6.0.3", diff --git a/yarn.lock b/yarn.lock index 748d1666adb..02300b77a1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -915,10 +915,10 @@ dependencies: big-integer "^1.6.51" -"@iota/wallet@2.0.3-rc.42": - version "2.0.3-rc.42" - resolved "https://registry.yarnpkg.com/@iota/wallet/-/wallet-2.0.3-rc.42.tgz#62373ba2dca09a9d6a0358ae2580e89f88d1f353" - integrity sha512-w3M0B/KLDYyYP0C72rHgc1KQ+WN21RDdFldapVbGDgtWyDuQN/XiXC90hPDvr8G8++V9d2nQ0gnxfSvpfsgOPQ== +"@iota/wallet@2.0.3-rc.43": + version "2.0.3-rc.43" + resolved "https://registry.yarnpkg.com/@iota/wallet/-/wallet-2.0.3-rc.43.tgz#bec803864399bf730364ccaa39bec42785330146" + integrity sha512-TtGsxF/hg3aj3ntCgQC8ns+ANUdoBMsiQzQsg1+IjyUeE0WmAT1OCOOtK1F9yAxrCO9G0JC7PIbXZ4mBLGAfeg== dependencies: "@iota/types" "^1.0.0-beta.15" cargo-cp-artifact "^0.1.6" From c1b8347f58d1a72ccfb39e59abc7ea59c3710489 Mon Sep 17 00:00:00 2001 From: cpl121 <100352899+cpl121@users.noreply.github.com> Date: Wed, 2 Aug 2023 12:15:32 +0200 Subject: [PATCH 3/8] fix: dont store stronghold version on ledger profiles (#7292) * fix: dont store stronghold version on ledger profiles * perf: improve logic --- .../views/ChooseCreateProfileFlowView.svelte | 7 +++++-- .../helpers/buildInitialOnboardingProfile.ts | 2 -- .../actions/active-profile/saveActiveProfile.ts | 2 +- .../actions/profiles/checkAndMigrateProfiles.ts | 10 ++++++++++ .../core/profile/constants/profile-version.constant.ts | 2 +- .../profile/interfaces/persisted-profile.interface.ts | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte b/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte index da3c9189231..e61c07687d0 100644 --- a/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte +++ b/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte @@ -15,6 +15,7 @@ import { destroyProfileManager } from '@core/profile-manager/actions' import { Icon as IconEnum } from '@auxiliary/icon' import { AnimationEnum } from '@auxiliary/animation' + import { STRONGHOLD_VERSION } from '@core/stronghold' let isBusy = { [CreateProfileType.Mnemonic]: false, @@ -27,8 +28,10 @@ async function onProfileTypeClick(createProfileType: CreateProfileType): Promise { isBusy = { ...isBusy, [createProfileType]: true } - const type = createProfileType === CreateProfileType.Ledger ? ProfileType.Ledger : ProfileType.Software - updateOnboardingProfile({ createProfileType, type }) + const isLedgerProfile = createProfileType === CreateProfileType.Ledger + const type = isLedgerProfile ? ProfileType.Ledger : ProfileType.Software + const strongholdVersion = isLedgerProfile ? undefined : STRONGHOLD_VERSION + updateOnboardingProfile({ createProfileType, type, ...(strongholdVersion && { strongholdVersion }) }) await initialiseProfileManagerFromOnboardingProfile() $createProfileRouter.next() } diff --git a/packages/shared/lib/contexts/onboarding/helpers/buildInitialOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/helpers/buildInitialOnboardingProfile.ts index 90ffdc47bd7..99351bf0d61 100644 --- a/packages/shared/lib/contexts/onboarding/helpers/buildInitialOnboardingProfile.ts +++ b/packages/shared/lib/contexts/onboarding/helpers/buildInitialOnboardingProfile.ts @@ -1,5 +1,4 @@ import { generateRandomId } from '@core/utils' -import { STRONGHOLD_VERSION } from '@core/stronghold' import { IOnboardingProfile } from '../interfaces' /** @@ -10,6 +9,5 @@ export function buildInitialOnboardingProfile(isDeveloperProfile: boolean): Part return { id: generateRandomId(), isDeveloperProfile, - strongholdVersion: STRONGHOLD_VERSION, } } diff --git a/packages/shared/lib/core/profile/actions/active-profile/saveActiveProfile.ts b/packages/shared/lib/core/profile/actions/active-profile/saveActiveProfile.ts index bcc190bf845..8247e1ceed5 100644 --- a/packages/shared/lib/core/profile/actions/active-profile/saveActiveProfile.ts +++ b/packages/shared/lib/core/profile/actions/active-profile/saveActiveProfile.ts @@ -16,7 +16,7 @@ export function saveActiveProfile(): void { isDeveloperProfile: _activeProfile.isDeveloperProfile, clientOptions: _activeProfile.clientOptions, forceAssetRefresh: _activeProfile.forceAssetRefresh, - strongholdVersion: _activeProfile.strongholdVersion, + ...(_activeProfile.strongholdVersion && { strongholdVersion: _activeProfile.strongholdVersion }), ...(_activeProfile.hasVisitedDashboard && { hasVisitedDashboard: _activeProfile.hasVisitedDashboard }), ...(_activeProfile.lastUsedAccountIndex && { lastUsedAccountIndex: _activeProfile.lastUsedAccountIndex }), ...(_activeProfile.accountPersistedData && { accountPersistedData: _activeProfile.accountPersistedData }), diff --git a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts index 5cb2348c6b7..f0d0d6d9696 100644 --- a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts +++ b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts @@ -17,6 +17,7 @@ import { } from '../../constants' import { IPersistedProfile } from '../../interfaces' import { currentProfileVersion, profiles, saveProfile } from '../../stores' +import { ProfileType } from '@core/profile/enums' /** * Migrates profile data in need of being modified to accommodate changes @@ -60,6 +61,7 @@ const persistedProfileMigrationsMap: Record Date: Wed, 2 Aug 2023 13:40:16 +0200 Subject: [PATCH 4/8] chore: bump version to 2.1.5-beta-1 --- 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 aadee59390f..ae38d113f78 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Firefly Shimmer", - "version": "2.1.5-alpha-1", + "version": "2.1.5-beta-1", "description": "Official wallet application of Shimmer", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git", From 079ca7c2ff59eb02f2dace273f8e8d4c9cf7e173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20=C3=81lvarez=20de=20la=20Cruz?= Date: Thu, 3 Aug 2023 12:29:53 +0200 Subject: [PATCH 5/8] chore: upgrade bindings to rc-44 (#7299) --- packages/shared/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/shared/package.json b/packages/shared/package.json index 2d35b85e046..84632690d43 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -11,7 +11,7 @@ "@iota/transaction-converter": "^1.0.0-beta.30", "@iota/unit-converter": "^1.0.0-beta.30", "@iota/util.js": "^2.0.0-rc.1", - "@iota/wallet": "2.0.3-rc.43", + "@iota/wallet": "2.0.3-rc.44", "@sveltejs/svelte-virtual-list": "^3.0.1", "big-integer": "^1.6.51", "big.js": "^6.0.3", diff --git a/yarn.lock b/yarn.lock index 02300b77a1b..260913c4b6b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -915,10 +915,10 @@ dependencies: big-integer "^1.6.51" -"@iota/wallet@2.0.3-rc.43": - version "2.0.3-rc.43" - resolved "https://registry.yarnpkg.com/@iota/wallet/-/wallet-2.0.3-rc.43.tgz#bec803864399bf730364ccaa39bec42785330146" - integrity sha512-TtGsxF/hg3aj3ntCgQC8ns+ANUdoBMsiQzQsg1+IjyUeE0WmAT1OCOOtK1F9yAxrCO9G0JC7PIbXZ4mBLGAfeg== +"@iota/wallet@2.0.3-rc.44": + version "2.0.3-rc.44" + resolved "https://registry.yarnpkg.com/@iota/wallet/-/wallet-2.0.3-rc.44.tgz#5d724638a23c68e5f0f61861660ac4ed321a0a54" + integrity sha512-/o1o9yH83nY16nvqLfcMtSZPy92Ca0m5+MtKjnR2V0u5UCwUu6GH3cSauIuWrT4rFJoaKZF3CAPcc2raJ/5YDg== dependencies: "@iota/types" "^1.0.0-beta.15" cargo-cp-artifact "^0.1.6" From e7b469fbe5495f0d00c76cfd72fae4148ca0cef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20=C3=81lvarez=20de=20la=20Cruz?= Date: Thu, 3 Aug 2023 14:51:02 +0200 Subject: [PATCH 6/8] feat: add tanglebay node (#7290) * fat: add tanglebay node to official node list * fix: tests --- .../lib/core/network/constants/official-node-urls.constant.ts | 2 +- packages/shared/lib/core/network/tests/network.test.ts | 2 +- 2 files changed, 2 insertions(+), 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 8ae998b29b1..c6df21d89ac 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 @@ -6,6 +6,6 @@ export const OFFICIAL_NODE_URLS: Readonly<{ [key in NetworkId]?: string[] }> = { 'https://chrysalis-nodes.iota.cafe', 'https://iota-node.tanglebay.com', ], - [NetworkId.Shimmer]: ['https://api.shimmer.network'], + [NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'], [NetworkId.Testnet]: ['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 index 45246033c54..7269f3798ac 100644 --- a/packages/shared/lib/core/network/tests/network.test.ts +++ b/packages/shared/lib/core/network/tests/network.test.ts @@ -25,7 +25,7 @@ describe('File: network.ts', () => { 'https://chrysalis-nodes.iota.cafe', 'https://iota-node.tanglebay.com', ], - [NetworkId.Shimmer]: ['https://api.shimmer.network'], + [NetworkId.Shimmer]: ['https://api.shimmer.network', 'https://shimmer-node.tanglebay.com'], [NetworkId.Testnet]: ['https://api.testnet.shimmer.network'], } From 38c65bb2902f668bafe2ac41c3ad7b18808f30ac Mon Sep 17 00:00:00 2001 From: cpl121 <100352899+cpl121@users.noreply.github.com> Date: Thu, 3 Aug 2023 15:46:21 +0200 Subject: [PATCH 7/8] fix: move strongholdVersion logic from create profile to finish onboarding (#7304) --- .../complete-onboarding/views/FinishOnboardingView.svelte | 6 ++++++ .../views/ChooseCreateProfileFlowView.svelte | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte b/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte index 7455467a7da..cac8c6a3285 100644 --- a/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte +++ b/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte @@ -7,11 +7,14 @@ completeOnboardingProcess, isOnboardingLedgerProfile, onboardingProfile, + updateOnboardingProfile, } from '@contexts/onboarding' import { mobile } from '@core/app' import { localize } from '@core/i18n' import { checkOrConnectLedger } from '@core/ledger' + import { ProfileType } from '@core/profile' import { setStrongholdPassword } from '@core/profile-manager' + import { STRONGHOLD_VERSION } from '@core/stronghold' import { Animation, Button, Icon, Text, TextHint } from '@ui' import { TextType } from '@ui/enums' import { onboardingRouter } from '@views/onboarding/onboarding-router' @@ -29,6 +32,9 @@ if ($onboardingProfile?.restoreProfileType === RestoreProfileType.Stronghold) { await setStrongholdPassword($onboardingProfile.strongholdPassword) } + const isLedgerProfile = $onboardingProfile?.type === ProfileType.Ledger + const strongholdVersion = isLedgerProfile ? undefined : STRONGHOLD_VERSION + updateOnboardingProfile({ ...(strongholdVersion && { strongholdVersion }) }) completeOnboardingProcess() $onboardingRouter.next() return Promise.resolve() diff --git a/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte b/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte index e61c07687d0..da3c9189231 100644 --- a/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte +++ b/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte @@ -15,7 +15,6 @@ import { destroyProfileManager } from '@core/profile-manager/actions' import { Icon as IconEnum } from '@auxiliary/icon' import { AnimationEnum } from '@auxiliary/animation' - import { STRONGHOLD_VERSION } from '@core/stronghold' let isBusy = { [CreateProfileType.Mnemonic]: false, @@ -28,10 +27,8 @@ async function onProfileTypeClick(createProfileType: CreateProfileType): Promise { isBusy = { ...isBusy, [createProfileType]: true } - const isLedgerProfile = createProfileType === CreateProfileType.Ledger - const type = isLedgerProfile ? ProfileType.Ledger : ProfileType.Software - const strongholdVersion = isLedgerProfile ? undefined : STRONGHOLD_VERSION - updateOnboardingProfile({ createProfileType, type, ...(strongholdVersion && { strongholdVersion }) }) + const type = createProfileType === CreateProfileType.Ledger ? ProfileType.Ledger : ProfileType.Software + updateOnboardingProfile({ createProfileType, type }) await initialiseProfileManagerFromOnboardingProfile() $createProfileRouter.next() } From 4ce17023f8bff6162f6e1dcd5e8f0139112942b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Thu, 17 Aug 2023 16:31:23 +0200 Subject: [PATCH 8/8] chore: bump version to 2.1.5 --- 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 ae38d113f78..4ec23cde31c 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Firefly Shimmer", - "version": "2.1.5-beta-1", + "version": "2.1.5", "description": "Official wallet application of Shimmer", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git",