Merge pull request #302 from WalletConnect/chores/fixes_and_coverage

Chores/fixes and coverage

.gitignore

@@ -31,6 +31,7 @@
 .pub/
 pubspec.lock
 /build/
+coverage/
 
 # Web related
 lib/generated_plugin_registrant.dart

example/wallet/lib/dependencies/chains/common.dart

@@ -28,15 +28,24 @@ class CommonMethods {
     }
   }
 
-  static Future<bool> requestApproval(String text, {String? title}) async {
+  static Future<bool> requestApproval(
+    String text, {
+    String? title,
+    String? method,
+    String? chainId,
+    String? address,
+  }) async {
     final bottomSheetService = GetIt.I<IBottomSheetService>();
     final WCBottomSheetResult rs = (await bottomSheetService.queueBottomSheet(
           widget: WCRequestWidget(
             child: WCConnectionWidget(
-              title: 'Approve Request',
+              title: title ?? 'Approve Request',
               info: [
                 WCConnectionModel(
-                  title: title,
+                  title: 'Method: $method\n'
+                      'Chain ID: $chainId\n'
+                      'Address: $address\n\n'
+                      'Message:',
                   elements: [
                     text,
                   ],

example/wallet/lib/dependencies/chains/evm_service.dart

@@ -97,15 +97,21 @@ class EVMService {
   // personal_sign is handled using onSessionRequest event for demo purposes
   Future<void> personalSign(String topic, dynamic parameters) async {
     debugPrint('[WALLET] personalSign request: $parameters');
-    final pRequest = _web3Wallet.pendingRequests.getAll().last;
-    final data = EthUtils.getDataFromParamsList(parameters);
+    final SessionRequest pRequest = _web3Wallet.pendingRequests.getAll().last;
+    final address = EthUtils.getAddressFromSessionRequest(pRequest);
+    final data = EthUtils.getDataFromSessionRequest(pRequest);
     final message = EthUtils.getUtf8Message(data.toString());
     var response = JsonRpcResponse(
       id: pRequest.id,
       jsonrpc: '2.0',
     );
 
-    if (await CommonMethods.requestApproval(message)) {
+    if (await CommonMethods.requestApproval(
+      message,
+      method: pRequest.method,
+      chainId: pRequest.chainId,
+      address: address,
+    )) {
       try {
         // Load the private key
         final keys = GetIt.I<IKeyService>().getKeysForChain(
@@ -145,7 +151,7 @@ class EVMService {
   Future<void> ethSign(String topic, dynamic parameters) async {
     debugPrint('[WALLET] ethSign request: $parameters');
     final pRequest = _web3Wallet.pendingRequests.getAll().last;
-    final data = EthUtils.getDataFromParamsList(parameters);
+    final data = EthUtils.getDataFromSessionRequest(pRequest);
     final message = EthUtils.getUtf8Message(data.toString());
     var response = JsonRpcResponse(
       id: pRequest.id,
@@ -192,7 +198,7 @@ class EVMService {
   Future<void> ethSignTypedData(String topic, dynamic parameters) async {
     debugPrint('[WALLET] ethSignTypedData request: $parameters');
     final pRequest = _web3Wallet.pendingRequests.getAll().last;
-    final data = EthUtils.getDataFromParamsList(parameters);
+    final data = EthUtils.getDataFromSessionRequest(pRequest);
     var response = JsonRpcResponse(
       id: pRequest.id,
       jsonrpc: '2.0',
@@ -234,7 +240,7 @@ class EVMService {
   Future<void> ethSignTypedDataV4(String topic, dynamic parameters) async {
     debugPrint('[WALLET] ethSignTypedDataV4 request: $parameters');
     final pRequest = _web3Wallet.pendingRequests.getAll().last;
-    final data = EthUtils.getDataFromParamsList(parameters);
+    final data = EthUtils.getDataFromSessionRequest(pRequest);
     var response = JsonRpcResponse(
       id: pRequest.id,
       jsonrpc: '2.0',
@@ -275,15 +281,21 @@ class EVMService {
 
   Future<void> ethSignTransaction(String topic, dynamic parameters) async {
     debugPrint('[WALLET] ethSignTransaction request: $parameters');
-    final pRequest = _web3Wallet.pendingRequests.getAll().last;
-    final data = EthUtils.getTransactionFromParams(parameters);
+    final SessionRequest pRequest = _web3Wallet.pendingRequests.getAll().last;
+
+    final data = EthUtils.getTransactionFromSessionRequest(pRequest);
     if (data == null) return;
+
     var response = JsonRpcResponse(
       id: pRequest.id,
       jsonrpc: '2.0',
     );
 
-    final transaction = await _approveTransaction(data);
+    final transaction = await _approveTransaction(
+      data,
+      method: pRequest.method,
+      chainId: pRequest.chainId,
+    );
     if (transaction is Transaction) {
       try {
         // Load the private key
@@ -329,15 +341,21 @@ class EVMService {
 
   Future<void> ethSendTransaction(String topic, dynamic parameters) async {
     debugPrint('[WALLET] ethSendTransaction request: $parameters');
-    final pRequest = _web3Wallet.pendingRequests.getAll().last;
-    final data = EthUtils.getTransactionFromParams(parameters);
+    final SessionRequest pRequest = _web3Wallet.pendingRequests.getAll().last;
+
+    final data = EthUtils.getTransactionFromSessionRequest(pRequest);
     if (data == null) return;
+
     var response = JsonRpcResponse(
       id: pRequest.id,
       jsonrpc: '2.0',
     );
 
-    final transaction = await _approveTransaction(data);
+    final transaction = await _approveTransaction(
+      data,
+      method: pRequest.method,
+      chainId: pRequest.chainId,
+    );
     if (transaction is Transaction) {
       try {
         // Load the private key
@@ -430,7 +448,12 @@ class EVMService {
   //   CommonMethods.goBackToDapp(topic, true);
   // }
 
-  Future<dynamic> _approveTransaction(Map<String, dynamic> tJson) async {
+  Future<dynamic> _approveTransaction(
+    Map<String, dynamic> tJson, {
+    String? title,
+    String? method,
+    String? chainId,
+  }) async {
     Transaction transaction = tJson.toTransaction();
 
     final gasPrice = await ethClient.getGasPrice();
@@ -480,12 +503,21 @@ class EVMService {
     final gweiGasPrice = (transaction.gasPrice?.getInWei ?? BigInt.zero) /
         BigInt.from(1000000000);
 
+    const encoder = JsonEncoder.withIndent('  ');
+    final trx = encoder.convert(tJson);
     final WCBottomSheetResult rs = (await _bottomSheetService.queueBottomSheet(
           widget: WCRequestWidget(
             child: WCConnectionWidget(
-              title: 'Approve Transaction',
+              title: title ?? 'Approve Transaction',
               info: [
-                WCConnectionModel(elements: [jsonEncode(tJson)]),
+                WCConnectionModel(
+                  title: 'Method: $method\n'
+                      'Chain ID: $chainId\n\n'
+                      'Transaction:',
+                  elements: [
+                    trx,
+                  ],
+                ),
                 WCConnectionModel(
                   title: 'Gas price',
                   elements: ['${gweiGasPrice.toStringAsFixed(2)} GWEI'],

example/wallet/lib/pages/apps_page.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:fl_toast/fl_toast.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
@@ -215,31 +217,50 @@ class AppsPageState extends State<AppsPage> with GetItStateMixin {
       DeepLinkHandler.waiting.value = true;
       final Uri uriData = Uri.parse(uri!);
       await _web3Wallet.pair(uri: uriData);
-    } catch (e) {
-      DeepLinkHandler.waiting.value = false;
-      showPlatformToast(
-        child: Container(
-          padding: const EdgeInsets.all(StyleConstants.linear8),
-          margin: const EdgeInsets.only(
-            bottom: StyleConstants.magic40,
-          ),
-          decoration: BoxDecoration(
-            color: StyleConstants.errorColor,
-            borderRadius: BorderRadius.circular(
-              StyleConstants.linear16,
-            ),
-          ),
-          child: const Text(
-            StringConstants.invalidUri,
-            style: StyleConstants.bodyTextBold,
-          ),
-        ),
-        // ignore: use_build_context_synchronously
-        context: context,
-      );
+    } on WalletConnectError catch (e) {
+      _showErrorDialog('${e.code}: ${e.message}');
+    } on TimeoutException catch (_) {
+      _showErrorDialog('Time out error. Check your connection.');
     }
   }
 
+  void _showErrorDialog(String message) {
+    DeepLinkHandler.waiting.value = false;
+    showDialog(
+        context: context,
+        builder: (BuildContext context) {
+          return AlertDialog(
+            title: const Text(
+              'Error',
+              style: TextStyle(
+                color: Colors.black,
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+            content: Text(
+              message,
+              style: const TextStyle(
+                color: Colors.black,
+              ),
+            ),
+            actions: [
+              TextButton(
+                onPressed: () {
+                  Navigator.of(context).pop();
+                },
+                child: const Text(
+                  'Close',
+                  style: TextStyle(
+                    color: Colors.black,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              )
+            ],
+          );
+        });
+  }
+
   void _onListItemTap(PairingInfo pairing) {
     Navigator.push(
       context,

example/wallet/lib/utils/eth_utils.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 
 import 'package:convert/convert.dart';
+import 'package:flutter/foundation.dart';
 import 'package:get_it/get_it.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import 'package:walletconnect_flutter_v2_wallet/dependencies/i_web3wallet_service.dart';
@@ -22,36 +23,54 @@ class EthUtils {
     return maybeHex;
   }
 
-  static dynamic getAddressFromParamsList(dynamic params) {
-    return (params as List).firstWhere((p) {
-      try {
-        if (addressRegEx.hasMatch(p)) {
+  static String? getAddressFromSessionRequest(SessionRequest request) {
+    try {
+      final paramsList = List.from((request.params as List));
+      if (request.method == 'personal_sign') {
+        // for `personal_sign` first value in params has to be always the message
+        paramsList.removeAt(0);
+      }
+
+      return paramsList.firstWhere((p) {
+        try {
           EthereumAddress.fromHex(p);
           return true;
+        } catch (e) {
+          return false;
         }
-        return false;
-      } catch (e) {
-        return false;
-      }
-    }, orElse: () => null);
+      });
+    } catch (e) {
+      debugPrint(e.toString());
+      return null;
+    }
   }
 
-  static dynamic getDataFromParamsList(dynamic params) {
-    final address = getAddressFromParamsList(params);
-    final param = (params as List).firstWhere(
-      (p) => p != address,
-      orElse: () => null,
-    );
-    return param;
+  static dynamic getDataFromSessionRequest(SessionRequest request) {
+    try {
+      final paramsList = List.from((request.params as List));
+      if (request.method == 'personal_sign') {
+        return paramsList.first;
+      }
+      return paramsList.firstWhere((p) {
+        final address = getAddressFromSessionRequest(request);
+        return p != address;
+      });
+    } catch (e) {
+      debugPrint(e.toString());
+      return null;
+    }
   }
 
-  static Map<String, dynamic>? getTransactionFromParams(dynamic params) {
-    final address = getAddressFromParamsList(params);
-    final param = params.firstWhere(
-      (p) => p != address,
-      orElse: () => null,
-    );
-    return param as Map<String, dynamic>?;
+  static Map<String, dynamic>? getTransactionFromSessionRequest(
+    SessionRequest request,
+  ) {
+    try {
+      final param = (request.params as List<dynamic>).first;
+      return param as Map<String, dynamic>;
+    } catch (e) {
+      debugPrint(e.toString());
+      return null;
+    }
   }
 
   static Future<dynamic> decodeMessageEvent(MessageEvent event) async {

lib/apis/core/pairing/pairing.dart

@@ -194,19 +194,25 @@ class Pairing implements IPairing {
       rethrow;
     }
 
-    await pairings.set(topic, pairing);
-    await core.crypto.setSymKey(symKey, overrideTopic: topic);
-    await core.relayClient.subscribe(topic: topic);
-    await core.expirer.set(topic, expiry);
-
-    onPairingCreate.broadcast(
-      PairingEvent(
-        topic: topic,
-      ),
-    );
+    try {
+      await pairings.set(topic, pairing);
+      await core.crypto.setSymKey(symKey, overrideTopic: topic);
+      await core.relayClient.subscribe(topic: topic).timeout(
+            const Duration(seconds: 15),
+          );
+      await core.expirer.set(topic, expiry);
+
+      onPairingCreate.broadcast(
+        PairingEvent(
+          topic: topic,
+        ),
+      );
 
-    if (activatePairing) {
-      await activate(topic: topic);
+      if (activatePairing) {
+        await activate(topic: topic);
+      }
+    } catch (e) {
+      rethrow;
     }
 
     return pairing;

lib/apis/utils/walletconnect_utils.dart

@@ -3,9 +3,7 @@ import 'dart:io';
 
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
-import 'package:walletconnect_flutter_v2/apis/core/relay_client/relay_client_models.dart';
-import 'package:walletconnect_flutter_v2/apis/models/basic_models.dart';
-import 'package:walletconnect_flutter_v2/apis/models/uri_parse_result.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 
 class WalletConnectUtils {
   static bool isExpired(int expiry) {