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

 Conflicts:

	cw_bitcoin/lib/bitcoin_wallet.dart

.github/workflows/pr_test_build.yml

@@ -151,6 +151,7 @@ jobs:
           echo "const moralisApiKey = '${{ secrets.MORALIS_API_KEY }}';" >> lib/.secrets.g.dart
           echo "const polygonScanApiKey = '${{ secrets.POLYGON_SCAN_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
           echo "const ankrApiKey = '${{ secrets.ANKR_API_KEY }}';" >> cw_solana/lib/.secrets.g.dart
+          echo "const quantexExchangeMarkup = '${{ secrets.QUANTEX_EXCHANGE_MARKUP }}';" >> lib/.secrets.g.dart
           echo "const nano2ApiKey = '${{ secrets.NANO2_API_KEY }}';" >> cw_nano/lib/.secrets.g.dart
           echo "const tronGridApiKey = '${{ secrets.TRON_GRID_API_KEY }}';" >> cw_tron/lib/.secrets.g.dart
 

cw_bitcoin/lib/bitcoin_wallet.dart

@@ -1,24 +1,25 @@
-import 'package:bitcoin_base/bitcoin_base.dart';
+import 'dart:convert';
-import 'package:convert/convert.dart';
 
+import 'package:bip39/bip39.dart' as bip39;
+import 'package:bitcoin_base/bitcoin_base.dart';
+import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
+import 'package:convert/convert.dart';
+import 'package:cw_bitcoin/bitcoin_address_record.dart';
 import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
 import 'package:cw_core/encryption_file_utils.dart';
+import 'package:cw_bitcoin/bitcoin_wallet_addresses.dart';
+import 'package:cw_bitcoin/electrum_balance.dart';
+import 'package:cw_bitcoin/electrum_wallet.dart';
+import 'package:cw_bitcoin/electrum_wallet_snapshot.dart';
 import 'package:cw_bitcoin/psbt_transaction_builder.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/unspent_coins_info.dart';
+import 'package:cw_core/wallet_info.dart';
+import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
 import 'package:ledger_bitcoin/ledger_bitcoin.dart';
 import 'package:ledger_flutter/ledger_flutter.dart';
 import 'package:mobx/mobx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:bitcoin_flutter/bitcoin_flutter.dart' as bitcoin;
-import 'package:cw_bitcoin/electrum_wallet_snapshot.dart';
-import 'package:cw_bitcoin/electrum_wallet.dart';
-import 'package:cw_core/wallet_info.dart';
-import 'package:cw_bitcoin/bitcoin_address_record.dart';
-import 'package:cw_bitcoin/electrum_balance.dart';
-import 'package:cw_bitcoin/bitcoin_wallet_addresses.dart';
-import 'package:bip39/bip39.dart' as bip39;
 
 part 'bitcoin_wallet.g.dart';
 
@@ -223,4 +224,23 @@ abstract class BitcoinWalletBase extends ElectrumWallet with Store {
     final rawHex = await _bitcoinLedgerApp!.signPsbt(_ledgerDevice!, psbt: psbt.psbt);
     return BtcTransaction.fromRaw(hex.encode(rawHex));
   }
+
+  @override
+  Future<String> signMessage(String message, {String? address = null}) async {
+    if (walletInfo.isHardwareWallet) {
+      final addressEntry = address != null
+          ? walletAddresses.allAddresses.firstWhere((element) => element.address == address)
+          : null;
+      final index = addressEntry?.index ?? 0;
+      final isChange = addressEntry?.isHidden == true ? 1 : 0;
+      final accountPath = walletInfo.derivationInfo?.derivationPath;
+      final derivationPath = accountPath != null ? "$accountPath/$isChange/$index" : null;
+
+      final signature = await _bitcoinLedgerApp!
+          .signMessage(_ledgerDevice!, message: ascii.encode(message), signDerivationPath: derivationPath);
+      return base64Encode(signature);
+    }
+
+    return super.signMessage(message, address: address);
+  }
 }

cw_bitcoin/pubspec.lock

@@ -492,10 +492,10 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: b6ed573cbeb57d5f0d39dfe4254bf9d15b620ab6
+      resolved-ref: f819d37e235e239c315e93856abbf5e5d3b71dab
-      url: "https://github.com/cake-tech/ledger-bitcoin.git"
+      url: "https://github.com/cake-tech/ledger-bitcoin"
     source: git
