Merge branch 'cake-tech:dev' into dev

cw_bitcoin/lib/electrum_wallet.dart

@@ -18,7 +18,6 @@ import 'package:cw_bitcoin/bitcoin_address_record.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_priority.dart';
 import 'package:cw_bitcoin/bitcoin_unspent.dart';
-import 'package:cw_bitcoin/bitcoin_wallet.dart';
 import 'package:cw_bitcoin/bitcoin_wallet_keys.dart';
 import 'package:cw_bitcoin/electrum.dart' as electrum;
 import 'package:cw_bitcoin/electrum_balance.dart';
@@ -27,25 +26,20 @@ import 'package:cw_bitcoin/electrum_transaction_history.dart';
 import 'package:cw_bitcoin/electrum_transaction_info.dart';
 import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
 import 'package:cw_bitcoin/exceptions.dart';
-import 'package:cw_bitcoin/litecoin_wallet.dart';
 import 'package:cw_bitcoin/pending_bitcoin_transaction.dart';
 import 'package:cw_bitcoin/utils.dart';
 import 'package:cw_core/amount/money.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/encryption_file_utils.dart';
 import 'package:cw_core/get_height_by_date.dart';
-import 'package:cw_core/hardware/hardware_wallet_service.dart';
 import 'package:cw_core/node.dart';
 import 'package:cw_core/output_info.dart';
 import 'package:cw_core/pending_transaction.dart';
-import 'package:cw_core/root_dir.dart';
 import 'package:cw_core/sync_status.dart';
 import 'package:cw_core/transaction_direction.dart';
 import 'package:cw_core/transaction_priority.dart';
 import 'package:cw_core/unspent_coin_type.dart';
 import 'package:cw_core/unspent_coins_info.dart';
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/utils/proxy_wrapper.dart';
 import 'package:cw_core/utils/socket_health_logger.dart';
 import 'package:cw_core/utils/tor/abstract.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -57,7 +51,6 @@ import 'package:hex/hex.dart';
 import 'package:hive/hive.dart';
 import 'package:mobx/mobx.dart';
 import 'package:rxdart/subjects.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:sp_scanner/sp_scanner.dart';
 
 part 'electrum_wallet.g.dart';
@@ -1984,8 +1977,12 @@ abstract class ElectrumWalletBase
   @action
   Future<void> addCoinInfo(BitcoinUnspent coin) async {
     // Check if the coin is already in the unspentCoinsInfo for the wallet
-    final existingCoinInfo = unspentCoinsInfo.values
-        .firstWhereOrNull((element) => element.walletId == walletInfo.id && element == coin);
+    final existingCoinInfo = unspentCoinsInfo.values.firstWhereOrNull(
+      (element) =>
+          element.walletId == walletInfo.id &&
+          element.hash == coin.hash &&
+          element.vout == coin.vout,
+    );
 
     if (existingCoinInfo == null) {
       final newInfo = UnspentCoinsInfo(
@@ -3681,7 +3678,6 @@ abstract class ElectrumWalletBase
           syncStatus = ConnectingSyncStatus();
         }
         break;
-      default:
     }
   }
 

cw_zcash/lib/src/migrate.dart

@@ -71,7 +71,7 @@ Future<void> migrateOldSqliteToZkool2({required final String walletName}) async
     if (ya.idAccount != walletId) {
       continue;
     }
-    printV("migrating account: ${ya.name}");
+    printV("migrating account: ${ya.name} - ${walletName}");
     int birthHeight = await ZcashHeight.getBlockHeightByTime(DateTime(2026, 1, 1));
 
     final accTxs = await migrateDb.rawQuery(
@@ -83,12 +83,12 @@ Future<void> migrateOldSqliteToZkool2({required final String walletName}) async
     }
 
     final accountId = await ZcashWalletBase.restoreZcashWalletFromSeed(
-      name: ya.name,
+      name: walletName,
       seed: ya.zkoolSeed.seed,
       passphrase: ya.zkoolSeed.passphrase,
       birthHeight: birthHeight,
     );
