Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Fix: LIVE-13547 Replace expo-random lib with expo-crypto #7586

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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/stupid-coins-build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@ledgerhq/coin-ton": patch
"live-mobile": patch
"@ledgerhq/live-common": patch
---

fix: replace expo-random lib with expo-crypto
2 changes: 1 addition & 1 deletion apps/ledger-live-mobile/.unimportedrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"expo-image-loader",
"expo-modules-autolinking",
"expo-modules-core",
"expo-random",
"expo-crypto",
"prop-types",
"react-native-codegen",
"react-native-fast-pbkdf2",
Expand Down
12 changes: 6 additions & 6 deletions apps/ledger-live-mobile/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ PODS:
- ExpoModulesCore
- ZXingObjC/OneD
- ZXingObjC/PDF417
- ExpoCrypto (12.8.1):
- ExpoModulesCore
- ExpoFileSystem (16.0.8):
- ExpoModulesCore
- ExpoImageManipulator (11.8.0):
Expand All @@ -47,8 +49,6 @@ PODS:
- React-NativeModulesApple
- React-RCTAppDelegate
- ReactCommon/turbomodule/core
- ExpoRandom (13.6.0):
- ExpoModulesCore
- FBLazyVector (0.73.6)
- FBReactNativeSpec (0.73.6):
- RCT-Folly (= 2022.05.16.00)
Expand Down Expand Up @@ -1418,11 +1418,11 @@ DEPENDENCIES:
- "EXImageLoader (from `../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]_reac_wajnkpyn453mstvl5ptvmgckqi/node_modules/expo-image-loader/ios`)"
- "Expo (from `../../../node_modules/.pnpm/[email protected]_@[email protected]_@[email protected]_@[email protected]__expo-m_x6ekalzt4c5scoc72n5xqrun6q/node_modules/expo`)"
- "ExpoCamera (from `../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]_react@18._7axu465aov6jwcuohjxifpffzu/node_modules/expo-camera/ios`)"
- "ExpoCrypto (from `../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]_react@18._f3pw2vhdzqwifnm4jdvwei6rie/node_modules/expo-crypto/ios`)"
- "ExpoFileSystem (from `../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]_reac_f2vophyguewptethhwrvhw6jze/node_modules/expo-file-system/ios`)"
- "ExpoImageManipulator (from `../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]._sgbzbk7nfhtlihtns5cja4huei/node_modules/expo-image-manipulator/ios`)"
- "ExpoKeepAwake (from `../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]_react_gqhplzyroote7enqgwhytprwhq/node_modules/expo-keep-awake/ios`)"
- "ExpoModulesCore (from `../../../node_modules/.pnpm/[email protected][email protected]_@[email protected][email protected][email protected]/node_modules/expo-modules-core`)"
- "ExpoRandom (from `../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]_react@18._74hzmsxcfy4hq2gp3ztpqsecuu/node_modules/expo-random/ios`)"
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
- Flipper (= 0.201.0)
Expand Down Expand Up @@ -1605,6 +1605,8 @@ EXTERNAL SOURCES:
:path: "../../../node_modules/.pnpm/[email protected]_@[email protected]_@[email protected]_@[email protected]__expo-m_x6ekalzt4c5scoc72n5xqrun6q/node_modules/expo"
ExpoCamera:
:path: "../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]_react@18._7axu465aov6jwcuohjxifpffzu/node_modules/expo-camera/ios"
ExpoCrypto:
:path: "../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]_react@18._f3pw2vhdzqwifnm4jdvwei6rie/node_modules/expo-crypto/ios"
ExpoFileSystem:
:path: "../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]_reac_f2vophyguewptethhwrvhw6jze/node_modules/expo-file-system/ios"
ExpoImageManipulator:
Expand All @@ -1613,8 +1615,6 @@ EXTERNAL SOURCES:
:path: "../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]_react_gqhplzyroote7enqgwhytprwhq/node_modules/expo-keep-awake/ios"
ExpoModulesCore:
:path: "../../../node_modules/.pnpm/[email protected][email protected]_@[email protected][email protected][email protected]/node_modules/expo-modules-core"
ExpoRandom:
:path: "../../../node_modules/.pnpm/[email protected][email protected][email protected]_@[email protected]_react@18._74hzmsxcfy4hq2gp3ztpqsecuu/node_modules/expo-random/ios"
FBLazyVector:
:path: "../node_modules/react-native/Libraries/FBLazyVector"
FBReactNativeSpec:
Expand Down Expand Up @@ -1824,11 +1824,11 @@ SPEC CHECKSUMS:
EXImageLoader: 55080616b2fe9da19ef8c7f706afd9814e279b6b
Expo: e01a77c6fa4bc80a6d1bb949cda1d12d21044abd
ExpoCamera: f3f157db67e5a491e1104a2c0018c240242936e7
ExpoCrypto: b6428f48599c007676dc81a9b5f72c07e62fdccc
ExpoFileSystem: eecaf6796aed0f4dd20042dc2ca2cac6c4bc1185
ExpoImageManipulator: c1d7cb865eacd620a35659f3da34c70531f10b59
ExpoKeepAwake: 0f5cad99603a3268e50af9a6eb8b76d0d9ac956c
ExpoModulesCore: 61dc57c6e2a35f2f84baf488146db624e03af4cd
ExpoRandom: f0cd58e154e463d913462f3b445870b12d1c2f12
FBLazyVector: f64d1e2ea739b4d8f7e4740cde18089cd97fe864
FBReactNativeSpec: 7351d9daa8a692bc3af6eb00a56e4cdb07403431
Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
Expand Down
2 changes: 1 addition & 1 deletion apps/ledger-live-mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"expo-keep-awake": "~12.8.2",
"expo-modules-autolinking": "^1.10.2",
"expo-modules-core": "^1.11.8",
"expo-random": "^13.6.0",
"expo-crypto": "^12.8.1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use the latest version (13.0.2) of expo-crypto ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good point.
In fact, I just take the same PR as zondax did. https://github.com/LedgerHQ/ledger-live/pull/7459/files
I will try with your suggestion, thanks

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In fact,
in the new version of expo-crypto
the https://github.com/expo/expo/blob/main/packages/expo-crypto/android/build.gradle
is not compatible with our current android SDK version and it causes an error in CI.

