Wc2 pub

android/app/src/main/kotlin/com/bitmark/autonomy_flutter/MainActivity.kt

@@ -42,7 +42,6 @@ class MainActivity : FlutterFragmentActivity() {
 
         BackupDartPlugin().createChannels(flutterEngine, applicationContext)
         TezosBeaconDartPlugin().createChannels(flutterEngine)
-        flutterEngine.plugins.add(Wc2ConnectPlugin(this.application))
     }
 
     private fun getExistingUuids(): String {

lib/database/dao/connection_dao.dart

@@ -15,8 +15,9 @@ abstract class ConnectionDao {
   @Query('SELECT * FROM Connection')
   Future<List<Connection>> getConnections();
 
-  @Query(
-      'SELECT * FROM Connection WHERE connectionType NOT IN ("dappConnect", "dappConnect2", "walletConnect2", "beaconP2PPeer", "manuallyIndexerTokenID")')
+  @Query('SELECT * FROM Connection WHERE connectionType NOT IN '
+      '("dappConnect", "dappConnect2", "walletConnect2", "beaconP2PPeer", '
+      '"manuallyIndexerTokenID")')
   Future<List<Connection>> getLinkedAccounts();
 
   // getUpdatedLinkedAccounts:
@@ -25,7 +26,7 @@ abstract class ConnectionDao {
     final linkedAccounts = await getLinkedAccounts();
 
     final deprecatedConnections = linkedAccounts
-        .where((element) => element.connectionType != "manuallyAddress");
+        .where((element) => element.connectionType != 'manuallyAddress');
 
     if (deprecatedConnections.isNotEmpty) {
       await _migrateDeprecatedConnections(deprecatedConnections.toList());
@@ -35,16 +36,20 @@ abstract class ConnectionDao {
     return linkedAccounts;
   }
 
-  @Query(
-      'SELECT * FROM Connection WHERE connectionType IN ("dappConnect", "dappConnect2", "beaconP2PPeer")')
+  @Query('SELECT * FROM Connection WHERE connectionType IN '
+      '("dappConnect", "dappConnect2", "beaconP2PPeer")')
   Future<List<Connection>> getRelatedPersonaConnections();
 
-  @Query(
-      'SELECT * FROM Connection WHERE connectionType = :type ORDER BY createdAt DESC')
+  @Query('SELECT * FROM Connection WHERE connectionType IN '
+      '("dappConnect2", "walletConnect2")')
+  Future<List<Connection>> getWc2Connections();
+
+  @Query('SELECT * FROM Connection WHERE connectionType = :type '
+      'ORDER BY createdAt DESC')
   Future<List<Connection>> getConnectionsByType(String type);
 
-  @Query(
-      'SELECT * FROM Connection WHERE accountNumber = :accountNumber COLLATE NOCASE')
+  @Query('SELECT * FROM Connection WHERE accountNumber = :accountNumber '
+      'COLLATE NOCASE')
   Future<List<Connection>> getConnectionsByAccountNumber(String accountNumber);
 
   @Insert(onConflict: OnConflictStrategy.replace)
@@ -65,8 +70,8 @@ abstract class ConnectionDao {
   @delete
   Future<void> deleteConnections(List<Connection> connections);
 
-  @Query(
-      'DELETE FROM Connection WHERE accountNumber = :accountNumber COLLATE NOCASE')
+  @Query('DELETE FROM Connection WHERE accountNumber = :accountNumber '
+      'COLLATE NOCASE')
   Future<void> deleteConnectionsByAccountNumber(String accountNumber);
 
   @Query('DELETE FROM Connection WHERE connectionType = :type')
@@ -82,7 +87,8 @@ abstract class ConnectionDao {
       switch (oldConnection.connectionType) {
         case 'ledger':
           final jsonData = json.decode(oldConnection.data);
-          // there is a typo in creating connections for ledger code: etheremAddress
+          // there is a typo in creating connections for ledger code:
+          // etheremAddress
           final etheremAddress = (jsonData['etheremAddress'] == null
                   ? []
                   : (jsonData['etheremAddress'] as List<dynamic>))

lib/model/connection_request_args.dart

@@ -7,6 +7,7 @@
 
 import 'package:autonomy_flutter/model/wc2_request.dart';
 import 'package:tezart/tezart.dart';
+import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 
 abstract class ConnectionRequest {
   bool get isWalletConnect2 => false;
@@ -15,7 +16,7 @@ abstract class ConnectionRequest {
 
   bool get isBeaconConnect => false;
 
-  String get id;
+  dynamic get id;
 
   String? get name;
 
@@ -83,16 +84,17 @@ class Wc2Proposal extends ConnectionRequest {
     return proposalChains.contains(Wc2Chain.autonomy);
   }
 
-  AppMetadata proposer;
-  Map<String, Wc2Namespace> requiredNamespaces;
-  Map<String, Wc2Namespace> optionalNamespaces;
+  PairingMetadata proposer;
+  Map<String, RequiredNamespace> requiredNamespaces;
+  Map<String, RequiredNamespace> optionalNamespaces;
 
-  Map<String, Wc2Namespace> get allNamespaces =>
+  Map<String, RequiredNamespace> get allNamespaces =>
       {...requiredNamespaces, ...optionalNamespaces};
-  final String _id;
+
+  final int _id;
 
   @override
-  String get id => _id;
+  int get id => _id;
 
   @override
   String? get name => proposer.name;

lib/model/wc2_request.dart

@@ -8,8 +8,8 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:autonomy_flutter/model/connection_request_args.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:walletconnect_flutter_v2/apis/core/pairing/utils/pairing_models.dart';
 
 part 'wc2_request.g.dart';
 
@@ -28,25 +28,25 @@ class Wc2Request {
   String topic;
   dynamic params;
   String chainId;
-  AppMetadata? proposer;
+  PairingMetadata? proposer;
 
   factory Wc2Request.fromJson(Map<String, dynamic> json) => Wc2Request(
-        id: json["id"] is int ? json["id"] : int.tryParse(json["id"]) ?? 0,
-        method: json["method"],
-        topic: json["topic"],
-        params: Platform.isIOS ? json["params"] : jsonDecode(json["params"]),
-        chainId: json["chainId"],
-        proposer: json["proposer"] != null
-            ? AppMetadata.fromJson(json["proposer"])
+        id: json['id'] is int ? json['id'] : int.tryParse(json['id']) ?? 0,
+        method: json['method'],
+        topic: json['topic'],
+        params: Platform.isIOS ? json['params'] : jsonDecode(json['params']),
+        chainId: json['chainId'],
+        proposer: json['proposer'] != null
+            ? PairingMetadata.fromJson(json['proposer'])
             : null,
       );
 
   Map<String, dynamic> toJson() => {
-        "id": id,
-        "method": method,
-        "topic": topic,
-        "params": params,
-        "chainId": chainId,
+        'id': id,
+        'method': method,
+        'topic': topic,
+        'params': params,
+        'chainId': chainId,
       };
 }
 
@@ -63,16 +63,16 @@ class Wc2PermissionsRequestParams {
 
   factory Wc2PermissionsRequestParams.fromJson(Map<String, dynamic> json) =>
       Wc2PermissionsRequestParams(
-        message: json["message"],
+        message: json['message'],
         permissions: List<Wc2Permission>.from(
-            json["permissions"].map((x) => Wc2Permission.fromJson(x))),
-        account: json["account"],
+            json['permissions'].map((x) => Wc2Permission.fromJson(x))),
+        account: json['account'],
       );
 
   Map<String, dynamic> toJson() => {
-        "message": message,
-        "permissions": List<dynamic>.from(permissions.map((x) => x.toJson())),
-        "account": account,
+        'message': message,
+        'permissions': List<dynamic>.from(permissions.map((x) => x.toJson())),
+        'account': account,
       };
 }
 
@@ -88,15 +88,15 @@ class Wc2Permission {
   Wc2ChainsPermissionRequest request;
 
   factory Wc2Permission.fromJson(Map<String, dynamic> json) => Wc2Permission(
-        type: json["type"],
-        includeLinkedAccount: json["includeLinkedAccount"],
-        request: Wc2ChainsPermissionRequest.fromJson(json["request"]),
+        type: json['type'],
+        includeLinkedAccount: json['includeLinkedAccount'],
+        request: Wc2ChainsPermissionRequest.fromJson(json['request']),
       );
 
   Map<String, dynamic> toJson() => {
-        "type": type,
-        "includeLinkedAccount": includeLinkedAccount,
-        "request": request.toJson(),
+        'type': type,
+        'includeLinkedAccount': includeLinkedAccount,
+        'request': request.toJson(),
       };
 }
 
@@ -109,11 +109,11 @@ class Wc2ChainsPermissionRequest {
 
   factory Wc2ChainsPermissionRequest.fromJson(Map<String, dynamic> json) =>
       Wc2ChainsPermissionRequest(
-        chains: List<String>.from(json["chains"].map((x) => x)),
+        chains: List<String>.from(json['chains'].map((x) => x)),
       );
 
   Map<String, dynamic> toJson() => {
-        "chains": List<dynamic>.from(chains.map((x) => x)),
+        'chains': List<dynamic>.from(chains.map((x) => x)),
       };
 }
 
@@ -130,15 +130,15 @@ class Wc2SignRequestParams {
 
   factory Wc2SignRequestParams.fromJson(Map<String, dynamic> json) =>
       Wc2SignRequestParams(
-        chain: json["chain"],
-        address: json["address"],
-        message: json["message"],
+        chain: json['chain'],
+        address: json['address'],
+        message: json['message'],
       );
 
   Map<String, dynamic> toJson() => {
-        "chain": chain,
-        "address": address,
-        "message": message,
+        'chain': chain,
+        'address': address,
+        'message': message,
       };
 }
 
@@ -155,15 +155,15 @@ class Wc2SendRequestParams {
 
   factory Wc2SendRequestParams.fromJson(Map<String, dynamic> json) =>
       Wc2SendRequestParams(
-        chain: json["chain"],
-        address: json["address"],
-        transactions: json["transactions"],
+        chain: json['chain'],
+        address: json['address'],
+        transactions: json['transactions'],
       );
 
   Map<String, dynamic> toJson() => {
-        "chain": chain,
-        "address": address,
-        "transactions": transactions,
+        'chain': chain,
+        'address': address,
+        'transactions': transactions,
       };
 }
 
@@ -215,9 +215,9 @@ class Wc2ChainResult {
 
 @JsonSerializable()
 class Wc2Chain {
-  static const autonomy = "autonomy";
-  static const ethereum = "eip155";
-  static const tezos = "tezos";
+  static const autonomy = 'autonomy';
+  static const ethereum = 'eip155';
+  static const tezos = 'tezos';
 
   final String chain;
   final String address;

lib/screen/app_router.dart

@@ -13,7 +13,6 @@ import 'package:autonomy_flutter/model/connection_request_args.dart';
 import 'package:autonomy_flutter/model/ff_series.dart';
 import 'package:autonomy_flutter/model/play_list_model.dart';
 import 'package:autonomy_flutter/model/postcard_claim.dart';
-import 'package:autonomy_flutter/model/wc2_request.dart';
 import 'package:autonomy_flutter/screen/account/access_method_page.dart';
 import 'package:autonomy_flutter/screen/account/link_manually_page.dart';
 import 'package:autonomy_flutter/screen/account/recovery_phrase_page.dart';
@@ -135,6 +134,7 @@ import 'package:autonomy_flutter/screen/wallet_connect/wc_connect_page.dart';
 import 'package:autonomy_flutter/screen/wallet_connect/wc_sign_message_page.dart';
 import 'package:autonomy_flutter/service/audit_service.dart';
 import 'package:autonomy_flutter/service/configuration_service.dart';
+import 'package:autonomy_flutter/service/wc2_service.dart';
 import 'package:autonomy_flutter/view/transparent_router.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -476,7 +476,6 @@ class AppRouter {
               injector(),
               injector(),
               injector(),
-              injector(),
             ),
             child: WCSendTransactionPage(
                 args: settings.arguments! as WCSendTransactionPageArgs),
@@ -723,8 +722,8 @@ class AppRouter {
       case AUSignMessagePage.tag:
         return CupertinoPageRoute(
           settings: settings,
-          builder: (context) =>
-              AUSignMessagePage(request: settings.arguments! as Wc2Request),
+          builder: (context) => AUSignMessagePage(
+              request: settings.arguments! as Wc2RequestPayload),
         );
       case TBSendTransactionPage.tag:
         return CupertinoPageRoute(
@@ -988,7 +987,7 @@ class AppRouter {
                       ),
                     ],
                     child: Wc2RequestPage(
-                        request: settings.arguments! as Wc2Request)));
+                        request: settings.arguments! as Wc2RequestPayload)));
 
       case walletPage:
         return CupertinoPageRoute(

lib/screen/irl_screen/webview_irl_screen.dart

@@ -30,6 +30,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:tezart/tezart.dart';
+import 'package:walletconnect_flutter_v2/apis/core/pairing/utils/pairing_models.dart';
 import 'package:uuid/uuid.dart';
 
 class IRLWebScreen extends StatefulWidget {
@@ -314,14 +315,8 @@ class _IRLWebScreenState extends State<IRLWebScreen> {
             }
 
             final args = WCSendTransactionPageArgs(
-              1,
-              AppMetadata.fromJson(argument.metadata ??
-                  {
-                    'name': '',
-                    'url': '',
-                    'icons': [''],
-                    'description': '',
-                  }),
+              const PairingMetadata(
+                  name: '', description: '', url: '', icons: []),
               WCEthereumTransaction.fromJson(transaction),
               account.wallet.uuid,
               account.index,