From 0c270ddcbf3888f7a1cace666e3d40eba3139839 Mon Sep 17 00:00:00 2001 From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Date: Fri, 26 Jul 2024 10:01:05 +0100 Subject: [PATCH 1/6] chore(wallet-mobile): bumped cardano-hw-app ledger 7.x (#3428) --- apps/wallet-mobile/package.json | 4 +-- .../src/yoroi-wallets/cardano/hw/hw.test.ts | 2 +- packages/swap/package.json | 4 +-- packages/types/package.json | 5 ++- yarn.lock | 31 ++++++------------- 5 files changed, 18 insertions(+), 28 deletions(-) diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json index b7a343ef9b..0d43a47353 100644 --- a/apps/wallet-mobile/package.json +++ b/apps/wallet-mobile/package.json @@ -91,7 +91,7 @@ }, "dependencies": { "@amplitude/analytics-react-native": "1.3.1", - "@cardano-foundation/ledgerjs-hw-app-cardano": "^6.0.0", + "@cardano-foundation/ledgerjs-hw-app-cardano": "^7.1.3", "@emurgo/cip14-js": "^3.0.1", "@emurgo/cip4-js": "1.0.7", "@emurgo/cross-csl-core": "4.4.0", @@ -99,7 +99,7 @@ "@emurgo/csl-mobile-bridge": "6.0.0-alpha.9", "@emurgo/react-native-blockies-svg": "^0.0.2", "@emurgo/react-native-hid": "^5.15.6", - "@emurgo/yoroi-lib": "0.15.5", + "@emurgo/yoroi-lib": "^0.15.6", "@formatjs/intl-datetimeformat": "^6.7.0", "@formatjs/intl-getcanonicallocales": "^2.1.0", "@formatjs/intl-locale": "^3.2.1", diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/hw/hw.test.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/hw/hw.test.ts index b203f0cde0..0e6850a478 100644 --- a/apps/wallet-mobile/src/yoroi-wallets/cardano/hw/hw.test.ts +++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/hw/hw.test.ts @@ -9,7 +9,7 @@ describe('hw', () => { major: 2, minor: 0, patch: 4, - flags: {isDebug: false}, + flags: {isDebug: false, isAppXS: false}, } const mockResponse: GetVersionResponse = { version, diff --git a/packages/swap/package.json b/packages/swap/package.json index 72badee65b..d83939b80f 100644 --- a/packages/swap/package.json +++ b/packages/swap/package.json @@ -142,7 +142,7 @@ }, "devDependencies": { "@commitlint/config-conventional": "^17.0.2", - "@emurgo/yoroi-lib": "0.15.3", + "@emurgo/yoroi-lib": "0.15.6", "@react-native-async-storage/async-storage": "^1.19.3", "@react-native-community/eslint-config": "^3.0.2", "@release-it/conventional-changelog": "^5.0.0", @@ -173,7 +173,7 @@ "typescript": "^5.3.3" }, "peerDependencies": { - "@emurgo/yoroi-lib": "0.15.3", + "@emurgo/yoroi-lib": "0.15.6", "@react-native-async-storage/async-storage": ">= 1.19.3 <= 1.20.0", "immer": "^10.0.2", "react": ">= 16.8.0 <= 19.0.0", diff --git a/packages/types/package.json b/packages/types/package.json index 8debea0af7..f60623ffde 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -114,7 +114,10 @@ "typescript": "^5.3.3" }, "peerDependencies": { - "axios": "^1.5.0" + "@emurgo/yoroi-lib": "0.15.6", + "axios": "^1.5.0", + "bignumber.js": "^9.0.1", + "rxjs": "^7.8.1" }, "packageManager": "yarn@1.22.21", "engines": { diff --git a/yarn.lock b/yarn.lock index 6b9c0c2800..0eca4ac66f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2397,10 +2397,10 @@ blake2 "^4.0.2" int64-buffer "^1.0.1" -"@cardano-foundation/ledgerjs-hw-app-cardano@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-6.0.0.tgz#720f2eb90efd8ca90a055bb09e22d8988bdda7cd" - integrity sha512-aiWlERF5sXMzygE62YH9AXrVePu5ZG+QKGv/ZhvYec35vUhDFJK8qPiLzXmTy6MdoDKSqbYVRPd6jY3KKs5pOg== +"@cardano-foundation/ledgerjs-hw-app-cardano@^7.1.3": + version "7.1.3" + resolved "https://registry.yarnpkg.com/@cardano-foundation/ledgerjs-hw-app-cardano/-/ledgerjs-hw-app-cardano-7.1.3.tgz#1d8bb05993c3e061029defff36e8d707221c05d5" + integrity sha512-1cW5WgF2pkla2pvNp/lGsPfdDh8FjnRRLUaHsyxgZd2NNtr939F9k5R/ExCuJS0Ish4wnArucbPAZ15Cq7PIUA== dependencies: "@ledgerhq/hw-transport" "^6.27.10" base-x "^3.0.5" @@ -2767,25 +2767,12 @@ "@ledgerhq/logs" "^5.15.0" rxjs "^6.5.5" -"@emurgo/yoroi-lib@0.15.3": - version "0.15.3" - resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.3.tgz#629cf1119c3b5b1946d64e7a031c1b21e6fca652" - integrity sha512-TOykcWUwybOlAMo+ELzapTv1uAXpYcXI1KDA2CYfZmdrsT8rnV2xc6Si085cKk/kviEZwMRn8XWmHhbGknT0Cg== - dependencies: - "@cardano-foundation/ledgerjs-hw-app-cardano" "^6.0.0" - "@emurgo/cross-csl-core" "4.4.0" - "@noble/hashes" "^1.3.2" - axios "^0.24.0" - bech32 "^2.0.0" - bignumber.js "^9.0.1" - easy-crc "1.1.0" - -"@emurgo/yoroi-lib@0.15.5": - version "0.15.5" - resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.5.tgz#534cf4b81376f2b185b73e05a2103d9712be4a8d" - integrity sha512-Fq6MN/l5Na14d3LOsnT7xzKDky1ugbKxQ6+zzxchZkcF+w0OXGtK4sFGXccR47E7JhRLhjLqOzKSKhKGkTVt+A== +"@emurgo/yoroi-lib@0.15.6", "@emurgo/yoroi-lib@^0.15.6": + version "0.15.6" + resolved "https://registry.yarnpkg.com/@emurgo/yoroi-lib/-/yoroi-lib-0.15.6.tgz#b17f3922598724fb02407be7fa816095c1e59f32" + integrity sha512-JX6PUaXRgpefDdtBw12jE6TYgp1fd4WXAMp9kj7EuT+FET3324iX8hRXNE5c1bS0wz9j1Qh3xwzWgiEtK7iJBw== dependencies: - "@cardano-foundation/ledgerjs-hw-app-cardano" "^6.0.0" + "@cardano-foundation/ledgerjs-hw-app-cardano" "^7.1.3" "@emurgo/cross-csl-core" "4.4.0" "@noble/hashes" "^1.3.2" axios "^0.24.0" From 56505de250fa6f3763a613d808ee28edfacf3847 Mon Sep 17 00:00:00 2001 From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:35:51 +0100 Subject: [PATCH 2/6] chore(wallet-mobile): bump ledger transport --- apps/wallet-mobile/package.json | 2 +- yarn.lock | 154 ++++++++++++++++++++++++++------ 2 files changed, 127 insertions(+), 29 deletions(-) diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json index 0d43a47353..77ddb50824 100644 --- a/apps/wallet-mobile/package.json +++ b/apps/wallet-mobile/package.json @@ -107,7 +107,7 @@ "@formatjs/intl-pluralrules": "^5.2.1", "@formatjs/intl-relativetimeformat": "^11.2.1", "@gorhom/bottom-sheet": "^4", - "@ledgerhq/react-native-hw-transport-ble": "6.27.3", + "@ledgerhq/react-native-hw-transport-ble": "^6.33.2", "@react-native-async-storage/async-storage": "^1.19.3", "@react-native-community/clipboard": "^1.5.1", "@react-native-community/datetimepicker": "^7.1.0", diff --git a/yarn.lock b/yarn.lock index 0eca4ac66f..30f62d353e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2943,11 +2943,39 @@ xcode "^3.0.1" xml2js "0.4.23" +"@expo/config-plugins@^7.2.5": + version "7.9.2" + resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-7.9.2.tgz#fc18e84761067ce670742d735b888613c06fbea8" + integrity sha512-sRU/OAp7kJxrCUiCTUZqvPMKPdiN1oTmNfnbkG4oPdfWQTpid3jyCH7ZxJEN5SI6jrY/ZsK5B/JPgjDUhuWLBQ== + dependencies: + "@expo/config-types" "^50.0.0-alpha.1" + "@expo/fingerprint" "^0.6.0" + "@expo/json-file" "~8.3.0" + "@expo/plist" "^0.1.0" + "@expo/sdk-runtime-versions" "^1.0.0" + "@react-native/normalize-color" "^2.0.0" + chalk "^4.1.2" + debug "^4.3.1" + find-up "~5.0.0" + getenv "^1.0.0" + glob "7.1.6" + resolve-from "^5.0.0" + semver "^7.5.3" + slash "^3.0.0" + slugify "^1.6.6" + xcode "^3.0.1" + xml2js "0.6.0" + "@expo/config-types@^48.0.0": version "48.0.0" resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-48.0.0.tgz#15a46921565ffeda3c3ba010701398f05193d5b3" integrity sha512-DwyV4jTy/+cLzXGAo1xftS6mVlSiLIWZjl9DjTCLPFVgNYQxnh7htPilRv4rBhiNs7KaznWqKU70+4zQoKVT9A== +"@expo/config-types@^50.0.0-alpha.1": + version "50.0.1" + resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-50.0.1.tgz#12d889214dedf64fbf2322c9d9e75c9d5ca7f695" + integrity sha512-EZHMgzkWRB9SMHO1e9m8s+OMahf92XYTnsCFjxhSfcDrcEoSdFPyJWDJVloHZPMGhxns7Fi2+A+bEVN/hD4NKA== + "@expo/config@8.0.5", "@expo/config@~8.0.0": version "8.0.5" resolved "https://registry.yarnpkg.com/@expo/config/-/config-8.0.5.tgz#71380a7a20f2e27fe386d7bb73428a437b27a96b" @@ -3006,6 +3034,19 @@ tmp "^0.0.33" tslib "^2.4.0" +"@expo/fingerprint@^0.6.0": + version "0.6.1" + resolved "https://registry.yarnpkg.com/@expo/fingerprint/-/fingerprint-0.6.1.tgz#763ae79b06f60e10853596bfa2bd730bfb13f2b0" + integrity sha512-ggLn6unI6qowlA1FihdQwPpLn16VJulYkvYAEL50gaqVahfNEglRQMSH2giZzjD0d6xq2/EQuUdFyHaJfyJwOQ== + dependencies: + "@expo/spawn-async" "^1.5.0" + chalk "^4.1.2" + debug "^4.3.4" + find-up "^5.0.0" + minimatch "^3.0.4" + p-limit "^3.1.0" + resolve-from "^5.0.0" + "@expo/image-utils@0.3.22": version "0.3.22" resolved "https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.3.22.tgz#3a45fb2e268d20fcc761c87bca3aca7fd8e24260" @@ -3032,6 +3073,15 @@ json5 "^2.2.2" write-file-atomic "^2.3.0" +"@expo/json-file@~8.3.0": + version "8.3.3" + resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.3.3.tgz#7926e3592f76030ce63d6b1308ac8f5d4d9341f4" + integrity sha512-eZ5dld9AD0PrVRiIWpRkm5aIoWBw3kAyd8VkuWEy92sEthBKDDDHAnK2a0dw0Eil6j7rK7lS/Qaq/Zzngv2h5A== + dependencies: + "@babel/code-frame" "~7.10.4" + json5 "^2.2.2" + write-file-atomic "^2.3.0" + "@expo/metro-config@~0.7.0": version "0.7.1" resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.7.1.tgz#eaae792da23554c1abbc401df868566fab29951b" @@ -3079,6 +3129,15 @@ base64-js "^1.2.3" xmlbuilder "^14.0.0" +"@expo/plist@^0.1.0": + version "0.1.3" + resolved "https://registry.yarnpkg.com/@expo/plist/-/plist-0.1.3.tgz#b4fbee2c4f7a88512a4853d85319f4d95713c529" + integrity sha512-GW/7hVlAylYg1tUrEASclw1MMk9FP4ZwyFAY/SUTJIhPDQHtfOlXREyWV3hhrHdX/K+pS73GNgdfT6E/e+kBbg== + dependencies: + "@xmldom/xmldom" "~0.7.7" + base64-js "^1.2.3" + xmlbuilder "^14.0.0" + "@expo/prebuild-config@6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-6.0.1.tgz#e3a5bbf5892859e71ac6a2408b1cc8ba6ca3f58f" @@ -4105,16 +4164,6 @@ rxjs "6" semver "^7.3.5" -"@ledgerhq/devices@^7.0.0": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-7.0.7.tgz#3499304a1c9d3aa7399de2ad390719bef5d1e89c" - integrity sha512-PZ9TtaTGBYUm/g0qNKPbECZt7DDNvqM3ILS5wAtOMna2cBR+mrywUGXrkjuOWlHpuqZ8wenaAKveQBbzF2ba8w== - dependencies: - "@ledgerhq/errors" "^6.12.3" - "@ledgerhq/logs" "^6.10.1" - rxjs "6" - semver "^7.3.5" - "@ledgerhq/devices@^8.0.4": version "8.0.4" resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.0.4.tgz#ebc7779adbbec2d046424603a481623eb3fbe306" @@ -4125,16 +4174,31 @@ rxjs "6" semver "^7.3.5" +"@ledgerhq/devices@^8.4.2": + version "8.4.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.4.2.tgz#f1c56194cf1343d56cad49c8feba92ad93432e14" + integrity sha512-oWNTp3jCMaEvRHsXNYE/yo+PFMgXAJGFHLOU1UdE4/fYkniHbD9wdxwyZrZvrxr9hNw4/9wHiThyITwPtMzG7g== + dependencies: + "@ledgerhq/errors" "^6.18.0" + "@ledgerhq/logs" "^6.12.0" + rxjs "^7.8.1" + semver "^7.3.5" + "@ledgerhq/errors@^5.15.0", "@ledgerhq/errors@^5.50.0": version "5.50.0" resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.50.0.tgz#e3a6834cb8c19346efca214c1af84ed28e69dad9" integrity sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow== -"@ledgerhq/errors@^6.10.1", "@ledgerhq/errors@^6.12.3", "@ledgerhq/errors@^6.12.7": +"@ledgerhq/errors@^6.12.7": version "6.12.7" resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.12.7.tgz#c7b630488d5713bc7b1e1682d6ab5d08918c69f1" integrity sha512-1BpjzFErPK7qPFx0oItcX0mNLJMplVAm2Dpl5urZlubewnTyyw5sahIBjU+8LLCWJ2eGEh/0wyvh0jMtR0n2Mg== +"@ledgerhq/errors@^6.18.0": + version "6.18.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.18.0.tgz#d55d6a57430d7a86532a9033ce0b45103264c620" + integrity sha512-L3jQWAGyooxRDk/MRlW2v4Ji9+kloBtdmz9wBkHaj2j0n+05rweJSV3GHw9oye1BYMbVFqFffmT4H3hlXlCasw== + "@ledgerhq/hw-transport@^5.12.0", "@ledgerhq/hw-transport@^5.15.0": version "5.51.1" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz#8dd14a8e58cbee4df0c29eaeef983a79f5f22578" @@ -4144,7 +4208,7 @@ "@ledgerhq/errors" "^5.50.0" events "^3.3.0" -"@ledgerhq/hw-transport@^6.27.10", "@ledgerhq/hw-transport@^6.27.2": +"@ledgerhq/hw-transport@^6.27.10": version "6.28.5" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.28.5.tgz#675193be2f695a596068145351da598316c25831" integrity sha512-xmw5RhYbqExBBqTvOnOjN/RYNIGMBxFJ+zcYNfkfw/E+uEY3L7xq8Z7sC/n7URTT6xtEctElqduBJnBQE4OQtw== @@ -4153,29 +4217,43 @@ "@ledgerhq/errors" "^6.12.7" events "^3.3.0" +"@ledgerhq/hw-transport@^6.31.2": + version "6.31.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.31.2.tgz#79c95f7928a64a0e3b5bc4ea7b5be04b9f738322" + integrity sha512-B27UIzMzm2IXPGYnEB95R7eHxpXBkTBHh6MUJJQZVknt8LilEz1tfpTYUdzAKDGQ+Z5MZyYb01Eh3Zqm3kn3uw== + dependencies: + "@ledgerhq/devices" "^8.4.2" + "@ledgerhq/errors" "^6.18.0" + "@ledgerhq/logs" "^6.12.0" + events "^3.3.0" + "@ledgerhq/logs@^5.15.0", "@ledgerhq/logs@^5.50.0": version "5.50.0" resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.50.0.tgz#29c6419e8379d496ab6d0426eadf3c4d100cd186" integrity sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA== -"@ledgerhq/logs@^6.10.0", "@ledgerhq/logs@^6.10.1": +"@ledgerhq/logs@^6.10.1": version "6.10.1" resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.10.1.tgz#5bd16082261d7364eabb511c788f00937dac588d" integrity sha512-z+ILK8Q3y+nfUl43ctCPuR4Y2bIxk/ooCQFwZxhtci1EhAtMDzMAx2W25qx8G1PPL9UUOdnUax19+F0OjXoj4w== -"@ledgerhq/react-native-hw-transport-ble@6.27.3": - version "6.27.3" - resolved "https://registry.yarnpkg.com/@ledgerhq/react-native-hw-transport-ble/-/react-native-hw-transport-ble-6.27.3.tgz#69bbfb705db46d9c2dad75b31c7c4d8c8c56af9a" - integrity sha512-b8DlfxYjpZ6IRvlLj55PH6cYCemYdbJIsmM6uzpSmMO3BoUis4qgU1xH9UBqcGScjzSYFWYt6v6ohbgc6W1Y4Q== - dependencies: - "@ledgerhq/devices" "^7.0.0" - "@ledgerhq/errors" "^6.10.1" - "@ledgerhq/hw-transport" "^6.27.2" - "@ledgerhq/logs" "^6.10.0" - invariant "^2.2.4" - react-native-ble-plx "2.0.3" - rxjs "6" - uuid "^3.4.0" +"@ledgerhq/logs@^6.12.0": + version "6.12.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.12.0.tgz#ad903528bf3687a44da435d7b2479d724d374f5d" + integrity sha512-ExDoj1QV5eC6TEbMdLUMMk9cfvNKhhv5gXol4SmULRVCx/3iyCPhJ74nsb3S0Vb+/f+XujBEj3vQn5+cwS0fNA== + +"@ledgerhq/react-native-hw-transport-ble@^6.33.2": + version "6.33.2" + resolved "https://registry.yarnpkg.com/@ledgerhq/react-native-hw-transport-ble/-/react-native-hw-transport-ble-6.33.2.tgz#6b6097d87dc544d66d978010a136be10a7ab15df" + integrity sha512-fkh2fbeBDz8fv5jmENndh8EGbPxEepx6uDdmKmJjaRyKvfcvRiM1bKKQdptQ96fumGnlkPvI9zO546R+IO/xzQ== + dependencies: + "@ledgerhq/devices" "^8.4.2" + "@ledgerhq/errors" "^6.18.0" + "@ledgerhq/hw-transport" "^6.31.2" + "@ledgerhq/logs" "^6.12.0" + react-native-ble-plx "3.1.2" + rxjs "^7.8.1" + uuid "^9.0.1" "@lerna/child-process@7.1.5": version "7.1.5" @@ -19705,7 +19783,14 @@ react-native-background-timer@2.4.1: resolved "https://registry.yarnpkg.com/react-native-background-timer/-/react-native-background-timer-2.4.1.tgz#a3bc1cafa8c1e3aeefd0611de120298b67978a0f" integrity sha512-TE4Kiy7jUyv+hugxDxitzu38sW1NqjCk4uE5IgU2WevLv7sZacaBc6PZKOShNRPGirLl1NWkaG3LDEkdb9Um5g== -react-native-ble-plx@2.0.3, react-native-ble-plx@^2.0.3: +react-native-ble-plx@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/react-native-ble-plx/-/react-native-ble-plx-3.1.2.tgz#fa57b6e2bf2102500f70df286578d66723d7b606" + integrity sha512-QgukxgjrZYMUxyZ9w4XEiR9QdbdKLibhggE+sPRxp6q11rZG9upU5aricnVB2CiSbn164nlYx3j+GNlJKSlaLg== + dependencies: + "@expo/config-plugins" "^7.2.5" + +react-native-ble-plx@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/react-native-ble-plx/-/react-native-ble-plx-2.0.3.tgz#b0a746f33389dbf7fd7b158513330d487d5d0fbb" integrity sha512-62LRDBPf/03K7sge+qq2ZuF8PWCGB782G+SBrpgNm5fA5Hs3FCY1ExTJZ1G0tB5ZhBPYEXcKRxPLuFegcDFrqA== @@ -21333,7 +21418,7 @@ slice-ansi@^5.0.0: ansi-styles "^6.0.0" is-fullwidth-code-point "^4.0.0" -slugify@^1.3.4: +slugify@^1.3.4, slugify@^1.6.6: version "1.6.6" resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.6.tgz#2d4ac0eacb47add6af9e04d3be79319cbcc7924b" integrity sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw== @@ -23177,6 +23262,11 @@ uuid@^9.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== +uuid@^9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" + integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== + v8-compile-cache-lib@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" @@ -23658,6 +23748,14 @@ xml2js@0.4.23: sax ">=0.6.0" xmlbuilder "~11.0.0" +xml2js@0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.0.tgz#07afc447a97d2bd6507a1f76eeadddb09f7a8282" + integrity sha512-eLTh0kA8uHceqesPqSE+VvO1CDDJWMwlQfB6LuN6T8w6MaDJ8Txm8P7s5cHD0miF0V+GGTZrDQfxPZQVsur33w== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + xmlbuilder@^14.0.0: version "14.0.0" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-14.0.0.tgz#876b5aec4f05ffd5feb97b0a871c855d16fbeb8c" From 93c2e5bcb6cae377e916a6dcc3ebfff93833be54 Mon Sep 17 00:00:00 2001 From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Date: Tue, 30 Jul 2024 13:23:53 +0100 Subject: [PATCH 3/6] fix(wallet-mobile): bump hw packages --- apps/wallet-mobile/package.json | 5 +- .../src/HW/LedgerConnect/LedgerConnect.tsx | 14 +- .../src/HW/LedgerConnect/LedgerConnect.json | 32 ++-- yarn.lock | 138 +++++------------- 4 files changed, 65 insertions(+), 124 deletions(-) diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json index 77ddb50824..aacf251675 100644 --- a/apps/wallet-mobile/package.json +++ b/apps/wallet-mobile/package.json @@ -107,7 +107,7 @@ "@formatjs/intl-pluralrules": "^5.2.1", "@formatjs/intl-relativetimeformat": "^11.2.1", "@gorhom/bottom-sheet": "^4", - "@ledgerhq/react-native-hw-transport-ble": "^6.33.2", + "@ledgerhq/react-native-hw-transport-ble": "6.27.3", "@react-native-async-storage/async-storage": "^1.19.3", "@react-native-community/clipboard": "^1.5.1", "@react-native-community/datetimepicker": "^7.1.0", @@ -159,7 +159,7 @@ "react-intl": "^6.6.2", "react-native": "~0.71.0", "react-native-background-timer": "2.4.1", - "react-native-ble-plx": "^2.0.3", + "react-native-ble-plx": "2.0.3", "react-native-bootsplash": "^4.6.0", "react-native-config": "^1.5.0", "react-native-crypto": "2.2.0", @@ -190,6 +190,7 @@ "react-native-webview": "^11.25.0", "react-query": "^3.39.3", "reselect": "^4.0.0", + "rxjs": "^7.8.1", "sentry-expo": "^7.0.1", "stream-browserify": "3.0.0", "tinycolor2": "1.4.2", diff --git a/apps/wallet-mobile/src/HW/LedgerConnect/LedgerConnect.tsx b/apps/wallet-mobile/src/HW/LedgerConnect/LedgerConnect.tsx index d9c6747c73..60d390575a 100644 --- a/apps/wallet-mobile/src/HW/LedgerConnect/LedgerConnect.tsx +++ b/apps/wallet-mobile/src/HW/LedgerConnect/LedgerConnect.tsx @@ -7,6 +7,7 @@ import * as React from 'react' import type {IntlShape} from 'react-intl' import {defineMessages, useIntl} from 'react-intl' import {ActivityIndicator, Alert, FlatList, Image, RefreshControl, ScrollView, StyleSheet, View} from 'react-native' +import {Observer} from 'rxjs' import bleImage from '../../assets/img/bluetooth.png' import usbImage from '../../assets/img/ledger-nano-usb.png' @@ -64,8 +65,8 @@ class _LedgerConnect extends React.Component { // as it's just an empty method. Rather, we make sure sate is only // modified when component is mounted let previousAvailable = false - TransportBLE.observeState({ - next: (e: {available: boolean}) => { + const observer: Observer<{available: boolean; type: string}> = { + next: (e: {available: boolean; type: string}) => { if (this._isMounted) { Logger.debug('BLE observeState event', e) if (this._bluetoothEnabled == null && !e.available) { @@ -89,7 +90,14 @@ class _LedgerConnect extends React.Component { } } }, - }) + error: (e) => { + Logger.error('BLE observeState error', e) + }, + complete: () => { + Logger.info('BLE observeState done') + }, + } + TransportBLE.observeState(observer) } this.startScan() } diff --git a/apps/wallet-mobile/translations/messages/src/HW/LedgerConnect/LedgerConnect.json b/apps/wallet-mobile/translations/messages/src/HW/LedgerConnect/LedgerConnect.json index e90899215d..d51e183eca 100644 --- a/apps/wallet-mobile/translations/messages/src/HW/LedgerConnect/LedgerConnect.json +++ b/apps/wallet-mobile/translations/messages/src/HW/LedgerConnect/LedgerConnect.json @@ -4,14 +4,14 @@ "defaultMessage": "!!!Scanning bluetooth devices...", "file": "src/HW/LedgerConnect/LedgerConnect.tsx", "start": { - "line": 315, + "line": 323, "column": 11, - "index": 9898 + "index": 10191 }, "end": { - "line": 318, + "line": 326, "column": 3, - "index": 10032 + "index": 10325 } }, { @@ -19,14 +19,14 @@ "defaultMessage": "!!!You'll need to:", "file": "src/HW/LedgerConnect/LedgerConnect.tsx", "start": { - "line": 319, + "line": 327, "column": 13, - "index": 10047 + "index": 10340 }, "end": { - "line": 322, + "line": 330, "column": 3, - "index": 10169 + "index": 10462 } }, { @@ -34,14 +34,14 @@ "defaultMessage": "!!!USB device is ready, please tap on Confirm to continue.", "file": "src/HW/LedgerConnect/LedgerConnect.tsx", "start": { - "line": 323, + "line": 331, "column": 18, - "index": 10189 + "index": 10482 }, "end": { - "line": 326, + "line": 334, "column": 3, - "index": 10334 + "index": 10627 } }, { @@ -49,14 +49,14 @@ "defaultMessage": "!!!An error occurred while trying to connect with your hardware wallet:", "file": "src/HW/LedgerConnect/LedgerConnect.tsx", "start": { - "line": 327, + "line": 335, "column": 9, - "index": 10345 + "index": 10638 }, "end": { - "line": 330, + "line": 338, "column": 3, - "index": 10516 + "index": 10809 } } ] \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 30f62d353e..4750125d66 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2943,39 +2943,11 @@ xcode "^3.0.1" xml2js "0.4.23" -"@expo/config-plugins@^7.2.5": - version "7.9.2" - resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-7.9.2.tgz#fc18e84761067ce670742d735b888613c06fbea8" - integrity sha512-sRU/OAp7kJxrCUiCTUZqvPMKPdiN1oTmNfnbkG4oPdfWQTpid3jyCH7ZxJEN5SI6jrY/ZsK5B/JPgjDUhuWLBQ== - dependencies: - "@expo/config-types" "^50.0.0-alpha.1" - "@expo/fingerprint" "^0.6.0" - "@expo/json-file" "~8.3.0" - "@expo/plist" "^0.1.0" - "@expo/sdk-runtime-versions" "^1.0.0" - "@react-native/normalize-color" "^2.0.0" - chalk "^4.1.2" - debug "^4.3.1" - find-up "~5.0.0" - getenv "^1.0.0" - glob "7.1.6" - resolve-from "^5.0.0" - semver "^7.5.3" - slash "^3.0.0" - slugify "^1.6.6" - xcode "^3.0.1" - xml2js "0.6.0" - "@expo/config-types@^48.0.0": version "48.0.0" resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-48.0.0.tgz#15a46921565ffeda3c3ba010701398f05193d5b3" integrity sha512-DwyV4jTy/+cLzXGAo1xftS6mVlSiLIWZjl9DjTCLPFVgNYQxnh7htPilRv4rBhiNs7KaznWqKU70+4zQoKVT9A== -"@expo/config-types@^50.0.0-alpha.1": - version "50.0.1" - resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-50.0.1.tgz#12d889214dedf64fbf2322c9d9e75c9d5ca7f695" - integrity sha512-EZHMgzkWRB9SMHO1e9m8s+OMahf92XYTnsCFjxhSfcDrcEoSdFPyJWDJVloHZPMGhxns7Fi2+A+bEVN/hD4NKA== - "@expo/config@8.0.5", "@expo/config@~8.0.0": version "8.0.5" resolved "https://registry.yarnpkg.com/@expo/config/-/config-8.0.5.tgz#71380a7a20f2e27fe386d7bb73428a437b27a96b" @@ -3034,19 +3006,6 @@ tmp "^0.0.33" tslib "^2.4.0" -"@expo/fingerprint@^0.6.0": - version "0.6.1" - resolved "https://registry.yarnpkg.com/@expo/fingerprint/-/fingerprint-0.6.1.tgz#763ae79b06f60e10853596bfa2bd730bfb13f2b0" - integrity sha512-ggLn6unI6qowlA1FihdQwPpLn16VJulYkvYAEL50gaqVahfNEglRQMSH2giZzjD0d6xq2/EQuUdFyHaJfyJwOQ== - dependencies: - "@expo/spawn-async" "^1.5.0" - chalk "^4.1.2" - debug "^4.3.4" - find-up "^5.0.0" - minimatch "^3.0.4" - p-limit "^3.1.0" - resolve-from "^5.0.0" - "@expo/image-utils@0.3.22": version "0.3.22" resolved "https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.3.22.tgz#3a45fb2e268d20fcc761c87bca3aca7fd8e24260" @@ -3073,15 +3032,6 @@ json5 "^2.2.2" write-file-atomic "^2.3.0" -"@expo/json-file@~8.3.0": - version "8.3.3" - resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.3.3.tgz#7926e3592f76030ce63d6b1308ac8f5d4d9341f4" - integrity sha512-eZ5dld9AD0PrVRiIWpRkm5aIoWBw3kAyd8VkuWEy92sEthBKDDDHAnK2a0dw0Eil6j7rK7lS/Qaq/Zzngv2h5A== - dependencies: - "@babel/code-frame" "~7.10.4" - json5 "^2.2.2" - write-file-atomic "^2.3.0" - "@expo/metro-config@~0.7.0": version "0.7.1" resolved "https://registry.yarnpkg.com/@expo/metro-config/-/metro-config-0.7.1.tgz#eaae792da23554c1abbc401df868566fab29951b" @@ -3129,15 +3079,6 @@ base64-js "^1.2.3" xmlbuilder "^14.0.0" -"@expo/plist@^0.1.0": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@expo/plist/-/plist-0.1.3.tgz#b4fbee2c4f7a88512a4853d85319f4d95713c529" - integrity sha512-GW/7hVlAylYg1tUrEASclw1MMk9FP4ZwyFAY/SUTJIhPDQHtfOlXREyWV3hhrHdX/K+pS73GNgdfT6E/e+kBbg== - dependencies: - "@xmldom/xmldom" "~0.7.7" - base64-js "^1.2.3" - xmlbuilder "^14.0.0" - "@expo/prebuild-config@6.0.1": version "6.0.1" resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-6.0.1.tgz#e3a5bbf5892859e71ac6a2408b1cc8ba6ca3f58f" @@ -4164,6 +4105,16 @@ rxjs "6" semver "^7.3.5" +"@ledgerhq/devices@^7.0.0": + version "7.0.7" + resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-7.0.7.tgz#3499304a1c9d3aa7399de2ad390719bef5d1e89c" + integrity sha512-PZ9TtaTGBYUm/g0qNKPbECZt7DDNvqM3ILS5wAtOMna2cBR+mrywUGXrkjuOWlHpuqZ8wenaAKveQBbzF2ba8w== + dependencies: + "@ledgerhq/errors" "^6.12.3" + "@ledgerhq/logs" "^6.10.1" + rxjs "6" + semver "^7.3.5" + "@ledgerhq/devices@^8.0.4": version "8.0.4" resolved "https://registry.yarnpkg.com/@ledgerhq/devices/-/devices-8.0.4.tgz#ebc7779adbbec2d046424603a481623eb3fbe306" @@ -4189,16 +4140,16 @@ resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-5.50.0.tgz#e3a6834cb8c19346efca214c1af84ed28e69dad9" integrity sha512-gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow== +"@ledgerhq/errors@^6.10.1", "@ledgerhq/errors@^6.12.3", "@ledgerhq/errors@^6.18.0": + version "6.18.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.18.0.tgz#d55d6a57430d7a86532a9033ce0b45103264c620" + integrity sha512-L3jQWAGyooxRDk/MRlW2v4Ji9+kloBtdmz9wBkHaj2j0n+05rweJSV3GHw9oye1BYMbVFqFffmT4H3hlXlCasw== + "@ledgerhq/errors@^6.12.7": version "6.12.7" resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.12.7.tgz#c7b630488d5713bc7b1e1682d6ab5d08918c69f1" integrity sha512-1BpjzFErPK7qPFx0oItcX0mNLJMplVAm2Dpl5urZlubewnTyyw5sahIBjU+8LLCWJ2eGEh/0wyvh0jMtR0n2Mg== -"@ledgerhq/errors@^6.18.0": - version "6.18.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/errors/-/errors-6.18.0.tgz#d55d6a57430d7a86532a9033ce0b45103264c620" - integrity sha512-L3jQWAGyooxRDk/MRlW2v4Ji9+kloBtdmz9wBkHaj2j0n+05rweJSV3GHw9oye1BYMbVFqFffmT4H3hlXlCasw== - "@ledgerhq/hw-transport@^5.12.0", "@ledgerhq/hw-transport@^5.15.0": version "5.51.1" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-5.51.1.tgz#8dd14a8e58cbee4df0c29eaeef983a79f5f22578" @@ -4217,7 +4168,7 @@ "@ledgerhq/errors" "^6.12.7" events "^3.3.0" -"@ledgerhq/hw-transport@^6.31.2": +"@ledgerhq/hw-transport@^6.27.2": version "6.31.2" resolved "https://registry.yarnpkg.com/@ledgerhq/hw-transport/-/hw-transport-6.31.2.tgz#79c95f7928a64a0e3b5bc4ea7b5be04b9f738322" integrity sha512-B27UIzMzm2IXPGYnEB95R7eHxpXBkTBHh6MUJJQZVknt8LilEz1tfpTYUdzAKDGQ+Z5MZyYb01Eh3Zqm3kn3uw== @@ -4232,28 +4183,29 @@ resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.50.0.tgz#29c6419e8379d496ab6d0426eadf3c4d100cd186" integrity sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA== +"@ledgerhq/logs@^6.10.0", "@ledgerhq/logs@^6.12.0": + version "6.12.0" + resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.12.0.tgz#ad903528bf3687a44da435d7b2479d724d374f5d" + integrity sha512-ExDoj1QV5eC6TEbMdLUMMk9cfvNKhhv5gXol4SmULRVCx/3iyCPhJ74nsb3S0Vb+/f+XujBEj3vQn5+cwS0fNA== + "@ledgerhq/logs@^6.10.1": version "6.10.1" resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.10.1.tgz#5bd16082261d7364eabb511c788f00937dac588d" integrity sha512-z+ILK8Q3y+nfUl43ctCPuR4Y2bIxk/ooCQFwZxhtci1EhAtMDzMAx2W25qx8G1PPL9UUOdnUax19+F0OjXoj4w== -"@ledgerhq/logs@^6.12.0": - version "6.12.0" - resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-6.12.0.tgz#ad903528bf3687a44da435d7b2479d724d374f5d" - integrity sha512-ExDoj1QV5eC6TEbMdLUMMk9cfvNKhhv5gXol4SmULRVCx/3iyCPhJ74nsb3S0Vb+/f+XujBEj3vQn5+cwS0fNA== - -"@ledgerhq/react-native-hw-transport-ble@^6.33.2": - version "6.33.2" - resolved "https://registry.yarnpkg.com/@ledgerhq/react-native-hw-transport-ble/-/react-native-hw-transport-ble-6.33.2.tgz#6b6097d87dc544d66d978010a136be10a7ab15df" - integrity sha512-fkh2fbeBDz8fv5jmENndh8EGbPxEepx6uDdmKmJjaRyKvfcvRiM1bKKQdptQ96fumGnlkPvI9zO546R+IO/xzQ== +"@ledgerhq/react-native-hw-transport-ble@6.27.3": + version "6.27.3" + resolved "https://registry.yarnpkg.com/@ledgerhq/react-native-hw-transport-ble/-/react-native-hw-transport-ble-6.27.3.tgz#69bbfb705db46d9c2dad75b31c7c4d8c8c56af9a" + integrity sha512-b8DlfxYjpZ6IRvlLj55PH6cYCemYdbJIsmM6uzpSmMO3BoUis4qgU1xH9UBqcGScjzSYFWYt6v6ohbgc6W1Y4Q== dependencies: - "@ledgerhq/devices" "^8.4.2" - "@ledgerhq/errors" "^6.18.0" - "@ledgerhq/hw-transport" "^6.31.2" - "@ledgerhq/logs" "^6.12.0" - react-native-ble-plx "3.1.2" - rxjs "^7.8.1" - uuid "^9.0.1" + "@ledgerhq/devices" "^7.0.0" + "@ledgerhq/errors" "^6.10.1" + "@ledgerhq/hw-transport" "^6.27.2" + "@ledgerhq/logs" "^6.10.0" + invariant "^2.2.4" + react-native-ble-plx "2.0.3" + rxjs "6" + uuid "^3.4.0" "@lerna/child-process@7.1.5": version "7.1.5" @@ -19783,14 +19735,7 @@ react-native-background-timer@2.4.1: resolved "https://registry.yarnpkg.com/react-native-background-timer/-/react-native-background-timer-2.4.1.tgz#a3bc1cafa8c1e3aeefd0611de120298b67978a0f" integrity sha512-TE4Kiy7jUyv+hugxDxitzu38sW1NqjCk4uE5IgU2WevLv7sZacaBc6PZKOShNRPGirLl1NWkaG3LDEkdb9Um5g== -react-native-ble-plx@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/react-native-ble-plx/-/react-native-ble-plx-3.1.2.tgz#fa57b6e2bf2102500f70df286578d66723d7b606" - integrity sha512-QgukxgjrZYMUxyZ9w4XEiR9QdbdKLibhggE+sPRxp6q11rZG9upU5aricnVB2CiSbn164nlYx3j+GNlJKSlaLg== - dependencies: - "@expo/config-plugins" "^7.2.5" - -react-native-ble-plx@^2.0.3: +react-native-ble-plx@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/react-native-ble-plx/-/react-native-ble-plx-2.0.3.tgz#b0a746f33389dbf7fd7b158513330d487d5d0fbb" integrity sha512-62LRDBPf/03K7sge+qq2ZuF8PWCGB782G+SBrpgNm5fA5Hs3FCY1ExTJZ1G0tB5ZhBPYEXcKRxPLuFegcDFrqA== @@ -21418,7 +21363,7 @@ slice-ansi@^5.0.0: ansi-styles "^6.0.0" is-fullwidth-code-point "^4.0.0" -slugify@^1.3.4, slugify@^1.6.6: +slugify@^1.3.4: version "1.6.6" resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.6.tgz#2d4ac0eacb47add6af9e04d3be79319cbcc7924b" integrity sha512-h+z7HKHYXj6wJU+AnS/+IH8Uh9fdcX1Lrhg1/VMdf9PwoBQXFcXiAdsy2tSK0P6gKwJLXp02r90ahUCqHk9rrw== @@ -23262,11 +23207,6 @@ uuid@^9.0.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== -uuid@^9.0.1: - version "9.0.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30" - integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA== - v8-compile-cache-lib@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" @@ -23748,14 +23688,6 @@ xml2js@0.4.23: sax ">=0.6.0" xmlbuilder "~11.0.0" -xml2js@0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.0.tgz#07afc447a97d2bd6507a1f76eeadddb09f7a8282" - integrity sha512-eLTh0kA8uHceqesPqSE+VvO1CDDJWMwlQfB6LuN6T8w6MaDJ8Txm8P7s5cHD0miF0V+GGTZrDQfxPZQVsur33w== - dependencies: - sax ">=0.6.0" - xmlbuilder "~11.0.0" - xmlbuilder@^14.0.0: version "14.0.0" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-14.0.0.tgz#876b5aec4f05ffd5feb97b0a871c855d16fbeb8c" From 98e55cc3a03c312b6bda527cbd59553c53c879b4 Mon Sep 17 00:00:00 2001 From: ci-bot Date: Tue, 30 Jul 2024 12:27:16 +0000 Subject: [PATCH 4/6] chore(release): nightly --- apps/wallet-mobile/android/app/build.gradle | 2 +- apps/wallet-mobile/ios/nightly.plist | 2 +- apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj | 8 ++++---- apps/wallet-mobile/ios/yoroi/Info.plist | 2 +- apps/wallet-mobile/ios/yoroiTests/Info.plist | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle index 8b8bd057b8..57bec52041 100644 --- a/apps/wallet-mobile/android/app/build.gradle +++ b/apps/wallet-mobile/android/app/build.gradle @@ -108,7 +108,7 @@ android { applicationId "com.emurgo" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 688 + versionCode 689 versionName "4.27.0" testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist index 7699d820fd..7faf38607e 100644 --- a/apps/wallet-mobile/ios/nightly.plist +++ b/apps/wallet-mobile/ios/nightly.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 575 + 576 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj index ca1914972d..b96b214afe 100644 --- a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj +++ b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj @@ -839,7 +839,7 @@ CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 575; + CURRENT_PROJECT_VERSION = 576; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -884,7 +884,7 @@ CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 575; + CURRENT_PROJECT_VERSION = 576; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env.production"; @@ -1079,7 +1079,7 @@ CODE_SIGN_ENTITLEMENTS = nightly.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 575; + CURRENT_PROJECT_VERSION = 576; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1124,7 +1124,7 @@ CODE_SIGN_ENTITLEMENTS = nightly.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 575; + CURRENT_PROJECT_VERSION = 576; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env.nightly"; diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist index 1cd0b46d1a..8cf4a061b4 100644 --- a/apps/wallet-mobile/ios/yoroi/Info.plist +++ b/apps/wallet-mobile/ios/yoroi/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 575 + 576 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist index 8c471fa3d6..b33b65ff30 100644 --- a/apps/wallet-mobile/ios/yoroiTests/Info.plist +++ b/apps/wallet-mobile/ios/yoroiTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 575 + 576 From 82be1ff4e4067975c61e8864e674f6b9935c863d Mon Sep 17 00:00:00 2001 From: Juliano Lazzarotto <30806844+stackchain@users.noreply.github.com> Date: Tue, 30 Jul 2024 13:29:04 +0100 Subject: [PATCH 5/6] chore(wallet-mobile): bump versions --- apps/wallet-mobile/android/app/build.gradle | 2 +- apps/wallet-mobile/ios/nightly.plist | 2 +- apps/wallet-mobile/ios/yoroi/Info.plist | 2 +- apps/wallet-mobile/ios/yoroiTests/Info.plist | 2 +- apps/wallet-mobile/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle index 57bec52041..00661e3247 100644 --- a/apps/wallet-mobile/android/app/build.gradle +++ b/apps/wallet-mobile/android/app/build.gradle @@ -109,7 +109,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 689 - versionName "4.27.0" + versionName "4.28.0" testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist index 7faf38607e..983cbca1ae 100644 --- a/apps/wallet-mobile/ios/nightly.plist +++ b/apps/wallet-mobile/ios/nightly.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.27.0 + 4.28.0 CFBundleSignature ???? CFBundleVersion diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist index 8cf4a061b4..af25b8a768 100644 --- a/apps/wallet-mobile/ios/yoroi/Info.plist +++ b/apps/wallet-mobile/ios/yoroi/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.27.0 + 4.28.0 CFBundleSignature ???? CFBundleURLTypes diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist index b33b65ff30..9b35fbc2e0 100644 --- a/apps/wallet-mobile/ios/yoroiTests/Info.plist +++ b/apps/wallet-mobile/ios/yoroiTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 4.27.0 + 4.28.0 CFBundleSignature ???? CFBundleVersion diff --git a/apps/wallet-mobile/package.json b/apps/wallet-mobile/package.json index aacf251675..fb35f805ac 100644 --- a/apps/wallet-mobile/package.json +++ b/apps/wallet-mobile/package.json @@ -1,6 +1,6 @@ { "name": "@yoroi/wallet-mobile", - "version": "4.27.1", + "version": "4.28.0", "private": true, "scripts": { "android-bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res", From bd20a2d5b4249e7660ae17f8a7831e94dae301c2 Mon Sep 17 00:00:00 2001 From: ci-bot Date: Tue, 30 Jul 2024 12:32:35 +0000 Subject: [PATCH 6/6] chore(release): nightly --- apps/wallet-mobile/android/app/build.gradle | 2 +- apps/wallet-mobile/ios/nightly.plist | 2 +- apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj | 8 ++++---- apps/wallet-mobile/ios/yoroi/Info.plist | 2 +- apps/wallet-mobile/ios/yoroiTests/Info.plist | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/wallet-mobile/android/app/build.gradle b/apps/wallet-mobile/android/app/build.gradle index 00661e3247..e3e4527583 100644 --- a/apps/wallet-mobile/android/app/build.gradle +++ b/apps/wallet-mobile/android/app/build.gradle @@ -108,7 +108,7 @@ android { applicationId "com.emurgo" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 689 + versionCode 690 versionName "4.28.0" testBuildType System.getProperty('testBuildType', 'debug') testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/apps/wallet-mobile/ios/nightly.plist b/apps/wallet-mobile/ios/nightly.plist index 983cbca1ae..3290f7974f 100644 --- a/apps/wallet-mobile/ios/nightly.plist +++ b/apps/wallet-mobile/ios/nightly.plist @@ -21,7 +21,7 @@ CFBundleSignature ???? CFBundleVersion - 576 + 577 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj index b96b214afe..6d6384ffb5 100644 --- a/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj +++ b/apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj @@ -839,7 +839,7 @@ CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 576; + CURRENT_PROJECT_VERSION = 577; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -884,7 +884,7 @@ CODE_SIGN_ENTITLEMENTS = yoroi/yoroi.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 576; + CURRENT_PROJECT_VERSION = 577; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env.production"; @@ -1079,7 +1079,7 @@ CODE_SIGN_ENTITLEMENTS = nightly.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 576; + CURRENT_PROJECT_VERSION = 577; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENABLE_BITCODE = NO; @@ -1124,7 +1124,7 @@ CODE_SIGN_ENTITLEMENTS = nightly.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 576; + CURRENT_PROJECT_VERSION = 577; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = F8NVT2G2L4; ENVFILE = "$(PODS_ROOT)/../../.env.nightly"; diff --git a/apps/wallet-mobile/ios/yoroi/Info.plist b/apps/wallet-mobile/ios/yoroi/Info.plist index af25b8a768..37e8a934be 100644 --- a/apps/wallet-mobile/ios/yoroi/Info.plist +++ b/apps/wallet-mobile/ios/yoroi/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 576 + 577 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/apps/wallet-mobile/ios/yoroiTests/Info.plist b/apps/wallet-mobile/ios/yoroiTests/Info.plist index 9b35fbc2e0..432c87dda7 100644 --- a/apps/wallet-mobile/ios/yoroiTests/Info.plist +++ b/apps/wallet-mobile/ios/yoroiTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 576 + 577