Merge breez and minor fixes

2025-01-03 09:29:48 +00:00 · 2024-06-30 05:43:52 +03:00 · 2024-06-30 05:43:52 +03:00 · f56f830eb4
commit f56f830eb4
parent 90508b8726
14 changed files with 176 additions and 47 deletions
--- a/assets/text/Release_Notes.txt
+++ b/assets/text/Release_Notes.txt
@ -1,2 +1,3 @@
-Monero enhancements
-Bug fixes
+Bitcoin Lightning with Breez
+Add Wownero wallet
+Monero fixes and enhancements
--- a/cw_bitcoin/pubspec.lock
+++ b/cw_bitcoin/pubspec.lock
@ -403,10 +403,10 @@ packages:
    dependency: "direct dev"
    description:
      name: hive_generator
-      sha256: "81fd20125cb2ce8fd23623d7744ffbaf653aae93706c9bd3bf7019ea0ace3938"
+      sha256: "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4"
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.3"
+    version: "2.0.1"
  http:
    dependency: "direct main"
    description:
@ -732,10 +732,10 @@ packages:
    dependency: "direct main"
    description:
      name: rxdart
-      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
      url: "https://pub.dev"
    source: hosted
-    version: "0.27.7"
+    version: "0.28.0"
  shelf:
    dependency: transitive
    description:
@ -866,10 +866,10 @@ packages:
    dependency: transitive
    description:
      name: unorm_dart
-      sha256: "5b35bff83fce4d76467641438f9e867dc9bcfdb8c1694854f230579d68cd8f4b"
+      sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b"
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.0"
+    version: "0.3.0"
  vector_math:
    dependency: transitive
    description:
--- a/cw_core/lib/amount_converter.dart
+++ b/cw_core/lib/amount_converter.dart
@ -6,7 +6,6 @@ class AmountConverter {
  static const _moneroAmountDivider = 1000000000000;
  static const _wowneroAmountLength = 11;
  static const _wowneroAmountDivider = 100000000000;
-  static const _ethereumAmountDivider = 1000000000000000000;
  static const _bitcoinAmountDivider = 100000000;
  static const _bitcoinAmountLength = 8;
  static final _bitcoinAmountFormat = NumberFormat()
@ -91,4 +90,7 @@ class AmountConverter {

  static String _wowneroAmountToString(int amount) => _wowneroAmountFormat
      .format(cryptoAmountToDouble(amount: amount, divider: _wowneroAmountDivider));
+
+  static int _moneroParseAmount(String amount) =>
+      _moneroAmountFormat.parse(amount).toInt();
 }
--- a/cw_core/lib/node.dart
+++ b/cw_core/lib/node.dart
@ -98,6 +98,7 @@ class Node extends HiveObject with Keyable {
      case WalletType.tron:
        return Uri.https(uriRaw, path ?? '');
      case WalletType.none:
+      case WalletType.lightning:
        throw Exception('Unexpected type ${type.toString()} for Node uri');
    }
  }
