Merge branch 'main' into CW-868-Fix-false-synchronized-status-when-the-socket-connection-fails-due-to-network-issues

2024-12-22 11:39:22 +00:00 · 2024-12-19 13:01:58 +02:00 · 2024-12-19 13:01:58 +02:00 · f82e3b561c
commit f82e3b561c
parent 0bb022ac30 301cb3b7e0
21 changed files with 126 additions and 75 deletions
--- a/assets/solana_node_list.yml
+++ b/assets/solana_node_list.yml
@ -1,6 +1,5 @@
 -
  uri: rpc.ankr.com
-  is_default: true
  useSSL: true
 -
  uri: api.mainnet-beta.solana.com:443
@ -8,3 +7,4 @@
 -
  uri: solana-rpc.publicnode.com:443
  useSSL: true
+  is_default: true
--- a/assets/text/Monerocom_Release_Notes.txt
+++ b/assets/text/Monerocom_Release_Notes.txt
@ -1,2 +1,3 @@
-UI/UX enhancements
-Bug fixes and app improvements
+Support Monero Ledger
+Bug fixes
+New designs and better user experience
--- a/assets/text/Release_Notes.txt
+++ b/assets/text/Release_Notes.txt
@ -1,2 +1,5 @@
-UI/UX enhancements
-Bug fixes and app improvements
+Support Monero Ledger
+Prepare for Haven removal
+Improve Ethereum and Polygon sending process
+Bug fixes
+New designs and better user experience
--- a/assets/tron_node_list.yml
+++ b/assets/tron_node_list.yml
@ -4,9 +4,8 @@
  useSSL: true
 -
  uri: api.trongrid.io
-  is_default: false
+  is_default: true
  useSSL: true
 - 
  uri: trx.nownodes.io
-  is_default: true
  useSSL: true
--- a/cw_bitcoin/lib/electrum_wallet.dart
+++ b/cw_bitcoin/lib/electrum_wallet.dart
@ -1100,6 +1100,7 @@ abstract class ElectrumWalletBase
        )..addListener((transaction) async {
            transactionHistory.addOne(transaction);
            await updateBalance();
+            await updateAllUnspents();
          });
      }

@ -1192,6 +1193,7 @@ abstract class ElectrumWalletBase
              .removeWhere((utxo) => estimatedTx.utxos.any((e) => e.utxo.txHash == utxo.hash));

          await updateBalance();
+          await updateAllUnspents();
        });
    } catch (e) {
      throw e;
@ -1846,6 +1848,7 @@ abstract class ElectrumWalletBase
          });
          transactionHistory.addOne(transaction);
          await updateBalance();
