fix nodes

update versions
2025-01-08 20:09:24 +00:00 · 2024-05-15 02:55:58 +03:00 · 2024-05-15 02:55:58 +03:00 · 78a6015da5
commit 78a6015da5
parent 20b0f2475b
9 changed files with 141 additions and 64 deletions
--- a/assets/text/Release_Notes.txt
+++ b/assets/text/Release_Notes.txt
@ -1 +1 @@
-Bug fixes and generic enhancements
+Bitcoin Silent Payments
--- a/cw_bitcoin/pubspec.lock
+++ b/cw_bitcoin/pubspec.lock
@ -29,10 +29,10 @@ packages:
    dependency: transitive
    description:
      name: asn1lib
-      sha256: c9c85fedbe2188b95133cbe960e16f5f448860f7133330e272edbbca5893ddc6
+      sha256: "58082b3f0dca697204dbab0ef9ff208bfaea7767ea771076af9a343488428dda"
      url: "https://pub.dev"
    source: hosted
-    version: "1.5.2"
+    version: "1.5.3"
  async:
    dependency: transitive
    description:
@ -79,11 +79,11 @@ packages:
    dependency: "direct main"
    description:
      path: "."
-      ref: cake-update-v2
-      resolved-ref: "01d844a5f5a520a31df5254e34169af4664aa769"
-      url: "https://github.com/cake-tech/bitcoin_base.git"
+      ref: cake-update-v3
+      resolved-ref: cc99eedb1d28ee9376dda0465ef72aa627ac6149
+      url: "https://github.com/cake-tech/bitcoin_base"
    source: git
-    version: "4.2.0"
+    version: "4.2.1"
  bitcoin_flutter:
    dependency: "direct main"
    description:
@ -96,11 +96,12 @@ packages:
  blockchain_utils:
    dependency: "direct main"
    description:
-      name: blockchain_utils
-      sha256: "38ef5f4a22441ac4370aed9071dc71c460acffc37c79b344533f67d15f24c13c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
+      path: "."
+      ref: cake-update-v1
+      resolved-ref: cabd7e0e16c4da9920338c76eff3aeb8af0211f3
+      url: "https://github.com/cake-tech/blockchain_utils"
+    source: git
+    version: "2.1.2"
  boolean_selector:
    dependency: transitive
    description:
@ -197,6 +198,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.3"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.1"
  clock:
    dependency: transitive
    description:
@ -241,10 +250,10 @@ packages:
    dependency: "direct main"
    description:
      name: cryptography
-      sha256: df156c5109286340817d21fa7b62f9140f17915077127dd70f8bd7a2a0997a35
+      sha256: d146b76d33d94548cf035233fbc2f4338c1242fa119013bead807d033fc4ae05
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.0"
+    version: "2.7.0"
  cw_core:
    dependency: "direct main"
    description:
@ -288,10 +297,18 @@ packages:
    dependency: transitive
    description:
      name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
+  ffigen:
+    dependency: transitive
+    description:
+      name: ffigen
+      sha256: d3e76c2ad48a4e7f93a29a162006f00eba46ce7c08194a77bb5c5e97d1b5ff0a
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.0.2"
  file:
    dependency: transitive
    description:
@ -346,10 +363,10 @@ packages:
    dependency: transitive
    description:
      name: functional_data
-      sha256: aefdec4365452283b2a7cf420a3169654d51d3e9553069a22d76680d7a9d7c3d
+      sha256: "76d17dc707c40e552014f5a49c0afcc3f1e3f05e800cd6b7872940bfe41a5039"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
  glob:
    dependency: transitive
    description:
@ -394,10 +411,10 @@ packages:
    dependency: "direct main"
    description:
      name: http
-      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
+      sha256: "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.0"
+    version: "1.2.1"
  http_multi_server:
    dependency: transitive
    description:
@ -442,10 +459,10 @@ packages:
    dependency: transitive
    description:
      name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
      url: "https://pub.dev"
    source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
  leak_tracker:
    dependency: transitive
    description:
@ -531,10 +548,10 @@ packages:
    dependency: transitive
    description:
      name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      sha256: "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
  mobx:
    dependency: "direct main"
    description:
@ -579,26 +596,26 @@ packages:
    dependency: "direct main"
    description:
      name: path_provider
-      sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b
+      sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
  path_provider_android:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668"
+      sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.2"
+    version: "2.2.4"
  path_provider_foundation:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: "5a7999be66e000916500be4f15a3633ebceb8302719b47b9cc49ce924125350f"
+      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.4.0"
  path_provider_linux:
    dependency: transitive
    description:
@ -643,10 +660,10 @@ packages:
    dependency: transitive
    description:
      name: pointycastle
-      sha256: "70fe966348fe08c34bf929582f1d8247d9d9408130723206472b4687227e4333"
+      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
      url: "https://pub.dev"
    source: hosted
-    version: "3.8.0"
+    version: "3.9.1"
  pool:
    dependency: transitive
    description:
