From aeb253ff79801475e5041f1a0370f0c8b57d662b Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@comunes.org>
Date: Thu, 8 Jun 2023 23:11:58 +0200
Subject: [PATCH] pubkey checksum
---
lib/data/models/contact_cubit.dart | 11 +++++++--
lib/g1/api.dart | 23 +++++++++++++------
lib/g1/g1_helper.dart | 2 ++
lib/shared_prefs.dart | 4 +++-
.../fourth_screen/transaction_page.dart | 9 ++++----
5 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/lib/data/models/contact_cubit.dart b/lib/data/models/contact_cubit.dart
index d00de6e8..2746e658 100644
--- a/lib/data/models/contact_cubit.dart
+++ b/lib/data/models/contact_cubit.dart
@@ -1,6 +1,7 @@
import 'package:flutter/foundation.dart';
import 'package:hydrated_bloc/hydrated_bloc.dart';
+import '../../g1/g1_helper.dart';
import '../../ui/ui_helpers.dart';
import 'contact.dart';
import 'contact_state.dart';
@@ -66,14 +67,17 @@ class ContactsCubit extends HydratedCubit<ContactsState> {
}
void updateContact(Contact contact) {
+ final String pubKey = extractPublicKey(contact.pubKey);
final List<Contact> contacts = state.contacts.map((Contact c) {
- if (c.pubKey == contact.pubKey) {
+ if (c.pubKey == contact.pubKey ||
+ c.pubKey == extractPublicKey(contact.pubKey)) {
return contact;
}
return c;
}).toList();
final List<Contact> fcontacts = state.filteredContacts.map((Contact c) {
- if (c.pubKey == contact.pubKey) {
+ if (c.pubKey == contact.pubKey ||
+ c.pubKey == extractPublicKey(contact.pubKey)) {
return contact;
}
return c;
@@ -101,6 +105,9 @@ class ContactsCubit extends HydratedCubit<ContactsState> {
if (c.pubKey.contains(query)) {
return true;
}
+ if (c.pubKey.contains(extractPublicKey(query))) {
+ return true;
+ }
if (c.nick != null &&
containsLowerOrUpper(c.nick!, query, queryLower, queryUpper)) {
return true;
diff --git a/lib/g1/api.dart b/lib/g1/api.dart
index 393b0e4c..77dd1545 100644
--- a/lib/g1/api.dart
+++ b/lib/g1/api.dart
@@ -62,8 +62,9 @@ Future<Response> searchCPlusUser(String searchTerm) async {
return response;
}
-Future<Contact> getProfile(String pubKey,
+Future<Contact> getProfile(String pubKeyRaw,
[bool onlyCPlusProfile = false]) async {
+ final String pubKey = extractPublicKey(pubKeyRaw);
try {
final Response cPlusResponse = await requestCPlusWithRetry(
'/user/profile/$pubKey',
@@ -103,7 +104,11 @@ Not found sample:
"found": false
}
*/
-Future<List<Contact>> searchWot(String searchTerm) async {
+Future<List<Contact>> searchWot(String searchTermRaw) async {
+ // If pubkey, remove checksum
+ final String searchTerm = validateKey(searchTermRaw)
+ ? extractPublicKey(searchTermRaw)
+ : searchTermRaw;
final Response response = await requestDuniterWithRetry(
'/wot/lookup/$searchTerm',
retryWith404: false);
@@ -554,7 +559,7 @@ Future<PayResult> pay(
'Trying $nodeUrl to send $amount to $to with comment ${comment ?? ''}');
final String response = await gva.pay(
- recipient: to,
+ recipient: extractPublicKey(to),
amount: amount,
comment: comment ?? '',
cesiumSeed: wallet.seed,
@@ -616,20 +621,24 @@ String proxyfyNode(String nodeUrl) {
return url;
}
-Future<Tuple2<Map<String, dynamic>?, Node>> gvaHistoryAndBalance(String pubKey,
- [int? pageSize, String? cursor]) async {
+Future<Tuple2<Map<String, dynamic>?, Node>> gvaHistoryAndBalance(
+ String pubKeyRaw,
+ [int? pageSize,
+ String? cursor]) async {
logger('Get tx history (page size: $pageSize: cursor $cursor)');
+ final String pubKey = extractPublicKey(pubKeyRaw);
return gvaFunctionWrapper<Map<String, dynamic>>(
pubKey, (Gva gva) => gva.history(pubKey, pageSize, cursor));
}
Future<Tuple2<double?, Node>> gvaBalance(String pubKey) async {
- return gvaFunctionWrapper<double>(pubKey, (Gva gva) => gva.balance(pubKey));
+ return gvaFunctionWrapper<double>(
+ extractPublicKey(pubKey), (Gva gva) => gva.balance(pubKey));
}
Future<Tuple2<String?, Node>> gvaNick(String pubKey) async {
return gvaFunctionWrapper<String>(
- pubKey, (Gva gva) => gva.getUsername(pubKey));
+ pubKey, (Gva gva) => gva.getUsername(extractPublicKey(pubKey)));
}
Future<Tuple2<T?, Node>> gvaFunctionWrapper<T>(
diff --git a/lib/g1/g1_helper.dart b/lib/g1/g1_helper.dart
index c171f728..cc2fd0a5 100644
--- a/lib/g1/g1_helper.dart
+++ b/lib/g1/g1_helper.dart
@@ -247,3 +247,5 @@ int toCG1(double amount) => (amount.toPrecision(2) * 100).toInt();
extension Ex on double {
double toPrecision(int n) => double.parse(toStringAsFixed(n));
}
+
+String extractPublicKey(String key) => key.split(':')[0];
diff --git a/lib/shared_prefs.dart b/lib/shared_prefs.dart
index 6eb8301b..5bfa7ef0 100644
--- a/lib/shared_prefs.dart
+++ b/lib/shared_prefs.dart
@@ -108,7 +108,9 @@ class SharedPreferencesHelper {
// Get the public key from the specified index (default to first wallet)
String getPubKey({int index = 0}) {
final CesiumCard card = cesiumCards[index];
- return card.pubKey;
+ final String pubKey = card.pubKey;
+ final String checksum = pkChecksum(pubKey);
+ return '$pubKey:$checksum';
}
List<CesiumCard> get cards => cesiumCards;
diff --git a/lib/ui/widgets/fourth_screen/transaction_page.dart b/lib/ui/widgets/fourth_screen/transaction_page.dart
index 62f2cfc5..6e1cea3b 100644
--- a/lib/ui/widgets/fourth_screen/transaction_page.dart
+++ b/lib/ui/widgets/fourth_screen/transaction_page.dart
@@ -88,10 +88,11 @@ class _TransactionsAndBalanceWidgetState
SnackBar(
content: Text(tr('fetch_tx_error')),
action: SnackBarAction(
- label: tr('retry'),
- textColor: Theme.of(context).primaryColor,
- onPressed: () => _pagingController.retryLastFailedRequest(),
- ),
+ label: tr('retry'),
+ textColor: Theme.of(context).primaryColor,
+ onPressed: () =>
+ _refresh() // _pagingController.retryLastFailedRequest(),
+ ),
),
);
}
--
GitLab