Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-282-add-trocador-exchange

lib/anypay/anypay_api.dart

@@ -80,7 +80,7 @@ class AnyPayApi {
 		final response = await post(Uri.parse(uri), headers: headers, body: utf8.encode(json.encode(body)));
 		if (response.statusCode == 400) {
 			final decodedBody = json.decode(response.body) as Map<String, dynamic>;
-			throw Exception(decodedBody['message'] as String);
+			throw Exception(decodedBody['message'] as String? ?? 'Unexpected response\nError code: 400');
 		}
 
 		if (response.statusCode != 200) {

lib/core/address_validator.dart

@@ -198,4 +198,26 @@ class AddressValidator extends TextValidator {
         return [];
     }
   }
+
+  static String? getAddressFromStringPattern(CryptoCurrency type) {
+    switch (type) {
+      case CryptoCurrency.xmr:
+        return '([^0-9a-zA-Z]|^)4[0-9a-zA-Z]{94}([^0-9a-zA-Z]|\$)'
+            '|([^0-9a-zA-Z]|^)8[0-9a-zA-Z]{94}([^0-9a-zA-Z]|\$)'
+            '|([^0-9a-zA-Z]|^)[0-9a-zA-Z]{106}([^0-9a-zA-Z]|\$)';
+      case CryptoCurrency.btc:
+        return '([^0-9a-zA-Z]|^)1[0-9a-zA-Z]{32}([^0-9a-zA-Z]|\$)'
+            '|([^0-9a-zA-Z]|^)1[0-9a-zA-Z]{33}([^0-9a-zA-Z]|\$)'
+            '|([^0-9a-zA-Z]|^)3[0-9a-zA-Z]{32}([^0-9a-zA-Z]|\$)'
+            '|([^0-9a-zA-Z]|^)3[0-9a-zA-Z]{33}([^0-9a-zA-Z]|\$)'
+            '|([^0-9a-zA-Z]|^)bc1[0-9a-zA-Z]{39}([^0-9a-zA-Z]|\$)'
+            '|([^0-9a-zA-Z]|^)bc1[0-9a-zA-Z]{59}([^0-9a-zA-Z]|\$)';
+      case CryptoCurrency.ltc:
+        return '([^0-9a-zA-Z]|^)^L[a-zA-Z0-9]{26,33}([^0-9a-zA-Z]|\$)'
+            '|([^0-9a-zA-Z]|^)[LM][a-km-zA-HJ-NP-Z1-9]{26,33}([^0-9a-zA-Z]|\$)'
+            '|([^0-9a-zA-Z]|^)ltc[a-zA-Z0-9]{26,45}([^0-9a-zA-Z]|\$)';
+      default:
+        return null;
+    }
+  }
 }

lib/entities/openalias_record.dart

@@ -1,5 +1,4 @@
 import 'package:basic_utils/basic_utils.dart';