-    version: "0.0.1"
+    version: "0.0.2"
   ledger_flutter:
     dependency: "direct main"
     description:

cw_bitcoin/pubspec.yaml

@@ -38,7 +38,7 @@ dependencies:
   ledger_flutter: ^1.0.1
   ledger_bitcoin:
     git:
-      url: https://github.com/cake-tech/ledger-bitcoin.git
+      url: https://github.com/cake-tech/ledger-bitcoin
 
 dev_dependencies:
   flutter_test:

cw_tron/lib/tron_client.dart

@@ -208,7 +208,7 @@ class TronClient {
         TransactionContract(type: contract.contractType, parameter: parameter);
 
     // Set the transaction expiration time (maximum 24 hours)
-    final expireTime = DateTime.now().add(const Duration(hours: 24));
+    final expireTime = DateTime.now().add(const Duration(minutes: 30));
 
     // Create a raw transaction
     TransactionRaw rawTransaction = TransactionRaw(
@@ -369,7 +369,7 @@ class TronClient {
         TransactionContract(type: contract.contractType, parameter: parameter);
 
     // Set the transaction expiration time (maximum 24 hours)
-    final expireTime = DateTime.now().add(const Duration(hours: 24));
+    final expireTime = DateTime.now().add(const Duration(minutes: 30));
 
     // Create a raw transaction
     TransactionRaw rawTransaction = TransactionRaw(

lib/exchange/exchange_provider_description.dart

@@ -22,10 +22,11 @@ class ExchangeProviderDescription extends EnumerableItem<int> with Serializable<
       ExchangeProviderDescription(title: 'Trocador', raw: 5, image: 'assets/images/trocador.png');
   static const exolix =
       ExchangeProviderDescription(title: 'Exolix', raw: 6, image: 'assets/images/exolix.png');
-  static const thorChain =
-  ExchangeProviderDescription(title: 'ThorChain' , raw: 8, image: 'assets/images/thorchain.png');
-
   static const all = ExchangeProviderDescription(title: 'All trades', raw: 7, image: '');
+  static const thorChain =
+      ExchangeProviderDescription(title: 'ThorChain', raw: 8, image: 'assets/images/thorchain.png');
+  static const quantex =
+      ExchangeProviderDescription(title: 'Quantex', raw: 9, image: 'assets/images/quantex.png');
 
   static ExchangeProviderDescription deserialize({required int raw}) {
     switch (raw) {
@@ -43,10 +44,12 @@ class ExchangeProviderDescription extends EnumerableItem<int> with Serializable<
         return trocador;
       case 6:
         return exolix;
-      case 8:
-        return thorChain;
       case 7:
         return all;
+      case 8:
+        return thorChain;
+      case 9:
+        return quantex;
       default:
         throw Exception('Unexpected token: $raw for ExchangeProviderDescription deserialize');
     }

lib/exchange/provider/quantex_exchange_provider.dart

@@ -0,0 +1,252 @@
+import 'dart:convert';
+
+import 'package:cake_wallet/.secrets.g.dart' as secrets;
+import 'package:cake_wallet/exchange/exchange_provider_description.dart';
+import 'package:cake_wallet/exchange/limits.dart';
+import 'package:cake_wallet/exchange/provider/exchange_provider.dart';
+import 'package:cake_wallet/exchange/trade.dart';
+import 'package:cake_wallet/exchange/trade_not_created_exception.dart';
+import 'package:cake_wallet/exchange/trade_not_found_exception.dart';
+import 'package:cake_wallet/exchange/trade_request.dart';
+import 'package:cake_wallet/exchange/trade_state.dart';
+import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart';
+import 'package:cw_core/crypto_currency.dart';
+import 'package:http/http.dart';
+
+class QuantexExchangeProvider extends ExchangeProvider {
+  QuantexExchangeProvider() : super(pairList: supportedPairs(_notSupported));
+
+  static final List<CryptoCurrency> _notSupported = [
+    ...(CryptoCurrency.all
+        .where((element) => ![
+              CryptoCurrency.btc,
+              CryptoCurrency.sol,
+              CryptoCurrency.eth,
+              CryptoCurrency.ltc,
+              CryptoCurrency.ada,
+              CryptoCurrency.bch,
+              CryptoCurrency.usdt,
+              CryptoCurrency.bnb,
+              CryptoCurrency.xmr,
+            ].contains(element))
+        .toList())
+  ];
+
+  static final markup = secrets.quantexExchangeMarkup;
+
+  static const apiAuthority = 'api.myquantex.com';
+  static const getRate = '/api/swap/get-rate';
+  static const getCoins = '/api/swap/get-coins';
+  static const createOrder = '/api/swap/create-order';
+
+  @override
+  String get title => 'Quantex';
+
+  @override
+  bool get isAvailable => true;
+
+  @override
+  bool get isEnabled => true;
+
+  @override
+  bool get supportsFixedRate => false;
+
+  @override
+  ExchangeProviderDescription get description => ExchangeProviderDescription.quantex;
+
+  @override
+  Future<bool> checkIsAvailable() async => true;
+
+  @override
+  Future<Limits> fetchLimits({
+    required CryptoCurrency from,
+    required CryptoCurrency to,
+    required bool isFixedRateMode,
+  }) async {
+    try {
+      final uri = Uri.https(apiAuthority, getCoins);
+      final response = await get(uri);
+
+      final responseJSON = json.decode(response.body) as Map<String, dynamic>;
+
+      if (response.statusCode != 200)
+        throw Exception('Unexpected http status: ${response.statusCode}');
+
+      final coinsInfo = responseJSON['data'] as List<dynamic>;
+
+      for (var coin in coinsInfo) {
+        if (coin['id'].toString().toUpperCase() == _normalizeCurrency(from)) {
+          return Limits(
+            min: double.parse(coin['min'].toString()),
+            max: double.parse(coin['max'].toString()),
+          );
+        }
+      }
+
+      // coin not found:
+      return Limits(min: 0, max: 0);
+    } catch (e) {
+      print(e.toString());
+      return Limits(min: 0, max: 0);
+    }
+  }
+
+  @override
+  Future<double> fetchRate({
+    required CryptoCurrency from,
+    required CryptoCurrency to,
+    required double amount,
+    required bool isFixedRateMode,
+    required bool isReceiveAmount,
+  }) async {
+    try {
+      if (amount == 0) return 0.0;
+
+      final headers = <String, String>{};
+      final params = <String, dynamic>{};
+      final body = <String, String>{
+        'coin_send': _normalizeCurrency(from),
+        'coin_receive': _normalizeCurrency(to),
+        'ref': 'cake',
+      };
+
+      final uri = Uri.https(apiAuthority, getRate, params);
+      final response = await post(uri, body: body, headers: headers);
+      final responseBody = json.decode(response.body) as Map<String, dynamic>;
+
+      if (response.statusCode != 200)
+        throw Exception('Unexpected http status: ${response.statusCode}');
+
+      final data = responseBody['data'] as Map<String, dynamic>;
+      double rate = double.parse(data['price'].toString());
+      return rate;
+    } catch (e) {
+      print("error fetching rate: ${e.toString()}");
+      return 0.0;
+    }
+  }
+
+  @override
+  Future<Trade> createTrade({
+    required TradeRequest request,
+    required bool isFixedRateMode,
+    required bool isSendAll,
+  }) async {
+    try {
+      final headers = <String, String>{};
+      final params = <String, dynamic>{};
+      var body = <String, dynamic>{
+        'coin_send': _normalizeCurrency(request.fromCurrency),
+        'coin_receive': _normalizeCurrency(request.toCurrency),
+        'amount_send': request.fromAmount,
+        'recipient': request.toAddress,
+        'ref': 'cake',
+        'markup': markup,
+      };
+
+      String? fromNetwork = _networkFor(request.fromCurrency);
+      String? toNetwork = _networkFor(request.toCurrency);
+      if (fromNetwork != null) body['coin_send_network'] = fromNetwork;
+      if (toNetwork != null) body['coin_receive_network'] = toNetwork;
+
+      final uri = Uri.https(apiAuthority, createOrder, params);
+      final response = await post(uri, body: body, headers: headers);
+      final responseBody = json.decode(response.body) as Map<String, dynamic>;
+
+      if (response.statusCode == 400 || responseBody["success"] == false) {
+        final error = responseBody['errors'][0]['msg'] as String;
+        throw TradeNotCreatedException(description, description: error);
+      }
+
+      if (response.statusCode != 200)
+        throw Exception('Unexpected http status: ${response.statusCode}');
+
+      final responseData = responseBody['data'] as Map<String, dynamic>;
+
+      return Trade(
+        id: responseData["order_id"] as String,
+        inputAddress: responseData["server_address"] as String,
+        amount: request.fromAmount,
+        from: request.fromCurrency,
+        to: request.toCurrency,
+        provider: description,
+        createdAt: DateTime.now(),
+        state: TradeState.created,
+        payoutAddress: request.toAddress,
+        isSendAll: isSendAll,
+      );
+    } catch (e) {
+      print("error creating trade: ${e.toString()}");
+      throw TradeNotCreatedException(description, description: e.toString());
+    }
+  }
+
+  @override
+  Future<Trade> findTradeById({required String id}) async {
+    try {
+      final headers = <String, String>{};
+      final params = <String, dynamic>{};
+      var body = <String, dynamic>{
+        'order_id': id,
+      };
+
+      final uri = Uri.https(apiAuthority, createOrder, params);
+      final response = await post(uri, body: body, headers: headers);
+      final responseBody = json.decode(response.body) as Map<String, dynamic>;
+
+      if (response.statusCode == 400 || responseBody["success"] == false) {
+        final error = responseBody['errors'][0]['msg'] as String;
+        throw TradeNotCreatedException(description, description: error);
+      }
+
+      if (response.statusCode != 200)
+        throw Exception('Unexpected http status: ${response.statusCode}');
+
+      final responseData = responseBody['data'] as Map<String, dynamic>;
+      final fromCurrency = responseData['coin_send'] as String;
+      final from = CryptoCurrency.fromString(fromCurrency);
+      final toCurrency = responseData['coin_receive'] as String;
+      final to = CryptoCurrency.fromString(toCurrency);
+      final inputAddress = responseData['server_address'] as String;
+      final status = responseData['status'] as String;
+      final state = TradeState.deserialize(raw: status);
+      final response_id = responseData['order_id'] as String;
+      final expectedSendAmount = responseData['amount_send'] as String;
+
+      return Trade(
+        id: response_id,
+        from: from,
+        to: to,
+        provider: description,
+        inputAddress: inputAddress,
+        amount: expectedSendAmount,
+        state: state,
+      );
+    } catch (e) {
+      print("error getting trade: ${e.toString()}");
+      throw TradeNotFoundException(
+        id,
+        provider: description,
+        description: e.toString(),
+      );
+    }
+  }
+
+  String _normalizeCurrency(CryptoCurrency currency) {
+    switch (currency) {
+      default:
+        return currency.title.toUpperCase();
+    }
+  }
+
+  String? _networkFor(CryptoCurrency currency) {
+    switch (currency) {
+      case CryptoCurrency.usdt:
+        return "USDT_ERC20";
+      case CryptoCurrency.bnb:
+        return "BNB_BSC";
+      default:
+        return null;
+    }
+  }
+}

lib/exchange/trade_state.dart

@@ -28,6 +28,7 @@ class TradeState extends EnumerableItem<String> with Serializable<String> {
       TradeState(raw: 'waitingAuthorization', title: 'Waiting authorization');
   static const failed = TradeState(raw: 'failed', title: 'Failed');
   static const completed = TradeState(raw: 'completed', title: 'Completed');
+  static const expired = TradeState(raw: 'expired', title: 'Expired');
   static const settling = TradeState(raw: 'settling', title: 'Settlement in progress');
   static const settled = TradeState(raw: 'settled', title: 'Settlement completed');
   static const wait = TradeState(raw: 'wait', title: 'Waiting');
@@ -39,7 +40,33 @@ class TradeState extends EnumerableItem<String> with Serializable<String> {
   static const exchanging = TradeState(raw: 'exchanging', title: 'Exchanging');
   static const sending = TradeState(raw: 'sending', title: 'Sending');
   static const success = TradeState(raw: 'success', title: 'Success');
+  
   static TradeState deserialize({required String raw}) {
+
+    switch (raw) {
+      case '1':
+        return unpaid;
+      case '2':
+        return paidUnconfirmed;
+      case '3':
+        return sending;
+      case '4':
+        return confirmed;
+      case '5':
+      case '6':
+        return exchanging;
+      case '7':
+        return sending;
+      case '8':
+        return complete;
+      case '9':
+        return expired;
+      case '10':
+        return underpaid;
+      case '11':
+        return failed;
+    }
+
     switch (raw) {
       case 'NOT_FOUND':
         return notFound;

lib/main.dart

@@ -47,6 +47,7 @@ final rootKey = GlobalKey<RootState>();
 final RouteObserver<PageRoute<dynamic>> routeObserver = RouteObserver<PageRoute<dynamic>>();
 
 Future<void> main() async {
+  bool isAppRunning = false;
   await runZonedGuarded(() async {
     WidgetsFlutterBinding.ensureInitialized();
 
@@ -67,31 +68,35 @@ Future<void> main() async {
     await initializeAppConfigs();
 
     runApp(App());
+
+    isAppRunning = true;
   }, (error, stackTrace) async {
-    runApp(
+    if (!isAppRunning) {
-      MaterialApp(
+      runApp(
-        debugShowCheckedModeBanner: false,
+        MaterialApp(
-        home: Scaffold(
+          debugShowCheckedModeBanner: false,
-          body: SingleChildScrollView(
+          home: Scaffold(
-            child: Container(
+            body: SingleChildScrollView(
-              margin: EdgeInsets.only(top: 50, left: 20, right: 20, bottom: 20),
+              child: Container(
-              child: Column(
+                margin: EdgeInsets.only(top: 50, left: 20, right: 20, bottom: 20),
-                children: [
+                child: Column(
-                  Text(
+                  children: [
-                    'Error:\n${error.toString()}',
+                    Text(
-                    style: TextStyle(fontSize: 22),
+                      'Error:\n${error.toString()}',
-                  ),
+                      style: TextStyle(fontSize: 22),
-                  Text(
+                    ),
-                    'Stack trace:\n${stackTrace.toString()}',
+                    Text(
-                    style: TextStyle(fontSize: 16),
+                      'Stack trace:\n${stackTrace.toString()}',
-                  ),
+                      style: TextStyle(fontSize: 16),
-                ],
+                    ),
+                  ],
+                ),
               ),
             ),
           ),
         ),
-      ),
+      );
-    );
+    }
 
     ExceptionHandler.onError(FlutterErrorDetails(exception: error, stack: stackTrace));
   });

lib/src/screens/connect_device/connect_device_page.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
+// import 'package:cake_wallet/src/screens/connect_device/debug_device_page.dart';
 import 'package:cake_wallet/src/screens/connect_device/widgets/device_tile.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
@@ -78,15 +79,13 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
   @override
   void initState() {
     super.initState();
-    Future.delayed(
+    WidgetsBinding.instance.addPostFrameCallback((_) {
-      Duration(seconds: 1),
+      _bleRefreshTimer = Timer.periodic(Duration(seconds: 1), (_) => _refreshBleDevices());
-      () => _bleRefresh = ledger.scan().listen((device) => setState(() => bleDevices.add(device))),
-    );
-    // _bleRefreshTimer = Timer.periodic(Duration(seconds: 1), (_) => _refreshBleDevices());
 
-    if (Platform.isAndroid) {
+      if (Platform.isAndroid) {
-      _usbRefreshTimer = Timer.periodic(Duration(seconds: 1), (_) => _refreshUsbDevices());
+        _usbRefreshTimer = Timer.periodic(Duration(seconds: 1), (_) => _refreshUsbDevices());
-    }
+      }
+    });
   }
 
   @override
@@ -103,14 +102,16 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
   }
 
   Future<void> _refreshBleDevices() async {
-    final isBleEnabled = await Permission.bluetooth.serviceStatus.isEnabled;
+    try {
-
+      _bleRefresh = ledger.scan().listen((device) => setState(() => bleDevices.add(device)))
-    setState(() => bleIsEnabled = isBleEnabled);
+        ..onError((e) {
-
+          throw e as Exception;
-    if (isBleEnabled) {
+        });
-      _bleRefresh = ledger.scan().listen((device) => setState(() => bleDevices.add(device)));
+      setState(() => bleIsEnabled = true);
       _bleRefreshTimer?.cancel();
       _bleRefreshTimer = null;
+    } catch (e) {
+      setState(() => bleIsEnabled = false);
     }
   }
 
@@ -142,6 +143,15 @@ class ConnectDevicePageBodyState extends State<ConnectDevicePageBody> {
                   textAlign: TextAlign.center,
                 ),
               ),
+              // DeviceTile(
+              //   onPressed: () => Navigator.of(context).push(
+              //     MaterialPageRoute<void>(
+              //       builder: (BuildContext context) => DebugDevicePage(),
+              //     ),
+              //   ),
+              //   title: "Debug Ledger",
+              //   leading: imageLedger,
+              // ),
               if (!bleIsEnabled)
                 Padding(
                   padding: EdgeInsets.only(left: 20, right: 20, bottom: 20),

lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart

@@ -120,22 +120,25 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
     if (selectedWallet.isCurrent || !selectedWallet.isEnabled) {
       return;
     }
-    final confirmed = await showPopUp<bool>(
-            context: context,
-            builder: (dialogContext) {
-              return AlertWithTwoActions(
-                  alertTitle: S.of(context).change_wallet_alert_title,
-                  alertContent: S.of(context).change_wallet_alert_content(selectedWallet.name),
-                  leftButtonText: S.of(context).cancel,
-                  rightButtonText: S.of(context).change,
-                  actionLeftButton: () => Navigator.of(dialogContext).pop(false),
-                  actionRightButton: () => Navigator.of(dialogContext).pop(true));
-            }) ??
-        false;
 
-    if (confirmed) {
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      await _loadWallet(selectedWallet);
+      final confirmed = await showPopUp<bool>(
-    }
+          context: context,
+          builder: (dialogContext) {
+            return AlertWithTwoActions(
+                alertTitle: S.of(context).change_wallet_alert_title,
+                alertContent: S.of(context).change_wallet_alert_content(selectedWallet.name),
+                leftButtonText: S.of(context).cancel,
+                rightButtonText: S.of(context).change,
+                actionLeftButton: () => Navigator.of(dialogContext).pop(false),
+                actionRightButton: () => Navigator.of(dialogContext).pop(true));
+          }) ??
+          false;
+
+      if (confirmed) {
+        await _loadWallet(selectedWallet);
+      }
+    });
   }
 
   Image _imageFor({required WalletType type}) {

lib/view_model/exchange/exchange_trade_view_model.dart

@@ -4,6 +4,7 @@ import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/exchange/provider/changenow_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/exolix_exchange_provider.dart';
+import 'package:cake_wallet/exchange/provider/quantex_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/sideshift_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/simpleswap_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/thorchain_exchange.provider.dart';
@@ -48,6 +49,9 @@ abstract class ExchangeTradeViewModelBase with Store {
       case ExchangeProviderDescription.exolix:
         _provider = ExolixExchangeProvider();
         break;
+      case ExchangeProviderDescription.quantex:
+        _provider = QuantexExchangeProvider();
+        break;
       case ExchangeProviderDescription.thorChain:
         _provider = ThorChainExchangeProvider(tradesStore: trades);
         break;

lib/view_model/exchange/exchange_view_model.dart

@@ -30,6 +30,7 @@ import 'package:cake_wallet/exchange/limits_state.dart';
 import 'package:cake_wallet/exchange/provider/changenow_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/exolix_exchange_provider.dart';
+import 'package:cake_wallet/exchange/provider/quantex_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/sideshift_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/simpleswap_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/thorchain_exchange.provider.dart';
@@ -157,6 +158,7 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
             useTorOnly: _useTorOnly, providerStates: _settingsStore.trocadorProviderStates),
         ThorChainExchangeProvider(tradesStore: trades),
         if (FeatureFlag.isExolixEnabled) ExolixExchangeProvider(),
+        QuantexExchangeProvider(),
       ];
 
   @observable

lib/view_model/trade_details_view_model.dart

@@ -4,6 +4,7 @@ import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/exchange/provider/changenow_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/exolix_exchange_provider.dart';
+import 'package:cake_wallet/exchange/provider/quantex_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/sideshift_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/simpleswap_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/thorchain_exchange.provider.dart';
@@ -56,6 +57,9 @@ abstract class TradeDetailsViewModelBase with Store {
       case ExchangeProviderDescription.thorChain:
         _provider = ThorChainExchangeProvider(tradesStore: trades);
         break;
+      case ExchangeProviderDescription.quantex:
+        _provider = QuantexExchangeProvider();
+        break;
     }
 
     _updateItems();
@@ -80,6 +84,8 @@ abstract class TradeDetailsViewModelBase with Store {
         return 'https://exolix.com/transaction/${trade.id}';
       case ExchangeProviderDescription.thorChain:
         return 'https://track.ninerealms.com/${trade.id}';
+      case ExchangeProviderDescription.quantex:
+        return 'https://myquantex.com/send/${trade.id}';
     }
     return null;
   }

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.13.1"
+MONERO_COM_VERSION="1.13.2"
-MONERO_COM_BUILD_NUMBER=87
+MONERO_COM_BUILD_NUMBER=88
 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.16.1"
+CAKEWALLET_VERSION="4.16.2"
-CAKEWALLET_BUILD_NUMBER=211
+CAKEWALLET_BUILD_NUMBER=212
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"

scripts/android/pubspec_gen.sh

@@ -10,7 +10,7 @@ case $APP_ANDROID_TYPE in
                 CONFIG_ARGS="--monero"
                 ;;
         $CAKEWALLET)
-                CONFIG_ARGS="--monero --bitcoin --haven --ethereum --polygon --nano --bitcoinCash --solana"
+                CONFIG_ARGS="--monero --bitcoin --haven --ethereum --polygon --nano --bitcoinCash --solana --tron"
                 ;;
         $HAVEN)
                 CONFIG_ARGS="--haven"

scripts/ios/app_config.sh

@@ -28,7 +28,7 @@ case $APP_IOS_TYPE in
 		CONFIG_ARGS="--monero"
 		;;
         $CAKEWALLET)
-		CONFIG_ARGS="--monero --bitcoin --haven --ethereum --polygon --nano --bitcoinCash --solana"
+		CONFIG_ARGS="--monero --bitcoin --haven --ethereum --polygon --nano --bitcoinCash --solana --tron"
 		;;
 	$HAVEN)
 

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.13.1"
+MONERO_COM_VERSION="1.13.2"
-MONERO_COM_BUILD_NUMBER=85
+MONERO_COM_BUILD_NUMBER=86
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.16.1"
+CAKEWALLET_VERSION="4.16.2"
-CAKEWALLET_BUILD_NUMBER=239
+CAKEWALLET_BUILD_NUMBER=240
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"

scripts/macos/app_config.sh

@@ -31,7 +31,7 @@ case $APP_MACOS_TYPE in
         $MONERO_COM)
 		CONFIG_ARGS="--monero";;
         $CAKEWALLET)
-		CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana";; #--haven
+		CONFIG_ARGS="--monero --bitcoin --ethereum --polygon --nano --bitcoinCash --solana --tron";; #--haven
 esac
 
 cp -rf pubspec_description.yaml pubspec.yaml

scripts/macos/app_env.sh

@@ -16,13 +16,13 @@ if [ -n "$1" ]; then
 fi
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.3.1"
+MONERO_COM_VERSION="1.3.2"
-MONERO_COM_BUILD_NUMBER=18
+MONERO_COM_BUILD_NUMBER=19
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.9.1"
+CAKEWALLET_VERSION="1.9.2"
-CAKEWALLET_BUILD_NUMBER=72
+CAKEWALLET_BUILD_NUMBER=73
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then

tool/utils/secret_key.dart

@@ -38,6 +38,7 @@ class SecretKey {
     SecretKey('walletConnectProjectId', () => ''),
     SecretKey('moralisApiKey', () => ''),
     SecretKey('ankrApiKey', () => ''),
+    SecretKey('quantexExchangeMarkup', () => ''),
   ];
 
   static final evmChainsSecrets = [