@ -687,6 +704,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.2.3"
+  quiver:
+    dependency: transitive
+    description:
+      name: quiver
+      sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.2.1"
  reactive_ble_mobile:
    dependency: transitive
    description:
@ -736,10 +761,10 @@ packages:
    dependency: transitive
    description:
      name: socks5_proxy
-      sha256: "1d21b5606169654bbf4cfb904e8e6ed897e9f763358709f87310c757096d909a"
+      sha256: "045cbba84f6e2b01c1c77634a63e926352bf110ef5f07fc462c6d43bbd4b6a83"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.4"
+    version: "1.0.5+dev.2"
  source_gen:
    dependency: transitive
    description:
@ -764,6 +789,15 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.10.0"
+  sp_scanner:
+    dependency: "direct main"
+    description:
+      path: "."
+      ref: master
+      resolved-ref: "0594c8e074c2515e55134410a5026bd8417aa67f"
+      url: "https://github.com/rafael-xmr/sp_scanner"
+    source: git
+    version: "0.0.1"
  stack_trace:
    dependency: transitive
    description:
@ -860,22 +894,30 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.1"
  web_socket_channel:
    dependency: transitive
    description:
      name: web_socket_channel
-      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
+      sha256: "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.0"
+    version: "2.4.5"
  win32:
    dependency: transitive
    description:
      name: win32
-      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
+      sha256: "0eaf06e3446824099858367950a813472af675116bf63f008a4c2a75ae13e9cb"
      url: "https://pub.dev"
    source: hosted
-    version: "5.0.9"
+    version: "5.5.0"
  xdg_directories:
    dependency: transitive
    description:
@ -892,6 +934,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.1.2"
+  yaml_edit:
+    dependency: transitive
+    description:
+      name: yaml_edit
+      sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
 sdks:
-  dart: ">=3.2.0-0 <4.0.0"
-  flutter: ">=3.10.0"
+  dart: ">=3.3.0 <4.0.0"
+  flutter: ">=3.16.6"
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -147,6 +147,8 @@ PODS:
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
+  - sp_scanner (0.0.1):
+    - Flutter
  - SwiftProtobuf (1.25.2)
  - SwiftyGif (5.4.4)
  - Toast (4.1.0)