-import 'package:cw_core/wallet_type.dart';
 
 class OpenaliasRecord {
   OpenaliasRecord({
@@ -22,69 +21,68 @@ class OpenaliasRecord {
     return formattedName;
   }
 
-  static Future<OpenaliasRecord> fetchAddressAndName({
+  static Future<List<RRecord>?> lookupOpenAliasRecord(String name) async {
+    try {
+      final txtRecord = await DnsUtils.lookupRecord(name, RRecordType.TXT, dnssec: true);
+
+      return txtRecord;
+    } catch (e) {
+      print("${e.toString()}");
+      return null;
+    }
+  }
+
+  static OpenaliasRecord fetchAddressAndName({
     required String formattedName,
     required String ticker,
-  }) async {
+    required List<RRecord> txtRecord,
+  })  {
     String address = formattedName;
     String name = formattedName;
     String note = '';
 
-    if (formattedName.contains(".")) {
-      try {
-        final txtRecord = await DnsUtils.lookupRecord(
-            formattedName, RRecordType.TXT,
-            dnssec: true);
+    for (RRecord element in txtRecord) {
+      String record = element.data;
 
-        if (txtRecord != null) {
-          for (RRecord element in txtRecord) {
-            String record = element.data;
+      if (record.contains("oa1:$ticker") && record.contains("recipient_address")) {
+        record = record.replaceAll('\"', "");
 
-            if (record.contains("oa1:$ticker") &&
-                record.contains("recipient_address")) {
-              record = record.replaceAll('\"', "");
+        final dataList = record.split(";");
 
-              final dataList = record.split(";");
+        address = dataList
+            .where((item) => (item.contains("recipient_address")))
+            .toString()
+            .replaceAll("oa1:$ticker recipient_address=", "")
+            .replaceAll("(", "")
+            .replaceAll(")", "")
+            .trim();
 
-              address = dataList
-                  .where((item) => (item.contains("recipient_address")))
-                  .toString()
-                  .replaceAll("oa1:$ticker recipient_address=", "")
-                  .replaceAll("(", "")
-                  .replaceAll(")", "")
-                  .trim();
+        final recipientName = dataList
+            .where((item) => (item.contains("recipient_name")))
+            .toString()
+            .replaceAll("(", "")
+            .replaceAll(")", "")
+            .trim();
 
-              final recipientName = dataList
-                  .where((item) => (item.contains("recipient_name")))
-                  .toString()
-                  .replaceAll("(", "")
-                  .replaceAll(")", "")
-                  .trim();
-
-              if (recipientName.isNotEmpty) {
-                name = recipientName.replaceAll("recipient_name=", "");
-              }
-
-              final description = dataList
-                  .where((item) => (item.contains("tx_description")))
-                  .toString()
-                  .replaceAll("(", "")
-                  .replaceAll(")", "")
-                  .trim();
-
-              if (description.isNotEmpty) {
-                note = description.replaceAll("tx_description=", "");
-              }
-
-              break;
-            }
-          }
+        if (recipientName.isNotEmpty) {
+          name = recipientName.replaceAll("recipient_name=", "");
         }
-      } catch (e) {
-        print("${e.toString()}");
-      }
-    }
 
-    return OpenaliasRecord(address: address, name: name, description: note);
+        final description = dataList
+            .where((item) => (item.contains("tx_description")))
+            .toString()
+            .replaceAll("(", "")
+            .replaceAll(")", "")
+            .trim();
+
+        if (description.isNotEmpty) {
+          note = description.replaceAll("tx_description=", "");
+        }
+
+        break;
+      }
+
   }
+    return OpenaliasRecord(address: address, name: name, description: note);
+}
 }

lib/entities/parse_address_from_domain.dart

@@ -1,40 +1,61 @@
+import 'package:cake_wallet/core/address_validator.dart';
 import 'package:cake_wallet/core/yat_service.dart';
 import 'package:cake_wallet/entities/openalias_record.dart';
 import 'package:cake_wallet/entities/parsed_address.dart';
 import 'package:cake_wallet/entities/unstoppable_domain_address.dart';
 import 'package:cake_wallet/entities/emoji_string_extension.dart';
+import 'package:cake_wallet/twitter/twitter_api.dart';
+import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/entities/fio_address_provider.dart';
 
 class AddressResolver {
-  
   AddressResolver({required this.yatService, required this.walletType});
-  
+
   final YatService yatService;
   final WalletType walletType;
-  
+
   static const unstoppableDomains = [
-  'crypto',
-  'zil',
-  'x',
-  'coin',
-  'wallet',
-  'bitcoin',
-  '888',
-  'nft',
-  'dao',
-  'blockchain'
-];
+    'crypto',
+    'zil',
+    'x',
+    'coin',
+    'wallet',
+    'bitcoin',
+    '888',
+    'nft',
+    'dao',
+    'blockchain'
+  ];
+
+  static String? extractAddressByType({required String raw, required CryptoCurrency type}) {
+    final addressPattern = AddressValidator.getAddressFromStringPattern(type);
+
+    if (addressPattern == null) {
+      throw 'Unexpected token: $type for getAddressFromStringPattern';
+    }
+
+    final match = RegExp(addressPattern).firstMatch(raw);
+    return match?.group(0)?.replaceAll(RegExp('[^0-9a-zA-Z]'), '');
+  }
 
   Future<ParsedAddress> resolve(String text, String ticker) async {
     try {
-      if (text.contains('@') && !text.contains('.')) {
+      if (text.startsWith('@') && !text.substring(1).contains('@')) {
+        final formattedName = text.substring(1);
+        final twitterUser = await TwitterApi.lookupUserByName(userName: formattedName);
+        final address = extractAddressByType(
+            raw: twitterUser.description ?? '', type: CryptoCurrency.fromString(ticker));
+        if (address != null) {
+          return ParsedAddress.fetchTwitterAddress(address: address, name: text);
+        }
+      }
+      if (!text.startsWith('@') && text.contains('@') && !text.contains('.')) {
         final bool isFioRegistered = await FioAddressProvider.checkAvail(text);
         if (isFioRegistered) {
           final address = await FioAddressProvider.getPubAddress(text, ticker);
           return ParsedAddress.fetchFioAddress(address: address, name: text);
-      }
-
+        }
       }
       if (text.hasOnlyEmojis) {
         if (walletType != WalletType.haven) {
@@ -55,10 +76,14 @@ class AddressResolver {
         return ParsedAddress.fetchUnstoppableDomainAddress(address: address, name: text);
       }
 
-      final record = await OpenaliasRecord.fetchAddressAndName(
-          formattedName: formattedName, ticker: ticker);
-      return ParsedAddress.fetchOpenAliasAddress(record: record, name: text);
-      
+      if (formattedName.contains(".")) {
+        final txtRecord = await OpenaliasRecord.lookupOpenAliasRecord(formattedName);
+        if (txtRecord != null) {
+          final record = await OpenaliasRecord.fetchAddressAndName(
+              formattedName: formattedName, ticker: ticker, txtRecord: txtRecord);
+          return ParsedAddress.fetchOpenAliasAddress(record: record, name: text);
+        }
+      }
     } catch (e) {
       print(e.toString());
     }

lib/entities/parsed_address.dart

@@ -1,8 +1,7 @@
 import 'package:cake_wallet/entities/openalias_record.dart';
 import 'package:cake_wallet/entities/yat_record.dart';
-import 'package:flutter/material.dart';
 
-enum ParseFrom { unstoppableDomains, openAlias, yatRecord, fio, notParsed }
+enum ParseFrom { unstoppableDomains, openAlias, yatRecord, fio, notParsed, twitter }
 
 class ParsedAddress {
   ParsedAddress({
@@ -41,11 +40,7 @@ class ParsedAddress {
       );
   }
 
-  factory ParsedAddress.fetchOpenAliasAddress({OpenaliasRecord? record, required String name}){
-    final formattedName = OpenaliasRecord.formatDomainName(name);
-    if (record == null || record.address.contains(formattedName)) {
-        return ParsedAddress(addresses: [name]);
-      }
+  factory ParsedAddress.fetchOpenAliasAddress({required OpenaliasRecord record, required String name}){
       return ParsedAddress(
         addresses: [record.address],
         name: record.name,
@@ -62,6 +57,14 @@ class ParsedAddress {
     );
   }
 
+  factory ParsedAddress.fetchTwitterAddress({required String address, required String name}){
+    return ParsedAddress(
+      addresses: [address],
+      name: name,
+      parseFrom: ParseFrom.twitter,
+    );
+  }
+
   final List<String> addresses;
   final String name;
   final String description;

lib/exchange/changenow/changenow_exchange_provider.dart

@@ -276,6 +276,10 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
    switch(currency) {
       case CryptoCurrency.zec:
         return 'zec';
+      case CryptoCurrency.usdcpoly:
+        return 'usdcmatic';
+      case CryptoCurrency.maticpoly:
+        return 'maticmainnet';
       default:
         return currency.title.toLowerCase();
     }

lib/exchange/simpleswap/simpleswap_exchange_provider.dart

@@ -235,6 +235,10 @@ class SimpleSwapExchangeProvider extends ExchangeProvider {
         return 'usdcpoly';
       case CryptoCurrency.usdcsol:
         return 'usdcspl';
+      case CryptoCurrency.matic:
+        return 'maticerc20';
+      case CryptoCurrency.maticpoly:
+        return 'matic';
       default:
         return currency.title.toLowerCase();
     }

lib/main.dart

@@ -1,22 +1,12 @@
 import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
-import 'dart:isolate';
-import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/entities/language_service.dart';
 import 'package:cake_wallet/buy/order.dart';
-import 'package:cake_wallet/entities/preferences_key.dart';
-import 'package:cake_wallet/ionia/ionia_category.dart';
-import 'package:cake_wallet/ionia/ionia_merchant.dart';
-import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/store/yat/yat_store.dart';
-import 'package:cake_wallet/themes/theme_list.dart';
-import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:flutter_mailer/flutter_mailer.dart';
 import 'package:hive/hive.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:path_provider/path_provider.dart';
@@ -50,21 +40,18 @@ import 'package:cake_wallet/wallet_type_utils.dart';
 final navigatorKey = GlobalKey<NavigatorState>();
 final rootKey = GlobalKey<RootState>();
 final RouteObserver<PageRoute> routeObserver = RouteObserver<PageRoute>();
-bool hasError = false;
 
 Future<void> main() async {
 
   await runZonedGuarded(() async {
     WidgetsFlutterBinding.ensureInitialized();
 
-    FlutterError.onError = (errorDetails) {
-      _onError(errorDetails);
-    };
+    FlutterError.onError = ExceptionHandler.onError;
 
     /// A callback that is invoked when an unhandled error occurs in the root
     /// isolate.
     PlatformDispatcher.instance.onError = (error, stack) {
-      _onError(FlutterErrorDetails(exception: error, stack: stack));
+      ExceptionHandler.onError(FlutterErrorDetails(exception: error, stack: stack));
 
       return true;
     };
@@ -155,92 +142,10 @@ Future<void> main() async {
         initialMigrationVersion: 19);
     runApp(App());
   }, (error, stackTrace) async {
-    _onError(FlutterErrorDetails(exception: error, stack: stackTrace));
+    ExceptionHandler.onError(FlutterErrorDetails(exception: error, stack: stackTrace));
   });
 }
 
-void _saveException(String? error, StackTrace? stackTrace) async {
-  final appDocDir = await getApplicationDocumentsDirectory();
-
-  final file = File('${appDocDir.path}/error.txt');
-  final exception = {
-    "${DateTime.now()}": {
-      "Error": error,
-      "StackTrace": stackTrace.toString(),
-    }
-  };
-
-  const String separator =
-      '''\n\n==========================================================
-      ==========================================================\n\n''';
-
-  await file.writeAsString(
-    jsonEncode(exception) + separator,
-    mode: FileMode.append,
-  );
-}
-
-void _sendExceptionFile() async {
-  try {
-    final appDocDir = await getApplicationDocumentsDirectory();
-
-    final file = File('${appDocDir.path}/error.txt');
-
-    final MailOptions mailOptions = MailOptions(
-      subject: 'Mobile App Issue',
-      recipients: ['support@cakewallet.com'],
-      attachments: [file.path],
-    );
-
-    final result = await FlutterMailer.send(mailOptions);
-
-    // Clear file content if the error was sent or saved.
-    // On android we can't know if it was sent or saved
-    if (result.name == MailerResponse.sent.name ||
-        result.name == MailerResponse.saved.name ||
-        result.name == MailerResponse.android.name) {
-      file.writeAsString("", mode: FileMode.write);
-    }
-  } catch (e, s) {
-    _saveException(e.toString(), s);
-  }
-}
-
-void _onError(FlutterErrorDetails errorDetails) {
-  _saveException(errorDetails.exception.toString(), errorDetails.stack);
-
-  if (hasError) {
-    return;
-  }
-  hasError = true;
-
-  WidgetsBinding.instance.addPostFrameCallback(
-      (timeStamp) async {
-        await showPopUp<void>(
-          context: navigatorKey.currentContext!,
-          builder: (context) {
-            return AlertWithTwoActions(
-              isDividerExist: true,
-              alertTitle: S.of(context).error,
-              alertContent: S.of(context).error_dialog_content,
-              rightButtonText: S.of(context).send,
-              leftButtonText: S.of(context).do_not_send,
-              actionRightButton: () {
-                Navigator.of(context).pop();
-                _sendExceptionFile();
-              },
-              actionLeftButton: () {
-                Navigator.of(context).pop();
-              },
-            );
-          },
-        );
-
-        hasError = false;
-    },
-  );
-}
-
 Future<void> initialSetup(
     {required SharedPreferences sharedPreferences,
     required Box<Node> nodes,

lib/src/screens/ionia/cards/ionia_payment_status_page.dart

@@ -157,7 +157,8 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
             Container(
               padding: EdgeInsets.only(left: 40, right: 40, bottom: 20),
               child: Text(
-                S.of(context).proceed_after_one_minute,
+                widget.viewModel.payingByBitcoin ? S.of(context).bitcoin_payments_require_1_confirmation
+                    : S.of(context).proceed_after_one_minute,
                 style: textMedium(
                   color: Theme.of(context).primaryTextTheme!.headline6!.color!,
                 ).copyWith(fontWeight: FontWeight.w500),

lib/src/screens/send/widgets/extract_address_from_parsed.dart

@@ -19,13 +19,18 @@ Future<String> extractAddressFromParsed(
       address = parsedAddress.addresses.first;
       break;
     case ParseFrom.openAlias:
-      title = S.of(context).openalias_alert_title;
-      content = S.of(context).openalias_alert_content(parsedAddress.name);
+      title = S.of(context).address_detected;
+      content = S.of(context).extracted_address_content('${parsedAddress.name} (OpenAlias)');
       address = parsedAddress.addresses.first;
       break;
     case ParseFrom.fio:
       title = S.of(context).address_detected;
-      content = S.of(context).openalias_alert_content(parsedAddress.name);
+      content = S.of(context).extracted_address_content('${parsedAddress.name} (FIO)');
+      address = parsedAddress.addresses.first;
+      break;
+    case ParseFrom.twitter:
+      title = S.of(context).address_detected;
+      content = S.of(context).extracted_address_content('${parsedAddress.name} (Twitter)');
       address = parsedAddress.addresses.first;
       break;
     case ParseFrom.yatRecord:

lib/twitter/twitter_api.dart

@@ -0,0 +1,37 @@
+import 'dart:convert';
+import 'package:cake_wallet/twitter/twitter_user.dart';
+import 'package:http/http.dart' as http;
+import 'package:cake_wallet/.secrets.g.dart' as secrets;
+
+class TwitterApi {
+  static const twitterBearerToken = secrets.twitterBearerToken;
+  static const httpsScheme = 'https';
+  static const apiHost = 'api.twitter.com';
+  static const userPath = '/2/users/by/username/';
+
+  static Future<TwitterUser> lookupUserByName({required String userName}) async {
+    final queryParams = {'user.fields': 'description'};
+
+    final headers = {'authorization': 'Bearer $twitterBearerToken'};
+
+    final uri = Uri(
+      scheme: httpsScheme,
+      host: apiHost,
+      path: userPath + userName,
+      queryParameters: queryParams,
+    );
+
+    var response = await http.get(uri, headers: headers);
+
+    if (response.statusCode != 200) {
+      throw Exception('Unexpected http status: ${response.statusCode}');
+    }
+    final responseJSON = json.decode(response.body) as Map<String, dynamic>;
+
+    if (responseJSON['errors'] != null) {
+      throw Exception(responseJSON['errors'][0]['detail']);
+    }
+
+    return TwitterUser.fromJson(responseJSON['data'] as Map<String, dynamic>);
+  }
+}

lib/twitter/twitter_user.dart

@@ -0,0 +1,16 @@
+class TwitterUser {
+  TwitterUser({required this.id, required this.username, required this.name, this.description});
+
+  final String id;
+  final String username;
+  final String name;
+  final String? description;
+
+  factory TwitterUser.fromJson(Map<String, dynamic> json) {
+    return TwitterUser(
+        id: json['id'] as String,
+        username: json['username'] as String,
+        name: json['name'] as String,
+        description: json['description'] as String?);
+  }
+}

lib/utils/exception_handler.dart

@@ -0,0 +1,105 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/main.dart';
+import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
+import 'package:cake_wallet/utils/show_pop_up.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_mailer/flutter_mailer.dart';
+import 'package:path_provider/path_provider.dart';
+
+class ExceptionHandler {
+  static bool _hasError = false;
+
+  static void _saveException(String? error, StackTrace? stackTrace) async {
+    final appDocDir = await getApplicationDocumentsDirectory();
+
+    final file = File('${appDocDir.path}/error.txt');
+    final exception = {
+      "${DateTime.now()}": {
+        "Error": error,
+        "StackTrace": stackTrace.toString(),
+      }
+    };
+
+    const String separator = '''\n\n==========================================================
+      ==========================================================\n\n''';
+
+    await file.writeAsString(
+      jsonEncode(exception) + separator,
+      mode: FileMode.append,
+    );
+  }
+
+  static void _sendExceptionFile() async {
+    try {
+      final appDocDir = await getApplicationDocumentsDirectory();
+
+      final file = File('${appDocDir.path}/error.txt');
+
+      final MailOptions mailOptions = MailOptions(
+        subject: 'Mobile App Issue',
+        recipients: ['support@cakewallet.com'],
+        attachments: [file.path],
+      );
+
+      final result = await FlutterMailer.send(mailOptions);
+
+      // Clear file content if the error was sent or saved.
+      // On android we can't know if it was sent or saved
+      if (result.name == MailerResponse.sent.name ||
+          result.name == MailerResponse.saved.name ||
+          result.name == MailerResponse.android.name) {
+        file.writeAsString("", mode: FileMode.write);
+      }
+    } catch (e, s) {
+      _saveException(e.toString(), s);
+    }
+  }
+
+  static void onError(FlutterErrorDetails errorDetails) {
+    if (_ignoreError(errorDetails.exception.toString())) {
+      return;
+    }
+
+    _saveException(errorDetails.exception.toString(), errorDetails.stack);
+
+    if (_hasError) {
+      return;
+    }
+    _hasError = true;
+
+    WidgetsBinding.instance.addPostFrameCallback(
+      (timeStamp) async {
+        await showPopUp<void>(
+          context: navigatorKey.currentContext!,
+          builder: (context) {
+            return AlertWithTwoActions(
+              isDividerExist: true,
+              alertTitle: S.of(context).error,
+              alertContent: S.of(context).error_dialog_content,
+              rightButtonText: S.of(context).send,
+              leftButtonText: S.of(context).do_not_send,
+              actionRightButton: () {
+                Navigator.of(context).pop();
+                _sendExceptionFile();
+              },
+              actionLeftButton: () {
+                Navigator.of(context).pop();
+              },
+            );
+          },
+        );
+
+        _hasError = false;
+      },
+    );
+  }
+
+  /// Ignore User related errors or system errors
+  static bool _ignoreError(String error) {
+    return error.contains("errno = 103") || // SocketException: Software caused connection abort
+        error.contains("errno = 9"); // SocketException: Bad file descriptor (iOS socket exception)
+  }
+}

lib/view_model/ionia/ionia_payment_status_view_model.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:cake_wallet/anypay/any_pay_chain.dart';
 import 'package:mobx/mobx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/ionia/ionia_service.dart';
@@ -39,6 +40,8 @@ abstract class IoniaPaymentStatusViewModelBase with Store {
 
   Timer? get timer => _timer;
 
+  bool get payingByBitcoin => paymentInfo.anyPayPayment.chain == AnyPayChain.btc;
+
   Timer? _timer;
 
   @action