Explore-Reown-For-WalletConnect (#2156)

* Reown WalletConnect Implementation
- Setup for Solana Chain
- Setup for EVM chain
- Enable signing messages and transactions on Solana Chain
- Fix issues related to signinig of transactions on Solana chain
- Decode mesage to human readable format - WIP

* Reown WalletConnect Implementation Continuation:
- Add readable text for signedTypedDatav4 and sendTransaction event requests
- Modify styling for bottomsheetModel
- Switch minimum deployment target to 13.0
- Gracefully handle errors
- Fix issues discovered while testing across dApps

* chore: ReownWalletConnectImplementation (Cont.)
- Remove unneeded code and files
- Rename files to match classes and vice versa
- Add maven jitpack repository for reown.com/yttrium repo
- Add better folder structuring to entire feature
- Add localization for all feature related texts
- Add testnet and devnet access for Solana Chain Service
- Add a better error message for Moralis NFT fetch

* feat:
- Add field to enter wc uri directly
- Handle bottomsheet not coming up after initial display
- Remove unneeded print statements
- Remove double display of success popup for session proposal bottomsheets

* fix:
- Add visual feedback to WC RelayClient Errors
- Adjust theme for bottomSheets

* Testing a theroy

* Temporarily add flags back

* Remove added flags and update proguard rules

* fix(android): update proguard-rules.pro and drop minify flags (#2199)

Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>

* fix: Switch bottomsheet result from signOne to signAll

---------

Co-authored-by: cyan <cyjan@mrcyjanek.net>
Co-authored-by: Omar Hatem <omarh.ismail1@gmail.com>

lib/core/wallet_connect/chain_service/chain_service.dart

@@ -1,5 +0,0 @@
-abstract class ChainService {
-  String getNamespace();
-  String getChainId();
-  List<String> getEvents();
-}

lib/core/wallet_connect/chain_service/eth/evm_chain_id.dart

@@ -1,35 +0,0 @@
-import 'package:cake_wallet/core/wallet_connect/chain_service/eth/evm_chain_service.dart';
-
-enum EVMChainId {
-  ethereum,
-  polygon,
-  goerli,
-  mumbai,
-  arbitrum,
-}
-
-extension EVMChainIdX on EVMChainId {
-  String chain() {
-    String name = '';
-
-    switch (this) {
-      case EVMChainId.ethereum:
-        name = '1';
-        break;
-      case EVMChainId.polygon:
-        name = '137';
-        break;
-      case EVMChainId.goerli:
-        name = '5';
-        break;
-      case EVMChainId.arbitrum:
-        name = '42161';
-        break;
-      case EVMChainId.mumbai:
-        name = '80001';
-        break;
-    }
-
-    return '${EvmChainServiceImpl.namespace}:$name';
-  }
-}

lib/core/wallet_connect/chain_service/eth/evm_chain_service.dart

@@ -1,304 +0,0 @@
-import 'dart:convert';
-import 'dart:developer';
-import 'dart:typed_data';
-
-import 'package:cake_wallet/core/wallet_connect/eth_transaction_model.dart';
-import 'package:cake_wallet/core/wallet_connect/chain_service/eth/evm_chain_id.dart';
-import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/reactions/wallet_connect.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart';
-import 'package:cake_wallet/store/app_store.dart';
-import 'package:cake_wallet/core/wallet_connect/models/chain_key_model.dart';
-import 'package:cake_wallet/core/wallet_connect/models/connection_model.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/connection_widget.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/web3_request_modal.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/utils/string_parsing.dart';
-import 'package:convert/convert.dart';
-import 'package:eth_sig_util/eth_sig_util.dart';
-import 'package:eth_sig_util/util/utils.dart';
-import 'package:http/http.dart' as http;
-import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
-import 'package:web3dart/web3dart.dart';
-import '../chain_service.dart';
-import '../../wallet_connect_key_service.dart';
-
-class EvmChainServiceImpl implements ChainService {
-  final AppStore appStore;
-  final BottomSheetService bottomSheetService;
-  final Web3Wallet wallet;
-  final WalletConnectKeyService wcKeyService;
-
-  static const namespace = 'eip155';
-  static const pSign = 'personal_sign';
-  static const eSign = 'eth_sign';
-  static const eSignTransaction = 'eth_signTransaction';
-  static const eSignTypedData = 'eth_signTypedData_v4';
-  static const eSendTransaction = 'eth_sendTransaction';
-
-  final EVMChainId reference;
-
-  final Web3Client ethClient;
-
-  EvmChainServiceImpl({
-    required this.reference,
-    required this.appStore,
-    required this.wcKeyService,
-    required this.bottomSheetService,
-    required this.wallet,
-    Web3Client? web3Client,
-  }) : ethClient = web3Client ??
-            Web3Client(
-              appStore.settingsStore.getCurrentNode(appStore.wallet!.type).uri.toString(),
-              http.Client(),
-            ) {
-    for (final String event in getEvents()) {
-      wallet.registerEventEmitter(chainId: getChainId(), event: event);
-    }
-    wallet.registerRequestHandler(
-      chainId: getChainId(),
-      method: pSign,
-      handler: personalSign,
-    );
-    wallet.registerRequestHandler(
-      chainId: getChainId(),
-      method: eSign,
-      handler: ethSign,
-    );
-    wallet.registerRequestHandler(
-      chainId: getChainId(),
-      method: eSignTransaction,
-      handler: ethSignTransaction,
-    );
-    wallet.registerRequestHandler(
-      chainId: getChainId(),
-      method: eSendTransaction,
-      handler: ethSignTransaction,
-    );
-    wallet.registerRequestHandler(
-      chainId: getChainId(),
-      method: eSignTypedData,
-      handler: ethSignTypedData,
-    );
-  }
-
-  @override
-  String getNamespace() {
-    return namespace;
-  }
-
-  @override
-  String getChainId() {
-    return reference.chain();
-  }
-
-  @override
-  List<String> getEvents() {
-    return ['chainChanged', 'accountsChanged'];
-  }
-
-  Future<String?> requestAuthorization(String? text) async {
-    // Show the bottom sheet
-    final bool? isApproved = await bottomSheetService.queueBottomSheet(
-      widget: Web3RequestModal(
-        child: ConnectionWidget(
-          title: S.current.signTransaction,
-          info: [
-            ConnectionModel(
-              text: text,
-            ),
-          ],
-        ),
-      ),
-    ) as bool?;
-
-    if (isApproved != null && isApproved == false) {
-      return 'User rejected signature';
-    }
-
-    return null;
-  }
-
-  Future<String> personalSign(String topic, dynamic parameters) async {
-    log('received personal sign request: $parameters');
-
-    final String message;
-    if (parameters[0] == null) {
-      message = '';
-    } else {
-      message = parameters[0].toString().utf8Message;
-    }
-
-    final String? authError = await requestAuthorization(message);
-
-    if (authError != null) {
-      return authError;
-    }
-
-    try {
-      // Load the private key
-      final List<ChainKeyModel> keys = wcKeyService
-          .getKeysForChain(appStore.wallet!);
-
-      final Credentials credentials = EthPrivateKey.fromHex(keys[0].privateKey);
-
-      final String signature = hex.encode(
-        credentials.signPersonalMessageToUint8List(Uint8List.fromList(utf8.encode(message))),
-      );
-
-      return '0x$signature';
-    } catch (e) {
-      log(e.toString());
-      bottomSheetService.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(
-          message: '${S.current.errorGettingCredentials} ${e.toString()}',
-        ),
-      );
-      return 'Failed: Error while getting credentials';
-    }
-  }
-
-  Future<String> ethSign(String topic, dynamic parameters) async {
-    log('received eth sign request: $parameters');
-
-    final String message;
-    if (parameters[1] == null) {
-      message = '';
-    } else {
-      message = parameters[1].toString().utf8Message;
-    }
-
-    final String? authError = await requestAuthorization(message);
-    if (authError != null) {
-      return authError;
-    }
-
-    try {
-      // Load the private key
-      final List<ChainKeyModel> keys = wcKeyService
-          .getKeysForChain(appStore.wallet!);
-
-      final EthPrivateKey credentials = EthPrivateKey.fromHex(keys[0].privateKey);
-
-      final String signature = hex.encode(
-        credentials.signPersonalMessageToUint8List(
-          Uint8List.fromList(utf8.encode(message)),
-          chainId: getChainIdBasedOnWalletType(appStore.wallet!.type),
-        ),
-      );
-      log(signature);
-
-      return '0x$signature';
-    } catch (e) {
-      log('error: ${e.toString()}');
-      bottomSheetService.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(message: '${S.current.error}: ${e.toString()}'),
-      );
-      return 'Failed';
-    }
-  }
-
-  Future<String> ethSignTransaction(String topic, dynamic parameters) async {
-    log('received eth sign transaction request: $parameters');
-
-    final paramsData = parameters[0] as Map<String, dynamic>;
-
-    final message = _convertToReadable(paramsData);
-
-    final String? authError = await requestAuthorization(message);
-
-    if (authError != null) {
-      return authError;
-    }
-
-    // Load the private key
-    final List<ChainKeyModel> keys = wcKeyService
-        .getKeysForChain(appStore.wallet!);
-
-    final Credentials credentials = EthPrivateKey.fromHex(keys[0].privateKey);
-
-    WCEthereumTransactionModel ethTransaction =
-        WCEthereumTransactionModel.fromJson(parameters[0] as Map<String, dynamic>);
-
-    final transaction = Transaction(
-      from: EthereumAddress.fromHex(ethTransaction.from),
-      to: EthereumAddress.fromHex(ethTransaction.to),
-      maxGas: ethTransaction.gasLimit != null ? int.tryParse(ethTransaction.gasLimit ?? "") : null,
-      gasPrice: ethTransaction.gasPrice != null
-          ? EtherAmount.inWei(BigInt.parse(ethTransaction.gasPrice ?? ""))
-          : null,
-      value: EtherAmount.inWei(BigInt.parse(ethTransaction.value)),
-      data: hexToBytes(ethTransaction.data ?? ""),
-      nonce: ethTransaction.nonce != null ? int.tryParse(ethTransaction.nonce ?? "") : null,
-    );
-
-    try {
-      final result = await ethClient.sendTransaction(
-        credentials,
-        transaction,
-        chainId: getChainIdBasedOnWalletType(appStore.wallet!.type),
-      );
-
-      log('Result: $result');
-
-      bottomSheetService.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(
-          message: S.current.awaitDAppProcessing,
-          isError: false,
-        ),
-      );
-
-      return result;
-    } catch (e) {
-      log('An error has occurred while signing transaction: ${e.toString()}');
-      bottomSheetService.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(
-          message: '${S.current.errorSigningTransaction}: ${e.toString()}',
-        ),
-      );
-      return 'Failed';
-    }
-  }
-
-  Future<String> ethSignTypedData(String topic, dynamic parameters) async {
-    log('received eth sign typed data request: $parameters');
-    final String? data = parameters[1] as String?;
-
-    final String? authError = await requestAuthorization(data);
-
-    if (authError != null) {
-      return authError;
-    }
-
-    final List<ChainKeyModel> keys = wcKeyService
-        .getKeysForChain(appStore.wallet!);
-
-    return EthSigUtil.signTypedData(
-      privateKey: keys[0].privateKey,
-      jsonData: data ?? '',
-      version: TypedDataVersion.V4,
-    );
-  }
-
-  String _convertToReadable(Map<String, dynamic> data) {
-    final tokenName = getTokenNameBasedOnWalletType(appStore.wallet!.type);
-    String gas = int.parse((data['gas'] as String).substring(2), radix: 16).toString();
-    String value = data['value'] != null
-        ? (int.parse((data['value'] as String).substring(2), radix: 16) / 1e18).toString() +
-            ' $tokenName'
-        : '0 $tokenName';
-    String from = data['from'] as String;
-    String to = data['to'] as String;
-
-    return '''
- Gas: $gas\n
- Value: $value\n
- From: $from\n
- To: $to
-             ''';
-  }
-}

