Merge branch 'main' of https://github.com/cake-tech/cake_wallet into v5.1.0-rc

cw_bitcoin/lib/bitcoin_wallet_addresses.dart

@@ -67,6 +67,8 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with S
       payjoinManager.resumeSessions();
     } catch (e) {
       printV(e);
+      // Ignore Connectivity errors
+      if (!e.toString().contains("error sending request for url")) rethrow;
     }
   }
 
@@ -79,6 +81,8 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with S
       payjoinManager.spawnReceiver(receiver: currentPayjoinReceiver!);
     } catch (e) {
       printV(e);
+      // Ignore Connectivity errors
+      if (!e.toString().contains("error sending request for url")) rethrow;
     }
   }
 }

cw_bitcoin/lib/payjoin/payjoin_send_worker.dart

@@ -106,8 +106,8 @@ class PayjoinSenderWorker {
       sendPort.send({'type': PayjoinSenderRequestTypes.requestPosted});
 
       return await postRequest.$2.processResponse(response: response);
-    } catch (e) {
-      throw PayjoinSessionError.unrecoverable('Send V1 payjoin error: $e');
+    } catch (e, stack) {
+      throw PayjoinSessionError.unrecoverable('Send V1 payjoin error: $e, $stack');
     }
   }
 

cw_core/lib/crypto_currency.dart

@@ -111,7 +111,8 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
     CryptoCurrency.zano,
     CryptoCurrency.ton,
     CryptoCurrency.flip,