-    await ZcashWalletBase.saveAccountId(ya.name, accountId);
+    await ZcashWalletBase.saveAccountId(walletName, accountId);
     return;
   }
 

lib/new-ui/pages/swap_page.dart

@@ -429,8 +429,8 @@ class _NewSwapPageState extends State<NewSwapPage> {
     final parsedAddress = await widget.adrResService
         .resolve(query: domain, wallet: widget.exchangeViewModel.wallet, currency: currency);
     return parsedAddress.isNotEmpty
-        ? parsedAddress.first.parsedAddressByCurrencyMap[currency] ?? ''
-        : '';
+        ? (parsedAddress.first.parsedAddressByCurrencyMap[currency] ?? domain)
+        : domain;
   }
 
   void _showFeeAlert(BuildContext context) async {

lib/src/screens/exchange/exchange_page.dart

@@ -659,8 +659,8 @@ class ExchangePage extends BasePage {
     final parsedAddresses = await adrResService.resolve(
         query: domain, wallet: exchangeViewModel.wallet, currency: currency);
     return parsedAddresses.isNotEmpty
-        ? parsedAddresses.first.parsedAddressByCurrencyMap[currency] ?? ''
-        : '';
+        ? (parsedAddresses.first.parsedAddressByCurrencyMap[currency] ?? domain)
+        : domain;
   }
 
   void _showFeeAlert(BuildContext context) async {

lib/view_model/send/send_view_model.dart

@@ -3,7 +3,6 @@ import 'dart:async';
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/core/address_resolver/parsed_address.dart';
 import 'package:cake_wallet/core/address_resolver/address_resolver_service.dart';
-import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/core/address_validator.dart';
 import 'package:cake_wallet/core/amount_parsing_proxy.dart';
 import 'package:cake_wallet/core/amount_validator.dart';
@@ -128,8 +127,8 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
     outputs.add(Output(wallet, _appStore, _fiatConversationStore, _outputCryptoCurrencyHandler));
 
     unspentCoinsListViewModel
-        .initialSetup()
-        .then((_) => unspentCoinsListViewModel.resetUnspentCoinsInfoSelections());
+        .initialSetup();
+        // .then((_) => unspentCoinsListViewModel.resetUnspentCoinsInfoSelections());
 
     reaction((_) {
       if (isEVMCompatibleChain(wallet.type)) {

macos/Podfile.lock

@@ -1,12 +1,10 @@
 PODS:
   - bitbox_flutter (0.0.1):
     - FlutterMacOS
-  - breez_sdk_spark_flutter (0.11.0):
+  - breez_sdk_spark_flutter (0.14.0):
     - FlutterMacOS
   - connectivity_plus (0.0.1):
     - FlutterMacOS
-  - cw_decred (0.0.1):
-    - FlutterMacOS
   - cw_mweb (0.0.1):
     - FlutterMacOS
   - device_info_plus (0.0.1):
@@ -30,19 +28,9 @@ PODS:
   - FlutterMacOS (1.0.0)
   - in_app_review (2.0.0):
     - FlutterMacOS
-  - local_auth_darwin (0.0.1):
-    - Flutter
-    - FlutterMacOS
   - OrderedSet (6.0.3)
   - package_info_plus (0.0.1):
     - FlutterMacOS
-  - path_provider_foundation (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - rive_common (0.0.1):
-    - FlutterMacOS
-  - rlz (0.0.1):
-    - FlutterMacOS
   - share_plus (0.0.1):
     - FlutterMacOS
   - shared_preferences_foundation (0.0.1):
@@ -92,7 +80,6 @@ DEPENDENCIES:
   - bitbox_flutter (from `Flutter/ephemeral/.symlinks/plugins/bitbox_flutter/macos`)
   - breez_sdk_spark_flutter (from `Flutter/ephemeral/.symlinks/plugins/breez_sdk_spark_flutter/macos`)
   - connectivity_plus (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos`)
-  - cw_decred (from `Flutter/ephemeral/.symlinks/plugins/cw_decred/macos`)
   - cw_mweb (from `Flutter/ephemeral/.symlinks/plugins/cw_mweb/macos`)
   - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - devicelocale (from `Flutter/ephemeral/.symlinks/plugins/devicelocale/macos`)
@@ -105,11 +92,7 @@ DEPENDENCIES:
   - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
   - in_app_review (from `Flutter/ephemeral/.symlinks/plugins/in_app_review/macos`)
-  - local_auth_darwin (from `Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin`)
   - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
-  - path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
-  - rive_common (from `Flutter/ephemeral/.symlinks/plugins/rive_common/macos`)
-  - rlz (from `Flutter/ephemeral/.symlinks/plugins/rlz/macos`)
   - share_plus (from `Flutter/ephemeral/.symlinks/plugins/share_plus/macos`)
   - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sp_scanner (from `Flutter/ephemeral/.symlinks/plugins/sp_scanner/macos`)
@@ -132,8 +115,6 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/breez_sdk_spark_flutter/macos
   connectivity_plus:
     :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus/macos
-  cw_decred:
-    :path: Flutter/ephemeral/.symlinks/plugins/cw_decred/macos
   cw_mweb:
     :path: Flutter/ephemeral/.symlinks/plugins/cw_mweb/macos
   device_info_plus:
@@ -158,16 +139,8 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral
   in_app_review:
     :path: Flutter/ephemeral/.symlinks/plugins/in_app_review/macos
-  local_auth_darwin:
-    :path: Flutter/ephemeral/.symlinks/plugins/local_auth_darwin/darwin
   package_info_plus:
     :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos
-  path_provider_foundation:
-    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin
-  rive_common:
-    :path: Flutter/ephemeral/.symlinks/plugins/rive_common/macos
-  rlz:
-    :path: Flutter/ephemeral/.symlinks/plugins/rlz/macos
   share_plus:
     :path: Flutter/ephemeral/.symlinks/plugins/share_plus/macos
   shared_preferences_foundation:
@@ -188,38 +161,33 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/wakelock_plus/macos
 
 SPEC CHECKSUMS:
-  bitbox_flutter: 16088f5c7febacf894f4d07bbdfb441c9f0757fe
-  breez_sdk_spark_flutter: 2e864a52e699546aedea3d64d0e0cc88bc0ac595
-  connectivity_plus: 0a976dfd033b59192912fa3c6c7b54aab5093802
-  cw_decred: 0c93fbeb31bd97a6ad4ec5680960af0943bfca78
-  cw_mweb: 7440b12ead811dda972a9918442ea2a458e8742c
-  device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
-  devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
+  bitbox_flutter: b3c6d3c4970b134a78a17fddef0ef429cfec2593
+  breez_sdk_spark_flutter: 0da35c86276ec740d938139262e198a475586548
+  connectivity_plus: 4adf20a405e25b42b9c9f87feff8f4b6fde18a4e
+  cw_mweb: 4746a3b5cc5bd4afe6fadd2481c4f7b239e391d0
+  device_info_plus: b0fafc687fb901e2af612763340f1b0d4352f8e5
+  devicelocale: 456a07c045d3113938aa4983065bd8526e2af792
   dnssec_proof: d461cac7bd3301eb7447f87936745a0c1ae0a67e
-  fast_scanner: d31bae07e2653403a69dac99fb710c1722b16a97
-  file_selector_macos: cc3858c981fe6889f364731200d6232dac1d812d
-  flutter_inappwebview_macos: bdf207b8f4ebd58e86ae06cd96b147de99a67c9b
-  flutter_local_authentication: 85674893931e1c9cfa7c9e4f5973cb8c56b018b0
-  flutter_local_notifications: 4ccab5b7a22835214a6672e3f9c5e8ae207dab36
-  flutter_secure_storage_macos: d56e2d218c1130b262bef8b4a7d64f88d7f9c9ea
-  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  in_app_review: 866c9b17c87a7b46a395bda43f5d3ca02deb585a
-  local_auth_darwin: fa4b06454df7df8e97c18d7ee55151c57e7af0de
+  fast_scanner: a4ead8e56f185cd565e25250fdb97fa669ea1d2e
+  file_selector_macos: 9e9e068e90ebee155097d00e89ae91edb2374db7
+  flutter_inappwebview_macos: c2d68649f9f8f1831bfcd98d73fd6256366d9d1d
+  flutter_local_authentication: 2f9a2682f498abcc12d7e9729b5007a947170fdc
+  flutter_local_notifications: 4bf37a31afde695b56091b4ae3e4d9c7a7e6cda0
+  flutter_secure_storage_macos: 3dacac420d84c4d0dc5e868194ee43c8664ec797
+  FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
+  in_app_review: 66e7680752b632d83f4f0e88b34d52ed303fbff4
   OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
-  package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
-  rive_common: 9580b9f1f08a8c85006083078e80479edf3db26a
-  rlz: fa94ecbcb2ca519363c320ec7a0f22525a536b59
-  share_plus: 1fa619de8392a4398bfaf176d441853922614e89
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
-  sp_scanner: 269d96e0ec3173e69156be7239b95182be3b8303
-  sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
+  package_info_plus: f0052d280d17aa382b932f399edf32507174e870
+  share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc
+  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
+  sp_scanner: d9316427b628dd86d6e9e3c5d42ed6b4b410157c
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
   sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
-  sqlite3_flutter_libs: 86f82662868ee26ff3451f73cac9c5fc2a1f57fa
-  torch_dart: 2e94855e15fcc87bd824e179f1f9c3e0f1e1d302
-  universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6
-  url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
-  wakelock_plus: 9d63063ffb7af1c215209769067c57103bde719d
+  sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
+  torch_dart: 7e4f682c34ee0d967a35977102590094a7510c90
+  universal_ble: a322ebabee64f0ec27a313e89a5dd6967f37a60f
+  url_launcher_macos: f87a979182d112f911de6820aefddaf56ee9fbfd
+  wakelock_plus: 917609be14d812ddd9e9528876538b2263aaa03b
 
 PODFILE CHECKSUM: 65ec1541137fb5b35d00490dec1bb48d4d9586bb
 

macos/Runner.xcodeproj/project.pbxproj

@@ -433,7 +433,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -521,7 +521,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -568,7 +568,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;

res/values/strings_en.arb

@@ -556,7 +556,7 @@
   "incorrect_seed_option": "Incorrect. Please try again",
   "incorrect_seed_option_back": "Incorrect. Please make sure your seed is saved correctly and try again.",
   "infobox_auto_address": "Your receive address will rotate every time you receive a transaction",
-  "infobox_multichain": "Use this addess to receive any token or collectible on",
+  "infobox_multichain": "Use this address to receive any token or collectible on",
   "infobox_rotation": "Your receive address will rotate every time you close and reopen this screen",
   "input": "Input",
   "inputs": "Inputs",

scripts/android/app_env.sh

@@ -14,15 +14,15 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="6.3.0"
-MONERO_COM_BUILD_NUMBER=4162
+MONERO_COM_VERSION="6.3.2"
+MONERO_COM_BUILD_NUMBER=4163
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 MONERO_COM_SCHEME="monero.com"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="6.3.0"
-CAKEWALLET_BUILD_NUMBER=4416
+CAKEWALLET_VERSION="6.3.2"
+CAKEWALLET_BUILD_NUMBER=4418
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"

scripts/ios/app_env.sh

@@ -12,13 +12,13 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="6.3.0"
-MONERO_COM_BUILD_NUMBER=168
+MONERO_COM_VERSION="6.3.2"
+MONERO_COM_BUILD_NUMBER=169
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="6.3.0"
-CAKEWALLET_BUILD_NUMBER=426
+CAKEWALLET_VERSION="6.3.2"
+CAKEWALLET_BUILD_NUMBER=429
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"