lib/core/wallet_connect/chain_service/solana/entities/solana_sign_message.dart

@@ -1,28 +0,0 @@
-class SolanaSignMessage {
-  final String pubkey;
-  final String message;
-
-  SolanaSignMessage({
-    required this.pubkey,
-    required this.message,
-  });
-
-  factory SolanaSignMessage.fromJson(Map<String, dynamic> json) {
-    return SolanaSignMessage(
-      pubkey: json['pubkey'] as String,
-      message: json['message'] as String,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return <String, dynamic>{
-      'pubkey': pubkey,
-      'message': message,
-    };
-  }
-
-  @override
-  String toString() {
-    return 'SolanaSignMessage(pubkey: $pubkey, message: $message)';
-  }
-}

lib/core/wallet_connect/chain_service/solana/entities/solana_sign_transaction.dart

@@ -1,106 +0,0 @@
-class SolanaSignTransaction {
-  final String? feePayer;
-  final String? recentBlockhash;
-  final String transaction;
-  final List<SolanaInstruction>? instructions;
-
-  SolanaSignTransaction({
-    required this.feePayer,
-    required this.recentBlockhash,
-    required this.instructions,
-    required this.transaction,
-  });
-
-  factory SolanaSignTransaction.fromJson(Map<String, dynamic> json) {
-    return SolanaSignTransaction(
-      feePayer:json['feePayer'] !=null ? json['feePayer'] as String: null,
-      recentBlockhash: json['recentBlockhash']!=null? json['recentBlockhash'] as String: null,
-      instructions:json['instructions']!=null? (json['instructions'] as List<dynamic>)
-          .map((e) => SolanaInstruction.fromJson(e as Map<String, dynamic>))
-          .toList(): null,
-      transaction: json['transaction'] as String,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'feePayer': feePayer,
-      'recentBlockhash': recentBlockhash,
-      'instructions': instructions,
-      'transaction': transaction,
-    };
-  }
-
-  @override
-  String toString() {
-    return 'SolanaSignTransaction(feePayer: $feePayer, recentBlockhash: $recentBlockhash, instructions: $instructions, transaction: $transaction)';
-  }
-}
-
-class SolanaInstruction {
-  final String programId;
-  final List<SolanaKeyMetadata> keys;
-  final List<int> data;
-
-  SolanaInstruction({
-    required this.programId,
-    required this.keys,
-    required this.data,
-  });
-
-  factory SolanaInstruction.fromJson(Map<String, dynamic> json) {
-    return SolanaInstruction(
-      programId: json['programId'] as String,
-      keys: (json['keys'] as List<dynamic>)
-          .map((e) => SolanaKeyMetadata.fromJson(e as Map<String, dynamic>))
-          .toList(),
-      data: (json['data'] as List<dynamic>).map((e) => e as int).toList(),
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return <String, dynamic>{
-      'programId': programId,
-      'keys': keys,
-      'data': data,
-    };
-  }
-
-  @override
-  String toString() {
-    return 'SolanaInstruction(programId: $programId, keys: $keys, data: $data)';
-  }
-}
-
-class SolanaKeyMetadata {
-  final String pubkey;
-  final bool isSigner;
-  final bool isWritable;
-
-  SolanaKeyMetadata({
-    required this.pubkey,
-    required this.isSigner,
-    required this.isWritable,
-  });
-
-  factory SolanaKeyMetadata.fromJson(Map<String, dynamic> json) {
-    return SolanaKeyMetadata(
-      pubkey: json['pubkey'] as String,
-      isSigner: json['isSigner'] as bool,
-      isWritable: json['isWritable'] as bool,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return <String, dynamic>{
-      'pubkey': pubkey,
-      'isSigner': isSigner,
-      'isWritable': isWritable,
-    };
-  }
-
-  @override
-  String toString() {
-    return 'SolanaKeyMetadata(pubkey: $pubkey, isSigner: $isSigner, isWritable: $isWritable)';
-  }
-}

lib/core/wallet_connect/chain_service/solana/solana_chain_id.dart

@@ -1,30 +0,0 @@
-import 'solana_chain_service.dart';
-
-enum SolanaChainId {
-  mainnet,
-  // testnet,
-  // devnet,
-}
-
-extension SolanaChainIdX on SolanaChainId {
-  String chain() {
-    String name = '';
-
-    switch (this) {
-      case SolanaChainId.mainnet:
-        name = '4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ';
-        // solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp
-        break;
-      // case SolanaChainId.devnet:
-      //   name = '8E9rvCKLFQia2Y35HXjjpWzj8weVo44K';
-      //   // solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1
-      //   break;
-      // case SolanaChainId.testnet:
-      //   name = '';
-      //   // solana:4uhcVJyU9pJkvQyS88uRDiswHXSCkY3z
-      //   break;
-    }
-
-    return '${SolanaChainServiceImpl.namespace}:$name';
-  }
-}

lib/core/wallet_connect/chain_service/solana/solana_chain_service.dart

@@ -1,170 +0,0 @@
-import 'dart:convert';
-import 'dart:developer';
-
-import 'package:blockchain_utils/blockchain_utils.dart';
-import 'package:cake_wallet/core/wallet_connect/chain_service/solana/entities/solana_sign_message.dart';
-import 'package:cake_wallet/core/wallet_connect/chain_service/solana/solana_chain_id.dart';
-import 'package:cake_wallet/core/wallet_connect/wc_bottom_sheet_service.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart';
-import 'package:cake_wallet/core/wallet_connect/models/connection_model.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/connection_widget.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/web3_request_modal.dart';
-import 'package:cw_core/solana_rpc_http_service.dart';
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:on_chain/solana/solana.dart';
-import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
-import '../chain_service.dart';
-import '../../wallet_connect_key_service.dart';
-import 'entities/solana_sign_transaction.dart';
-
-class SolanaChainServiceImpl implements ChainService {
-  final BottomSheetService bottomSheetService;
-  final Web3Wallet wallet;
-  final WalletConnectKeyService wcKeyService;
-
-  static const namespace = 'solana';
-  static const solSignTransaction = 'solana_signTransaction';
-  static const solSignMessage = 'solana_signMessage';
-
-  final SolanaChainId reference;
-
-  final SolanaRPC solanaProvider;
-
-  final SolanaPrivateKey? ownerPrivateKey;
-
-  SolanaChainServiceImpl({
-    required this.reference,
-    required this.wcKeyService,
-    required this.bottomSheetService,
-    required this.wallet,
-    required this.ownerPrivateKey,
-    required String formattedRPCUrl,
-    SolanaRPC? solanaProvider,
-  }) : solanaProvider = solanaProvider ?? SolanaRPC(SolanaRPCHTTPService(url: formattedRPCUrl)) {
-    for (final String event in getEvents()) {
-      wallet.registerEventEmitter(chainId: getChainId(), event: event);
-    }
-    wallet.registerRequestHandler(
-      chainId: getChainId(),
-      method: solSignTransaction,
-      handler: solanaSignTransaction,
-    );
-    wallet.registerRequestHandler(
-      chainId: getChainId(),
-      method: solSignMessage,
-      handler: solanaSignMessage,
-    );
-  }
-
-  @override
-  String getNamespace() {
-    return namespace;
-  }
-
-  @override
-  String getChainId() {
-    return reference.chain();
-  }
-
-  @override
-  List<String> getEvents() {
-    return ['chainChanged', 'accountsChanged'];
-  }
-
-  Future<String?> requestAuthorization(String? text) async {
-    // Show the bottom sheet
-    final bool? isApproved = await bottomSheetService.queueBottomSheet(
-      widget: Web3RequestModal(
-        child: ConnectionWidget(
-          title: S.current.signTransaction,
-          info: [
-            ConnectionModel(
-              text: text,
-            ),
-          ],
-        ),
-      ),
-    ) as bool?;
-
-    if (isApproved != null && isApproved == false) {
-      return 'User rejected signature';
-    }
-
-    return null;
-  }
-
-  Future<String> solanaSignTransaction(String topic, dynamic parameters) async {
-    log('received solana sign transaction request $parameters');
-
-    final solanaSignTx = SolanaSignTransaction.fromJson(parameters as Map<String, dynamic>);
-
-    final String? authError = await requestAuthorization('Confirm request to sign transaction?');
-
-    if (authError != null) {
-      return authError;
-    }
-
-    try {
-      // Convert transaction string to bytes
-      List<int> transactionBytes = base64Decode(solanaSignTx.transaction);
-
-      final message = SolanaTransactionUtils.deserializeMessageLegacy(transactionBytes);
-
-      final sign = ownerPrivateKey!.sign(message.serialize());
-
-      final signature = solanaProvider.request(
-        SolanaRPCSendTransaction(
-          encodedTransaction: Base58Encoder.encode(sign),
-          commitment: Commitment.confirmed,
-        ),
-      );
-
-      bottomSheetService.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(
-          message: S.current.awaitDAppProcessing,
-          isError: false,
-        ),
-      );
-
-      return signature;
-    } catch (e) {
-      log('An error has occurred while signing transaction: ${e.toString()}');
-      bottomSheetService.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(
-          message: '${S.current.errorSigningTransaction}: ${e.toString()}',
-        ),
-      );
-      return 'Failed';
-    }
-  }
-
-  Future<String> solanaSignMessage(String topic, dynamic parameters) async {
-    log('received solana sign message request: $parameters');
-
-    final solanaSignMessage = SolanaSignMessage.fromJson(parameters as Map<String, dynamic>);
-
-    final String? authError = await requestAuthorization('Confirm request to sign message?');
-
-    if (authError != null) {
-      return authError;
-    }
-    List<int>? sign;
-
-    try {
-      sign = ownerPrivateKey!.sign(Base58Decoder.decode(solanaSignMessage.message));
-    } catch (e) {
-      printV(e);
-    }
-
-    if (sign == null) {
-      return '';
-    }
-
-    final signature = Base58Encoder.encode(sign);
-
-    return signature;
-  }
-}

lib/core/wallet_connect/eth_transaction_model.dart

@@ -1,60 +0,0 @@
-class WCEthereumTransactionModel {
-  final String from;
-  final String to;
-  final String value;
-  final String? nonce;
-  final String? gasPrice;
-  final String? maxFeePerGas;
-  final String? maxPriorityFeePerGas;
-  final String? gas;
-  final String? gasLimit;
-  final String? data;
-
-  WCEthereumTransactionModel({
-    required this.from,
-    required this.to,
-    required this.value,
-    this.nonce,
-    this.gasPrice,
-    this.maxFeePerGas,
-    this.maxPriorityFeePerGas,
-    this.gas,
-    this.gasLimit,
-    this.data,
-  });
-
-  factory WCEthereumTransactionModel.fromJson(Map<String, dynamic> json) {
-    return WCEthereumTransactionModel(
-      from: json['from'] as String,
-      to: json['to'] as String,
-      value: json['value'] as String,
-      nonce: json['nonce'] as String?,
-      gasPrice: json['gasPrice'] as String?,
-      maxFeePerGas: json['maxFeePerGas'] as String?,
-      maxPriorityFeePerGas: json['maxPriorityFeePerGas'] as String?,
-      gas: json['gas'] as String?,
-      gasLimit: json['gasLimit'] as String?,
-      data: json['data'] as String?,
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'from': from,
-      'to': to,
-      'value': value,
-      'nonce': nonce,
-      'gasPrice': gasPrice,
-      'maxFeePerGas': maxFeePerGas,
-      'maxPriorityFeePerGas': maxPriorityFeePerGas,
-      'gas': gas,
-      'gasLimit': gasLimit,
-      'data': data,
-    };
-  }
-
-  @override
-  String toString() {
-    return 'EthereumTransactionModel(from: $from, to: $to, nonce: $nonce, gasPrice: $gasPrice, maxFeePerGas: $maxFeePerGas, maxPriorityFeePerGas: $maxPriorityFeePerGas, gas: $gas, gasLimit: $gasLimit, value: $value, data: $data)';
-  }
-}

lib/core/wallet_connect/models/auth_request_model.dart

@@ -1,16 +0,0 @@
-import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
-
-class AuthRequestModel {
-  final String iss;
-  final AuthRequest request;
-
-  AuthRequestModel({
-    required this.iss,
-    required this.request,
-  });
-
-  @override
-  String toString() {
-    return 'AuthRequestModel(iss: $iss, request: $request)';
-  }
-}

lib/core/wallet_connect/models/bottom_sheet_queue_item_model.dart

@@ -1,20 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/cupertino.dart';
-
-class BottomSheetQueueItemModel {
-  final Widget widget;
-  final bool isModalDismissible;
-  final Completer<dynamic> completer;
-
-  BottomSheetQueueItemModel({
-    required this.widget,
-    required this.completer,
-    this.isModalDismissible = false,
-  });
-
-  @override
-  String toString() {
-    return 'BottomSheetQueueItemModel(widget: $widget, completer: $completer)';
-  }
-}

lib/core/wallet_connect/models/chain_key_model.dart

@@ -1,16 +0,0 @@
-class ChainKeyModel {
-  final List<String> chains;
-  final String privateKey;
-  final String publicKey;
-
-  ChainKeyModel({
-    required this.chains,
-    required this.privateKey,
-    required this.publicKey,
-  });
-
-  @override
-  String toString() {
-    return 'ChainKeyModel(chains: $chains, privateKey: $privateKey, publicKey: $publicKey)';
-  }
-}

lib/core/wallet_connect/models/connection_model.dart

@@ -1,18 +0,0 @@
-class ConnectionModel {
-  final String? title;
-  final String? text;
-  final List<String>? elements;
-  final Map<String, void Function()>? elementActions;
-
-  ConnectionModel({
-    this.title,
-    this.text,
-    this.elements,
-    this.elementActions,
-  });
-
-  @override
-  String toString() {
-    return 'WalletConnectRequestModel(title: $title, text: $text, elements: $elements, elementActions: $elementActions)';
-  }
-}

lib/core/wallet_connect/models/session_request_model.dart

@@ -1,14 +0,0 @@
-import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
-
-class SessionRequestModel {
-  final ProposalData request;
-
-  SessionRequestModel({
-    required this.request,
-  });
-
-  @override
-  String toString() {
-    return 'SessionRequestModel(request: $request)';
-  }
-}

lib/core/wallet_connect/wallet_connect_key_service.dart

@@ -1,80 +0,0 @@
-import 'package:cake_wallet/ethereum/ethereum.dart';
-import 'package:cake_wallet/core/wallet_connect/models/chain_key_model.dart';
-import 'package:cake_wallet/polygon/polygon.dart';
-import 'package:cake_wallet/reactions/wallet_connect.dart';
-import 'package:cake_wallet/solana/solana.dart';
-import 'package:cw_core/wallet_base.dart';
-import 'package:cw_core/wallet_type.dart';
-
-abstract class WalletConnectKeyService {
-  /// Returns a list of all the keys.
-  List<ChainKeyModel> getKeys(WalletBase wallet);
-
-  /// Returns a list of all the keys for a given chain id.
-  /// If the chain is not found, returns an empty list.
-  ///  - [chain]: The chain to get the keys for.
-  List<ChainKeyModel> getKeysForChain(WalletBase wallet);
-}
-
-class KeyServiceImpl implements WalletConnectKeyService {
-  static String _getPrivateKeyForWallet(WalletBase wallet) {
-    switch (wallet.type) {
-      case WalletType.ethereum:
-        return ethereum!.getPrivateKey(wallet);
-      case WalletType.polygon:
-        return polygon!.getPrivateKey(wallet);
-      case WalletType.solana:
-        return solana!.getPrivateKey(wallet);
-      default:
-        return '';
-    }
-  }
-
-  static String _getPublicKeyForWallet(WalletBase wallet) {
-    switch (wallet.type) {
-      case WalletType.ethereum:
-        return ethereum!.getPublicKey(wallet);
-      case WalletType.polygon:
-        return polygon!.getPublicKey(wallet);
-      case WalletType.solana:
-        return solana!.getPublicKey(wallet);
-      default:
-        return '';
-    }
-  }
-
-  @override
-  List<ChainKeyModel> getKeys(WalletBase wallet) {
-    final keys = [
-      ChainKeyModel(
-        chains: [
-          'eip155:1',
-          'eip155:5',
-          'eip155:137',
-          'eip155:42161',
-          'eip155:80001',
-        ],
-        privateKey: _getPrivateKeyForWallet(wallet),
-        publicKey: _getPublicKeyForWallet(wallet),
-      ),
-      ChainKeyModel(
-        chains: [
-          'solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ', // main-net
-          'solana:8E9rvCKLFQia2Y35HXjjpWzj8weVo44K', // test-net
-        ],
-        privateKey: _getPrivateKeyForWallet(wallet),
-        publicKey: _getPublicKeyForWallet(wallet),
-      ),
-    ];
-    return keys;
-  }
-
-  @override
-  List<ChainKeyModel> getKeysForChain(WalletBase wallet) {
-    final chain = getChainNameSpaceAndIdBasedOnWalletType(wallet.type);
-
-    final keys = getKeys(wallet);
-
-    return keys.where((e) => e.chains.contains(chain)).toList();
-  }
-}

lib/core/wallet_connect/wc_bottom_sheet_service.dart

@@ -1,43 +0,0 @@
-import 'dart:async';
-import 'package:cake_wallet/core/wallet_connect/models/bottom_sheet_queue_item_model.dart';
-import 'package:flutter/material.dart';
-
-abstract class BottomSheetService {
-  abstract final ValueNotifier<BottomSheetQueueItemModel?> currentSheet;
-
-  Future<dynamic> queueBottomSheet({
-    required Widget widget,
-    bool isModalDismissible = false,
-  });
-
-  void resetCurrentSheet();
-}
-
-class BottomSheetServiceImpl implements BottomSheetService {
-
-  @override
-  final ValueNotifier<BottomSheetQueueItemModel?> currentSheet = ValueNotifier(null);
-
-  @override
-  Future<dynamic> queueBottomSheet({
-    required Widget widget,
-    bool isModalDismissible = false,
-  }) async {
-    // Create the bottom sheet queue item
-    final completer = Completer<dynamic>();
-    final queueItem = BottomSheetQueueItemModel(
-      widget: widget,
-      completer: completer,
-      isModalDismissible: isModalDismissible,
-    );
-
-    currentSheet.value = queueItem;
-
-    return await completer.future;
-  }
-
-  @override
-  void resetCurrentSheet() {
-    currentSheet.value = null;
-  }
-}

lib/core/wallet_connect/web3wallet_service.dart

@@ -1,416 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:developer';
-import 'dart:typed_data';
-
-import 'package:cake_wallet/core/wallet_connect/chain_service/eth/evm_chain_id.dart';
-import 'package:cake_wallet/core/wallet_connect/chain_service/eth/evm_chain_service.dart';
-import 'package:cake_wallet/core/wallet_connect/wallet_connect_key_service.dart';
-import 'package:cake_wallet/entities/preferences_key.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/core/wallet_connect/models/auth_request_model.dart';
-import 'package:cake_wallet/core/wallet_connect/models/chain_key_model.dart';
-import 'package:cake_wallet/core/wallet_connect/models/session_request_model.dart';
-import 'package:cake_wallet/reactions/wallet_connect.dart';
-import 'package:cake_wallet/solana/solana.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/connection_request_widget.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/message_display_widget.dart';
-import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/web3_request_modal.dart';
-import 'package:cake_wallet/store/app_store.dart';
-import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cw_core/wallet_type.dart';
-import 'package:eth_sig_util/eth_sig_util.dart';
-import 'package:flutter/material.dart';
-import 'package:mobx/mobx.dart';
-import 'package:on_chain/solana/solana.dart' hide Store;
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
-
-import 'chain_service/solana/solana_chain_id.dart';
-import 'chain_service/solana/solana_chain_service.dart';
-import 'wc_bottom_sheet_service.dart';
-import 'package:cake_wallet/.secrets.g.dart' as secrets;
-
-part 'web3wallet_service.g.dart';
-
-class Web3WalletService = Web3WalletServiceBase with _$Web3WalletService;
-
-abstract class Web3WalletServiceBase with Store {
-  final AppStore appStore;
-  final SharedPreferences sharedPreferences;
-  final BottomSheetService _bottomSheetHandler;
-  final WalletConnectKeyService walletKeyService;
-
-  late Web3Wallet _web3Wallet;
-
-  @observable
-  bool isInitialized;
-
-  /// The list of requests from the dapp
-  /// Potential types include, but aren't limited to:
-  /// [SessionProposalEvent], [AuthRequest]
-  @observable
-  ObservableList<PairingInfo> pairings;
-
-  @observable
-  ObservableList<SessionData> sessions;
-
-  @observable
-  ObservableList<StoredCacao> auth;
-
-  Web3WalletServiceBase(
-      this._bottomSheetHandler, this.walletKeyService, this.appStore, this.sharedPreferences)
-      : pairings = ObservableList<PairingInfo>(),
-        sessions = ObservableList<SessionData>(),
-        auth = ObservableList<StoredCacao>(),
-        isInitialized = false;
-
-  @action
-  void create() {
-    // Create the web3wallet client
-    _web3Wallet = Web3Wallet(
-      core: Core(projectId: secrets.walletConnectProjectId),
-      metadata: const PairingMetadata(
-        name: 'Cake Wallet',
-        description: 'Cake Wallet',
-        url: 'https://cakewallet.com',
-        icons: ['https://cakewallet.com/assets/image/cake_logo.png'],
-      ),
-    );
-
-    // Setup our accounts
-    List<ChainKeyModel> chainKeys = walletKeyService.getKeys(appStore.wallet!);
-    for (final chainKey in chainKeys) {
-      for (final chainId in chainKey.chains) {
-        _web3Wallet.registerAccount(
-          chainId: chainId,
-          accountAddress: chainKey.publicKey,
-        );
-      }
-    }
-
-    // Setup our listeners
-    log('Created instance of web3wallet');
-    _web3Wallet.core.pairing.onPairingInvalid.subscribe(_onPairingInvalid);
-    _web3Wallet.core.pairing.onPairingCreate.subscribe(_onPairingCreate);
-    _web3Wallet.core.pairing.onPairingDelete.subscribe(_onPairingDelete);
-    _web3Wallet.core.pairing.onPairingExpire.subscribe(_onPairingDelete);
-    _web3Wallet.pairings.onSync.subscribe(_onPairingsSync);
-    _web3Wallet.onSessionProposal.subscribe(_onSessionProposal);
-    _web3Wallet.onSessionProposalError.subscribe(_onSessionProposalError);
-    _web3Wallet.onSessionConnect.subscribe(_onSessionConnect);
-    _web3Wallet.onAuthRequest.subscribe(_onAuthRequest);
-  }
-
-  @action
-  Future<void> init() async {
-    // Await the initialization of the web3wallet
-    log('Intializing web3wallet');
-    if (!isInitialized) {
-      try {
-        await _web3Wallet.init();
-        log('Initialized');
-        isInitialized = true;
-      } catch (e) {
-        log('Experimentallllll: $e');
-        isInitialized = false;
-      }
-    }
-
-    _refreshPairings();
-
-    final newSessions = _web3Wallet.sessions.getAll();
-    sessions.addAll(newSessions);
-
-    final newAuthRequests = _web3Wallet.completeRequests.getAll();
-    auth.addAll(newAuthRequests);
-
-    if (isEVMCompatibleChain(appStore.wallet!.type)) {
-      for (final cId in EVMChainId.values) {
-        EvmChainServiceImpl(
-          reference: cId,
-          appStore: appStore,
-          wcKeyService: walletKeyService,
-          bottomSheetService: _bottomSheetHandler,
-          wallet: _web3Wallet,
-        );
-      }
-    }
-
-    if (appStore.wallet!.type == WalletType.solana) {
-      for (final cId in SolanaChainId.values) {
-        final node = appStore.settingsStore.getCurrentNode(appStore.wallet!.type);
-
-        String formattedUrl;
-        String protocolUsed = node.isSSL ? "https" : "http";
-
-        if (node.uriRaw == 'rpc.ankr.com') {
-          String ankrApiKey = secrets.ankrApiKey;
-
-          formattedUrl = '$protocolUsed://${node.uriRaw}/$ankrApiKey';
-        } else if (node.uriRaw == 'solana-mainnet.core.chainstack.com') {
-          String chainStackApiKey = secrets.chainStackApiKey;
-
-          formattedUrl = '$protocolUsed://${node.uriRaw}/$chainStackApiKey';
-        } else {
-          formattedUrl = '$protocolUsed://${node.uriRaw}';
-        }
-
-        SolanaChainServiceImpl(
-          reference: cId,
-          formattedRPCUrl: formattedUrl,
-          wcKeyService: walletKeyService,
-          bottomSheetService: _bottomSheetHandler,
-          wallet: _web3Wallet,
-          ownerPrivateKey: SolanaPrivateKey.fromSeedHex(solana!.getPrivateKey(appStore.wallet!)),
-        );
-      }
-    }
-  }
-
-  @action
-  FutureOr<void> onDispose() {
-    log('web3wallet dispose');
-    _web3Wallet.core.pairing.onPairingInvalid.unsubscribe(_onPairingInvalid);
-    _web3Wallet.pairings.onSync.unsubscribe(_onPairingsSync);
-    _web3Wallet.onSessionProposal.unsubscribe(_onSessionProposal);
-    _web3Wallet.onSessionProposalError.unsubscribe(_onSessionProposalError);
-    _web3Wallet.onSessionConnect.unsubscribe(_onSessionConnect);
-    _web3Wallet.onAuthRequest.unsubscribe(_onAuthRequest);
-    _web3Wallet.core.pairing.onPairingDelete.unsubscribe(_onPairingDelete);
-    _web3Wallet.core.pairing.onPairingExpire.unsubscribe(_onPairingDelete);
-    isInitialized = false;
-  }
-
-  Web3Wallet getWeb3Wallet() {
-    return _web3Wallet;
-  }
-
-  void _onPairingsSync(StoreSyncEvent? args) {
-    if (args != null) {
-      _refreshPairings();
-    }
-  }
-
-  void _onPairingDelete(PairingEvent? event) {
-    _refreshPairings();
-  }
-
-  Future<void> _onSessionProposalError(SessionProposalErrorEvent? args) async {
-    log(args.toString());
-  }
-
-  void _onSessionProposal(SessionProposalEvent? args) async {
-    if (args != null) {
-      final chaindIdNamespace = getChainNameSpaceAndIdBasedOnWalletType(appStore.wallet!.type);
-      final Widget modalWidget = Web3RequestModal(
-        child: ConnectionRequestWidget(
-          chaindIdNamespace: chaindIdNamespace,
-          wallet: _web3Wallet,
-          sessionProposal: SessionRequestModel(request: args.params),
-        ),
-      );
-      // show the bottom sheet
-      final bool? isApproved = await _bottomSheetHandler.queueBottomSheet(
-        widget: modalWidget,
-      ) as bool?;
-
-      if (isApproved != null && isApproved) {
-        _web3Wallet.approveSession(
-          id: args.id,
-          namespaces: args.params.generatedNamespaces!,
-        );
-      } else {
-        _web3Wallet.rejectSession(
-          id: args.id,
-          reason: Errors.getSdkError(
-            Errors.USER_REJECTED,
-          ),
-        );
-      }
-    }
-  }
-
-  @action
-  void _onPairingInvalid(PairingInvalidEvent? args) {
-    log('Pairing Invalid Event: $args');
-    _bottomSheetHandler.queueBottomSheet(
-      isModalDismissible: true,
-      widget: BottomSheetMessageDisplayWidget(message: '${S.current.pairingInvalidEvent}: $args'),
-    );
-  }
-
-  @action
-  Future<void> pairWithUri(Uri uri) async {
-    try {
-      log('Pairing with URI: $uri');
-      await _web3Wallet.pair(uri: uri);
-    } on WalletConnectError catch (e) {
-      _bottomSheetHandler.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(message: e.message),
-      );
-    } catch (e) {
-      _bottomSheetHandler.queueBottomSheet(
-        isModalDismissible: true,
-        widget: BottomSheetMessageDisplayWidget(message: e.toString()),
-      );
-    }
-  }
-
-  @action
-  void _refreshPairings() {
-    printV('Refreshing pairings');
-    pairings.clear();
-
-    final allPairings = _web3Wallet.pairings.getAll();
-
-    final keyForWallet = getKeyForStoringTopicsForWallet();
-
-    if (keyForWallet.isEmpty) return;
-
-    final currentTopicsForWallet = getPairingTopicsForWallet(keyForWallet);
-
-    final filteredPairings =
-        allPairings.where((pairing) => currentTopicsForWallet.contains(pairing.topic)).toList();
-
-    pairings.addAll(filteredPairings);
-  }
-
-  void _onPairingCreate(PairingEvent? args) {
-    log('Pairing Create Event: $args');
-  }
-
-  @action
-  Future<void> _onSessionConnect(SessionConnect? args) async {
-    if (args != null) {
-      log('Session Connected $args');
-
-      await savePairingTopicToLocalStorage(args.session.pairingTopic);
-
-      sessions.add(args.session);
-
-      _refreshPairings();
-    }
-  }
-
-  @action
-  Future<void> _onAuthRequest(AuthRequest? args) async {
-    if (args != null) {
-      final chaindIdNamespace = getChainNameSpaceAndIdBasedOnWalletType(appStore.wallet!.type);
-      List<ChainKeyModel> chainKeys = walletKeyService.getKeysForChain(appStore.wallet!);
-      // Create the message to be signed
-      final String iss = 'did:pkh:$chaindIdNamespace:${chainKeys.first.publicKey}';
-      final Widget modalWidget = Web3RequestModal(
-        child: ConnectionRequestWidget(
-          chaindIdNamespace: chaindIdNamespace,
-          wallet: _web3Wallet,
-          authRequest: AuthRequestModel(iss: iss, request: args),
-        ),
-      );
-      final bool? isAuthenticated = await _bottomSheetHandler.queueBottomSheet(
-        widget: modalWidget,
-      ) as bool?;
-
-      if (isAuthenticated != null && isAuthenticated) {
-        final String message = _web3Wallet.formatAuthMessage(
-          iss: iss,
-          cacaoPayload: CacaoRequestPayload.fromPayloadParams(
-            args.payloadParams,
-          ),
-        );
-
-        final String sig = EthSigUtil.signPersonalMessage(
-          message: Uint8List.fromList(message.codeUnits),
-          privateKey: chainKeys.first.privateKey,
-        );
-
-        await _web3Wallet.respondAuthRequest(
-          id: args.id,
-          iss: iss,
-          signature: CacaoSignature(
-            t: CacaoSignature.EIP191,
-            s: sig,
-          ),
-        );
-      } else {
-        await _web3Wallet.respondAuthRequest(
-          id: args.id,
-          iss: iss,
-          error: Errors.getSdkError(
-            Errors.USER_REJECTED_AUTH,
-          ),
-        );
-      }
-    }
-  }
-
-  @action
-  Future<void> disconnectSession(String topic) async {
-    final session = sessions.firstWhere((element) => element.pairingTopic == topic);
-
-    await _web3Wallet.core.pairing.disconnect(topic: topic);
-    await _web3Wallet.disconnectSession(
-        topic: session.topic, reason: Errors.getSdkError(Errors.USER_DISCONNECTED));
-  }
-
-  @action
-  List<SessionData> getSessionsForPairingInfo(PairingInfo pairing) {
-    return sessions.where((element) => element.pairingTopic == pairing.topic).toList();
-  }
-
-  String getKeyForStoringTopicsForWallet() {
-    List<ChainKeyModel> chainKeys = walletKeyService.getKeysForChain(appStore.wallet!);
-
-    if (chainKeys.isEmpty) {
-      return '';
-    }
-
-    final keyForPairingTopic =
-        PreferencesKey.walletConnectPairingTopicsListForWallet(chainKeys.first.publicKey);
-
-    return keyForPairingTopic;
-  }
-
-  List<String> getPairingTopicsForWallet(String key) {
-    // Get the JSON-encoded string from shared preferences
-    final jsonString = sharedPreferences.getString(key);
-
-    // If the string is null, return an empty list
-    if (jsonString == null) {
-      return [];
-    }
-
-    // Decode the JSON string to a list of strings
-    final List<dynamic> jsonList = jsonDecode(jsonString) as List<dynamic>;
-
-    // Cast each item to a string
-    return jsonList.map((item) => item as String).toList();
-  }
-
-  Future<void> savePairingTopicToLocalStorage(String pairingTopic) async {
-    // Get key specific to the current wallet
-    final key = getKeyForStoringTopicsForWallet();
-
-    if (key.isEmpty) return;
-
-    // Get all pairing topics attached to this key
-    final pairingTopicsForWallet = getPairingTopicsForWallet(key);
-
-    printV(pairingTopicsForWallet);
-
-    bool isPairingTopicAlreadySaved = pairingTopicsForWallet.contains(pairingTopic);
-    printV('Is Pairing Topic Saved: $isPairingTopicAlreadySaved');
-
-    if (!isPairingTopicAlreadySaved) {
-      // Update the list with the most recent pairing topic
-      pairingTopicsForWallet.add(pairingTopic);
-
-      // Convert the list of updated pairing topics to a JSON-encoded string
-      final jsonString = jsonEncode(pairingTopicsForWallet);
-
-      // Save the encoded string to shared preferences
-      await sharedPreferences.setString(key, jsonString);
-    }
-  }
-}