-    CryptoCurrency.deuro
+    CryptoCurrency.deuro,
+    CryptoCurrency.usdtbsc,
   ];
 
   static const havenCurrencies = [
@@ -233,6 +234,7 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
   static const zano = CryptoCurrency(title: 'ZANO', tag: 'ZANO', fullName: 'Zano', raw: 96, name: 'zano', iconPath: 'assets/images/zano_icon.png', decimals: 12);
   static const flip = CryptoCurrency(title: 'FLIP', tag: 'ETH', fullName: 'Chainflip', raw: 97, name: 'flip', iconPath: 'assets/images/flip_icon.png', decimals: 18);
   static const deuro = CryptoCurrency(title: 'DEURO', tag: 'ETH', fullName: 'Decentralized Euro', raw: 98, name: 'deuro', iconPath: 'assets/images/deuro_icon.png', decimals: 18);
+  static const usdtbsc = CryptoCurrency(title: 'USDT', tag: 'BSC', fullName: 'USDT Binance coin', raw: 99, name: 'usdtbsc', iconPath: 'assets/images/usdtbsc_icon.png', decimals: 18);
 
   static final Map<int, CryptoCurrency> _rawCurrencyMap =
     [...all, ...havenCurrencies].fold<Map<int, CryptoCurrency>>(<int, CryptoCurrency>{}, (acc, item) {

cw_ethereum/lib/deuro/deuro_savings.dart

@@ -2,6 +2,7 @@ import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_ethereum/deuro/deuro_savings_contract.dart';
 import 'package:cw_ethereum/ethereum_wallet.dart';
 import 'package:cw_evm/contract/erc20.dart';
+import 'package:cw_evm/evm_chain_exceptions.dart';
 import 'package:cw_evm/evm_chain_transaction_priority.dart';
 import 'package:cw_evm/pending_evm_chain_transaction.dart';
 import 'package:web3dart/crypto.dart';
@@ -43,8 +44,35 @@ class DEuro {
 
   Future<BigInt> get approvedBalance => _dEuro.allowance(_address, _savingsGateway.self.address);
 
+  Future<void> _checkEthBalanceForGasFees(EVMChainTransactionPriority priority) async {
+    final ethBalance = await _wallet.getWeb3Client()!.getBalance(_address);
+    final currentBalance = ethBalance.getInWei;
+
+    final gasFeesModel = await _wallet.calculateActualEstimatedFeeForCreateTransaction(
+      amount: BigInt.zero,
+      contractAddress: _savingsGateway.self.address.hexEip55,
+      receivingAddressHex: _savingsGateway.self.address.hexEip55,
+      priority: priority,
+      data: _savingsGateway.self.abi.functions[17]
+          .encodeCall([BigInt.zero, hexToBytes(frontendCode)]),
+    );
+
+    final estimatedGasFee = BigInt.from(gasFeesModel.estimatedGasFee);
+    final requiredBalance = estimatedGasFee;
+
+    if (currentBalance < requiredBalance) {
+      throw DeuroGasFeeException(
+        requiredGasFee: requiredBalance,
+        currentBalance: currentBalance,
+      );
+    }
+  }
+
   Future<PendingEVMChainTransaction> depositSavings(
       BigInt amount, EVMChainTransactionPriority priority) async {
+    try {
+      await _checkEthBalanceForGasFees(priority);
+
       final signedTransaction = await _savingsGateway.save(
         (amount: amount, frontendCode: hexToBytes(frontendCode)),
         credentials: _wallet.evmChainPrivateKey,
@@ -65,11 +93,24 @@ class DEuro {
         signedTransaction: signedTransaction,
         fee: BigInt.from(fee.estimatedGasFee),
         amount: amount.toString(),
-        exponent: 18);
+        exponent: 18,
+      );
+    } catch (e) {
+      if (e.toString().contains('insufficient funds for gas')) {
+        final ethBalance = await _wallet.getWeb3Client()!.getBalance(_address);
+        throw DeuroGasFeeException(
+          currentBalance: ethBalance.getInWei,
+        );
+      }
+      rethrow;
+    }
   }
 
   Future<PendingEVMChainTransaction> withdrawSavings(
       BigInt amount, EVMChainTransactionPriority priority) async {
+    try {
+      await _checkEthBalanceForGasFees(priority);
+
       final signedTransaction = await _savingsGateway.withdraw(
         (target: _address, amount: amount, frontendCode: hexToBytes(frontendCode)),
         credentials: _wallet.evmChainPrivateKey,
@@ -91,11 +132,23 @@ class DEuro {
           fee: BigInt.from(fee.estimatedGasFee),
           amount: amount.toString(),
           exponent: 18);
+    } catch (e) {
+      if (e.toString().contains('insufficient funds for gas')) {
+        final ethBalance = await _wallet.getWeb3Client()!.getBalance(_address);
+        throw DeuroGasFeeException(
+          currentBalance: ethBalance.getInWei,
+        );
+      }
+      rethrow;
+    }
   }
 
   // Set an infinite approval to save gas in the future
-  Future<PendingEVMChainTransaction> enableSavings(EVMChainTransactionPriority priority) async =>
-      (await _wallet.createApprovalTransaction(
+  Future<PendingEVMChainTransaction> enableSavings(EVMChainTransactionPriority priority) async {
+    try {
+      await _checkEthBalanceForGasFees(priority);
+
+      return (await _wallet.createApprovalTransaction(
         BigInt.parse(
           'ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff',
           radix: 16,
@@ -104,4 +157,14 @@ class DEuro {
         CryptoCurrency.deuro,
         priority,
       )) as PendingEVMChainTransaction;
+    } catch (e) {
+      if (e.toString().contains('insufficient funds for gas')) {
+        final ethBalance = await _wallet.getWeb3Client()!.getBalance(_address);
+        throw DeuroGasFeeException(
+          currentBalance: ethBalance.getInWei,
+        );
+      }
+      rethrow;
+    }
+  }
 }

cw_evm/lib/evm_chain_exceptions.dart

@@ -22,3 +22,32 @@ class EVMChainTransactionFeesException implements Exception {
   @override
   String toString() => exceptionMessage;
 }
+
+class DeuroGasFeeException implements Exception {
+  final String exceptionMessage;
+  final BigInt? requiredGasFee;
+  final BigInt? currentBalance;
+
+  DeuroGasFeeException({
+    this.requiredGasFee,
+    this.currentBalance,
+  }) : exceptionMessage = _buildMessage(requiredGasFee, currentBalance);
+
+  static String _buildMessage(BigInt? requiredGasFee, BigInt? currentBalance) {
+    const baseMessage = 'Insufficient ETH for gas fees.';
+    const addEthMessage = ' Please add ETH to your wallet to cover transaction fees.';
+    
+    if (requiredGasFee != null) {
+      final requiredEth = (requiredGasFee / BigInt.from(10).pow(18)).toStringAsFixed(8);
+      final balanceInfo = currentBalance != null 
+          ? ', Available: ${(currentBalance / BigInt.from(10).pow(18)).toStringAsFixed(8)} ETH'
+          : '';
+      return '$baseMessage Required: ~$requiredEth ETH$balanceInfo.$addEthMessage';
+    }
+    
+    return '$baseMessage$addEthMessage';
+  }
+
+  @override
+  String toString() => exceptionMessage;
+}

cw_monero/lib/api/wallet.dart

@@ -116,12 +116,17 @@ String getSeedLegacy(String? language) {
 }
 
 String getPassphrase() {
-  return currentWallet!.getCacheAttribute(key: "cakewallet.passphrase");
+  return currentWallet?.getCacheAttribute(key: "cakewallet.passphrase") ?? "";
 }
 
 Map<int, Map<int, Map<int, String>>> addressCache = {};
 
 String getAddress({int accountIndex = 0, int addressIndex = 0}) {
+  // this is a workaround for when we switch the wallet pointer,
+  // it should never reach UI but should be good enough to prevent gray screen
+  // or other errors because of forced null check.
+  if (currentWallet == null) return "<wallet not ready ($accountIndex:$addressIndex)>";
+
   // printV("getaddress: ${accountIndex}/${addressIndex}: ${monero.Wallet_numSubaddresses(wptr!, accountIndex: accountIndex)}: ${monero.Wallet_address(wptr!, accountIndex: accountIndex, addressIndex: addressIndex)}");
   // this could be a while loop, but I'm in favor of making it if to not cause freezes
   if (currentWallet!.numSubaddresses(accountIndex: accountIndex)-1 < addressIndex) {
@@ -272,13 +277,13 @@ void closeCurrentWallet() {
   currentWallet!.stop();
 }
 
-String getSecretViewKey() => currentWallet!.secretViewKey();
+String getSecretViewKey() => currentWallet?.secretViewKey() ?? "";
 
-String getPublicViewKey() => currentWallet!.publicViewKey();
+String getPublicViewKey() => currentWallet?.publicViewKey() ?? "";
 
-String getSecretSpendKey() => currentWallet!.secretSpendKey();
+String getSecretSpendKey() => currentWallet?.secretSpendKey() ?? "";
 
-String getPublicSpendKey() => currentWallet!.publicSpendKey();
+String getPublicSpendKey() => currentWallet?.publicSpendKey() ?? "";
 
 class SyncListener {
   SyncListener(this.onNewBlock, this.onNewTransaction)

lib/core/fiat_conversion_service.dart

@@ -5,8 +5,7 @@ import 'dart:convert';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 
 const _fiatApiClearNetAuthority = 'fiat-api.cakewallet.com';
-// const _fiatApiOnionAuthority = 'n4z7bdcmwk2oyddxvzaap3x2peqcplh3pzdy7tpkk5ejz5n4mhfvoxqd.onion';
-const _fiatApiOnionAuthority = _fiatApiClearNetAuthority;
+const _fiatApiOnionAuthority = 'kfkyguqtz5vcnbvar5pjgddkaeawbo4j3r4fj3e22k3tzqageplosiid.onion';
 const _fiatApiPath = '/v2/rates';
 
 Future<double> _fetchPrice(String crypto, String fiat, bool torOnly) async {

lib/exchange/provider/thorchain_exchange.provider.dart

@@ -23,6 +23,7 @@ class ThorChainExchangeProvider extends ExchangeProvider {
               // CryptoCurrency.eth,
               CryptoCurrency.ltc,
               CryptoCurrency.bch,
+              CryptoCurrency.usdtbsc,
               // CryptoCurrency.aave,
               // CryptoCurrency.dai,
               // CryptoCurrency.gusd,
@@ -259,7 +260,7 @@ class ThorChainExchangeProvider extends ExchangeProvider {
   }
 
   String _normalizeCurrency(CryptoCurrency currency) {
-    final networkTitle = currency.tag == 'ETH' ? 'ETH' : currency.title;
+    final networkTitle = currency.tag == 'ETH' ? 'ETH' : currency.tag ?? currency.title;
     return '$networkTitle.${currency.title}';
   }
 

lib/exchange/provider/trocador_exchange_provider.dart

@@ -348,6 +348,8 @@ class TrocadorExchangeProvider extends ExchangeProvider {
         return 'TRC20';
       case 'LN':
         return 'Lightning';
+      case 'BSC':
+        return 'BEP20';
       default:
         return tag.toLowerCase();
     }

lib/src/screens/integrations/deuro/savings_page.dart

@@ -4,9 +4,11 @@ import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/integrations/deuro/widgets/interest_card_widget.dart';
 import 'package:cake_wallet/src/screens/integrations/deuro/widgets/savings_card_widget.dart';
 import 'package:cake_wallet/src/screens/integrations/deuro/widgets/savings_edit_sheet.dart';
+import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart';
 import 'package:cake_wallet/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart';
 import 'package:cake_wallet/src/widgets/gradient_background.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/integrations/deuro_view_model.dart';
 import 'package:cake_wallet/view_model/send/send_view_model_state.dart';
 import 'package:cw_core/crypto_currency.dart';
@@ -190,6 +192,24 @@ class DEuroSavingsPage extends BasePage {
           );
         });
       }
+
+      if (state is FailureState) {
+        WidgetsBinding.instance.addPostFrameCallback((_) async {
+          if (!context.mounted) return;
+
+          await showPopUp<void>(
+            context: context,
+            builder: (BuildContext popupContext) {
+              return AlertWithOneAction(
+                alertTitle: S.of(popupContext).error,
+                alertContent: state.error,
+                buttonText: S.of(popupContext).ok,
+                buttonAction: () => Navigator.of(popupContext).pop(),
+              );
+            },
+          );
+        });
+      }
     });
 
     _isReactionsSet = true;

lib/view_model/dashboard/dashboard_view_model.dart

@@ -1123,13 +1123,18 @@ abstract class DashboardViewModelBase with Store {
   Future<ServicesResponse> _getServicesStatus() async {
     try {
       if (isEnabledBulletinAction) {
-        final uri = Uri.https(
+        final res = await ProxyWrapper().get(
+          clearnetUri: Uri.https(
             "service-api.cakewallet.com",
             "/v1/active-notices",
             {'key': secrets.fiatApiKey},
+          ),
+          onionUri: Uri.http(
+            "jpirgl4lrwzjgdqj2nsv3g7twhp2efzty5d3cnypktyczzqfc5qcwwyd.onion",
+            "/v1/active-notices",
+            {'key': secrets.fiatApiKey},
+          ),
         );
-
-        final res = await ProxyWrapper().get(clearnetUri: uri);
         if (res.statusCode < 200 || res.statusCode >= 300) {
           throw res.body;
         }

lib/view_model/integrations/deuro_view_model.dart

@@ -46,10 +46,8 @@ abstract class DEuroViewModelBase with Store {
 
   @action
   Future<void> reloadSavingsUserData() async {
-    final savingsBalanceRaw =
-    ethereum!.getDEuroSavingsBalance(_appStore.wallet!);
-    final accruedInterestRaw =
-    ethereum!.getDEuroAccruedInterest(_appStore.wallet!);
+    final savingsBalanceRaw = ethereum!.getDEuroSavingsBalance(_appStore.wallet!);
+    final accruedInterestRaw = ethereum!.getDEuroAccruedInterest(_appStore.wallet!);
 
     approvedTokens = await ethereum!.getDEuroSavingsApproved(_appStore.wallet!);
 
@@ -63,56 +61,73 @@ abstract class DEuroViewModelBase with Store {
 
   @action
   Future<void> reloadInterestRate() async {
-    final interestRateRaw =
-    await ethereum!.getDEuroInterestRate(_appStore.wallet!);
+    final interestRateRaw = await ethereum!.getDEuroInterestRate(_appStore.wallet!);
 
     interestRate = (interestRateRaw / BigInt.from(10000)).toString();
   }
 
   @action
   Future<void> prepareApproval() async {
+    try {
+      state = TransactionCommitting();
       final priority = _appStore.settingsStore.priority[WalletType.ethereum]!;
-    approvalTransaction =
-        await ethereum!.enableDEuroSaving(_appStore.wallet!, priority);
+      approvalTransaction = await ethereum!.enableDEuroSaving(_appStore.wallet!, priority);
+      state = InitialExecutionState();
+    } catch (e) {
+      state = FailureState(e.toString());
+    }
   }
 
   @action
   Future<void> prepareSavingsEdit(String amountRaw, bool isAdding) async {
+    try {
+      state = TransactionCommitting();
       final amount = BigInt.from(num.parse(amountRaw) * pow(10, 18));
       final priority = _appStore.settingsStore.priority[WalletType.ethereum]!;
       transaction = await (isAdding
           ? ethereum!.addDEuroSaving(_appStore.wallet!, amount, priority)
           : ethereum!.removeDEuroSaving(_appStore.wallet!, amount, priority));
+      state = InitialExecutionState();
+    } catch (e) {
+      state = FailureState(e.toString());
+    }
   }
 
-  Future<void> prepareCollectInterest() =>
-      prepareSavingsEdit(accruedInterest, false);
+  Future<void> prepareCollectInterest() => prepareSavingsEdit(accruedInterest, false);
 
   @action
   Future<void> commitTransaction() async {
     if (transaction != null) {
+      try {
         state = TransactionCommitting();
         await transaction!.commit();
         transaction = null;
         reloadSavingsUserData();
         state = TransactionCommitted();
+      } catch (e) {
+        state = FailureState(e.toString());
+      }
     }
   }
 
   @action
   Future<void> commitApprovalTransaction() async {
     if (approvalTransaction != null) {
+      try {
         state = TransactionCommitting();
         await approvalTransaction!.commit();
         approvalTransaction = null;
         reloadSavingsUserData();
         state = TransactionCommitted();
+      } catch (e) {
+        state = FailureState(e.toString());
+      }
     }
   }
 
   @action
   void dismissTransaction() {
-    transaction == null;
+    transaction = null;
     approvalTransaction = null;
     state = InitialExecutionState();
   }

lib/view_model/payjoin_details_view_model.dart

@@ -4,7 +4,9 @@ import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/trade_details/trade_details_list_card.dart';
 import 'package:cake_wallet/src/screens/trade_details/trade_details_status_item.dart';
+import 'package:cake_wallet/src/screens/transaction_details/blockexplorer_list_item.dart';
 import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
+import 'package:cake_wallet/src/screens/transaction_details/transaction_details_list_item.dart';
 import 'package:cake_wallet/themes/core/theme_store.dart';
 import 'package:cake_wallet/utils/date_formatter.dart';
 import 'package:cw_core/payjoin_session.dart';
@@ -12,6 +14,7 @@ import 'package:cw_core/transaction_info.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:mobx/mobx.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 part 'payjoin_details_view_model.g.dart';
 
@@ -40,7 +43,7 @@ abstract class PayjoinDetailsViewModelBase with Store {
   @observable
   late PayjoinSession payjoinSession;
 
-  final ObservableList<StandartListItem> items;
+  final ObservableList<TransactionDetailsListItem> items;
 
   late final StreamSubscription<BoxEvent> listener;
 
@@ -69,12 +72,25 @@ abstract class PayjoinDetailsViewModelBase with Store {
           title: S.current.error,
           value: payjoinSession.error!,
         ),
-      if (payjoinSession.txId?.isNotEmpty == true && transactionInfo != null)
+      if (payjoinSession.txId?.isNotEmpty == true && transactionInfo != null) ...[
         StandartListItem(
           title: S.current.transaction_details_transaction_id,
           value: payjoinSession.txId!,
           key: ValueKey('standard_list_item_transaction_details_id_key'),
+        ),
+        BlockExplorerListItem(
+          title: S.current.view_in_block_explorer,
+          value: '${S.current.view_transaction_on}mempool.space',
+          onTap: () async {
+            try {
+              final uri = Uri.parse('https://mempool.cakewallet.com/tx/${payjoinSession.txId!}');
+              if (await canLaunchUrl(uri))
+                await launchUrl(uri, mode: LaunchMode.externalApplication);
+            } catch (e) {}
+          },
+          key: ValueKey('block_explorer_list_item_wallet_type_key'),
         )
+      ]
     ]);
 
     if (transactionInfo != null) {