+          await updateAllUnspents();
        });
    } catch (e) {
      throw e;
--- a/cw_bitcoin/lib/litecoin_wallet.dart
+++ b/cw_bitcoin/lib/litecoin_wallet.dart
@ -758,6 +758,13 @@ abstract class LitecoinWalletBase extends ElectrumWallet with Store {
    if (!mwebEnabled) return false;
    if (!tx.isPending) return false;

+    final isMwebTx = (tx.inputAddresses?.any((addr) => addr.contains("mweb")) ?? false) ||
+        (tx.outputAddresses?.any((addr) => addr.contains("mweb")) ?? false);
+
+    if (!isMwebTx) {
+      return false;
+    }
+
    final outputId = <String>[], target = <String>{};
    final isHash = RegExp(r'^[a-f0-9]{64}$').hasMatch;
    final spendingOutputIds = tx.inputAddresses?.where(isHash) ?? [];
--- a/cw_haven/pubspec.lock
+++ b/cw_haven/pubspec.lock
@ -716,10 +716,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
      url: "https://pub.dev"
    source: hosted
-    version: "14.2.5"
+    version: "14.2.4"
  watcher:
    dependency: "direct overridden"
    description:
--- a/cw_monero/pubspec.lock
+++ b/cw_monero/pubspec.lock
@ -829,10 +829,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
      url: "https://pub.dev"
    source: hosted
-    version: "14.2.5"
+    version: "14.2.4"
  watcher:
    dependency: "direct overridden"
    description:
--- a/cw_nano/pubspec.lock
+++ b/cw_nano/pubspec.lock
@ -874,10 +874,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
      url: "https://pub.dev"
    source: hosted
-    version: "14.2.5"
+    version: "14.2.4"
  watcher:
    dependency: "direct overridden"
    description:
--- a/cw_polygon/lib/polygon_client.dart
+++ b/cw_polygon/lib/polygon_client.dart
@ -22,11 +22,11 @@ class PolygonClient extends EVMChainClient {
      from: from,
      to: to,
      value: amount,
-      data: data,
+      // data: data,
      maxGas: maxGas,
-      gasPrice: gasPrice,
-      maxFeePerGas: maxFeePerGas,
-      maxPriorityFeePerGas: maxPriorityFeePerGas,
+      // gasPrice: gasPrice,
+      // maxFeePerGas: maxFeePerGas,
+      // maxPriorityFeePerGas: maxPriorityFeePerGas,
    );
  }

--- a/cw_wownero/pubspec.lock
+++ b/cw_wownero/pubspec.lock
@ -757,10 +757,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
      url: "https://pub.dev"
    source: hosted
-    version: "14.2.5"
+    version: "14.2.4"
  watcher:
    dependency: "direct overridden"
    description:
--- a/lib/entities/default_settings_migration.dart
+++ b/lib/entities/default_settings_migration.dart
@ -1,13 +1,11 @@
 import 'dart:convert';
 import 'dart:io' show Directory, File, Platform;
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
-import 'package:cake_wallet/core/key_service.dart';
 import 'package:cake_wallet/core/secure_storage.dart';
 import 'package:cake_wallet/entities/exchange_api_mode.dart';
 import 'package:cake_wallet/entities/fiat_api_mode.dart';
 import 'package:cake_wallet/entities/haven_seed_store.dart';
 import 'package:cake_wallet/haven/haven.dart';
-import 'package:cw_core/cake_hive.dart';
 import 'package:cw_core/pathForWallet.dart';
 import 'package:cake_wallet/entities/secret_store_key.dart';
 import 'package:cw_core/root_dir.dart';
@ -42,8 +40,8 @@ const polygonDefaultNodeUri = 'polygon-bor.publicnode.com';
 const cakeWalletBitcoinCashDefaultNodeUri = 'bitcoincash.stackwallet.com:50002';
 const nanoDefaultNodeUri = 'nano.nownodes.io';
 const nanoDefaultPowNodeUri = 'rpc.nano.to';
-const solanaDefaultNodeUri = 'rpc.ankr.com';
-const tronDefaultNodeUri = 'trx.nownodes.io';
+const solanaDefaultNodeUri = 'solana-rpc.publicnode.com:443';
+const tronDefaultNodeUri = 'api.trongrid.io';
 const newCakeWalletBitcoinUri = 'btc-electrum.cakewallet.com:50002';
 const wowneroDefaultNodeUri = 'node3.monerodevs.org:34568';
 const moneroWorldNodeUri = '.moneroworld.com';
@ -311,6 +309,27 @@ Future<void> defaultSettingsMigration(
            type: WalletType.ethereum,
            useSSL: true,
          );
+          _changeDefaultNode(
+            nodes: nodes,
+            sharedPreferences: sharedPreferences,
+            type: WalletType.tron,
+            newDefaultUri: tronDefaultNodeUri,
+            currentNodePreferenceKey: PreferencesKey.currentTronNodeIdKey,
+            useSSL: true,
+            oldUri: [
+              'tron-rpc.publicnode.com:443',
+              'trx.nownodes.io',
+            ],
+          );
+          _changeDefaultNode(
+            nodes: nodes,
+            sharedPreferences: sharedPreferences,
+            type: WalletType.solana,
+            newDefaultUri: solanaDefaultNodeUri,
+            currentNodePreferenceKey: PreferencesKey.currentSolanaNodeIdKey,
+            useSSL: true,
+            oldUri: ['rpc.ankr.com'],
+          );
        default:
          break;
      }
@ -332,6 +351,7 @@ Future<void> _backupHavenSeeds(Box<HavenSeedStore> havenSeedStore) async {
  }
  return;
 }
