Skip to content

fix: improve WalletConnect stability and error handling #604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sallymoc wants to merge 1 commit into
base: hotfix/2.3.1
Choose a base branch
from
Open

fix: improve WalletConnect stability and error handling #604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 33 additions & 29 deletions lib/services/wallet_connect_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'dart:async';
import 'package:collection/collection.dart';
import 'package:qubic_wallet/config.dart';
import 'package:qubic_wallet/di.dart';
import 'package:qubic_wallet/dtos/qubic_asset_dto.dart';
Expand All @@ -19,7 +20,6 @@ import 'package:reown_walletkit/reown_walletkit.dart';
class WalletConnectService {
final ApplicationStore appStore = getIt<ApplicationStore>();
final SettingsStore settingsStore = getIt<SettingsStore>();
bool isReady = false;

PairingInfo? pairingInfo;

Expand Down Expand Up @@ -153,6 +153,14 @@ class WalletConnectService {

//---------------------------------- Triggers ----------------------------------

/// Checks if the session has subscribed to a specific event.
/// Returns false if namespaces are empty or the event is not found.
bool _sessionHasEvent(SessionData sessionData, String eventName) {
final events =
sessionData.namespaces.entries.firstOrNull?.value.events ?? [];
return events.contains(eventName);
}

//Triggers an amountChanged event for all the wallet connect clients who have subscribed to it
//@param changedIDs Map<String, int> with the publicId (key) and number of $Qubic (int)
void triggerAmountChangedEvent(Map<String, int> changedIDs) {
Expand All @@ -162,8 +170,7 @@ class WalletConnectService {
web3Wallet!
.getActiveSessions()
.forEach(((String session, SessionData sessionData) {
if (sessionData.namespaces.entries.first.value.events
.contains(WcEvents.amountChanged)) {
if (_sessionHasEvent(sessionData, WcEvents.amountChanged)) {
List<dynamic> data = [];
for (var id in changedIDs.entries) {
final account = appStore.findAccountById(id.key);
Expand Down Expand Up @@ -196,8 +203,7 @@ class WalletConnectService {
web3Wallet!
.getActiveSessions()
.forEach(((String session, SessionData sessionData) {
if (sessionData.namespaces.entries.first.value.events
.contains(WcEvents.assetAmountChanged)) {
if (_sessionHasEvent(sessionData, WcEvents.assetAmountChanged)) {
List<dynamic> data = [];
for (var id in changedIDs.entries) {
final account = appStore.findAccountById(id.key);
Expand Down Expand Up @@ -227,8 +233,7 @@ class WalletConnectService {
web3Wallet!
.getActiveSessions()
.forEach(((String session, SessionData sessionData) {
if (sessionData.namespaces.entries.first.value.events
.contains(WcEvents.accountsChanged)) {
if (_sessionHasEvent(sessionData, WcEvents.accountsChanged)) {
List<dynamic> data = _buildAccountsData(includeAssets: false);

web3Wallet!.emitSessionEvent(
Expand Down Expand Up @@ -294,21 +299,9 @@ class WalletConnectService {
appLogger.d("Session request: $args");
});

web3Wallet!.core.relayClient.onRelayClientDisconnect.subscribe((args) {
web3Wallet!.onSessionConnect.unsubscribeAll();
web3Wallet!.onSessionDelete.unsubscribeAll();
web3Wallet!.onSessionExpire.unsubscribeAll();
web3Wallet!.onProposalExpire.unsubscribeAll();
web3Wallet!.onSessionProposal.unsubscribeAll();
web3Wallet!.onSessionProposalError.unsubscribeAll();
web3Wallet!.onSessionAuthRequest.unsubscribeAll();
web3Wallet!.onSessionPing.unsubscribeAll();
web3Wallet!.onSessionRequest.unsubscribeAll();
web3Wallet!.core.relayClient.onRelayClientDisconnect.unsubscribeAll();

web3Wallet = null;
initialize();
});
// Note: We intentionally don't subscribe to onRelayClientDisconnect.
// The SDK handles reconnection internally. Subscribing and destroying
// the instance would fight the SDK's built-in reconnection logic.

//Event emitter registrations
web3Wallet!.registerEventEmitter(
Expand Down Expand Up @@ -360,7 +353,9 @@ class WalletConnectService {
late RequestHandleTransactionEvent event;

if (sendQubicHandler == null) {
throw "sendQubicHandler is not set";
throw const JsonRpcError(
code: WcErrors.qwUnexpectedError,
message: "sendQubicHandler is not set");
}
try {
event = RequestHandleTransactionEvent.fromMap(
Expand All @@ -386,7 +381,9 @@ class WalletConnectService {
late RequestHandleTransactionEvent event;

if (sendTransactionHandler == null) {
throw "sendTransactionHandler is not set";
throw const JsonRpcError(
code: WcErrors.qwUnexpectedError,
message: "sendTransactionHandler is not set");
}
try {
event = RequestHandleTransactionEvent.fromMap(
Expand Down Expand Up @@ -414,7 +411,9 @@ class WalletConnectService {
late RequestSignMessageEvent event;

if (signGenericHandler == null) {
throw "signGenericHandler is not set";
throw const JsonRpcError(
code: WcErrors.qwUnexpectedError,
message: "signGenericHandler is not set");
}
try {
event = RequestSignMessageEvent.fromMap(args, topic, sessionId);
Expand All @@ -439,7 +438,9 @@ class WalletConnectService {
late RequestHandleTransactionEvent event;

if (signTransactionHandler == null) {
throw "signTransactionHandler is not set";
throw const JsonRpcError(
code: WcErrors.qwUnexpectedError,
message: "signTransactionHandler is not set");
}
try {
event = RequestHandleTransactionEvent.fromMap(
Expand All @@ -466,7 +467,9 @@ class WalletConnectService {
late RequestSendAssetEvent event;

if (sendAssetHandler == null) {
throw "sendAssetHandler is not set";
throw const JsonRpcError(
code: WcErrors.qwUnexpectedError,
message: "sendAssetHandler is not set");
}
try {
event = RequestSendAssetEvent.fromMap(args, topic, sessionId);
Expand Down Expand Up @@ -509,13 +512,14 @@ class WalletConnectService {

void validateAndSetSession(String topic, RequestEvent event) {
if (event is! PairingMetadataMixin) {
throw "Event does not support pairing metadata";
throw JsonRpcError.invalidParams(
"Event does not support pairing metadata");
}

final activeSessions = web3Wallet!.getActiveSessions();

if (!activeSessions.containsKey(topic)) {
throw "Session not found";
throw JsonRpcError.invalidParams("Session not found");
}

final sessionMetadata = activeSessions[topic]!.peer.metadata;
Expand Down