@ -158,6 +159,7 @@ class Node extends HiveObject with Keyable {
        case WalletType.tron:
          return requestElectrumServer();
        case WalletType.none:
+        case WalletType.lightning:
          return false;
      }
    } catch (_) {
@ -233,7 +235,7 @@ class Node extends HiveObject with Keyable {
    if (proxy == null) {
      return false;
    }
-    final proxyAddress = proxy!.split(':')[0];
+    final proxyAddress = proxy.split(':')[0];
    final proxyPort = int.parse(proxy.split(':')[1]);
    try {
      final socket = await Socket.connect(proxyAddress, proxyPort, timeout: Duration(seconds: 5));
--- a/cw_lightning/lib/lightning_wallet.dart
+++ b/cw_lightning/lib/lightning_wallet.dart
@ -24,7 +24,6 @@ import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
 import 'package:cw_core/wallet_info.dart';
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_addresses.dart';
-import 'package:path_provider/path_provider.dart';
 import 'package:cw_lightning/.secrets.g.dart' as secrets;
 import 'package:cw_bitcoin/electrum_wallet.dart';
 import 'package:bip39/bip39.dart' as bip39;
@ -399,7 +398,6 @@ abstract class LightningWalletBase extends ElectrumWallet with Store {
    // balance is updated automatically
  }

-  @override
  String mnemonic;

  @override
--- a/cw_lightning/pubspec.lock
+++ b/cw_lightning/pubspec.lock
@ -87,11 +87,11 @@ packages:
    dependency: "direct main"
    description:
      path: "."
-      ref: cake-update-v2
-      resolved-ref: "3fd81d238b990bb767fc7a4fdd5053a22a142e2e"
-      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:
@ -104,11 +104,12 @@ packages:
  blockchain_utils:
    dependency: transitive
    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:
@ -121,11 +122,11 @@ packages:
    dependency: "direct main"
    description:
      path: "."
-      ref: "v0.4.0-rc2"
-      resolved-ref: "8762a59b1f823d3c37ee04b95bfe4eb88ea4eb6c"
+      ref: "v0.4.3-rc1"
+      resolved-ref: de050c62c73f30fdf5a626c2a395edc76caa9102
      url: "https://github.com/breez/breez-sdk-flutter.git"
    source: git
-    version: "0.4.0-rc2"
+    version: "0.4.3-rc1"
  bs58check:
    dependency: transitive
    description:
@ -222,6 +223,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.2"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.1"
  clock:
    dependency: transitive
    description:
@ -258,10 +267,10 @@ packages:
    dependency: transitive
    description:
      name: crypto
-      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
  cryptography:
    dependency: "direct main"
    description:
@ -292,6 +301,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.2.4"
+  dart_varuint_bitcoin:
+    dependency: transitive
+    description:
+      name: dart_varuint_bitcoin
+      sha256: "4f0ccc9733fb54148b9d3688eea822b7aaabf5cc00025998f8c09a1d45b31b4b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
  encrypt:
    dependency: transitive
    description:
@ -316,6 +333,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    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:
@ -345,6 +370,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.6+5"
+  flutter_reactive_ble:
+    dependency: transitive
+    description:
+      name: flutter_reactive_ble
+      sha256: "247e2efa76de203d1ba11335c13754b5b9d0504b5423e5b0c93a600f016b24e0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.3.1"
  flutter_rust_bridge:
    dependency: transitive
    description:
@ -382,6 +415,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.2.0"
+  functional_data:
+    dependency: transitive
+    description:
+      name: functional_data
+      sha256: "76d17dc707c40e552014f5a49c0afcc3f1e3f05e800cd6b7872940bfe41a5039"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.0"
  glob:
    dependency: transitive
    description:
@ -502,6 +543,31 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.0.1"
+  ledger_bitcoin:
+    dependency: transitive
+    description:
+      path: "."
+      ref: HEAD
+      resolved-ref: f819d37e235e239c315e93856abbf5e5d3b71dab
+      url: "https://github.com/cake-tech/ledger-bitcoin"
+    source: git
+    version: "0.0.2"
+  ledger_flutter:
+    dependency: transitive
+    description:
+      name: ledger_flutter
+      sha256: f1680060ed6ff78f275837e0024ccaf667715a59ba7aa29fa7354bc7752e71c8
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.1"
+  ledger_usb:
+    dependency: transitive
+    description:
+      name: ledger_usb
+      sha256: "52c92d03a4cffe06c82921c8e2f79f3cdad6e1cf78e1e9ca35444196ff8f14c2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
  logging:
    dependency: transitive
    description:
@ -642,18 +708,18 @@ packages:
    dependency: transitive
    description:
      name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.3"
+    version: "2.1.8"
  pointycastle:
    dependency: transitive
    description:
      name: pointycastle
-      sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
+      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
      url: "https://pub.dev"
    source: hosted
-    version: "3.6.2"
+    version: "3.9.1"
  pool:
    dependency: transitive
    description:
@ -670,6 +736,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "4.2.4"
+  protobuf:
+    dependency: transitive
+    description:
+      name: protobuf
+      sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
  pub_semver:
    dependency: transitive
    description:
@ -694,14 +768,38 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.2.0"
-  rxdart:
-    dependency: "direct main"
+  quiver:
+    dependency: transitive
    description:
-      name: rxdart
-      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
+      name: quiver
+      sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47
      url: "https://pub.dev"
    source: hosted
-    version: "0.27.7"
+    version: "3.2.1"
+  reactive_ble_mobile:
+    dependency: transitive
+    description:
+      name: reactive_ble_mobile
+      sha256: "9ec2b4c9c725e439950838d551579750060258fbccd5536d0543b4d07d225798"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.3.1"
+  reactive_ble_platform_interface:
+    dependency: transitive
+    description:
+      name: reactive_ble_platform_interface
+      sha256: "632c92401a2d69c9b94bd48f8fd47488a7013f3d1f9b291884350291a4a81813"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.3.1"
+  rxdart:
+    dependency: transitive
+    description:
+      name: rxdart
+      sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.28.0"
  shelf:
    dependency: transitive
    description:
@ -763,6 +861,15 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.10.0"
+  sp_scanner:
+    dependency: transitive
+    description:
+      path: "."
+      ref: "sp_v2.0.0"
+      resolved-ref: "62c152b9086cd968019128845371072f7e1168de"
+      url: "https://github.com/cake-tech/sp_scanner"
+    source: git
+    version: "0.0.1"
  sprintf:
    dependency: transitive
    description:
@ -844,13 +951,13 @@ packages:
    source: hosted
    version: "1.3.1"
  unorm_dart:
-    dependency: "direct main"
+    dependency: transitive
    description:
      name: unorm_dart
-      sha256: "5b35bff83fce4d76467641438f9e867dc9bcfdb8c1694854f230579d68cd8f4b"
+      sha256: "23d8bf65605401a6a32cff99435fed66ef3dab3ddcad3454059165df46496a3b"
      url: "https://pub.dev"
    source: hosted
-    version: "0.2.0"
+    version: "0.3.0"
  uuid:
    dependency: transitive
    description:
@ -876,13 +983,13 @@ packages:
    source: hosted
    version: "13.0.0"
  watcher:
-    dependency: transitive
+    dependency: "direct overridden"
    description:
      name: watcher
-      sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
+      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.2"
+    version: "1.1.0"
  web_socket_channel:
    dependency: transitive
    description:
@ -915,6 +1022,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.1.1"
+  yaml_edit:
+    dependency: transitive
+    description:
+      name: yaml_edit
+      sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
 sdks:
  dart: ">=3.3.0 <4.0.0"
  flutter: ">=3.19.0"
--- a/cw_wownero/lib/wownero_wallet.dart
+++ b/cw_wownero/lib/wownero_wallet.dart
@ -152,7 +152,7 @@ abstract class WowneroWalletBase
  Future<void>? updateBalance() => null;

  @override
-  void close() async {
+  void close({bool? switchingToSameWalletType}) async {
    _listener?.stop();
    _onAccountChangeReaction?.reaction.dispose();
    _autoSaveTimer?.cancel();
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -4,6 +4,8 @@ PODS:
    - MTBBarcodeScanner
    - SwiftProtobuf
  - BigInt (5.2.0)
+  - breez_sdk (0.4.3-rc1):
+    - Flutter
  - connectivity_plus (0.0.1):
    - Flutter
    - ReachabilitySwift
@ -113,6 +115,7 @@ PODS:

 DEPENDENCIES:
  - barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
+  - breez_sdk (from `.symlinks/plugins/breez_sdk/ios`)
  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
  - CryptoSwift
  - device_display_brightness (from `.symlinks/plugins/device_display_brightness/ios`)
@ -160,6 +163,8 @@ SPEC REPOS:
 EXTERNAL SOURCES:
  barcode_scan2:
    :path: ".symlinks/plugins/barcode_scan2/ios"
+  breez_sdk:
+    :path: ".symlinks/plugins/breez_sdk/ios"
  connectivity_plus:
    :path: ".symlinks/plugins/connectivity_plus/ios"
  device_display_brightness:
@ -214,6 +219,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
  BigInt: f668a80089607f521586bbe29513d708491ef2f7
+  breez_sdk: b5ce273108c74cd3067e5bfe9b998068174064e4
  connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
  CryptoSwift: b9c701d6f5011df23794dbf7f2e480a77835d83d
  device_display_brightness: 1510e72c567a1f6ce6ffe393dcd9afd1426034f7
--- a/lib/view_model/transaction_details_view_model.dart
+++ b/lib/view_model/transaction_details_view_model.dart
@ -178,6 +178,7 @@ abstract class TransactionDetailsViewModelBase with Store {
      case WalletType.wownero:
        return 'https://explore.wownero.com/tx/${txId}';
      case WalletType.none:
+      case WalletType.lightning:
        return '';
    }
  }
@ -208,6 +209,7 @@ abstract class TransactionDetailsViewModelBase with Store {
      case WalletType.wownero:
        return S.current.view_transaction_on + 'Wownero.com';
      case WalletType.none:
+      case WalletType.lightning:
        return '';
    }
  }
--- a/lib/view_model/wallet_restore_view_model.dart
+++ b/lib/view_model/wallet_restore_view_model.dart
@ -57,6 +57,7 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {
        availableModes = [WalletRestoreMode.seed, WalletRestoreMode.keys];
        break;
      case WalletType.bitcoin:
+      case WalletType.lightning:
      case WalletType.litecoin:
      case WalletType.bitcoinCash:
      case WalletType.none:
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@ -10,6 +10,7 @@ import device_info_plus
 import devicelocale
 import flutter_inappwebview_macos
 import flutter_local_authentication
+import flutter_secure_storage_macos
 import in_app_review
 import package_info
 import package_info_plus
@ -25,6 +26,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
  DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin"))
  InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
  FlutterLocalAuthenticationPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalAuthenticationPlugin"))
+  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
  InAppReviewPlugin.register(with: registry.registrar(forPlugin: "InAppReviewPlugin"))
  FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin"))
  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
--- 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.18.2"
-CAKEWALLET_BUILD_NUMBER=218
+CAKEWALLET_VERSION="4.19.0"
+CAKEWALLET_BUILD_NUMBER=219
 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
@ -19,7 +19,7 @@ MONERO_COM_BUNDLE_ID="com.cakewallet.monero"

 CAKEWALLET_NAME="Cake Wallet"
 CAKEWALLET_VERSION="4.19.0"
-CAKEWALLET_BUILD_NUMBER=251
+CAKEWALLET_BUILD_NUMBER=252
 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=23
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.11.2"
-CAKEWALLET_BUILD_NUMBER=80
+CAKEWALLET_VERSION="1.12.0"
+CAKEWALLET_BUILD_NUMBER=81
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"

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