it seems that the "useDefaultAndroidSdkVersions" needs a higher version of android SDK version.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay too bad maybe we'll need to update that at some point with the next RN update

"fuse.js": "^6.4.6",
"hoist-non-react-statics": "3.3.2",
"i18next": "20.6.1",
Expand Down
4 changes: 2 additions & 2 deletions libs/coin-modules/coin-ton/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
"@ledgerhq/logs": "workspace:^",
"@ledgerhq/types-cryptoassets": "workspace:^",
"@ledgerhq/types-live": "workspace:^",
"@ton/core": "^0.56.1",
"@ton/core": "^0.56.3",
"@ton/ton": "^13.11.1",
"@ton/crypto": "3.2.0",
"@ton/crypto": "^3.3.0",
"bignumber.js": "^9.1.2",
"expect": "^27.4.6",
"invariant": "^2.2.2",
Expand Down
4 changes: 2 additions & 2 deletions libs/ledger-live-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@
"@stricahq/typhonjs": "^2.0.0",
"@taquito/ledger-signer": "^20.0.0",
"@ton-community/ton-ledger": "^7.0.1",
"@ton/core": "^0.56.1",
"@ton/crypto": "3.2.0",
"@ton/core": "^0.56.3",
"@ton/crypto": "^3.3.0",
"@types/bchaddrjs": "^0.4.0",
"@types/pako": "^2.0.0",
"@types/qs": "^6.9.7",
Expand Down
Loading
Loading