+
 /// generic function for changing any wallet default node
 /// instead of making a new function for each change
 Future<void> _changeDefaultNode({
--- a/lib/entities/parse_address_from_domain.dart
+++ b/lib/entities/parse_address_from_domain.dart
@ -134,6 +134,7 @@ class AddressResolver {
  Future<ParsedAddress> resolve(BuildContext context, String text, CryptoCurrency currency) async {
    final ticker = currency.title;
    try {
+      // twitter handle example: @username
      if (text.startsWith('@') && !text.substring(1).contains('@')) {
        if (settingsStore.lookupsTwitter) {
          final formattedName = text.substring(1);
@ -165,6 +166,7 @@ class AddressResolver {
        }
      }

+      // Mastodon example: @username@hostname.xxx
      if (text.startsWith('@') && text.contains('@', 1) && text.contains('.', 1)) {
        if (settingsStore.lookupsMastodon) {
          final subText = text.substring(1);
--- a/lib/src/screens/connect_device/connect_device_page.dart
+++ b/lib/src/screens/connect_device/connect_device_page.dart
@ -92,6 +92,7 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
  late StreamSubscription<LedgerDevice>? _bleRefresh = null;

  bool longWait = false;
+  Timer? _longWaitTimer;

  @override
  void initState() {
@ -108,7 +109,7 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
            Timer.periodic(Duration(seconds: 1), (_) => _refreshUsbDevices());
      }

-      Future.delayed(Duration(seconds: 10), () {
+      _longWaitTimer = Timer(Duration(seconds: 10), () {
        if (widget.ledgerVM.bleIsEnabled && bleDevices.isEmpty)
          setState(() => longWait = true);
      });
@ -121,6 +122,7 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
    _bleStateTimer?.cancel();
    _usbRefreshTimer?.cancel();
    _bleRefresh?.cancel();
+    _longWaitTimer?.cancel();

    widget.ledgerVM.stopScanning();
    super.dispose();
@ -206,7 +208,8 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
                offstage: !longWait,
                child: Padding(
                  padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),
-                  child: Text(S.of(context).if_you_dont_see_your_device,
+                  child: Text(
+                    S.of(context).if_you_dont_see_your_device,
                    style: TextStyle(
                        fontSize: 16,
                        fontWeight: FontWeight.w500,
@ -235,7 +238,6 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
                  ),
                ),
              ),
-
              if (bleDevices.length > 0) ...[
                Padding(
                  padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),
@ -277,7 +279,9 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
                      style: TextStyle(
                        fontSize: 14,
                        fontWeight: FontWeight.w400,
-                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        color: Theme.of(context)
+                            .extension<CakeTextTheme>()!
+                            .titleColor,
                      ),
                    ),
                  ),
@ -299,8 +303,12 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
              if (widget.allowChangeWallet) ...[
                PrimaryButton(
                  text: S.of(context).wallets,
-                  color: Theme.of(context).extension<WalletListTheme>()!.createNewWalletButtonBackgroundColor,
-                  textColor: Theme.of(context).extension<WalletListTheme>()!.restoreWalletButtonTextColor,
+                  color: Theme.of(context)
+                      .extension<WalletListTheme>()!
+                      .createNewWalletButtonBackgroundColor,
+                  textColor: Theme.of(context)
+                      .extension<WalletListTheme>()!
+                      .restoreWalletButtonTextColor,
                  onPressed: _onChangeWallet,
                )
              ],
--- a/lib/view_model/hardware_wallet/ledger_view_model.dart
+++ b/lib/view_model/hardware_wallet/ledger_view_model.dart
@ -99,47 +99,54 @@ abstract class LedgerViewModelBase with Store {
  }

  Future<void> connectLedger(sdk.LedgerDevice device, WalletType type) async {
+    _isConnecting = true;
+    _connectingWalletType = type;
    if (isConnected) {
      try {
-        await _connectionChangeListener?.cancel();
-        _connectionChangeListener = null;
        await _connection!.disconnect().catchError((_) {});
      } catch (_) {}
    }
+
    final ledger = device.connectionType == sdk.ConnectionType.ble
        ? ledgerPlusBLE
        : ledgerPlusUSB;

-
-    if (_connectionChangeListener == null) {
-      _connectionChangeListener = ledger.deviceStateChanges.listen((event) {
-        printV('Ledger Device State Changed: $event');
-        if (event == sdk.BleConnectionState.disconnected) {
-          _connection = null;
-          if (type == WalletType.monero) {
-            monero!.resetLedgerConnection();
-
-            Navigator.of( navigatorKey.currentContext!).pushNamed(
-              Routes.connectDevices,
-              arguments: ConnectDevicePageParams(
-                walletType: WalletType.monero,
-                allowChangeWallet: true,
-                isReconnect: true,
-                onConnectDevice: (context, ledgerVM) async {
-                  Navigator.of(context).pop();
-                },
-              ),
-            );
-          }
-        }
-      });
+    if (_connectionChangeSubscription == null) {
+      _connectionChangeSubscription = ledger.deviceStateChanges
+          .listen(_connectionChangeListener);
    }

    _connection = await ledger.connect(device);
+    _isConnecting = false;
  }

-  StreamSubscription<sdk.BleConnectionState>? _connectionChangeListener;
+  StreamSubscription<sdk.BleConnectionState>? _connectionChangeSubscription;
  sdk.LedgerConnection? _connection;
+  bool _isConnecting = true;
+  WalletType? _connectingWalletType;
+
+  void _connectionChangeListener(
+      sdk.BleConnectionState event, ) {
+    printV('Ledger Device State Changed: $event');
+    if (event == sdk.BleConnectionState.disconnected && !_isConnecting) {
+      _connection = null;
+      if (_connectingWalletType == WalletType.monero) {
+        monero!.resetLedgerConnection();
+
+        Navigator.of(navigatorKey.currentContext!).pushNamed(
+          Routes.connectDevices,
+          arguments: ConnectDevicePageParams(
+            walletType: WalletType.monero,
+            allowChangeWallet: true,
+            isReconnect: true,
+            onConnectDevice: (context, ledgerVM) async {
+              Navigator.of(context).pop();
+            },
+          ),
+        );
+      }
+    }
+  }

  bool get isConnected => _connection != null && !(_connection!.isDisconnected);

--- a/lib/view_model/send/send_view_model.dart
+++ b/lib/view_model/send/send_view_model.dart
@ -26,7 +26,6 @@ import 'package:cw_core/transaction_priority.dart';
 import 'package:cw_core/unspent_coin_type.dart';
 import 'package:cake_wallet/view_model/send/output.dart';
 import 'package:cake_wallet/view_model/send/send_template_view_model.dart';
-import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_solana/solana_exceptions.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
@ -100,6 +99,8 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor

    outputs
        .add(Output(wallet, _settingsStore, _fiatConversationStore, () => selectedCryptoCurrency));
+
+    unspentCoinsListViewModel.initialSetup();
  }

  @observable
@ -717,9 +718,9 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor

        return 
        '''${S.current.insufficient_funds_for_tx} \n\n'''
-        '''${S.current.balance}: ${parsedErrorMessageResult.balanceEth} ETH (${parsedErrorMessageResult.balanceUsd} USD)\n\n'''
-        '''${S.current.transaction_cost}: ${parsedErrorMessageResult.txCostEth} ETH (${parsedErrorMessageResult.txCostUsd} USD)\n\n'''
-        '''${S.current.overshot}: ${parsedErrorMessageResult.overshotEth} ETH (${parsedErrorMessageResult.overshotUsd} USD)''';
+        '''${S.current.balance}: ${parsedErrorMessageResult.balanceEth} ${walletType == WalletType.polygon ? "POL" : "ETH"} (${parsedErrorMessageResult.balanceUsd} ${fiatFromSettings.name})\n\n'''
+        '''${S.current.transaction_cost}: ${parsedErrorMessageResult.txCostEth} ${walletType == WalletType.polygon ? "POL" : "ETH"} (${parsedErrorMessageResult.txCostUsd} ${fiatFromSettings.name})\n\n'''
+        '''${S.current.overshot}: ${parsedErrorMessageResult.overshotEth} ${walletType == WalletType.polygon ? "POL" : "ETH"} (${parsedErrorMessageResult.overshotUsd} ${fiatFromSettings.name})''';
      }

      return errorMessage;
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_ANDROID_TYPE=$1

 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.18.2"
-MONERO_COM_BUILD_NUMBER=108
+MONERO_COM_VERSION="1.19.0"
+MONERO_COM_BUILD_NUMBER=109
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 MONERO_COM_SCHEME="monero.com"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.21.2"
-CAKEWALLET_BUILD_NUMBER=239
+CAKEWALLET_VERSION="4.22.0"
+CAKEWALLET_BUILD_NUMBER=240
 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
@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_IOS_TYPE=$1

 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.18.2"
-MONERO_COM_BUILD_NUMBER=105
+MONERO_COM_VERSION="1.19.0"
+MONERO_COM_BUILD_NUMBER=106
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.21.2"
-CAKEWALLET_BUILD_NUMBER=284
+CAKEWALLET_VERSION="4.22.0"
+CAKEWALLET_BUILD_NUMBER=287
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"

 HAVEN_NAME="Haven"
--- a/scripts/linux/app_env.sh
+++ b/scripts/linux/app_env.sh
@ -14,8 +14,8 @@ if [ -n "$1" ]; then
 fi

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.11.2"
-CAKEWALLET_BUILD_NUMBER=40
+CAKEWALLET_VERSION="1.12.0"
+CAKEWALLET_BUILD_NUMBER=41

 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
    echo "Wrong app type."
--- a/scripts/macos/app_env.sh
+++ b/scripts/macos/app_env.sh
@ -16,13 +16,13 @@ if [ -n "$1" ]; then
 fi

 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.8.1"
-MONERO_COM_BUILD_NUMBER=37
+MONERO_COM_VERSION="1.9.0"
+MONERO_COM_BUILD_NUMBER=39
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.14.2"
-CAKEWALLET_BUILD_NUMBER=98
+CAKEWALLET_VERSION="1.15.0"
+CAKEWALLET_BUILD_NUMBER=99
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"

 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
--- a/scripts/windows/build_exe_installer.iss
+++ b/scripts/windows/build_exe_installer.iss
@ -1,5 +1,5 @@
 #define MyAppName "Cake Wallet"
-#define MyAppVersion "0.2.1"
+#define MyAppVersion "0.3.0"
 #define MyAppPublisher "Cake Labs LLC"
 #define MyAppURL "https://cakewallet.com/"
 #define MyAppExeName "CakeWallet.exe"