diff --git a/.gitignore b/.gitignore index d0308a18..7c315a37 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ web-build/ .env .npmrc +.yarn \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index c12617ec..bff8eb48 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -465,8 +465,6 @@ PODS: - ReactCommon/turbomodule/core - react-native-splash-screen (3.3.0): - React-Core - - react-native-voice (3.2.4): - - React-Core - react-native-webview (13.8.6): - RCT-Folly (= 2021.07.22.00) - React-Core @@ -689,7 +687,6 @@ DEPENDENCIES: - react-native-restart (from `../node_modules/react-native-restart`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) - react-native-splash-screen (from `../node_modules/react-native-splash-screen`) - - "react-native-voice (from `../node_modules/@react-native-voice/voice`)" - react-native-webview (from `../node_modules/react-native-webview`) - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) @@ -846,8 +843,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-safe-area-context" react-native-splash-screen: :path: "../node_modules/react-native-splash-screen" - react-native-voice: - :path: "../node_modules/@react-native-voice/voice" react-native-webview: :path: "../node_modules/react-native-webview" React-NativeModulesApple: @@ -972,7 +967,6 @@ SPEC CHECKSUMS: react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162 react-native-safe-area-context: 36cc67648134e89465663b8172336a19eeda493d react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457 - react-native-voice: f5e8eec2278451d0017eb6a30a6ccc726aca34e0 react-native-webview: a987704e6cd3f5a21d372ef316e43f7b442d59ca React-NativeModulesApple: c3e696ff867e4bc212266cbdf7e862e48a0166fd React-perflogger: 43287389ea08993c300897a46f95cfac04bb6c1a diff --git a/package-lock.json b/package-lock.json index 6e1410e8..c48c8977 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,6 @@ "@react-navigation/native": "6.1.9", "@react-navigation/native-stack": "6.9.17", "@vulpemventures/react-native-gdk": "^0.0.5", - "@vulpemventures/secp256k1-zkp": "^3.2.1", "ably": "^2.0.2", "assert": "^2.1.0", "axios": "^1.7.2", @@ -48,6 +47,7 @@ "expo-local-authentication": "~13.4.1", "expo-notifications": "~0.20.1", "expo-secure-store": "~12.3.1", + "expo-speech": "~11.3.0", "expo-status-bar": "~1.6.0", "expo-task-manager": "~11.3.0", "expo-web-browser": "~12.3.2", @@ -90,7 +90,7 @@ "@babel/runtime": "^7.20.0", "@react-native/eslint-config": "^0.72.2", "@react-native/metro-config": "^0.72.11", - "@tsconfig/react-native": "^3.0.0", + "@tsconfig/react-native": "^3.0.5", "@types/react": "^18.0.24", "@types/react-native-event-source": "^1.1.2", "@types/react-test-renderer": "^18.0.0", @@ -5716,9 +5716,9 @@ } }, "node_modules/@openzeppelin/contracts": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.1.tgz", - "integrity": "sha512-yQJaT5HDp9hYOOp4jTYxMsR02gdFZFXhewX5HW9Jo4fsqSVqqyIO/xTHdWDaKX5a3pv1txmf076Lziz+sO7L1w==" + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz", + "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==" }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", @@ -7751,9 +7751,9 @@ } }, "node_modules/@tsconfig/react-native": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@tsconfig/react-native/-/react-native-3.0.2.tgz", - "integrity": "sha512-F7IoHEqf741lut4Z2K+IkWQRvXAhBiZMeY5L7BysG7Z2Z3MlIyFR+AagD8jQ/CqC1vowGnRwfLjeuwIpaeoJxA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@tsconfig/react-native/-/react-native-3.0.5.tgz", + "integrity": "sha512-0+pmYzHccvwWpFz2Tv5AJxp6UroLALmAy+SX34tKlwaCie1mNbtCv6uOJp7x8pKchgNA9/n6BGrx7uLQvw8p9A==", "dev": true }, "node_modules/@types/babel__core": { @@ -9358,12 +9358,12 @@ "integrity": "sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==" }, "node_modules/boltz-core": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/boltz-core/-/boltz-core-2.1.1.tgz", - "integrity": "sha512-nbbMQbWcpJKoPvf1KNKZOlcOoflIrcretVhdt4rQ+QXVRULj+lCbl8t3FCfYLNKurWxl7OC3j/f+ILFCU7tkIw==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/boltz-core/-/boltz-core-2.1.2.tgz", + "integrity": "sha512-b19P5dFIWl/bf/sqBlSRbTj7+/48hWaTUfR1qVkWaPr+OR1T0gNuYP86EOi3yQwR689GxXk0adeV5rKc9ue3Xw==", "dependencies": { "@boltz/bitcoin-ops": "^2.0.0", - "@openzeppelin/contracts": "^5.0.1", + "@openzeppelin/contracts": "^5.0.2", "@vulpemventures/secp256k1-zkp": "^3.2.1", "bip32": "^4.0.0", "bip65": "^1.0.3", @@ -12400,6 +12400,14 @@ "expo": "*" } }, + "node_modules/expo-speech": { + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/expo-speech/-/expo-speech-11.3.0.tgz", + "integrity": "sha512-pJLh8pLuMJRZrg7hzS4JtMwvjbgfCkmoERL45A8vkq8VQFo+2GPT72BMuC9xy1sys7CGZJ8M5yMYTE5saUr1rg==", + "peerDependencies": { + "expo": "*" + } + }, "node_modules/expo-status-bar": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-1.6.0.tgz", diff --git a/package.json b/package.json index 585c26eb..92af9c7f 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "@react-navigation/native": "6.1.9", "@react-navigation/native-stack": "6.9.17", "@vulpemventures/react-native-gdk": "^0.0.5", - "@vulpemventures/secp256k1-zkp": "^3.2.1", "ably": "^2.0.2", "assert": "^2.1.0", "axios": "^1.7.2", @@ -50,6 +49,7 @@ "expo-local-authentication": "~13.4.1", "expo-notifications": "~0.20.1", "expo-secure-store": "~12.3.1", + "expo-speech": "~11.3.0", "expo-status-bar": "~1.6.0", "expo-task-manager": "~11.3.0", "expo-web-browser": "~12.3.2", @@ -92,7 +92,7 @@ "@babel/runtime": "^7.20.0", "@react-native/eslint-config": "^0.72.2", "@react-native/metro-config": "^0.72.11", - "@tsconfig/react-native": "^3.0.0", + "@tsconfig/react-native": "^3.0.5", "@types/react": "^18.0.24", "@types/react-native-event-source": "^1.1.2", "@types/react-test-renderer": "^18.0.0", diff --git a/patches/pdkdf2.patch b/patches/pdkdf2.patch new file mode 100644 index 00000000..8a98d794 --- /dev/null +++ b/patches/pdkdf2.patch @@ -0,0 +1 @@ +# make defult encoding the same for both causes an error \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 6c8fa752..98bf4330 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2482,10 +2482,10 @@ mkdirp "^1.0.4" rimraf "^3.0.2" -"@openzeppelin/contracts@^5.0.1": - version "5.0.1" - resolved "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.1.tgz" - integrity sha512-yQJaT5HDp9hYOOp4jTYxMsR02gdFZFXhewX5HW9Jo4fsqSVqqyIO/xTHdWDaKX5a3pv1txmf076Lziz+sO7L1w== +"@openzeppelin/contracts@^5.0.2": + version "5.0.2" + resolved "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz" + integrity sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA== "@pkgjs/parseargs@^0.11.0": version "0.11.0" @@ -2966,10 +2966,10 @@ dependencies: defer-to-connect "^2.0.0" -"@tsconfig/react-native@^3.0.0": - version "3.0.2" - resolved "https://registry.npmjs.org/@tsconfig/react-native/-/react-native-3.0.2.tgz" - integrity sha512-F7IoHEqf741lut4Z2K+IkWQRvXAhBiZMeY5L7BysG7Z2Z3MlIyFR+AagD8jQ/CqC1vowGnRwfLjeuwIpaeoJxA== +"@tsconfig/react-native@^3.0.5": + version "3.0.5" + resolved "https://registry.npmjs.org/@tsconfig/react-native/-/react-native-3.0.5.tgz" + integrity sha512-0+pmYzHccvwWpFz2Tv5AJxp6UroLALmAy+SX34tKlwaCie1mNbtCv6uOJp7x8pKchgNA9/n6BGrx7uLQvw8p9A== "@types/babel__core@^7.1.14": version "7.20.4" @@ -3983,12 +3983,12 @@ bolt11@^1.4.1: secp256k1 "^4.0.2" boltz-core@^2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/boltz-core/-/boltz-core-2.1.1.tgz" - integrity sha512-nbbMQbWcpJKoPvf1KNKZOlcOoflIrcretVhdt4rQ+QXVRULj+lCbl8t3FCfYLNKurWxl7OC3j/f+ILFCU7tkIw== + version "2.1.2" + resolved "https://registry.npmjs.org/boltz-core/-/boltz-core-2.1.2.tgz" + integrity sha512-b19P5dFIWl/bf/sqBlSRbTj7+/48hWaTUfR1qVkWaPr+OR1T0gNuYP86EOi3yQwR689GxXk0adeV5rKc9ue3Xw== dependencies: "@boltz/bitcoin-ops" "^2.0.0" - "@openzeppelin/contracts" "^5.0.1" + "@openzeppelin/contracts" "^5.0.2" "@vulpemventures/secp256k1-zkp" "^3.2.1" bip32 "^4.0.0" bip65 "^1.0.3" @@ -5731,6 +5731,11 @@ expo-secure-store@~12.3.1: resolved "https://registry.npmjs.org/expo-secure-store/-/expo-secure-store-12.3.1.tgz" integrity sha512-XLIgWDiIuiR0c+AA4NCWWibAMHCZUyRcy+lQBU49U6rvG+xmd3YrBJfQjfqAPyLroEqnLPGTWUX57GyRsfDOQw== +expo-speech@~11.3.0: + version "11.3.0" + resolved "https://registry.npmjs.org/expo-speech/-/expo-speech-11.3.0.tgz" + integrity sha512-pJLh8pLuMJRZrg7hzS4JtMwvjbgfCkmoERL45A8vkq8VQFo+2GPT72BMuC9xy1sys7CGZJ8M5yMYTE5saUr1rg== + expo-status-bar@~1.6.0: version "1.6.0" resolved "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-1.6.0.tgz"