From d6a919513c318a0615f4c8a01b1f5561e55160e4 Mon Sep 17 00:00:00 2001 From: Overtorment Date: Sun, 2 May 2021 19:17:39 +0100 Subject: [PATCH 1/4] REF: tor bootstrap & test --- blue_modules/torrific.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/blue_modules/torrific.js b/blue_modules/torrific.js index 83718f486..bde1b4cf8 100644 --- a/blue_modules/torrific.js +++ b/blue_modules/torrific.js @@ -1,5 +1,8 @@ import Tor from 'react-native-tor'; -const tor = Tor(); +const tor = Tor({ + bootstrapTimeoutMs: 35000, + numberConcurrentRequests: 1, +}); /** * TOR wrapper mimicking Frisbee interface @@ -85,7 +88,7 @@ class Torsbee { if (!this.constructor._testConn) { // no test conenctino exists, creating it... await tor.startIfNotStarted(); - const target = 'v7gtzf7nua6hdmb2wtqaqioqmesdb4xrlly4zwr7bvayxv2bpg665pqd.onion:50001'; + const target = 'explorerzydxu5ecjrkwceayqybizmpjjznk5izmitf2modhcusuqlid.onion:110'; this.constructor._testConn = await tor.createTcpConnection({ target }, (data, err) => { if (err) { return this.constructor._rejectReference(new Error(err)); From b5700fbb9a6ff26c45b8c4f6e6f532083b34a397 Mon Sep 17 00:00:00 2001 From: "transifex-integration[bot]" <43880903+transifex-integration[bot]@users.noreply.github.com> Date: Mon, 3 May 2021 09:21:39 +0000 Subject: [PATCH 2/4] Translate /loc/en.json in pt_BR review completed for the source file '/loc/en.json' on the 'pt_BR' language. --- loc/pt_br.json | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/loc/pt_br.json b/loc/pt_br.json index 0090eba01..759c66236 100644 --- a/loc/pt_br.json +++ b/loc/pt_br.json @@ -136,12 +136,12 @@ "ask": "Você salvou a frase de backup da sua carteira? Esta frase de backup é necessária para acessar seus fundos, caso você perca este dispositivo. Sem a frase de backup, seus fundos serão perdidos permanentemente.", "ask_no": "Não fiz", "ask_yes": "Sim, já fiz", - "ok": "Certo, já anotei!", - "ok_lnd": "OK, eu salvei.", - "text": "Reserve um momento para escrever estas palavras em uma folha de papel. É o backup que você pode usar para restaurar a carteira em outro dispositivo.", + "ok": "OK, eu anotei", + "ok_lnd": "OK, eu salvei", + "text": "Anote esta sequência de palavras em um pedaço de papel.\nÉ o seu backup e você pode usá-la para recuperar a sua carteira.", "text_lnd": "Reserve um momento para salvar este backup. É o seu backup que você pode usar para restaurar a carteira em outro dispositivo.", "text_lnd2": "Esta carteira é hospedada pela BlueWallet.", - "title": "Sua carteira foi criada." + "title": "Sua carteira foi criada" }, "receive": { "details_create": "Criar", @@ -257,13 +257,13 @@ "electrum_connected": "Conectado", "electrum_connected_not": "Não conectado", "electrum_error_connect": "Não é possível conectar ao servidor Electrum fornecido", - "electrum_host": "Host, por exemplo {example}", + "electrum_host": "Por ex. {example}", "electrum_port": "Porta TCP, geralmente {exemplo}", "electrum_port_ssl": "Porta SSL, geralmente {exemplo}", "electrum_saved": "Suas alterações foram salvas com sucesso. Pode ser necessário reiniciar para que as alterações tenham efeito.", "set_electrum_server_as_default": "Definir {server} como servidor Electrum padrão?", "set_lndhub_as_default": "Definir {server} como servidor LNDHub padrão?", - "electrum_settings_server": "Configurações de servidor Electrum", + "electrum_settings_server": "Servidor Electrum", "electrum_settings_explain": "Deixe em branco para usar o padrão.", "electrum_status": "Estado", "electrum_clear_alert_title": "Limpar histórico?", @@ -276,6 +276,7 @@ "electrum_history": "Histórico do servidor", "electrum_reset_to_default": "Tem certeza de que deseja redefinir suas configurações Electrum para o padrão?", "electrum_clear": "Limpar", + "tor_supported": "Compatível com Tor", "encrypt_decrypt": "Descriptografar armazenamento", "encrypt_decrypt_q": "Tem certeza de que deseja descriptografar seu armazenamento? Isso permitirá que suas carteiras sejam acessadas sem uma senha.", "encrypt_del_uninstall": "Apagar se a BlueWallet for desinstalada", @@ -296,6 +297,7 @@ "lightning_error_lndhub_uri": "Não é um URI LndHub válido", "lightning_saved": "Suas alterações foram salvas com sucesso", "lightning_settings": "Configurações Lightning", + "tor_settings": "Configurações Tor", "lightning_settings_explain": "Para se conectar ao seu próprio node LND, instale a LNDHub e copie o URL para cá. Deixe em branco para usar a LNDHub padrão fornecida pela BlueWallet (lndhub.io). Carteiras criadas após mudanças nestas preferências ficarão ligadas à instância LNDHub especificada.", "network": "Rede", "network_broadcast": "Transmitir transação", @@ -572,12 +574,12 @@ "sign_placeholder_address": "Endereço", "sign_placeholder_message": "Mensagem", "sign_placeholder_signature": "Assinatura", - "sign_aopp_title": "", + "sign_aopp_title": "AOPP", "sign_aopp_confirm": "Você deseja enviar a mensagem assinada para {hostname}?", - "address_balance": "Balanço: {balance} sats", + "address_balance": "Saldo: {balance} sats", "addresses_title": "Endereços", - "type_change": "Alterar", - "type_receive": "Receber" + "type_change": "Troco", + "type_receive": "Recebimento" }, "aopp": { "title": "Selecionar endereço", From e386f62a8d0a3e8f2413a9b81c99a12d40084978 Mon Sep 17 00:00:00 2001 From: Overtorment Date: Mon, 3 May 2021 16:09:46 +0100 Subject: [PATCH 3/4] OPS: bump android min sdk to android 9 (level 28) --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index fa25fa5eb..9b0285b12 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - minSdkVersion = 26 + minSdkVersion = 28 supportLibVersion = "28.0.0" buildToolsVersion = "29.0.2" compileSdkVersion = 29 From af0dc8d2aa43f87db567387f82d36b35d9ce2a7d Mon Sep 17 00:00:00 2001 From: marcosrdz Date: Mon, 3 May 2021 12:01:06 -0400 Subject: [PATCH 4/4] OPS: Fix Xcode 12.5 issues --- ios/Podfile | 2 +- ios/Podfile.lock | 93 ++++++++++++++++++++++++++--------------------- package-lock.json | 15 ++++---- package.json | 2 +- 4 files changed, 61 insertions(+), 51 deletions(-) diff --git a/ios/Podfile b/ios/Podfile index c98f12990..90527c069 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -12,7 +12,7 @@ target 'BlueWallet' do # # Note that if you have use_frameworks! enabled, Flipper will not work and # you should disable these next few lines. - use_flipper!({ 'Flipper' => '0.74.0' }) + use_flipper!({ 'Flipper-Folly' => '2.5.3', 'Flipper' => '0.87.0', 'Flipper-RSocket' => '1.3.1' }) post_install do |installer| flipper_post_install(installer) installer.pods_project.targets.each do |target| diff --git a/ios/Podfile.lock b/ios/Podfile.lock index ebd57f3f2..b61bb519c 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -12,11 +12,11 @@ PODS: - React-Core (= 0.63.4) - React-jsi (= 0.63.4) - ReactCommon/turbomodule/core (= 0.63.4) - - Flipper (0.74.0): + - Flipper (0.87.0): - Flipper-Folly (~> 2.5) - Flipper-RSocket (~> 1.3) - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.5.1): + - Flipper-Folly (2.5.3): - boost-for-react-native - Flipper-DoubleConversion - Flipper-Glog @@ -26,36 +26,47 @@ PODS: - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.3.1): - Flipper-Folly (~> 2.5) - - FlipperKit (0.74.0): - - FlipperKit/Core (= 0.74.0) - - FlipperKit/Core (0.74.0): - - Flipper (~> 0.74.0) + - FlipperKit (0.87.0): + - FlipperKit/Core (= 0.87.0) + - FlipperKit/Core (0.87.0): + - Flipper (~> 0.87.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.74.0): - - Flipper (~> 0.74.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.74.0): + - FlipperKit/CppBridge (0.87.0): + - Flipper (~> 0.87.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.87.0): - Flipper-Folly (~> 2.5) - - FlipperKit/FBDefines (0.74.0) - - FlipperKit/FKPortForwarding (0.74.0): + - FlipperKit/FBDefines (0.87.0) + - FlipperKit/FKPortForwarding (0.87.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.74.0) - - FlipperKit/FlipperKitLayoutPlugin (0.74.0): + - FlipperKit/FlipperKitHighlightOverlay (0.87.0) + - FlipperKit/FlipperKitLayoutHelpers (0.87.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.87.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.74.0) - - FlipperKit/FlipperKitNetworkPlugin (0.74.0): + - FlipperKit/FlipperKitLayoutPlugin (0.87.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.74.0): + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.87.0) + - FlipperKit/FlipperKitNetworkPlugin (0.87.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.74.0): + - FlipperKit/FlipperKitReactPlugin (0.87.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.74.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.87.0): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.87.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - Folly (2020.01.13.00): @@ -73,9 +84,9 @@ PODS: - glog (0.3.5) - libevent (2.1.12) - lottie-ios (3.1.9) - - lottie-react-native (3.5.0): + - lottie-react-native (4.0.2): - lottie-ios (~> 3.1.8) - - React + - React-Core - OpenSSL-Universal (1.1.180) - PasscodeAuth (1.0.0): - React @@ -434,25 +445,25 @@ DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - - Flipper (= 0.74.0) + - Flipper (= 0.87.0) - Flipper-DoubleConversion (= 1.1.7) - - Flipper-Folly (~> 2.2) + - Flipper-Folly (= 2.5.3) - Flipper-Glog (= 0.3.6) - Flipper-PeerTalk (~> 0.0.4) - - Flipper-RSocket (~> 1.1) - - FlipperKit (= 0.74.0) - - FlipperKit/Core (= 0.74.0) - - FlipperKit/CppBridge (= 0.74.0) - - FlipperKit/FBCxxFollyDynamicConvert (= 0.74.0) - - FlipperKit/FBDefines (= 0.74.0) - - FlipperKit/FKPortForwarding (= 0.74.0) - - FlipperKit/FlipperKitHighlightOverlay (= 0.74.0) - - FlipperKit/FlipperKitLayoutPlugin (= 0.74.0) - - FlipperKit/FlipperKitLayoutTextSearchable (= 0.74.0) - - FlipperKit/FlipperKitNetworkPlugin (= 0.74.0) - - FlipperKit/FlipperKitReactPlugin (= 0.74.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.74.0) - - FlipperKit/SKIOSNetworkPlugin (= 0.74.0) + - Flipper-RSocket (= 1.3.1) + - FlipperKit (= 0.87.0) + - FlipperKit/Core (= 0.87.0) + - FlipperKit/CppBridge (= 0.87.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.87.0) + - FlipperKit/FBDefines (= 0.87.0) + - FlipperKit/FKPortForwarding (= 0.87.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.87.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.87.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.87.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.87.0) + - FlipperKit/FlipperKitReactPlugin (= 0.87.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.87.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.87.0) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - lottie-ios (from `../node_modules/lottie-ios`) @@ -697,19 +708,19 @@ SPEC CHECKSUMS: DoubleConversion: cde416483dac037923206447da6e1454df403714 FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e - Flipper: c1ad50344bffdce628b1906b48f6e7cd06724236 + Flipper: 1bd2db48dcc31e4b167b9a33ec1df01c2ded4893 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: f7a3caafbd74bda4827954fd7a6e000e36355489 + Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154 - FlipperKit: f42987ea58737ac0fb3fbc38f8e703452ba56940 + FlipperKit: 651f50a42eb95c01b3e89a60996dd6aded529eeb Folly: b73c3869541e86821df3c387eb0af5f65addfab4 GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4 glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 lottie-ios: 3a3758ef5a008e762faec9c9d50a39842f26d124 - lottie-react-native: 1fb4ce21d6ad37dab8343eaff8719df76035bd93 + lottie-react-native: 4dff8fe8d10ddef9e7880e770080f4a56121397e OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b PasscodeAuth: 1cc99b13d8e4de4716d7e2b4069af2f1a9de30b2 RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e @@ -777,6 +788,6 @@ SPEC CHECKSUMS: Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 8fb37a9b658fd4d511d97e40f40e2d511092b261 +PODFILE CHECKSUM: e5cd06c8e5cb8f554b34954eef0d4d4f18e7d9d2 COCOAPODS: 1.10.1 diff --git a/package-lock.json b/package-lock.json index 406134a53..d1cbe561d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15952,14 +15952,13 @@ "integrity": "sha512-iB/jtMQiZnhNvPiQOkyRU3h8y+SKsIL8bqo8aAC9wTv2YStXSInmCPLw3JbIFy0HqW6YPwEFbqgFjtgo9vAHUg==" }, "lottie-react-native": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/lottie-react-native/-/lottie-react-native-3.5.0.tgz", - "integrity": "sha512-yKYj58xynDAG/BqJUhg9LTATBqwD4ATGXJKL2Ho6g4BTmPexOjDBNnPSeRBwjlpBxQ1nP4Qw//0zbuFsTFD1TA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/lottie-react-native/-/lottie-react-native-4.0.2.tgz", + "integrity": "sha512-8X5SV8X+es5dJwUGYcSyRIbHIPeWIcUH6PiRaReUEy+6s1d+NLBp3rj4+9I75F1ZN0nbFGNkrgypnGsXOAXBTw==", "requires": { "invariant": "^2.2.2", - "lottie-ios": "^3.1.8", "prop-types": "^15.5.10", - "react-native-safe-modules": "^1.0.0" + "react-native-safe-modules": "^1.0.3" } }, "lru-cache": { @@ -18960,9 +18959,9 @@ "integrity": "sha512-k2Nty4PwSnrg9HwrYeeE+EYqViYJoOFwEy9LxL5RIRfoqxAq/uQXNGwpUg2/u4gnKpBbEPa9eRh15KKMe/VHkA==" }, "react-native-safe-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/react-native-safe-modules/-/react-native-safe-modules-1.0.0.tgz", - "integrity": "sha512-ShT8duWBT30W4OFcltZl+UvpPDikZFURvLDQqAsrvbyy6HzWPGJDCpdqM+6GqzPPs4DPEW31YfMNmdJcZ6zI2w==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/react-native-safe-modules/-/react-native-safe-modules-1.0.3.tgz", + "integrity": "sha512-DUxti4Z+AgJ/ZsO5U7p3uSCUBko8JT8GvFlCeOXk9bMd+4qjpoDvMYpfbixXKgL88M+HwmU/KI1YFN6gsQZyBA==", "requires": { "dedent": "^0.6.0" } diff --git a/package.json b/package.json index 8c199e2fb..372811a11 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "frisbee": "3.1.4", "junderw-crc32c": "1.2.0", "lottie-ios": "3.1.9", - "lottie-react-native": "3.5.0", + "lottie-react-native": "4.0.2", "metro-react-native-babel-preset": "0.65.2", "path-browserify": "1.0.1", "payjoin-client": "1.0.0",