@ -188,6 +190,7 @@ DEPENDENCIES:
  - sensitive_clipboard (from `.symlinks/plugins/sensitive_clipboard/ios`)
  - share_plus (from `.symlinks/plugins/share_plus/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - sp_scanner (from `.symlinks/plugins/sp_scanner/ios`)
  - uni_links (from `.symlinks/plugins/uni_links/ios`)
  - UnstoppableDomainsResolution (~> 4.0.0)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
@ -259,6 +262,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/share_plus/ios"
  shared_preferences_foundation:
    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  sp_scanner:
+    :path: ".symlinks/plugins/sp_scanner/ios"
  uni_links:
    :path: ".symlinks/plugins/uni_links/ios"
  url_launcher_ios:
@ -302,6 +307,7 @@ SPEC CHECKSUMS:
  sensitive_clipboard: d4866e5d176581536c27bb1618642ee83adca986
  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  sp_scanner: 76e1515c7e8208e1a389eba7e5196381374c2f96
  SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
  Toast: ec33c32b8688982cecc6348adeae667c1b9938da
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@ -225,6 +225,9 @@ Future<void> defaultSettingsMigration(
          await addTronNodeList(nodes: nodes);
          await changeTronCurrentNodeToDefault(sharedPreferences: sharedPreferences, nodes: nodes);
          break;
+        case 34:
+          await _addElectRsNode(nodes, sharedPreferences);
+          break;
        default:
          break;
      }
@ -802,6 +805,26 @@ Future<void> changeDefaultBitcoinNode(
  }
 }

+Future<void> _addElectRsNode(Box<Node> nodeSource, SharedPreferences sharedPreferences) async {
+  const cakeWalletBitcoinNodeUriPattern = '.cakewallet.com';
+  final currentBitcoinNodeId =
+      sharedPreferences.getInt(PreferencesKey.currentBitcoinElectrumSererIdKey);
+  final currentBitcoinNode =
+      nodeSource.values.firstWhere((node) => node.key == currentBitcoinNodeId);
+  final needToReplaceCurrentBitcoinNode =
+      currentBitcoinNode.uri.toString().contains(cakeWalletBitcoinNodeUriPattern);
+
+  final newElectRsBitcoinNode =
+      Node(uri: cakeWalletSilentPaymentsElectrsUri, type: WalletType.bitcoin, useSSL: false);
+
+  await nodeSource.add(newElectRsBitcoinNode);
+
+  if (needToReplaceCurrentBitcoinNode) {
+    await sharedPreferences.setInt(
+        PreferencesKey.currentBitcoinElectrumSererIdKey, newElectRsBitcoinNode.key as int);
+  }
+}
+
 Future<void> checkCurrentNodes(
    Box<Node> nodeSource, Box<Node> powNodeSource, SharedPreferences sharedPreferences) async {
  final currentMoneroNodeId = sharedPreferences.getInt(PreferencesKey.currentNodeIdKey);
@ -846,23 +869,15 @@ Future<void> checkCurrentNodes(
    await sharedPreferences.setInt(PreferencesKey.currentNodeIdKey, newCakeWalletNode.key as int);
  }

-  final hasElectrs = nodeSource.values
-          .firstWhereOrNull((element) => element.uri == cakeWalletSilentPaymentsElectrsUri) ==
-      null;
-  final isUsingCakeWalletElectrum = currentBitcoinElectrumServer != null
-      ? (currentBitcoinElectrumServer.uri.toString().endsWith(cakeWalletBitcoinElectrumUri) ||
-          currentBitcoinElectrumServer.uri.toString().endsWith(newCakeWalletBitcoinUri))
-      : false;
-
-  if (currentBitcoinElectrumServer == null || (hasElectrs && isUsingCakeWalletElectrum)) {
-    final cakeWalletElectrs =
-        Node(uri: cakeWalletSilentPaymentsElectrsUri, type: WalletType.bitcoin, useSSL: false);
-    await nodeSource.add(cakeWalletElectrs);
-    // final cakeWalletElectrumTestnet =
-    //     Node(uri: publicBitcoinTestnetElectrumUri, type: WalletType.bitcoin, useSSL: false);
-    // await nodeSource.add(cakeWalletElectrumTestnet);
+  if (currentBitcoinElectrumServer == null) {
+    final cakeWalletElectrum =
+        Node(uri: cakeWalletBitcoinElectrumUri, type: WalletType.bitcoin, useSSL: false);
+    await nodeSource.add(cakeWalletElectrum);
+    final cakeWalletElectrumTestnet =
+        Node(uri: publicBitcoinTestnetElectrumUri, type: WalletType.bitcoin, useSSL: false);
+    await nodeSource.add(cakeWalletElectrumTestnet);
    await sharedPreferences.setInt(
-        PreferencesKey.currentBitcoinElectrumSererIdKey, cakeWalletElectrs.key as int);
+        PreferencesKey.currentBitcoinElectrumSererIdKey, cakeWalletElectrum.key as int);
  }

  if (currentLitecoinElectrumServer == null) {
--- a/lib/main.dart
+++ b/lib/main.dart
@ -202,7 +202,7 @@ Future<void> initializeAppConfigs() async {
    transactionDescriptions: transactionDescriptions,
    secureStorage: secureStorage,
    anonpayInvoiceInfo: anonpayInvoiceInfo,
-    initialMigrationVersion: 33,
+    initialMigrationVersion: 34,
  );
 }

--- a/macos/Podfile.lock
+++ b/macos/Podfile.lock
@ -47,6 +47,8 @@ PODS:
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
+  - sp_scanner (0.0.1):
+    - FlutterMacOS
  - url_launcher_macos (0.0.1):
    - FlutterMacOS
  - wakelock_plus (0.0.1):
@ -67,6 +69,7 @@ DEPENDENCIES:
  - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
  - share_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos`)
  - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - sp_scanner (from `Flutter/ephemeral/.symlinks/plugins/sp_scanner/macos`)
  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
  - wakelock_plus (from `Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos`)

@ -104,6 +107,8 @@ EXTERNAL SOURCES:
    :path: Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos
  shared_preferences_foundation:
    :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
+  sp_scanner:
+    :path: Flutter/ephemeral/.symlinks/plugins/sp_scanner/macos
  url_launcher_macos:
    :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
  wakelock_plus:
@ -126,7 +131,8 @@ SPEC CHECKSUMS:
  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
  share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4
  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  url_launcher_macos: d2691c7dd33ed713bf3544850a623080ec693d95
+  sp_scanner: 269d96e0ec3173e69156be7239b95182be3b8303
+  url_launcher_macos: 5f437abeda8c85500ceb03f5c1938a8c5a705399
  wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269

 PODFILE CHECKSUM: 65ec1541137fb5b35d00490dec1bb48d4d9586bb
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@ -22,8 +22,8 @@ MONERO_COM_PACKAGE="com.monero.app"
 MONERO_COM_SCHEME="monero.com"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.16.2"
-CAKEWALLET_BUILD_NUMBER=212
+CAKEWALLET_VERSION="4.17.0"
+CAKEWALLET_BUILD_NUMBER=213
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"
--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@ -18,8 +18,8 @@ MONERO_COM_BUILD_NUMBER=86
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.16.2"
-CAKEWALLET_BUILD_NUMBER=240
+CAKEWALLET_VERSION="4.17.0"
+CAKEWALLET_BUILD_NUMBER=241
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"

 HAVEN_NAME="Haven"
--- a/scripts/macos/app_env.sh
+++ b/scripts/macos/app_env.sh
@ -21,8 +21,8 @@ MONERO_COM_BUILD_NUMBER=19
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.9.2"
-CAKEWALLET_BUILD_NUMBER=73
+CAKEWALLET_VERSION="1.10.0"
+CAKEWALLET_BUILD_NUMBER=74
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"

 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then