From 914fd022f66c5822490f4d48c5ed50cef0e0d65e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Tue, 21 Nov 2023 10:42:19 +0100 Subject: [PATCH 01/12] chore: bump version to 2.1.10-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 10e776a80f2..857328b4e35 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Firefly Shimmer", - "version": "2.1.9", + "version": "2.1.10-beta-1", "description": "Official wallet application of Shimmer", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git", From ab5b1e81cedcfe0430c02adac7bac32c28b2d8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Mon, 27 Nov 2023 18:22:54 +0100 Subject: [PATCH 02/12] revert-later: update sdk version to include ledger with more logs --- packages/shared/package.json | 4 +++- yarn.lock | 37 ++++++++++++++++++++++++++++-------- 2 files changed, 32 insertions(+), 9 deletions(-) diff --git a/packages/shared/package.json b/packages/shared/package.json index 1ec9bab1617..16fee943f6f 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -7,12 +7,13 @@ "@iota/bundle": "^1.0.0-beta.30", "@iota/converter": "^1.0.0-beta.30", "@iota/crypto.js": "^1.8.6", + "@iota/sdk": "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?79b052a169d2b07a855d095c17aeb42560563feb", "@iota/transaction": "^1.0.0-beta.30", "@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/sdk": "1.1.3", "@sveltejs/svelte-virtual-list": "^3.0.1", + "add": "^2.0.6", "big-integer": "^1.6.51", "big.js": "^6.0.3", "lottie-web": "^5.7.8", @@ -22,6 +23,7 @@ "svelte-i18n": "3.7.0", "svelte-markdown": "0.2.3", "svelty-picker": "^5.0.0", + "yarn": "^1.22.21", "zxcvbn": "^4.4.2" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index b2758dd7cb0..34b45e71bb5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -767,10 +767,9 @@ resolved "https://registry.yarnpkg.com/@iota/pad/-/pad-1.0.0-beta.30.tgz#de19728f8f1b09c20e2365d0da34945006760082" integrity sha512-fnhPMPul18WunLq9Ni4rxzBFmhna6eaG8WroDg6GdQqSK/eN62uFHV8tpspJHXuCqwgCUVp6NpuUna7+B2OV9g== -"@iota/sdk@1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.1.3.tgz#ab54cf72d9fa46321ae635cdd7fb2e085e888d95" - integrity sha512-Igy1Pl4mLPIGJddepcJ0i3xF/6Yup8pMl0eSTknN1A97qhsNtvmV1iDDhSxAshmJYyBQ8LEzd0DrMrq5tioYyg== +"@iota/sdk@https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?79b052a169d2b07a855d095c17aeb42560563feb": + version "1.1.4" + resolved "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?79b052a169d2b07a855d095c17aeb42560563feb#62bb845469d343dfbf0b05f8929a44943798de3b" dependencies: "@types/node" "^18.15.12" cargo-cp-artifact "^0.1.6" @@ -1712,11 +1711,18 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.38.tgz#1dcdb6c54d02b323f621213745f2e44af30c73e6" integrity sha512-6sfo1qTulpVbkxECP+AVrHV9OoJqhzCsfTNp5NIG+enM4HyM3HvZCO798WShIXBN0+QtDIcutJCjsVYnQP5rIQ== -"@types/node@^18.15.11", "@types/node@^18.15.12": +"@types/node@^18.15.11": version "18.16.19" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.16.19.tgz#cb03fca8910fdeb7595b755126a8a78144714eea" integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA== +"@types/node@^18.15.12": + version "18.18.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.13.tgz#ae0f76c0bfe79d8fad0f910b78ae3e59b333c6e8" + integrity sha512-vXYZGRrSCreZmq1rEjMRLXJhiy8MrIeVasx+PCVlP414N7CJLHnMf+juVvjdprHyH+XRy3zKZLHeNueOpJCn0g== + dependencies: + undici-types "~5.26.4" + "@types/plist@^3.0.1": version "3.0.2" resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" @@ -2148,6 +2154,11 @@ acorn@^8.1.0, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9 resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== +add@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/add/-/add-2.0.6.tgz#248f0a9f6e5a528ef2295dbeec30532130ae2235" + integrity sha512-j5QzrmsokwWWp6kUcJQySpbG+xfOBqqKnup3OIk1pz+kB/80SLorZ9V8zHFLO92Lcd+hbvq8bT+zOGoPkmBV0Q== + agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -6256,9 +6267,9 @@ mz@^2.7.0: thenify-all "^1.0.0" nanoid@^3.1.31, nanoid@^3.3.6: - version "3.3.6" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" - integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== + version "3.3.7" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8" + integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g== napi-build-utils@^1.0.1: version "1.0.2" @@ -8442,6 +8453,11 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + unique-filename@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-3.0.0.tgz#48ba7a5a16849f5080d26c760c86cf5cf05770ea" @@ -8952,6 +8968,11 @@ yargs@^17.0.0, yargs@^17.0.1, yargs@^17.3.1, yargs@^17.6.2: y18n "^5.0.5" yargs-parser "^21.1.1" +yarn@^1.22.21: + version "1.22.21" + resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.21.tgz#1959a18351b811cdeedbd484a8f86c3cc3bbaf72" + integrity sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg== + yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" From a403f36d00c401584ab0cd930137676c4c721fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Mon, 27 Nov 2023 18:23:26 +0100 Subject: [PATCH 03/12] chore: bump version to 2.1.10-beta-2 --- 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 857328b4e35..7c67cc265e6 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Firefly Shimmer", - "version": "2.1.10-beta-1", + "version": "2.1.10-beta-2", "description": "Official wallet application of Shimmer", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git", From af966b53609b0afde618f51981d6344f6d2e95e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Wed, 29 Nov 2023 18:46:17 +0100 Subject: [PATCH 04/12] revert-later: update sdk version to test new ledger updates, not official release --- packages/shared/package.json | 2 +- yarn.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/shared/package.json b/packages/shared/package.json index 16fee943f6f..84d24914d93 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -7,7 +7,7 @@ "@iota/bundle": "^1.0.0-beta.30", "@iota/converter": "^1.0.0-beta.30", "@iota/crypto.js": "^1.8.6", - "@iota/sdk": "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?79b052a169d2b07a855d095c17aeb42560563feb", + "@iota/sdk": "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?bc6eb3a7219b50f3645aea5b59dc436d2dbefad3", "@iota/transaction": "^1.0.0-beta.30", "@iota/transaction-converter": "^1.0.0-beta.30", "@iota/unit-converter": "^1.0.0-beta.30", diff --git a/yarn.lock b/yarn.lock index 34b45e71bb5..a108d61bd35 100644 --- a/yarn.lock +++ b/yarn.lock @@ -767,9 +767,9 @@ resolved "https://registry.yarnpkg.com/@iota/pad/-/pad-1.0.0-beta.30.tgz#de19728f8f1b09c20e2365d0da34945006760082" integrity sha512-fnhPMPul18WunLq9Ni4rxzBFmhna6eaG8WroDg6GdQqSK/eN62uFHV8tpspJHXuCqwgCUVp6NpuUna7+B2OV9g== -"@iota/sdk@https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?79b052a169d2b07a855d095c17aeb42560563feb": +"@iota/sdk@https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?bc6eb3a7219b50f3645aea5b59dc436d2dbefad3": version "1.1.4" - resolved "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?79b052a169d2b07a855d095c17aeb42560563feb#62bb845469d343dfbf0b05f8929a44943798de3b" + resolved "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?bc6eb3a7219b50f3645aea5b59dc436d2dbefad3#d15e2d2ae9b287516676970e6dc19847845f929f" dependencies: "@types/node" "^18.15.12" cargo-cp-artifact "^0.1.6" From 7759db466277c19eb820747eeff18c4faf9a3d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Wed, 29 Nov 2023 18:49:04 +0100 Subject: [PATCH 05/12] chore: bump version to 2.1.10-beta-3 --- 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 7c67cc265e6..4b63564fe4c 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Firefly Shimmer", - "version": "2.1.10-beta-2", + "version": "2.1.10-beta-3", "description": "Official wallet application of Shimmer", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git", From 80be9e91aa954c7b03360d6437b589ab1b00709d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Thu, 30 Nov 2023 17:31:35 +0100 Subject: [PATCH 06/12] chore: remove unnecessary dependencies --- packages/shared/package.json | 2 -- yarn.lock | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/packages/shared/package.json b/packages/shared/package.json index 84d24914d93..948243e80e7 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -13,7 +13,6 @@ "@iota/unit-converter": "^1.0.0-beta.30", "@iota/util.js": "^2.0.0-rc.1", "@sveltejs/svelte-virtual-list": "^3.0.1", - "add": "^2.0.6", "big-integer": "^1.6.51", "big.js": "^6.0.3", "lottie-web": "^5.7.8", @@ -23,7 +22,6 @@ "svelte-i18n": "3.7.0", "svelte-markdown": "0.2.3", "svelty-picker": "^5.0.0", - "yarn": "^1.22.21", "zxcvbn": "^4.4.2" }, "scripts": { diff --git a/yarn.lock b/yarn.lock index a108d61bd35..3973b9cb753 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2154,11 +2154,6 @@ acorn@^8.1.0, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9 resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== -add@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/add/-/add-2.0.6.tgz#248f0a9f6e5a528ef2295dbeec30532130ae2235" - integrity sha512-j5QzrmsokwWWp6kUcJQySpbG+xfOBqqKnup3OIk1pz+kB/80SLorZ9V8zHFLO92Lcd+hbvq8bT+zOGoPkmBV0Q== - agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -8968,11 +8963,6 @@ yargs@^17.0.0, yargs@^17.0.1, yargs@^17.3.1, yargs@^17.6.2: y18n "^5.0.5" yargs-parser "^21.1.1" -yarn@^1.22.21: - version "1.22.21" - resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.21.tgz#1959a18351b811cdeedbd484a8f86c3cc3bbaf72" - integrity sha512-ynXaJsADJ9JiZ84zU25XkPGOvVMmZ5b7tmTSpKURYwgELdjucAOydqIOrOfTxVYcNXe91xvLZwcRh68SR3liCg== - yauzl@^2.10.0: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" From f1abf36163019dc31d4321350e2c2d3a4bf48ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Thu, 30 Nov 2023 17:34:37 +0100 Subject: [PATCH 07/12] chore: bump version to 2.1.10-beta-4 --- 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 4b63564fe4c..45e3518af09 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Firefly Shimmer", - "version": "2.1.10-beta-3", + "version": "2.1.10-beta-4", "description": "Official wallet application of Shimmer", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git", From 7349ab04a8c561617b24092fbd3c0a2e07fce4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Fri, 1 Dec 2023 16:03:03 +0100 Subject: [PATCH 08/12] revert-later: update sdk version to test new ledger updates, not official release --- packages/shared/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/shared/package.json b/packages/shared/package.json index 948243e80e7..ceb9226a2bc 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -7,7 +7,7 @@ "@iota/bundle": "^1.0.0-beta.30", "@iota/converter": "^1.0.0-beta.30", "@iota/crypto.js": "^1.8.6", - "@iota/sdk": "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?bc6eb3a7219b50f3645aea5b59dc436d2dbefad3", + "@iota/sdk": "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?7aaa63927a9e85f37a39eb5915b800264c367d39", "@iota/transaction": "^1.0.0-beta.30", "@iota/transaction-converter": "^1.0.0-beta.30", "@iota/unit-converter": "^1.0.0-beta.30", diff --git a/yarn.lock b/yarn.lock index 3973b9cb753..1fc3dd2f779 100644 --- a/yarn.lock +++ b/yarn.lock @@ -767,9 +767,9 @@ resolved "https://registry.yarnpkg.com/@iota/pad/-/pad-1.0.0-beta.30.tgz#de19728f8f1b09c20e2365d0da34945006760082" integrity sha512-fnhPMPul18WunLq9Ni4rxzBFmhna6eaG8WroDg6GdQqSK/eN62uFHV8tpspJHXuCqwgCUVp6NpuUna7+B2OV9g== -"@iota/sdk@https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?bc6eb3a7219b50f3645aea5b59dc436d2dbefad3": +"@iota/sdk@https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?7aaa63927a9e85f37a39eb5915b800264c367d39": version "1.1.4" - resolved "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?bc6eb3a7219b50f3645aea5b59dc436d2dbefad3#d15e2d2ae9b287516676970e6dc19847845f929f" + resolved "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?7aaa63927a9e85f37a39eb5915b800264c367d39#4aecc22feae97d376698cca96dbfd3d25abff7e6" dependencies: "@types/node" "^18.15.12" cargo-cp-artifact "^0.1.6" @@ -1717,9 +1717,9 @@ integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA== "@types/node@^18.15.12": - version "18.18.13" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.13.tgz#ae0f76c0bfe79d8fad0f910b78ae3e59b333c6e8" - integrity sha512-vXYZGRrSCreZmq1rEjMRLXJhiy8MrIeVasx+PCVlP414N7CJLHnMf+juVvjdprHyH+XRy3zKZLHeNueOpJCn0g== + version "18.19.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.0.tgz#e86ce256c46661016fa83360bf8738eb4efdc88c" + integrity sha512-667KNhaD7U29mT5wf+TZUnrzPrlL2GNQ5N0BMjO2oNULhBxX0/FKCkm6JMu0Jh7Z+1LwUlR21ekd7KhIboNFNw== dependencies: undici-types "~5.26.4" From ca719a923d6d9e064c6fe940c31ab53e8e0432e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Fri, 1 Dec 2023 16:03:44 +0100 Subject: [PATCH 09/12] chore: bump version to 2.1.10-beta-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 45e3518af09..5eb3883baae 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Firefly Shimmer", - "version": "2.1.10-beta-4", + "version": "2.1.10-beta-5", "description": "Official wallet application of Shimmer", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git", From 5420e6f5b4f541d6f72f538b5619a108dd246080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Fri, 8 Dec 2023 17:12:04 +0100 Subject: [PATCH 10/12] chore: bump sdk to v1.1.4 --- packages/shared/package.json | 2 +- yarn.lock | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/packages/shared/package.json b/packages/shared/package.json index ceb9226a2bc..3c836c70b44 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -7,7 +7,7 @@ "@iota/bundle": "^1.0.0-beta.30", "@iota/converter": "^1.0.0-beta.30", "@iota/crypto.js": "^1.8.6", - "@iota/sdk": "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?7aaa63927a9e85f37a39eb5915b800264c367d39", + "@iota/sdk": "1.1.4", "@iota/transaction": "^1.0.0-beta.30", "@iota/transaction-converter": "^1.0.0-beta.30", "@iota/unit-converter": "^1.0.0-beta.30", diff --git a/yarn.lock b/yarn.lock index 1fc3dd2f779..66d54b2f144 100644 --- a/yarn.lock +++ b/yarn.lock @@ -767,9 +767,10 @@ resolved "https://registry.yarnpkg.com/@iota/pad/-/pad-1.0.0-beta.30.tgz#de19728f8f1b09c20e2365d0da34945006760082" integrity sha512-fnhPMPul18WunLq9Ni4rxzBFmhna6eaG8WroDg6GdQqSK/eN62uFHV8tpspJHXuCqwgCUVp6NpuUna7+B2OV9g== -"@iota/sdk@https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?7aaa63927a9e85f37a39eb5915b800264c367d39": +"@iota/sdk@1.1.4": version "1.1.4" - resolved "https://gitpkg.now.sh/iotaledger/iota-sdk/bindings/nodejs?7aaa63927a9e85f37a39eb5915b800264c367d39#4aecc22feae97d376698cca96dbfd3d25abff7e6" + resolved "https://registry.yarnpkg.com/@iota/sdk/-/sdk-1.1.4.tgz#0661c6132c7632afcf7bf211e30d3e1b7bdddbb8" + integrity sha512-crcFQZzhsApDr44qBUTaIncGeArXjhuuY8+sjtOvNKz96S322MBmYiFVcyEOjtyeddBdo3J7YVWHx5eInYOmvw== dependencies: "@types/node" "^18.15.12" cargo-cp-artifact "^0.1.6" @@ -1717,9 +1718,9 @@ integrity sha512-IXl7o+R9iti9eBW4Wg2hx1xQDig183jj7YLn8F7udNceyfkbn1ZxmzZXuak20gR40D7pIkIY1kYGx5VIGbaHKA== "@types/node@^18.15.12": - version "18.19.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.0.tgz#e86ce256c46661016fa83360bf8738eb4efdc88c" - integrity sha512-667KNhaD7U29mT5wf+TZUnrzPrlL2GNQ5N0BMjO2oNULhBxX0/FKCkm6JMu0Jh7Z+1LwUlR21ekd7KhIboNFNw== + version "18.19.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.3.tgz#e4723c4cb385641d61b983f6fe0b716abd5f8fc0" + integrity sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg== dependencies: undici-types "~5.26.4" @@ -6302,9 +6303,9 @@ nice-try@^1.0.4: integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== node-abi@^3.0.0, node-abi@^3.3.0, node-abi@^3.8.0: - version "3.51.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d" - integrity sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA== + version "3.52.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.52.0.tgz#ffba0a85f54e552547e5849015f40f9514d5ba7c" + integrity sha512-JJ98b02z16ILv7859irtXn4oUaFWADtvkzy2c0IAatNVX2Mc9Yoh8z6hZInn3QwvMEYhHuQloYi+TTQy67SIdQ== dependencies: semver "^7.3.5" @@ -7155,9 +7156,9 @@ rechoir@^0.8.0: resolve "^1.20.0" reflect-metadata@^0.1.13: - version "0.1.13" - resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" - integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg== + version "0.1.14" + resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.14.tgz#24cf721fe60677146bb77eeb0e1f9dece3d65859" + integrity sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A== regexp-tree@~0.1.1: version "0.1.27" From fcf30614f6674226d3b5d6e55d55a5294fef3ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20=C3=81lvarez=20de=20la=20Cruz?= Date: Fri, 8 Dec 2023 17:20:18 +0100 Subject: [PATCH 11/12] enhancement: dont allow sending while preparing the output for the transaction (#7771) * enhancement: dont allow sending while preparing the output for the transaction * improvement: use fixed locale to improve ui --- .../components/popups/send/SendConfirmationPopup.svelte | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte index 6d1e94b05d0..da41753901c 100644 --- a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte +++ b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte @@ -59,6 +59,8 @@ let minimumStorageDeposit = 0 let visibleSurplus: number | undefined = undefined + let isPreparingOutput = false + $: expirationTimePicker?.setNull(giftStorageDeposit) $: isBaseTokenTransfer = @@ -101,6 +103,8 @@ }) async function rebuildTransactionOutput(): Promise { + isPreparingOutput = true + updateNewTransactionDetails({ type: transactionType, expirationDate, @@ -126,6 +130,8 @@ } } catch (err) { handleError(err) + } finally { + isPreparingOutput = false } } @@ -261,9 +267,12 @@ classes="w-full" onClick={onConfirmClick} disabled={isTransferring || + isPreparingOutput || (layer2Parameters?.networkAddress && !$newTransactionDetails?.layer2Parameters?.gasBudget)} isBusy={isTransferring || + isPreparingOutput || (layer2Parameters?.networkAddress && !$newTransactionDetails?.layer2Parameters?.gasBudget)} + busyMessage={isPreparingOutput ? 'Preparing' : ''} > {localize('actions.send')} From 122146774a8e6527b4f2167afa0e93ddb379b03c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Tue, 12 Dec 2023 17:04:24 +0100 Subject: [PATCH 12/12] chore: bump version to 2.1.10 --- 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 5eb3883baae..b55a47dd980 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "desktop", "productName": "Firefly Shimmer", - "version": "2.1.10-beta-5", + "version": "2.1.10", "description": "Official wallet application of Shimmer", "main": "public/build/main.js", "repository": "git@github.com:iotaledger/firefly.git",