Skip to content
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

Jump to bottom

Fixed dependencies #22

Closed
wants to merge 7 commits into from
+226 −255
Closed

Fixed dependencies #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f7994de
fix: _wcClient initialization
alienc0der Jul 20, 2023
34956f7
fix: check relay server connection
alienc0der Jul 21, 2023
3716c07
chore: update walletconnect_flutter_v2 to v2.0.15
alienc0der Jul 27, 2023
9a2359a
fix: onPairingDelete refresh pairingsBloc
alienc0der Jul 28, 2023
019ac6e
chore: update dependencies
alienc0der Jul 29, 2023
977e054
Merge branch 'zenon-network:master' into bigint-support
alienc0der Aug 1, 2023
43e4c28
Merge pull request #45 from alienc0der/bigint-support
alienc0der Aug 1, 2023
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
8 changes: 4 additions & 4 deletions lib/screens/export/export_wallet_password_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ class _ExportWalletPasswordScreenState
initialDirectory =
(await getApplicationDocumentsDirectory()).path;
}
final walletPath = await getSavePath(
final walletPath = await getSaveLocation(
acceptedTypeGroups: <XTypeGroup>[
const XTypeGroup(
label: 'file',
Expand All @@ -161,17 +161,17 @@ class _ExportWalletPasswordScreenState
if (walletPath != null) {
KeyStoreManager keyStoreManager = KeyStoreManager(
walletPath: Directory(
path.dirname(walletPath),
path.dirname(walletPath.path),
),
);
KeyStore keyStore = KeyStore.fromMnemonic(widget.seed);
await keyStoreManager.saveKeyStore(
keyStore,
_passwordController.text,
name: path.basename(walletPath),
name: path.basename(walletPath.path),
);
if (widget.backupWalletFlow) {
_sendSuccessNotification(walletPath);
_sendSuccessNotification(walletPath.path);
} else {
_updateExportedSeedList();
}
Expand Down
189 changes: 103 additions & 86 deletions lib/services/wallet_connect_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class WalletConnectService {

final List<int> _idSessionsApproved = [];

late Web3Wallet _wcClient;
Web3Wallet? _wcClient;
late BuildContext _context;

final List<SessionData> dAppsActiveSessions = [];
Expand All @@ -38,124 +38,135 @@ class WalletConnectService {

Future<void> initClient() async {
if (kWcProjectId.isNotEmpty) {
_wcClient = await Web3Wallet.createInstance(
projectId: kWcProjectId,
metadata: const PairingMetadata(
name: 's y r i u s',
description: 'A wallet for interacting with Zenon Network',
url: 'https://zenon.network',
icons: [
'https://raw.githubusercontent.com/zenon-network/syrius/master/macos/Runner/Assets.xcassets/AppIcon.appiconset/Icon-MacOS-512x512%402x.png'
],
),
).onError((e, stackTrace) {
Logger('WalletConnectService')
.log(Level.SEVERE, 'initClient onError ', e, stackTrace);
if (e != null) {
NotificationUtils.sendNotificationError(
e, 'WalletConnect initialization failed');
}
throw 'WalletConnect init failed';
});
if (_wcClient == null) {
_wcClient = await Web3Wallet.createInstance(
projectId: kWcProjectId,
metadata: const PairingMetadata(
name: 's y r i u s',
description: 'A wallet for interacting with Zenon Network',
url: 'https://zenon.network',
icons: [
'https://raw.githubusercontent.com/zenon-network/syrius/master/macos/Runner/Assets.xcassets/AppIcon.appiconset/Icon-MacOS-512x512%402x.png'
],
),
).onError((e, stackTrace) {
Logger('WalletConnectService')
.log(Level.SEVERE, 'initClient onError ', e, stackTrace);
if (e != null) {
NotificationUtils.sendNotificationError(
e, 'WalletConnect initialization failed');
}
throw 'WalletConnect init failed';
});

for (var pairingInfo in pairings) {
dAppsActiveSessions
.addAll(getSessionsForPairing(pairingInfo.topic).values);
for (var pairingInfo in pairings) {
dAppsActiveSessions
.addAll(getSessionsForPairing(pairingInfo.topic).values);

Logger('WalletConnectService')
.log(Level.INFO, 'active pairings: $pairingInfo');
}
Logger('WalletConnectService')
.log(Level.INFO, 'pairings num: ${pairings.length}');
Logger('WalletConnectService')
.log(Level.INFO, 'active sessions: ${getActiveSessions()}');
_initListeners();
_initialChecks();
} else {
Logger('WalletConnectService')
.log(Level.INFO, 'active pairings: $pairingInfo');
.log(Level.INFO, '_wcClient already initialized');
}
Logger('WalletConnectService')
.log(Level.INFO, 'pairings num: ${pairings.length}');
Logger('WalletConnectService')
.log(Level.INFO, 'active sessions: ${getActiveSessions()}');
_initListeners();
_initialChecks();
} else {
Logger('WalletConnectService').log(Level.INFO, 'kWcProjectId missing');
return;
}
return;
}

Future<PairingInfo> pair(Uri uri) => _wcClient.pair(uri: uri);
Future<PairingInfo> pair(Uri uri) => _wcClient!.pair(uri: uri);

void _initListeners() {
_wcClient.onSessionProposal.subscribe(onSessionProposal);
_wcClient!.onSessionProposal.subscribe(onSessionProposal);

_wcClient.core.relayClient.onRelayClientDisconnect.subscribe((args) {
_wcClient!.core.relayClient.onRelayClientDisconnect.subscribe((args) {
Logger('WalletConnectService').log(
Level.INFO, 'onRelayClientDisconnect triggered', args.toString());
_wcClient.core.relayClient.connect();

if (!_wcClient!.core.relayClient.isConnected) {
_wcClient!.core.relayClient.connect();
Logger('WalletConnectService')
.log(Level.INFO, 'relayClient reconnect', args.toString());
}
});

_wcClient.core.pairing.onPairingCreate.subscribe((args) {
_wcClient!.core.pairing.onPairingCreate.subscribe((args) {
Logger('WalletConnectService')
.log(Level.INFO, 'onPairingCreate triggered', args.toString());
sl.get<WalletConnectPairingsBloc>().refreshResults();
});

_wcClient.core.pairing.onPairingActivate.subscribe((args) {
_wcClient!.core.pairing.onPairingActivate.subscribe((args) {
Logger('WalletConnectService')
.log(Level.INFO, 'onPairingActivate triggered', args.toString());
sl.get<WalletConnectPairingsBloc>().refreshResults();
});

_wcClient.core.pairing.onPairingInvalid.subscribe((args) {
_wcClient!.core.pairing.onPairingInvalid.subscribe((args) {
Logger('WalletConnectService')
.log(Level.INFO, 'onPairingInvalid triggered', args.toString());
});

_wcClient.core.pairing.onPairingPing.subscribe((args) {
_wcClient!.core.pairing.onPairingPing.subscribe((args) {
Logger('WalletConnectService')
.log(Level.INFO, 'onPairingPing triggered', args.toString());
});

_wcClient.core.pairing.onPairingDelete.subscribe((args) {
_wcClient!.core.pairing.onPairingDelete.subscribe((args) {
Logger('WalletConnectService')
.log(Level.INFO, 'onPairingDelete triggered', args.toString());
sl.get<WalletConnectPairingsBloc>().refreshResults();
});

_wcClient.core.pairing.onPairingExpire.subscribe((args) {
_wcClient!.core.pairing.onPairingExpire.subscribe((args) {
Logger('WalletConnectService')
.log(Level.INFO, 'onPairingExpire triggered', args.toString());
});

_wcClient.onSessionPing.subscribe((args) {
_wcClient!.onSessionPing.subscribe((args) {
Logger('WalletConnectService')
.log(Level.INFO, 'onSessionPing triggered', args.toString());
});

_wcClient.onSessionDelete.subscribe((args) {
_wcClient!.onSessionDelete.subscribe((args) {
Logger('WalletConnectService')
.log(Level.INFO, 'onSessionDelete triggered', args.toString());
sl.get<WalletConnectSessionsBloc>().refreshResults();
});

_wcClient.onSessionProposalError.subscribe((args) {
_wcClient!.onSessionProposalError.subscribe((args) {
Logger('WalletConnectService')
.log(Level.INFO, 'onSessionProposalError triggered', args.toString());
sl.get<WalletConnectSessionsBloc>().refreshResults();
});

_wcClient.onSessionConnect.subscribe((args) {
_wcClient!.onSessionConnect.subscribe((args) {
Logger('WalletConnectService')
.log(Level.INFO, 'onSessionConnect triggered', args.toString());
Future.delayed(const Duration(seconds: 3)).then(
(value) => sl.get<WalletConnectSessionsBloc>().refreshResults());
});

_wcClient.onSessionRequest.subscribe((SessionRequestEvent? request) async {
_wcClient!.onSessionRequest.subscribe((SessionRequestEvent? request) async {
Logger('WalletConnectService')
.log(Level.INFO, 'onSessionRequest triggered', request.toString());
});

_wcClient.onAuthRequest.subscribe((args) {
_wcClient!.onAuthRequest.subscribe((args) {
Logger('WalletConnectService')
.log(Level.INFO, 'onAuthRequest triggered', args.toString());
});

_wcClient.registerRequestHandler(
_wcClient!.registerRequestHandler(
chainId: 'zenon:1',
method: 'znn_info',
handler: (topic, params) async {
Expand Down Expand Up @@ -225,12 +236,7 @@ class WalletConnectService {
},
);

_wcClient.onAuthRequest.subscribe((AuthRequest? args) async {
Logger('WalletConnectService')
.log(Level.INFO, 'onAuthRequest triggered', args.toString());
});

_wcClient.registerRequestHandler(
_wcClient!.registerRequestHandler(
chainId: 'zenon:1',
method: 'znn_sign',
handler: (topic, params) async {
Expand Down Expand Up @@ -297,7 +303,7 @@ class WalletConnectService {
},
);

_wcClient.registerRequestHandler(
_wcClient!.registerRequestHandler(
chainId: 'zenon:1',
method: 'znn_send',
handler: (topic, params) async {
Expand Down Expand Up @@ -390,7 +396,7 @@ class WalletConnectService {
);
}

List<PairingInfo> get pairings => _wcClient.pairings.getAll();
List<PairingInfo> get pairings => _wcClient!.pairings.getAll();

Future<ApproveResponse> approveSession(
{required int id, Map<String, Namespace>? namespaces}) async {
Expand All @@ -409,7 +415,7 @@ class WalletConnectService {
events: ['chainIdChange', 'addressChange'],
),
};
return _wcClient.approveSession(
return _wcClient!.approveSession(
id: id,
namespaces: namespaces,
);
Expand All @@ -419,7 +425,7 @@ class WalletConnectService {
required int id,
required WalletConnectError reason,
}) =>
_wcClient.rejectSession(id: id, reason: reason);
_wcClient!.rejectSession(id: id, reason: reason);

String _generateAccount(String address, int chainId) =>
'$kZenonNameSpace:1:$address';
Expand All @@ -433,15 +439,15 @@ class WalletConnectService {
Future<void> activatePairing({
required String topic,
}) =>
_wcClient.core.pairing.activate(
_wcClient!.core.pairing.activate(
topic: topic,
);

Future<void> deactivatePairing({
required String topic,
}) async {
try {
_wcClient.core.pairing.disconnect(topic: topic);
_wcClient!.core.pairing.disconnect(topic: topic);
} on WalletConnectError catch (e) {
// technically look for WalletConnectError 6 : Expired. to consider it a warning
Logger('WalletConnectService')
Expand All @@ -463,7 +469,7 @@ class WalletConnectService {
// }

Future<void> disconnectSession({required String topic}) async =>
_wcClient.disconnectSession(
_wcClient!.disconnectSession(
topic: topic,
reason: Errors.getSdkError(Errors.USER_DISCONNECTED),
);
Expand Down Expand Up @@ -496,7 +502,7 @@ class WalletConnectService {
required String changeName,
required String newValue,
}) =>
_wcClient.emitSessionEvent(
_wcClient!.emitSessionEvent(
topic: sessionTopic,
chainId: 'zenon:1',
event: SessionEventParams(
Expand All @@ -519,10 +525,11 @@ class WalletConnectService {
);
}

Map<String, SessionData> getActiveSessions() => _wcClient.getActiveSessions();
Map<String, SessionData> getActiveSessions() =>
_wcClient!.getActiveSessions();

Map<String, SessionData> getSessionsForPairing(String pairingTopic) =>
_wcClient.getSessionsForPairing(
_wcClient!.getSessionsForPairing(
pairingTopic: pairingTopic,
);

Expand Down Expand Up @@ -586,29 +593,35 @@ class WalletConnectService {
if (actionWasAccepted) {
if (!_idSessionsApproved.contains(event.id)) {
_idSessionsApproved.add(event.id);
ApproveResponse approveResponse = await _wcClient.approveSession(
id: event.id,
namespaces: {
'zenon': Namespace(
accounts: _getWalletAccounts(),
methods: [
'znn_sign',
'znn_info',
'znn_send',
],
events: [
'chainIdChange',
'addressChange',
],
),
},
);

_sendSuccessfullyApprovedSessionNotification(dAppMetadata);
dAppsActiveSessions.add(approveResponse.session);
try {
ApproveResponse approveResponse = await _wcClient!.approveSession(
id: event.id,
namespaces: {
'zenon': Namespace(
accounts: _getWalletAccounts(),
methods: [
'znn_sign',
'znn_info',
'znn_send',
],
events: [
'chainIdChange',
'addressChange',
],
),
},
);
_sendSuccessfullyApprovedSessionNotification(dAppMetadata);
dAppsActiveSessions.add(approveResponse.session);
} catch (e, stackTrace) {
NotificationUtils.sendNotificationError(
e, 'WalletConnect session approval failed');
Logger('WalletConnectService').log(
Level.INFO, 'onSessionProposal approveResponse', e, stackTrace);
}
}
} else {
await _wcClient.rejectSession(
await _wcClient!.rejectSession(
id: event.id,
reason: Errors.getSdkError(
Errors.USER_REJECTED,
Expand All @@ -619,12 +632,16 @@ class WalletConnectService {
}

void _initialChecks() {
final pendingProposals = _wcClient.getPendingSessionProposals();
if (!_wcClient!.core.relayClient.isConnected) {
_wcClient!.core.relayClient.connect();
Logger('WalletConnectService').log(Level.INFO, 'relayClient connect');
}
final pendingProposals = _wcClient!.getPendingSessionProposals();
Logger('WalletConnectService').log(
Level.INFO, 'checkForPendingRequests', pendingProposals.keys.length);
if (pendingProposals.isNotEmpty) {
pendingProposals.forEach((key, value) {
_wcClient.approveSession(id: value.id, namespaces: {
_wcClient!.approveSession(id: value.id, namespaces: {
'zenon': Namespace(
accounts: _getWalletAccounts(),
methods: [
Expand Down
Loading