lib/data/models/app_cubit.dart

@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:hydrated_bloc/hydrated_bloc.dart';
 
 import '../../g1/currency.dart';
+import '../../g1/distance_precompute.dart';
 import 'app_state.dart';
 
 class AppCubit extends HydratedCubit<AppState> {
@@ -12,6 +13,8 @@ class AppCubit extends HydratedCubit<AppState> {
 
   bool get isIntroViewed => state.introViewed;
 
+  bool get isWalletCreatedViewed => state.walletCreatedViewed;
+
   bool get isWarningViewed => state.warningViewed;
 
   bool get isWarningBrowserViewed => state.warningBrowserViewed;
@@ -26,6 +29,10 @@ class AppCubit extends HydratedCubit<AppState> {
     emit(state.copyWith(introViewed: true));
   }
 
+  void walletCreatedViewed() {
+    emit(state.copyWith(walletCreatedViewed: true));
+  }
+
   void warningViewed() {
     emit(state.copyWith(warningViewed: true));
   }
@@ -69,4 +76,16 @@ class AppCubit extends HydratedCubit<AppState> {
   void setUd(double currentUd) {
     emit(state.copyWith(currentUd: currentUd));
   }
+
+  void setV2Mode(bool v2mode) {
+    emit(state.copyWith(v2mode: v2mode));
+  }
+
+  bool get isV2 => state.v2mode;
+
+  void setDistancePreCompute(DistancePrecompute distancePrecompute) {
+    emit(state.copyWith(distancePrecompute: distancePrecompute));
+  }
+
+  DistancePrecompute? get distancePrecompute => state.distancePrecompute;
 }

lib/data/models/app_state.dart

@@ -2,6 +2,7 @@ import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 import '../../g1/currency.dart';
+import '../../g1/distance_precompute.dart';
 import 'is_json_serializable.dart';
 
 part 'app_state.g.dart';
@@ -13,23 +14,31 @@ class AppState extends Equatable implements IsJsonSerializable<AppState> {
       this.warningViewed = false,
       this.warningBrowserViewed = false,
       this.expertMode = false,
+      bool? walletCreatedViewed,
+      this.v2mode = false,
       Currency? currency,
       double? currentUd,
-      Map<String, bool>? tutorials})
+      Map<String, bool>? tutorials,
+      this.distancePrecompute})
       : tutorials = tutorials ?? <String, bool>{},
         currency = currency ?? Currency.G1,
-        currentUd = currentUd ?? 10.68; // as 14/05/2023
+        walletCreatedViewed = walletCreatedViewed ?? introViewed,
+        currentUd = currentUd ?? 11.06;
 
   factory AppState.fromJson(Map<String, dynamic> json) =>
       _$AppStateFromJson(json);
 
   final bool introViewed;
+  final bool walletCreatedViewed;
   final bool warningViewed;
   final bool warningBrowserViewed;
   final bool expertMode;
+  final bool v2mode;
   final Currency currency;
   final double currentUd;
   final Map<String, bool> tutorials;
+  @JsonKey(includeIfNull: false)
+  final DistancePrecompute? distancePrecompute;
 
   AppState copyWith(
       {bool? introViewed,
@@ -38,31 +47,40 @@ class AppState extends Equatable implements IsJsonSerializable<AppState> {
       bool? expertMode,
       Currency? currency,
       double? currentUd,
-      Map<String, bool>? tutorials}) {
+      bool? walletCreatedViewed,
+      bool? v2mode,
+      Map<String, bool>? tutorials,
+      DistancePrecompute? distancePrecompute}) {
     return AppState(
         introViewed: introViewed ?? this.introViewed,
         warningViewed: warningViewed ?? this.warningViewed,
         warningBrowserViewed: warningBrowserViewed ?? this.warningBrowserViewed,
         expertMode: expertMode ?? this.expertMode,
         currency: currency ?? this.currency,
+        walletCreatedViewed: walletCreatedViewed ?? this.walletCreatedViewed,
+        v2mode: v2mode ?? this.v2mode,
         currentUd: currentUd ?? this.currentUd,
-        tutorials: tutorials ?? this.tutorials);
+        tutorials: tutorials ?? this.tutorials,
+        distancePrecompute: distancePrecompute ?? this.distancePrecompute);
   }
 
   @override
-  AppState fromJson(Map<String, dynamic> json) => AppState.fromJson(json);
+  AppState fromJson(Map<String, dynamic> json) => _$AppStateFromJson(json);
 
   @override
   Map<String, dynamic> toJson() => _$AppStateToJson(this);
 
   @override
-  List<Object?> get props => <Object>[
+  List<Object?> get props => <Object?>[
         introViewed,
         warningViewed,
         expertMode,
         warningBrowserViewed,
+        walletCreatedViewed,
         tutorials,
         currency,
-        currentUd
+        currentUd,
+        v2mode,
+        distancePrecompute
       ];
 }

lib/data/models/app_state.g.dart

@@ -11,21 +11,31 @@ AppState _$AppStateFromJson(Map<String, dynamic> json) => AppState(
       warningViewed: json['warningViewed'] as bool? ?? false,
       warningBrowserViewed: json['warningBrowserViewed'] as bool? ?? false,
       expertMode: json['expertMode'] as bool? ?? false,
+      walletCreatedViewed: json['walletCreatedViewed'] as bool?,
+      v2mode: json['v2mode'] as bool? ?? false,
       currency: $enumDecodeNullable(_$CurrencyEnumMap, json['currency']),
       currentUd: (json['currentUd'] as num?)?.toDouble(),
       tutorials: (json['tutorials'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(k, e as bool),
       ),
+      distancePrecompute: json['distancePrecompute'] == null
+          ? null
+          : DistancePrecompute.fromJson(
+              json['distancePrecompute'] as Map<String, dynamic>),
     );
 
 Map<String, dynamic> _$AppStateToJson(AppState instance) => <String, dynamic>{
       'introViewed': instance.introViewed,
+      'walletCreatedViewed': instance.walletCreatedViewed,
       'warningViewed': instance.warningViewed,
       'warningBrowserViewed': instance.warningBrowserViewed,
       'expertMode': instance.expertMode,
+      'v2mode': instance.v2mode,
       'currency': _$CurrencyEnumMap[instance.currency]!,
       'currentUd': instance.currentUd,
       'tutorials': instance.tutorials,
+      if (instance.distancePrecompute case final value?)
+        'distancePrecompute': value,
     };
 
 const _$CurrencyEnumMap = {

lib/data/models/auth_data.dart

+import 'package:durt/durt.dart';
+import 'package:polkadart_keyring/polkadart_keyring.dart';
+
+class AuthDataV1 {
+  AuthDataV1(this.password, this.salt);
+
+  String password;
+  String salt;
+}
+
+class AuthDataV2 {
+  AuthDataV2(this.mnemonic, this.meta);
+
+  String mnemonic;
+  String meta;
+}
+
+class AuthData {
+  AuthData({this.v1, this.v2});
+
+  AuthDataV1? v1;
+  AuthDataV2? v2;
+}
+
+Future<KeyPair> createPair(AuthData data, Keyring keyring) async {
+  if (data.v1 != null) {
+    final CesiumWallet wallet = CesiumWallet(data.v1!.salt, data.v1!.password);
+    final KeyPair keyPair = KeyPair.ed25519.fromSeed(wallet.seed);
+    return keyPair;
+  } else if (data.v2 != null) {
+    final KeyPair keyPair = await keyring.fromUri(data.v2!.mnemonic,
+        password: data.v2!.meta, keyPairType: KeyPairType.sr25519);
+    return keyPair;
+  } else {
+    throw Exception('Data format not recognized');
+  }
+}

lib/data/models/cert.dart

+import 'package:copy_with_extension/copy_with_extension.dart';
+import 'package:json_annotation/json_annotation.dart';
+
+import 'contact.dart';
+
+part 'cert.g.dart';
+
+@CopyWith()
+@JsonSerializable()
+class Cert {
+  Cert({
+    required this.id,
+    required this.issuerId,
+    required this.receiverId,
+    required this.createdOn,
+    required this.expireOn,
+    required this.isActive,
+    required this.updatedOn,
+  });
+
+  factory Cert.fromJson(Map<String, dynamic> json) => _$CertFromJson(json);
+
+  final String id;
+
+  final Contact issuerId;
+  final Contact receiverId;
+  final int createdOn;
+  final int expireOn;
+  final bool isActive;
+  final int updatedOn;
+
+  Map<String, dynamic> toJson() => _$CertToJson(this);
+}

lib/data/models/cert.g.dart

+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'cert.dart';
+
+// **************************************************************************
+// CopyWithGenerator
+// **************************************************************************
+
+abstract class _$CertCWProxy {
+  Cert id(String id);
+
+  Cert issuerId(Contact issuerId);
+
+  Cert receiverId(Contact receiverId);
+
+  Cert createdOn(int createdOn);
+
+  Cert expireOn(int expireOn);
+
+  Cert isActive(bool isActive);
+
+  Cert updatedOn(int updatedOn);
+
+  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `Cert(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
+  ///
+  /// Usage
+  /// ```dart
+  /// Cert(...).copyWith(id: 12, name: "My name")
+  /// ````
+  Cert call({
+    String? id,
+    Contact? issuerId,
+    Contact? receiverId,
+    int? createdOn,
+    int? expireOn,
+    bool? isActive,
+    int? updatedOn,
+  });
+}
+
+/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfCert.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfCert.copyWith.fieldName(...)`
+class _$CertCWProxyImpl implements _$CertCWProxy {
+  const _$CertCWProxyImpl(this._value);
+
+  final Cert _value;
+
+  @override
+  Cert id(String id) => this(id: id);
+
+  @override
+  Cert issuerId(Contact issuerId) => this(issuerId: issuerId);
+
+  @override
+  Cert receiverId(Contact receiverId) => this(receiverId: receiverId);
+
+  @override
+  Cert createdOn(int createdOn) => this(createdOn: createdOn);
+
+  @override
+  Cert expireOn(int expireOn) => this(expireOn: expireOn);
+
+  @override
+  Cert isActive(bool isActive) => this(isActive: isActive);
+
+  @override
+  Cert updatedOn(int updatedOn) => this(updatedOn: updatedOn);
+
+  @override
+
+  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `Cert(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
+  ///
+  /// Usage
+  /// ```dart
+  /// Cert(...).copyWith(id: 12, name: "My name")
+  /// ````
+  Cert call({
+    Object? id = const $CopyWithPlaceholder(),
+    Object? issuerId = const $CopyWithPlaceholder(),
+    Object? receiverId = const $CopyWithPlaceholder(),
+    Object? createdOn = const $CopyWithPlaceholder(),
+    Object? expireOn = const $CopyWithPlaceholder(),
+    Object? isActive = const $CopyWithPlaceholder(),
+    Object? updatedOn = const $CopyWithPlaceholder(),
+  }) {
+    return Cert(
+      id: id == const $CopyWithPlaceholder() || id == null
+          ? _value.id
+          // ignore: cast_nullable_to_non_nullable
+          : id as String,
+      issuerId: issuerId == const $CopyWithPlaceholder() || issuerId == null
+          ? _value.issuerId
+          // ignore: cast_nullable_to_non_nullable
+          : issuerId as Contact,
+      receiverId:
+          receiverId == const $CopyWithPlaceholder() || receiverId == null
+              ? _value.receiverId
+              // ignore: cast_nullable_to_non_nullable
+              : receiverId as Contact,
+      createdOn: createdOn == const $CopyWithPlaceholder() || createdOn == null
+          ? _value.createdOn
+          // ignore: cast_nullable_to_non_nullable
+          : createdOn as int,
+      expireOn: expireOn == const $CopyWithPlaceholder() || expireOn == null
+          ? _value.expireOn
+          // ignore: cast_nullable_to_non_nullable
+          : expireOn as int,
+      isActive: isActive == const $CopyWithPlaceholder() || isActive == null
+          ? _value.isActive
+          // ignore: cast_nullable_to_non_nullable
+          : isActive as bool,
+      updatedOn: updatedOn == const $CopyWithPlaceholder() || updatedOn == null
+          ? _value.updatedOn
+          // ignore: cast_nullable_to_non_nullable
+          : updatedOn as int,
+    );
+  }
+}
+
+extension $CertCopyWith on Cert {
+  /// Returns a callable class that can be used as follows: `instanceOfCert.copyWith(...)` or like so:`instanceOfCert.copyWith.fieldName(...)`.
+  // ignore: library_private_types_in_public_api
+  _$CertCWProxy get copyWith => _$CertCWProxyImpl(this);
+}
+
+// **************************************************************************
+// JsonSerializableGenerator
+// **************************************************************************
+
+Cert _$CertFromJson(Map<String, dynamic> json) => Cert(
+      id: json['id'] as String,
+      issuerId: Contact.fromJson(json['issuerId'] as Map<String, dynamic>),
+      receiverId: Contact.fromJson(json['receiverId'] as Map<String, dynamic>),
+      createdOn: (json['createdOn'] as num).toInt(),
+      expireOn: (json['expireOn'] as num).toInt(),
+      isActive: json['isActive'] as bool,
+      updatedOn: (json['updatedOn'] as num).toInt(),
+    );
+
+Map<String, dynamic> _$CertToJson(Cert instance) => <String, dynamic>{
+      'id': instance.id,
+      'issuerId': instance.issuerId,
+      'receiverId': instance.receiverId,
+      'createdOn': instance.createdOn,
+      'expireOn': instance.expireOn,
+      'isActive': instance.isActive,
+      'updatedOn': instance.updatedOn,
+    };

lib/data/models/contact.dart

@@ -3,9 +3,13 @@ import 'dart:typed_data';
 import 'package:copy_with_extension/copy_with_extension.dart';
 import 'package:equatable/equatable.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:latlong2/latlong.dart';
 
 import '../../g1/g1_helper.dart';
+import '../../g1/g1_v2_helper.dart';
 import '../../ui/ui_helpers.dart';
+import 'cert.dart';
+import 'identity_status.dart';
 import 'is_json_serializable.dart';
 import 'model_utils.dart';
 
@@ -14,17 +18,200 @@ part 'contact.g.dart';
 @JsonSerializable()
 @CopyWith()
 class Contact extends Equatable implements IsJsonSerializable<Contact> {
-  const Contact({
-    this.nick,
-    required this.pubKey,
-    this.avatar,
-    this.notes,
-    this.name,
-  });
+  Contact(
+      {this.nick,
+      required String pubKey,
+      String? address,
+      this.avatar,
+      this.notes,
+      this.name,
+      this.avatarCid,
+      this.description,
+      this.city,
+      this.dataCid,
+      this.geoLoc,
+      this.indexRequestCid,
+      this.socials,
+      this.time,
+      this.certsIssued,
+      this.certsReceived,
+      this.status,
+      this.isMember,
+      this.createdOn,
+      this.index,
+      this.expireOn})
+      :
+        // ensure that Contact does not have v1 checksums
+        pubKey = extractPublicKey(pubKey),
+        address = address ?? addressFromV1Pubkey(extractPublicKey(pubKey));
+
+  factory Contact.withIdentityFields({
+    String? nick,
+    required String pubKey,
+    String? address,
+    List<Cert>? certsReceived,
+    List<Cert>? certsIssued,
+    IdentityStatus? status,
+    bool? isMember,
+    int? createdOn,
+    int? index,
+    int? expireOn,
+  }) {
+    return Contact(
+      nick: nick,
+      pubKey: pubKey,
+      address: address,
+      certsReceived: certsReceived,
+      certsIssued: certsIssued,
+      status: status,
+      isMember: isMember,
+      createdOn: createdOn,
+      expireOn: expireOn,
+      index: index,
+    );
+  }
 
   factory Contact.fromJson(Map<String, dynamic> json) =>
       _$ContactFromJson(json);
 
+  const Contact._(
+      {this.nick,
+      required this.pubKey,
+      required this.address,
+      this.avatar,
+      this.notes,
+      this.name,
+      this.avatarCid,
+      this.description,
+      this.city,
+      this.dataCid,
+      this.geoLoc,
+      this.indexRequestCid,
+      this.socials,
+      this.time,
+      this.certsIssued,
+      this.certsReceived,
+      this.status,
+      this.isMember,
+      this.createdOn,
+      this.index,
+      this.expireOn});
+
+  factory Contact.withPubKey(
+      {String? nick,
+      required String pubKey,
+      Uint8List? avatar,
+      String? notes,
+      String? name,
+      String? avatarCid,
+      String? description,
+      String? city,
+      String? dataCid,
+      LatLng? geoLoc,
+      String? indexRequestCid,
+      List<Map<String, String>>? socials,
+      List<Cert>? certsReceived,
+      List<Cert>? certsIssued,
+      int? index,
+      DateTime? time}) {
+    return Contact._(
+        nick: nick,
+        pubKey: extractPublicKey(pubKey),
+        address: addressFromV1Pubkey(extractPublicKey(pubKey)),
+        avatar: avatar,
+        notes: notes,
+        name: name,
+        avatarCid: avatarCid,
+        description: description,
+        city: city,
+        dataCid: dataCid,
+        geoLoc: geoLoc,
+        indexRequestCid: indexRequestCid,
+        socials: socials,
+        time: time,
+        certsReceived: certsReceived,
+        certsIssued: certsIssued,
+        index: index);
+  }
+
+  factory Contact.empty() {
+    return const Contact._(
+      name: '',
+      pubKey: '',
+      address: '',
+    );
+  }
+
+  factory Contact.withAddress(
+      {String? nick,
+      required String address,
+      Uint8List? avatar,
+      String? notes,
+      String? name,
+      String? avatarCid,
+      String? description,
+      String? city,
+      String? dataCid,
+      LatLng? geoLoc,
+      String? indexRequestCid,
+      List<Map<String, String>>? socials,
+      DateTime? time,
+      List<Cert>? certsReceived,
+      List<Cert>? certsIssued,
+      IdentityStatus? status,
+      bool? isMember,
+      int? createdOn,
+      int? expireOn,
+      int? index}) {
+    return Contact._(
+        nick: nick,
+        pubKey: v1pubkeyFromAddress(address),
+        address: address,
+        avatar: avatar,
+        notes: notes,
+        name: name,
+        avatarCid: avatarCid,
+        description: description,
+        city: city,
+        dataCid: dataCid,
+        geoLoc: geoLoc,
+        indexRequestCid: indexRequestCid,
+        socials: socials,
+        time: time,
+        certsReceived: certsReceived,
+        certsIssued: certsIssued,
+        status: status,
+        isMember: isMember,
+        createdOn: createdOn,
+        expireOn: expireOn,
+        index: index);
+  }
+
+  final String? nick;
+  final String pubKey;
+  final String address;
+  @JsonKey(fromJson: uIntFromList, toJson: uIntToList)
+  final Uint8List? avatar;
+  final String? notes;
+  final String? name;
+  final String? avatarCid;
+  final String? description;
+  final String? city;
+  final String? dataCid;
+  final LatLng? geoLoc;
+  final String? indexRequestCid;
+  final List<Map<String, String>>? socials;
+  final DateTime? time;
+
+  // identity fields
+  final List<Cert>? certsReceived;
+  final List<Cert>? certsIssued;
+  final IdentityStatus? status;
+  final bool? isMember;
+  final int? createdOn;
+  final int? expireOn;
+  final int? index;
+
   Contact merge(Contact c) {
     return Contact(
       nick: c.nick ?? nick,
@@ -32,15 +219,37 @@ class Contact extends Equatable implements IsJsonSerializable<Contact> {
       avatar: c.avatar ?? avatar,
       notes: c.notes ?? notes,
       name: c.name ?? name,
+      avatarCid: c.avatarCid ?? avatarCid,
+      description: c.description ?? description,
+      city: c.city ?? city,
+      dataCid: c.dataCid ?? dataCid,
+      geoLoc: c.geoLoc ?? geoLoc,
+      indexRequestCid: c.indexRequestCid ?? indexRequestCid,
+      socials: c.socials ?? socials,
+      time: c.time ?? time,
+      certsIssued: _mergeCertLists(c.certsIssued, certsIssued),
+      certsReceived: _mergeCertLists(c.certsReceived, certsReceived),
+      status: c.status ?? status,
+      isMember: c.isMember ?? isMember,
+      createdOn: c.createdOn ?? createdOn,
+      expireOn: c.expireOn ?? expireOn,
+      index: c.index ?? index,
     );
   }
 
-  final String? nick;
-  final String pubKey;
-  @JsonKey(fromJson: uIntFromList, toJson: uIntToList)
-  final Uint8List? avatar;
-  final String? notes;
-  final String? name;
+  List<Cert>? _mergeCertLists(List<Cert>? listA, List<Cert>? listB) {
+    if (listA == null && listB == null) {
+      return null;
+    }
+    if (listA == null) {
+      return listB;
+    }
+    if (listB == null) {
+      return listA;
+    }
+
+    return listB;
+  }
 
   @override
   List<Object?> get props => <dynamic>[
@@ -50,8 +259,26 @@ class Contact extends Equatable implements IsJsonSerializable<Contact> {
         avatar,
         notes,
         name,
+        address,
+        avatarCid,
+        description,
+        city,
+        dataCid,
+        geoLoc,
+        indexRequestCid,
+        socials,
+        time,
+        certsIssued,
+        certsReceived,
+        certsIssued,
+        status,
+        isMember,
+        createdOn,
+        expireOn,
+        index
       ];
 
+  // Only avatar binary
   bool get hasAvatar => avatar != null;
 
   @override
@@ -70,24 +297,38 @@ class Contact extends Equatable implements IsJsonSerializable<Contact> {
   }
 
   String get title => name != null && nick != null
-      ? name != nick
+      ? name != nick && name!.toLowerCase() != nick!.toLowerCase()
           ? '$name ($nick)'
           : name! // avoid "nick (nick)" users
       : nick ?? name ?? humanizePubKey(pubKey);
 
+  String get titleWithoutNick => name ?? humanizePubKey(pubKey);
+
   String? get subtitle =>
       (nick != null || name != null) ? humanizePubKey(pubKey) : null;
 
+  String? get subtitleV2 =>
+      (nick != null || name != null) ? humanizeAddress(address) : null;
+
   Contact cloneWithoutAvatar() {
     return Contact(
-      nick: nick,
-      pubKey: pubKey,
-      // avatar: null,
-      notes: notes,
-      name: name,
-    );
+        nick: nick,
+        pubKey: pubKey,
+        // avatar: null,
+        notes: notes,
+        name: name,
+        avatarCid: avatarCid,
+        description: description,
+        city: city,
+        dataCid: dataCid,
+        geoLoc: geoLoc,
+        indexRequestCid: indexRequestCid,
+        socials: socials,
+        time: time);
   }
 
   bool keyEqual(Contact other) =>
       extractPublicKey(pubKey) == extractPublicKey(other.pubKey);
+
+  bool get createdOnV2 => createdOn != null && createdOn! > 0;
 }

lib/data/models/contact.g.dart

@@ -11,12 +11,44 @@ abstract class _$ContactCWProxy {
 
   Contact pubKey(String pubKey);
 
+  Contact address(String? address);
+
   Contact avatar(Uint8List? avatar);
 
   Contact notes(String? notes);
 
   Contact name(String? name);
 
+  Contact avatarCid(String? avatarCid);
+
+  Contact description(String? description);
+
+  Contact city(String? city);
+
+  Contact dataCid(String? dataCid);
+
+  Contact geoLoc(LatLng? geoLoc);
+
+  Contact indexRequestCid(String? indexRequestCid);
+
+  Contact socials(List<Map<String, String>>? socials);
+
+  Contact time(DateTime? time);
+
+  Contact certsIssued(List<Cert>? certsIssued);
+
+  Contact certsReceived(List<Cert>? certsReceived);
+
+  Contact status(IdentityStatus? status);
+
+  Contact isMember(bool? isMember);
+
+  Contact createdOn(int? createdOn);
+
+  Contact index(int? index);
+
+  Contact expireOn(int? expireOn);
+
   /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `Contact(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
   ///
   /// Usage
@@ -26,9 +58,25 @@ abstract class _$ContactCWProxy {
   Contact call({
     String? nick,
     String? pubKey,
+    String? address,
     Uint8List? avatar,
     String? notes,
     String? name,
+    String? avatarCid,
+    String? description,
+    String? city,
+    String? dataCid,
+    LatLng? geoLoc,
+    String? indexRequestCid,
+    List<Map<String, String>>? socials,
+    DateTime? time,
+    List<Cert>? certsIssued,
+    List<Cert>? certsReceived,
+    IdentityStatus? status,
+    bool? isMember,
+    int? createdOn,
+    int? index,
+    int? expireOn,
   });
 }
 
@@ -44,6 +92,9 @@ class _$ContactCWProxyImpl implements _$ContactCWProxy {
   @override
   Contact pubKey(String pubKey) => this(pubKey: pubKey);
 
+  @override
+  Contact address(String? address) => this(address: address);
+
   @override
   Contact avatar(Uint8List? avatar) => this(avatar: avatar);
 
@@ -53,6 +104,54 @@ class _$ContactCWProxyImpl implements _$ContactCWProxy {
   @override
   Contact name(String? name) => this(name: name);
 
+  @override
+  Contact avatarCid(String? avatarCid) => this(avatarCid: avatarCid);
+
+  @override
+  Contact description(String? description) => this(description: description);
+
+  @override
+  Contact city(String? city) => this(city: city);
+
+  @override
+  Contact dataCid(String? dataCid) => this(dataCid: dataCid);
+
+  @override
+  Contact geoLoc(LatLng? geoLoc) => this(geoLoc: geoLoc);
+
+  @override
+  Contact indexRequestCid(String? indexRequestCid) =>
+      this(indexRequestCid: indexRequestCid);
+
+  @override
+  Contact socials(List<Map<String, String>>? socials) => this(socials: socials);
+
+  @override
+  Contact time(DateTime? time) => this(time: time);
+
+  @override
+  Contact certsIssued(List<Cert>? certsIssued) =>
+      this(certsIssued: certsIssued);
+
+  @override
+  Contact certsReceived(List<Cert>? certsReceived) =>
+      this(certsReceived: certsReceived);
+
+  @override
+  Contact status(IdentityStatus? status) => this(status: status);
+
+  @override
+  Contact isMember(bool? isMember) => this(isMember: isMember);
+
+  @override
+  Contact createdOn(int? createdOn) => this(createdOn: createdOn);
+
+  @override
+  Contact index(int? index) => this(index: index);
+
+  @override
+  Contact expireOn(int? expireOn) => this(expireOn: expireOn);
+
   @override
 
   /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `Contact(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
@@ -64,9 +163,25 @@ class _$ContactCWProxyImpl implements _$ContactCWProxy {
   Contact call({
     Object? nick = const $CopyWithPlaceholder(),
     Object? pubKey = const $CopyWithPlaceholder(),
+    Object? address = const $CopyWithPlaceholder(),
     Object? avatar = const $CopyWithPlaceholder(),
     Object? notes = const $CopyWithPlaceholder(),
     Object? name = const $CopyWithPlaceholder(),
+    Object? avatarCid = const $CopyWithPlaceholder(),
+    Object? description = const $CopyWithPlaceholder(),
+    Object? city = const $CopyWithPlaceholder(),
+    Object? dataCid = const $CopyWithPlaceholder(),
+    Object? geoLoc = const $CopyWithPlaceholder(),
+    Object? indexRequestCid = const $CopyWithPlaceholder(),
+    Object? socials = const $CopyWithPlaceholder(),
+    Object? time = const $CopyWithPlaceholder(),
+    Object? certsIssued = const $CopyWithPlaceholder(),
+    Object? certsReceived = const $CopyWithPlaceholder(),
+    Object? status = const $CopyWithPlaceholder(),
+    Object? isMember = const $CopyWithPlaceholder(),
+    Object? createdOn = const $CopyWithPlaceholder(),
+    Object? index = const $CopyWithPlaceholder(),
+    Object? expireOn = const $CopyWithPlaceholder(),
   }) {
     return Contact(
       nick: nick == const $CopyWithPlaceholder()
@@ -77,6 +192,10 @@ class _$ContactCWProxyImpl implements _$ContactCWProxy {
           ? _value.pubKey
           // ignore: cast_nullable_to_non_nullable
           : pubKey as String,
+      address: address == const $CopyWithPlaceholder()
+          ? _value.address
+          // ignore: cast_nullable_to_non_nullable
+          : address as String?,
       avatar: avatar == const $CopyWithPlaceholder()
           ? _value.avatar
           // ignore: cast_nullable_to_non_nullable
@@ -89,6 +208,66 @@ class _$ContactCWProxyImpl implements _$ContactCWProxy {
           ? _value.name
           // ignore: cast_nullable_to_non_nullable
           : name as String?,
+      avatarCid: avatarCid == const $CopyWithPlaceholder()
+          ? _value.avatarCid
+          // ignore: cast_nullable_to_non_nullable
+          : avatarCid as String?,
+      description: description == const $CopyWithPlaceholder()
+          ? _value.description
+          // ignore: cast_nullable_to_non_nullable
+          : description as String?,
+      city: city == const $CopyWithPlaceholder()
+          ? _value.city
+          // ignore: cast_nullable_to_non_nullable
+          : city as String?,
+      dataCid: dataCid == const $CopyWithPlaceholder()
+          ? _value.dataCid
+          // ignore: cast_nullable_to_non_nullable
+          : dataCid as String?,
+      geoLoc: geoLoc == const $CopyWithPlaceholder()
+          ? _value.geoLoc
+          // ignore: cast_nullable_to_non_nullable
+          : geoLoc as LatLng?,
+      indexRequestCid: indexRequestCid == const $CopyWithPlaceholder()
+          ? _value.indexRequestCid
+          // ignore: cast_nullable_to_non_nullable
+          : indexRequestCid as String?,
+      socials: socials == const $CopyWithPlaceholder()
+          ? _value.socials
+          // ignore: cast_nullable_to_non_nullable
+          : socials as List<Map<String, String>>?,
+      time: time == const $CopyWithPlaceholder()
+          ? _value.time
+          // ignore: cast_nullable_to_non_nullable
+          : time as DateTime?,
+      certsIssued: certsIssued == const $CopyWithPlaceholder()
+          ? _value.certsIssued
+          // ignore: cast_nullable_to_non_nullable
+          : certsIssued as List<Cert>?,
+      certsReceived: certsReceived == const $CopyWithPlaceholder()
+          ? _value.certsReceived
+          // ignore: cast_nullable_to_non_nullable
+          : certsReceived as List<Cert>?,
+      status: status == const $CopyWithPlaceholder()
+          ? _value.status
+          // ignore: cast_nullable_to_non_nullable
+          : status as IdentityStatus?,
+      isMember: isMember == const $CopyWithPlaceholder()
+          ? _value.isMember
+          // ignore: cast_nullable_to_non_nullable
+          : isMember as bool?,
+      createdOn: createdOn == const $CopyWithPlaceholder()
+          ? _value.createdOn
+          // ignore: cast_nullable_to_non_nullable
+          : createdOn as int?,
+      index: index == const $CopyWithPlaceholder()
+          ? _value.index
+          // ignore: cast_nullable_to_non_nullable
+          : index as int?,
+      expireOn: expireOn == const $CopyWithPlaceholder()
+          ? _value.expireOn
+          // ignore: cast_nullable_to_non_nullable
+          : expireOn as int?,
     );
   }
 }
@@ -106,15 +285,65 @@ extension $ContactCopyWith on Contact {
 Contact _$ContactFromJson(Map<String, dynamic> json) => Contact(
       nick: json['nick'] as String?,
       pubKey: json['pubKey'] as String,
+      address: json['address'] as String?,
       avatar: uIntFromList(json['avatar']),
       notes: json['notes'] as String?,
       name: json['name'] as String?,
+      avatarCid: json['avatarCid'] as String?,
+      description: json['description'] as String?,
+      city: json['city'] as String?,
+      dataCid: json['dataCid'] as String?,
+      geoLoc: json['geoLoc'] == null
+          ? null
+          : LatLng.fromJson(json['geoLoc'] as Map<String, dynamic>),
+      indexRequestCid: json['indexRequestCid'] as String?,
+      socials: (json['socials'] as List<dynamic>?)
+          ?.map((e) => Map<String, String>.from(e as Map))
+          .toList(),
+      time:
+          json['time'] == null ? null : DateTime.parse(json['time'] as String),
+      certsIssued: (json['certsIssued'] as List<dynamic>?)
+          ?.map((e) => Cert.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      certsReceived: (json['certsReceived'] as List<dynamic>?)
+          ?.map((e) => Cert.fromJson(e as Map<String, dynamic>))
+          .toList(),
+      status: $enumDecodeNullable(_$IdentityStatusEnumMap, json['status']),
+      isMember: json['isMember'] as bool?,
+      createdOn: (json['createdOn'] as num?)?.toInt(),
+      index: (json['index'] as num?)?.toInt(),
+      expireOn: (json['expireOn'] as num?)?.toInt(),
     );
 
 Map<String, dynamic> _$ContactToJson(Contact instance) => <String, dynamic>{
       'nick': instance.nick,
       'pubKey': instance.pubKey,
+      'address': instance.address,
       'avatar': uIntToList(instance.avatar),
       'notes': instance.notes,
       'name': instance.name,
+      'avatarCid': instance.avatarCid,
+      'description': instance.description,
+      'city': instance.city,
+      'dataCid': instance.dataCid,
+      'geoLoc': instance.geoLoc,
+      'indexRequestCid': instance.indexRequestCid,
+      'socials': instance.socials,
+      'time': instance.time?.toIso8601String(),
+      'certsReceived': instance.certsReceived,
+      'certsIssued': instance.certsIssued,
+      'status': _$IdentityStatusEnumMap[instance.status],
+      'isMember': instance.isMember,
+      'createdOn': instance.createdOn,
+      'expireOn': instance.expireOn,
+      'index': instance.index,
     };
+
+const _$IdentityStatusEnumMap = {
+  IdentityStatus.MEMBER: 'MEMBER',
+  IdentityStatus.NOTMEMBER: 'NOTMEMBER',
+  IdentityStatus.REMOVED: 'REMOVED',
+  IdentityStatus.REVOKED: 'REVOKED',
+  IdentityStatus.UNCONFIRMED: 'UNCONFIRMED',
+  IdentityStatus.UNVALIDATED: 'UNVALIDATED',
+};

lib/data/models/contact_cubit.dart

@@ -146,6 +146,9 @@ class ContactsCubit extends HydratedCubit<ContactsState> {
       if (c.pubKey.contains(query)) {
         return true;
       }
+      if (c.address.contains(query)) {
+        return true;
+      }
       if (c.pubKey.contains(extractPublicKey(query))) {
         return true;
       }

lib/data/models/contact_wot_info.dart

+import 'package:copy_with_extension/copy_with_extension.dart';
+import 'package:equatable/equatable.dart';
+
+import '../../g1/g1_helper.dart';
+import '../../ui/ui_helpers.dart';
+import 'contact.dart';
+
+part 'contact_wot_info.g.dart';
+
+@CopyWith()
+// ignore: must_be_immutable
+class ContactWotInfo extends Equatable {
+  ContactWotInfo({
+    required this.me,
+    required this.you,
+  });
+
+  final Contact me;
+  final Contact you;
+
+  bool? canCert;
+  bool? canCreateIdty;
+  bool? canCalcDistance;
+  bool? canCalcDistanceFor;
+  bool? waitingForCerts;
+  bool? alreadyCert;
+  DateTime? canCertOn;
+  DateTime? expireOn;
+  bool? distRuleOk;
+  double? distRuleRatio;
+  int? currentBlockHeight;
+  bool loaded = false;
+
+  bool get isme => isMe(you, me.pubKey);
+
+  @override
+  String toString() {
+    return 'ContactWotInfo{me: ${humanizeContact('', me)}, you: ${humanizeContact('', you)}, canCert: $canCert, canCreateIdty: $canCreateIdty}, waitingForCert: $waitingForCerts}';
+  }
+
+  @override
+  List<Object?> get props => <Object?>[
+        me,
+        you,
+        canCert,
+        canCreateIdty,
+        canCalcDistance,
+        canCalcDistanceFor,
+        waitingForCerts,
+        alreadyCert,
+        canCertOn,
+        expireOn,
+        distRuleOk,
+        distRuleRatio,
+        currentBlockHeight,
+        loaded
+      ];
+}

lib/data/models/contact_wot_info.g.dart

+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'contact_wot_info.dart';
+
+// **************************************************************************
+// CopyWithGenerator
+// **************************************************************************
+
+abstract class _$ContactWotInfoCWProxy {
+  ContactWotInfo me(Contact me);
+
+  ContactWotInfo you(Contact you);
+
+  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `ContactWotInfo(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
+  ///
+  /// Usage
+  /// ```dart
+  /// ContactWotInfo(...).copyWith(id: 12, name: "My name")
+  /// ````
+  ContactWotInfo call({
+    Contact? me,
+    Contact? you,
+  });
+}
+
+/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfContactWotInfo.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfContactWotInfo.copyWith.fieldName(...)`
+class _$ContactWotInfoCWProxyImpl implements _$ContactWotInfoCWProxy {
+  const _$ContactWotInfoCWProxyImpl(this._value);
+
+  final ContactWotInfo _value;
+
+  @override
+  ContactWotInfo me(Contact me) => this(me: me);
+
+  @override
+  ContactWotInfo you(Contact you) => this(you: you);
+
+  @override
+
+  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `ContactWotInfo(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
+  ///
+  /// Usage
+  /// ```dart
+  /// ContactWotInfo(...).copyWith(id: 12, name: "My name")
+  /// ````
+  ContactWotInfo call({
+    Object? me = const $CopyWithPlaceholder(),
+    Object? you = const $CopyWithPlaceholder(),
+  }) {
+    return ContactWotInfo(
+      me: me == const $CopyWithPlaceholder() || me == null
+          ? _value.me
+          // ignore: cast_nullable_to_non_nullable
+          : me as Contact,
+      you: you == const $CopyWithPlaceholder() || you == null
+          ? _value.you
+          // ignore: cast_nullable_to_non_nullable
+          : you as Contact,
+    );
+  }
+}
+
+extension $ContactWotInfoCopyWith on ContactWotInfo {
+  /// Returns a callable class that can be used as follows: `instanceOfContactWotInfo.copyWith(...)` or like so:`instanceOfContactWotInfo.copyWith.fieldName(...)`.
+  // ignore: library_private_types_in_public_api
+  _$ContactWotInfoCWProxy get copyWith => _$ContactWotInfoCWProxyImpl(this);
+}

lib/data/models/identity_status.dart

+import '../../ui/logger.dart';
+
+enum IdentityStatus {
+  MEMBER,
+  NOTMEMBER,
+  REMOVED,
+  REVOKED,
+  UNCONFIRMED,
+  UNVALIDATED
+}
+
+IdentityStatus? parseIdentityStatus(String? state) {
+  switch (state?.toUpperCase()) {
+    case 'MEMBER':
+      return IdentityStatus.MEMBER;
+    case 'NOTMEMBER':
+      return IdentityStatus.NOTMEMBER;
+    case 'REMOVED':
+      return IdentityStatus.REMOVED;
+    case 'REVOKED':
+      return IdentityStatus.REVOKED;
+    case 'UNCONFIRMED':
+      return IdentityStatus.UNCONFIRMED;
+    case 'UNVALIDATED':
+      return IdentityStatus.UNVALIDATED;
+    default:
+      if (state != null) {
+        log.e('Unknown identity state: $state');
+      }
+      return null;
+  }
+}

lib/data/models/lat_lng_parse.dart

+import 'package:latlong2/latlong.dart';
+
+extension LatLngParsing on LatLng {
+  static LatLng parse(String latLngString) {
+    final String cleanedString =
+        latLngString.replaceAll('(', '').replaceAll(')', '');
+    final List<String> parts = cleanedString.split(',');
+
+    final double latitude = double.parse(parts[0].trim());
+    final double longitude = double.parse(parts[1].trim());
+    return LatLng(latitude, longitude);
+  }
+}

lib/data/models/cesium_card.dart → lib/data/models/legacy_wallet.dart

 import 'package:copy_with_extension/copy_with_extension.dart';
 import 'package:json_annotation/json_annotation.dart';
 
-import 'credit_card_themes.dart';
 import 'is_json_serializable.dart';
+import 'wallet_themes.dart';
 
-part 'cesium_card.g.dart';
+part 'legacy_wallet.g.dart';
 
 @JsonSerializable()
 @CopyWith()
-class CesiumCard implements IsJsonSerializable<CesiumCard> {
-  CesiumCard(
+class LegacyWallet implements IsJsonSerializable<LegacyWallet> {
+  LegacyWallet(
       {required this.seed,
       required this.pubKey,
       required this.name,
       required this.theme});
 
-  factory CesiumCard.fromJson(Map<String, dynamic> json) =>
-      _$CesiumCardFromJson(json);
+  factory LegacyWallet.fromJson(Map<String, dynamic> json) =>
+      _$LegacyWalletFromJson(json);
 
   final String pubKey;
   final String seed;
-  final CreditCardTheme theme;
+  final WalletTheme theme;
   final String name;
 
   @override
-  Map<String, dynamic> toJson() => _$CesiumCardToJson(this);
+  Map<String, dynamic> toJson() => _$LegacyWalletToJson(this);
 
   @override
-  CesiumCard fromJson(Map<String, dynamic> json) {
-    return CesiumCard.fromJson(json);
+  LegacyWallet fromJson(Map<String, dynamic> json) {
+    return LegacyWallet.fromJson(json);
   }
 }

lib/data/models/cesium_card.g.dart → lib/data/models/legacy_wallet.g.dart

 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'cesium_card.dart';
+part of 'legacy_wallet.dart';
 
 // **************************************************************************
 // CopyWithGenerator
 // **************************************************************************
 
-abstract class _$CesiumCardCWProxy {
-  CesiumCard seed(String seed);
+abstract class _$LegacyWalletCWProxy {
+  LegacyWallet seed(String seed);
 
-  CesiumCard pubKey(String pubKey);
+  LegacyWallet pubKey(String pubKey);
 
-  CesiumCard name(String name);
+  LegacyWallet name(String name);
 
-  CesiumCard theme(CreditCardTheme theme);
+  LegacyWallet theme(WalletTheme theme);
 
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `CesiumCard(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
+  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LegacyWallet(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
   ///
   /// Usage
   /// ```dart
-  /// CesiumCard(...).copyWith(id: 12, name: "My name")
+  /// LegacyWallet(...).copyWith(id: 12, name: "My name")
   /// ````
-  CesiumCard call({
+  LegacyWallet call({
     String? seed,
     String? pubKey,
     String? name,
-    CreditCardTheme? theme,
+    WalletTheme? theme,
   });
 }
 
-/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfCesiumCard.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfCesiumCard.copyWith.fieldName(...)`
-class _$CesiumCardCWProxyImpl implements _$CesiumCardCWProxy {
-  const _$CesiumCardCWProxyImpl(this._value);
+/// Proxy class for `copyWith` functionality. This is a callable class and can be used as follows: `instanceOfLegacyWallet.copyWith(...)`. Additionally contains functions for specific fields e.g. `instanceOfLegacyWallet.copyWith.fieldName(...)`
+class _$LegacyWalletCWProxyImpl implements _$LegacyWalletCWProxy {
+  const _$LegacyWalletCWProxyImpl(this._value);
 
-  final CesiumCard _value;
+  final LegacyWallet _value;
 
   @override
-  CesiumCard seed(String seed) => this(seed: seed);
+  LegacyWallet seed(String seed) => this(seed: seed);
 
   @override
-  CesiumCard pubKey(String pubKey) => this(pubKey: pubKey);
+  LegacyWallet pubKey(String pubKey) => this(pubKey: pubKey);
 
   @override
-  CesiumCard name(String name) => this(name: name);
+  LegacyWallet name(String name) => this(name: name);
 
   @override
-  CesiumCard theme(CreditCardTheme theme) => this(theme: theme);
+  LegacyWallet theme(WalletTheme theme) => this(theme: theme);
 
   @override
 
-  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `CesiumCard(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
+  /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `LegacyWallet(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
   ///
   /// Usage
   /// ```dart
-  /// CesiumCard(...).copyWith(id: 12, name: "My name")
+  /// LegacyWallet(...).copyWith(id: 12, name: "My name")
   /// ````
-  CesiumCard call({
+  LegacyWallet call({
     Object? seed = const $CopyWithPlaceholder(),
     Object? pubKey = const $CopyWithPlaceholder(),
     Object? name = const $CopyWithPlaceholder(),
     Object? theme = const $CopyWithPlaceholder(),
   }) {
-    return CesiumCard(
+    return LegacyWallet(
       seed: seed == const $CopyWithPlaceholder() || seed == null
           ? _value.seed
           // ignore: cast_nullable_to_non_nullable
@@ -77,29 +77,29 @@ class _$CesiumCardCWProxyImpl implements _$CesiumCardCWProxy {
       theme: theme == const $CopyWithPlaceholder() || theme == null
           ? _value.theme
           // ignore: cast_nullable_to_non_nullable
-          : theme as CreditCardTheme,
+          : theme as WalletTheme,
     );
   }
 }
 
-extension $CesiumCardCopyWith on CesiumCard {
-  /// Returns a callable class that can be used as follows: `instanceOfCesiumCard.copyWith(...)` or like so:`instanceOfCesiumCard.copyWith.fieldName(...)`.
+extension $LegacyWalletCopyWith on LegacyWallet {
+  /// Returns a callable class that can be used as follows: `instanceOfLegacyWallet.copyWith(...)` or like so:`instanceOfLegacyWallet.copyWith.fieldName(...)`.
   // ignore: library_private_types_in_public_api
-  _$CesiumCardCWProxy get copyWith => _$CesiumCardCWProxyImpl(this);
+  _$LegacyWalletCWProxy get copyWith => _$LegacyWalletCWProxyImpl(this);
 }
 
 // **************************************************************************
 // JsonSerializableGenerator
 // **************************************************************************
 
-CesiumCard _$CesiumCardFromJson(Map<String, dynamic> json) => CesiumCard(
+LegacyWallet _$LegacyWalletFromJson(Map<String, dynamic> json) => LegacyWallet(
       seed: json['seed'] as String,
       pubKey: json['pubKey'] as String,
       name: json['name'] as String,
-      theme: CreditCardTheme.fromJson(json['theme'] as Map<String, dynamic>),
+      theme: WalletTheme.fromJson(json['theme'] as Map<String, dynamic>),
     );
 
-Map<String, dynamic> _$CesiumCardToJson(CesiumCard instance) =>
+Map<String, dynamic> _$LegacyWalletToJson(LegacyWallet instance) =>
     <String, dynamic>{
       'pubKey': instance.pubKey,
       'seed': instance.seed,

lib/data/models/multi_wallet_transaction_cubit.dart

 import 'dart:collection';
+import 'dart:io';
 
 import 'package:flutter/foundation.dart';
+import 'package:get_it/get_it.dart';
 import 'package:hydrated_bloc/hydrated_bloc.dart';
 import 'package:tuple/tuple.dart';
 
 import '../../g1/api.dart';
 import '../../g1/currency.dart';
 import '../../g1/g1_helper.dart';
-import '../../g1/transaction_parser.dart';
 import '../../shared_prefs_helper.dart';
 import '../../ui/logger.dart';
 import '../../ui/notification_controller.dart';
@@ -52,6 +53,16 @@ class MultiWalletTransactionCubit
     _emitState(key, newState);
   }
 
+  @override
+  // ignore: must_call_super
+  Future<void> close() {
+    return Future<void>.value();
+  }
+
+  Future<void> closeCubit() async {
+    await super.close();
+  }
+
   void _emitState(String keyRaw, TransactionState newState) {
     final String key = extractPublicKey(keyRaw);
     final Map<String, TransactionState> newStates =
@@ -116,28 +127,39 @@ class MultiWalletTransactionCubit
     _emitState(key, newState);
   }
 
-  List<Transaction> get transactions => currentWalletState().transactions;
+  List<Transaction> transactions(String? pubKey) =>
+      currentWalletState(pubKey).transactions;
 
-  TransactionState currentWalletState() => _getStateOfWallet(_defKey(null));
+  TransactionState currentWalletState(String? pubKey) =>
+      _getStateOfWallet(_defKey(pubKey));
 
-  double get balance => currentWalletState().balance;
+  double balance([String? pubKey]) => currentWalletState(pubKey).balance;
 
-  DateTime get lastChecked => currentWalletState().lastChecked;
+  // DateTime get lastChecked => currentWalletState().lastChecked;
 
   Future<List<Transaction>> fetchTransactions(
-      NodeListCubit cubit, AppCubit appCubit,
-      {int retries = 5, int? pageSize, String? cursor, String? pubKey}) async {
+      {int retries = 5,
+      int? pageSize,
+      String? cursor,
+      String? pubKey,
+      bool isExternal = false}) async {
+    final NodeListCubit nodeListCubit = GetIt.instance.get<NodeListCubit>();
+    final AppCubit appCubit = GetIt.instance.get<AppCubit>();
     final bool isCurrentWallet = pubKey != null &&
         (extractPublicKey(pubKey) ==
             extractPublicKey(SharedPreferencesHelper().getPubKey()));
     pubKey = _defKey(pubKey);
+    loggerDev('Fetching transactions for $pubKey in cubit');
     final TransactionState currentState = _getStateOfWallet(pubKey);
     Tuple2<Map<String, dynamic>?, Node> txDataResult;
     bool success = false;
     final bool isG1 = appCubit.currency == Currency.G1;
 
+    final bool isConnected = await ConnectivityWidgetWrapperWrapper.isConnected;
+
     for (int attempt = 0; attempt < retries; attempt++) {
-      txDataResult = await gvaHistoryAndBalance(pubKey, pageSize, cursor);
+      txDataResult = await getHistoryAndBalance(pubKey,
+          pageSize: pageSize, cursor: cursor, isConnected: isConnected);
       final Node node = txDataResult.item2;
       logger(
           'Loading transactions using $node (pageSize: $pageSize, cursor: $cursor) --------------------');
@@ -151,8 +173,9 @@ class MultiWalletTransactionCubit
       }
 
       final Map<String, dynamic> txData = txDataResult.item1!;
+
       final TransactionState newParsedState =
-          await transactionsGvaParser(txData, currentState, pubKey);
+          await transactionsParser(txData, currentState, pubKey);
 
       if (newParsedState.balance < 0) {
         logger('Warning: Negative balance in node ${txDataResult.item2}');
@@ -177,7 +200,12 @@ class MultiWalletTransactionCubit
 
       if (isCurrentWallet) {
         // We only reset if it's the current wallet
-        resetCurrentGvaNode(newState, cubit);
+        resetCurrentGvaNode(newState, nodeListCubit);
+      }
+
+      // Is external, forget notifications
+      if (isExternal || (!kIsWeb && Platform.isLinux)) {
+        return currentModifiedState.transactions;
       }
 
       logger(
@@ -186,7 +214,7 @@ class MultiWalletTransactionCubit
           'Last sent notification: ${currentModifiedState.latestSentNotification.toIso8601String()})}');
 
       logger(
-          '>>>>>>>>>>>>>>>>>>> Transactions: ${currentModifiedState.transactions.length}, wallets ${state.map.length}');
+          '>>>>>>>>>>>>>>>>>>> Transactions: ${currentModifiedState.transactions.length}, balance: ${currentModifiedState.balance} cursor: $cursor page size: $pageSize');
       for (final Transaction tx in currentModifiedState.transactions.reversed) {
         bool stateModified = false;
 
@@ -297,6 +325,12 @@ class MultiWalletTransactionCubit
         pendingMap[genTxKey(t)] = t;
       }
 
+      // log first pending
+      /*i f (newState.pendingTransactions.isNotEmpty) {
+        log.i(
+            'First pending transaction ${genTxKey(newState.pendingTransactions.first)}');
+      }*/
+
       // Adjust pending transactions in state
       // If waiting: re-add
       // If sent: don't add
@@ -306,11 +340,6 @@ class MultiWalletTransactionCubit
       //    - is old -> mark as failed
       //    - is not old --> re-add
       for (final Transaction pend in newState.pendingTransactions) {
-        /* if (pend.type == TransactionType.waitingNetwork) {
-          // Pending for manual retry
-          newPendingTxs.add(pend);
-          continue;
-        } */
         final Transaction? matchTx = txMap[genTxKey(pend)];
         if (matchTx != null) {
           // Found a match
@@ -353,6 +382,9 @@ class MultiWalletTransactionCubit
         }
       }
 
+      /* if (newState.transactions.isNotEmpty) {
+        log.i('First transaction ${genTxKey(newState.transactions.first)}');
+      }*/
       // Now that we have the pending, lets see the node retrieved txs
       for (final Transaction tx in newState.transactions) {
         if (pendingMap[genTxKey(tx)] != null &&
@@ -427,4 +459,13 @@ class MultiWalletTransactionCubit
       }
     }
   }
+
+  // Clear state of a pubkey (used after visiting a contact page profile)
+  void removeStateForKey(String pubKey) {
+    if (state.map.containsKey(pubKey)) {
+      state.map.remove(pubKey);
+      emit(MultiWalletTransactionState(
+          Map<String, TransactionState>.of(state.map)));
+    }
+  }
 }

lib/data/models/node.g.dart

@@ -8,9 +8,9 @@ part of 'node.dart';
 
 Node _$NodeFromJson(Map<String, dynamic> json) => Node(
       url: json['url'] as String,
-      latency: json['latency'] as int? ?? 99999,
-      errors: json['errors'] as int? ?? 0,
-      currentBlock: json['currentBlock'] as int? ?? 0,
+      latency: (json['latency'] as num?)?.toInt() ?? 99999,
+      errors: (json['errors'] as num?)?.toInt() ?? 0,
+      currentBlock: (json['currentBlock'] as num?)?.toInt() ?? 0,
     );
 
 Map<String, dynamic> _$NodeToJson(Node instance) => <String, dynamic>{

lib/data/models/node_list_cubit.dart

@@ -13,6 +13,17 @@ class NodeListCubit extends HydratedCubit<NodeListState> {
 
   Node? get currentGvaNode => state.currentGvaNode;
 
+  @override
+  // ignore: must_call_super
+  Future<void> close() {
+    // Prevent to close de node list cubit
+    return Future<void>.value();
+  }
+
+  Future<void> closeCubit() async {
+    await super.close();
+  }
+
   void setCurrentGvaNode(Node node) {
     emit(state.copyWith(currentGvaNode: node));
   }
@@ -22,23 +33,38 @@ class NodeListCubit extends HydratedCubit<NodeListState> {
   }
 
   void setDuniterNodes(List<Node> nodes) {
-    emit(state.copyWith(duniterNodes: nodes));
+    emit(state.copyWith(
+        duniterNodes: nodes, duniterNodesLastUpdate: DateTime.now()));
   }
 
   void setDuniterIndexerNodes(List<Node> nodes) {
-    emit(state.copyWith(duniterIndexerNodes: nodes));
+    emit(state.copyWith(
+        duniterIndexerNodes: nodes,
+        duniterIndexerNodesLastUpdate: DateTime.now()));
+  }
+
+  void setDuniterDataNodes(List<Node> nodes) {
+    emit(state.copyWith(
+        duniterDataNodes: nodes, duniterDataNodesLastUpdate: DateTime.now()));
+  }
+
+  void setIpfsGateways(List<Node> nodes) {
+    emit(state.copyWith(
+        ipfsGateways: nodes, ipfsGatewaysLastUpdate: DateTime.now()));
   }
 
   void setCesiumPlusNodes(List<Node> nodes) {
-    emit(state.copyWith(cesiumPlusNodes: nodes));
+    emit(state.copyWith(
+        cesiumPlusNodes: nodes, cesiumPlusNodesLastUpdate: DateTime.now()));
   }
 
   void setGvaNodes(List<Node> nodes) {
-    emit(state.copyWith(gvaNodes: nodes));
+    emit(state.copyWith(gvaNodes: nodes, gvaNodesLastUpdate: DateTime.now()));
   }
 
   void setEndpointNodes(List<Node> nodes) {
-    emit(state.copyWith(endpointNodes: nodes));
+    emit(state.copyWith(
+        endpointNodes: nodes, endpointNodesLastUpdate: DateTime.now()));
   }
 
   List<Node> get duniterNodes => state.duniterNodes;
@@ -51,6 +77,10 @@ class NodeListCubit extends HydratedCubit<NodeListState> {
 
   List<Node> get duniterIndexerNodes => state.duniterIndexerNodes;
 
+  List<Node> get duniterDataNodes => state.duniterDataNodes;
+
+  List<Node> get ipfsGateways => state.ipfsGateways;
+
   @override
   NodeListState? fromJson(Map<String, dynamic> json) =>
       NodeListState.fromJson(json);

lib/data/models/node_list_state.dart

@@ -12,19 +12,30 @@ part 'node_list_state.g.dart';
 @JsonSerializable()
 @CopyWith()
 class NodeListState extends Equatable {
-  NodeListState(
-      {List<Node>? duniterNodes,
-      List<Node>? cesiumPlusNodes,
-      List<Node>? gvaNodes,
-      List<Node>? endpointNodes,
-      List<Node>? duniterIndexerNodes,
-      this.currentGvaNode,
-      bool? isLoading})
-      : duniterNodes = duniterNodes ?? defaultDuniterNodes,
+  NodeListState({
+    List<Node>? duniterNodes,
+    List<Node>? cesiumPlusNodes,
+    List<Node>? gvaNodes,
+    List<Node>? endpointNodes,
+    List<Node>? duniterIndexerNodes,
+    List<Node>? duniterDataNodes,
+    List<Node>? ipfsGateways,
+    this.currentGvaNode,
+    this.duniterNodesLastUpdate,
+    this.cesiumPlusNodesLastUpdate,
+    this.gvaNodesLastUpdate,
+    this.endpointNodesLastUpdate,
+    this.duniterIndexerNodesLastUpdate,
+    this.duniterDataNodesLastUpdate,
+    this.ipfsGatewaysLastUpdate,
+    bool? isLoading,
+  })  : duniterNodes = duniterNodes ?? defaultDuniterNodes,
         cesiumPlusNodes = cesiumPlusNodes ?? defaultCesiumPlusNodes,
         gvaNodes = gvaNodes ?? defaultGvaNodes,
         endpointNodes = endpointNodes ?? defaultEndPointNodes,
         duniterIndexerNodes = duniterIndexerNodes ?? defaultDuniterIndexerNodes,
+        duniterDataNodes = duniterDataNodes ?? defaultDatapodEndpointNodes,
+        ipfsGateways = ipfsGateways ?? defaultIpfsGateways,
         isLoading = isLoading ?? false;
 
   factory NodeListState.fromJson(Map<String, dynamic> json) =>
@@ -40,17 +51,40 @@ class NodeListState extends Equatable {
   final List<Node> endpointNodes;
   @JsonKey(fromJson: _nodesFromJson, toJson: _nodesToJson)
   final List<Node> duniterIndexerNodes;
+  @JsonKey(fromJson: _nodesFromJson, toJson: _nodesToJson)
+  final List<Node> duniterDataNodes;
+  @JsonKey(fromJson: _nodesFromJson, toJson: _nodesToJson)
+  final List<Node> ipfsGateways;
+
+  final DateTime? duniterNodesLastUpdate;
+  final DateTime? cesiumPlusNodesLastUpdate;
+  final DateTime? gvaNodesLastUpdate;
+  final DateTime? endpointNodesLastUpdate;
+  final DateTime? duniterIndexerNodesLastUpdate;
+  final DateTime? duniterDataNodesLastUpdate;
+  final DateTime? ipfsGatewaysLastUpdate;
+
   final bool isLoading;
   @JsonKey(fromJson: _nodeFromJson, toJson: _nodeToJson)
   final Node? currentGvaNode;
 
   @override
-  List<Object?> get props => <Object>[
+  List<Object?> get props => <Object?>[
         duniterNodes,
         cesiumPlusNodes,
         gvaNodes,
         endpointNodes,
         duniterIndexerNodes,
+        duniterDataNodes,
+        ipfsGateways,
+        currentGvaNode,
+        duniterNodesLastUpdate,
+        cesiumPlusNodesLastUpdate,
+        gvaNodesLastUpdate,
+        endpointNodesLastUpdate,
+        duniterIndexerNodesLastUpdate,
+        duniterDataNodesLastUpdate,
+        ipfsGatewaysLastUpdate,
         isLoading
       ];
 

lib/data/models/node_list_state.g.dart

@@ -17,8 +17,28 @@ abstract class _$NodeListStateCWProxy {
 
   NodeListState duniterIndexerNodes(List<Node>? duniterIndexerNodes);
 
+  NodeListState duniterDataNodes(List<Node>? duniterDataNodes);
+
+  NodeListState ipfsGateways(List<Node>? ipfsGateways);
+
   NodeListState currentGvaNode(Node? currentGvaNode);
 
+  NodeListState duniterNodesLastUpdate(DateTime? duniterNodesLastUpdate);
+
+  NodeListState cesiumPlusNodesLastUpdate(DateTime? cesiumPlusNodesLastUpdate);
+
+  NodeListState gvaNodesLastUpdate(DateTime? gvaNodesLastUpdate);
+
+  NodeListState endpointNodesLastUpdate(DateTime? endpointNodesLastUpdate);
+
+  NodeListState duniterIndexerNodesLastUpdate(
+      DateTime? duniterIndexerNodesLastUpdate);
+
+  NodeListState duniterDataNodesLastUpdate(
+      DateTime? duniterDataNodesLastUpdate);
+
+  NodeListState ipfsGatewaysLastUpdate(DateTime? ipfsGatewaysLastUpdate);
+
   NodeListState isLoading(bool? isLoading);
 
   /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `NodeListState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
@@ -33,7 +53,16 @@ abstract class _$NodeListStateCWProxy {
     List<Node>? gvaNodes,
     List<Node>? endpointNodes,
     List<Node>? duniterIndexerNodes,
+    List<Node>? duniterDataNodes,
+    List<Node>? ipfsGateways,
     Node? currentGvaNode,
+    DateTime? duniterNodesLastUpdate,
+    DateTime? cesiumPlusNodesLastUpdate,
+    DateTime? gvaNodesLastUpdate,
+    DateTime? endpointNodesLastUpdate,
+    DateTime? duniterIndexerNodesLastUpdate,
+    DateTime? duniterDataNodesLastUpdate,
+    DateTime? ipfsGatewaysLastUpdate,
     bool? isLoading,
   });
 }
@@ -63,10 +92,49 @@ class _$NodeListStateCWProxyImpl implements _$NodeListStateCWProxy {
   NodeListState duniterIndexerNodes(List<Node>? duniterIndexerNodes) =>
       this(duniterIndexerNodes: duniterIndexerNodes);
 
+  @override
+  NodeListState duniterDataNodes(List<Node>? duniterDataNodes) =>
+      this(duniterDataNodes: duniterDataNodes);
+
+  @override
+  NodeListState ipfsGateways(List<Node>? ipfsGateways) =>
+      this(ipfsGateways: ipfsGateways);
+
   @override
   NodeListState currentGvaNode(Node? currentGvaNode) =>
       this(currentGvaNode: currentGvaNode);
 
+  @override
+  NodeListState duniterNodesLastUpdate(DateTime? duniterNodesLastUpdate) =>
+      this(duniterNodesLastUpdate: duniterNodesLastUpdate);
+
+  @override
+  NodeListState cesiumPlusNodesLastUpdate(
+          DateTime? cesiumPlusNodesLastUpdate) =>
+      this(cesiumPlusNodesLastUpdate: cesiumPlusNodesLastUpdate);
+
+  @override
+  NodeListState gvaNodesLastUpdate(DateTime? gvaNodesLastUpdate) =>
+      this(gvaNodesLastUpdate: gvaNodesLastUpdate);
+
+  @override
+  NodeListState endpointNodesLastUpdate(DateTime? endpointNodesLastUpdate) =>
+      this(endpointNodesLastUpdate: endpointNodesLastUpdate);
+
+  @override
+  NodeListState duniterIndexerNodesLastUpdate(
+          DateTime? duniterIndexerNodesLastUpdate) =>
+      this(duniterIndexerNodesLastUpdate: duniterIndexerNodesLastUpdate);
+
+  @override
+  NodeListState duniterDataNodesLastUpdate(
+          DateTime? duniterDataNodesLastUpdate) =>
+      this(duniterDataNodesLastUpdate: duniterDataNodesLastUpdate);
+
+  @override
+  NodeListState ipfsGatewaysLastUpdate(DateTime? ipfsGatewaysLastUpdate) =>
+      this(ipfsGatewaysLastUpdate: ipfsGatewaysLastUpdate);
+
   @override
   NodeListState isLoading(bool? isLoading) => this(isLoading: isLoading);
 
@@ -84,7 +152,16 @@ class _$NodeListStateCWProxyImpl implements _$NodeListStateCWProxy {
     Object? gvaNodes = const $CopyWithPlaceholder(),
     Object? endpointNodes = const $CopyWithPlaceholder(),
     Object? duniterIndexerNodes = const $CopyWithPlaceholder(),
+    Object? duniterDataNodes = const $CopyWithPlaceholder(),
+    Object? ipfsGateways = const $CopyWithPlaceholder(),
     Object? currentGvaNode = const $CopyWithPlaceholder(),
+    Object? duniterNodesLastUpdate = const $CopyWithPlaceholder(),
+    Object? cesiumPlusNodesLastUpdate = const $CopyWithPlaceholder(),
+    Object? gvaNodesLastUpdate = const $CopyWithPlaceholder(),
+    Object? endpointNodesLastUpdate = const $CopyWithPlaceholder(),
+    Object? duniterIndexerNodesLastUpdate = const $CopyWithPlaceholder(),
+    Object? duniterDataNodesLastUpdate = const $CopyWithPlaceholder(),
+    Object? ipfsGatewaysLastUpdate = const $CopyWithPlaceholder(),
     Object? isLoading = const $CopyWithPlaceholder(),
   }) {
     return NodeListState(
@@ -108,10 +185,52 @@ class _$NodeListStateCWProxyImpl implements _$NodeListStateCWProxy {
           ? _value.duniterIndexerNodes
           // ignore: cast_nullable_to_non_nullable
           : duniterIndexerNodes as List<Node>?,
+      duniterDataNodes: duniterDataNodes == const $CopyWithPlaceholder()
+          ? _value.duniterDataNodes
+          // ignore: cast_nullable_to_non_nullable
+          : duniterDataNodes as List<Node>?,
+      ipfsGateways: ipfsGateways == const $CopyWithPlaceholder()
+          ? _value.ipfsGateways
+          // ignore: cast_nullable_to_non_nullable
+          : ipfsGateways as List<Node>?,
       currentGvaNode: currentGvaNode == const $CopyWithPlaceholder()
           ? _value.currentGvaNode
           // ignore: cast_nullable_to_non_nullable
           : currentGvaNode as Node?,
+      duniterNodesLastUpdate:
+          duniterNodesLastUpdate == const $CopyWithPlaceholder()
+              ? _value.duniterNodesLastUpdate
+              // ignore: cast_nullable_to_non_nullable
+              : duniterNodesLastUpdate as DateTime?,
+      cesiumPlusNodesLastUpdate:
+          cesiumPlusNodesLastUpdate == const $CopyWithPlaceholder()
+              ? _value.cesiumPlusNodesLastUpdate
+              // ignore: cast_nullable_to_non_nullable
+              : cesiumPlusNodesLastUpdate as DateTime?,
+      gvaNodesLastUpdate: gvaNodesLastUpdate == const $CopyWithPlaceholder()
+          ? _value.gvaNodesLastUpdate
+          // ignore: cast_nullable_to_non_nullable
+          : gvaNodesLastUpdate as DateTime?,
+      endpointNodesLastUpdate:
+          endpointNodesLastUpdate == const $CopyWithPlaceholder()
+              ? _value.endpointNodesLastUpdate
+              // ignore: cast_nullable_to_non_nullable
+              : endpointNodesLastUpdate as DateTime?,
+      duniterIndexerNodesLastUpdate:
+          duniterIndexerNodesLastUpdate == const $CopyWithPlaceholder()
+              ? _value.duniterIndexerNodesLastUpdate
+              // ignore: cast_nullable_to_non_nullable
+              : duniterIndexerNodesLastUpdate as DateTime?,
+      duniterDataNodesLastUpdate:
+          duniterDataNodesLastUpdate == const $CopyWithPlaceholder()
+              ? _value.duniterDataNodesLastUpdate
+              // ignore: cast_nullable_to_non_nullable
+              : duniterDataNodesLastUpdate as DateTime?,
+      ipfsGatewaysLastUpdate:
+          ipfsGatewaysLastUpdate == const $CopyWithPlaceholder()
+              ? _value.ipfsGatewaysLastUpdate
+              // ignore: cast_nullable_to_non_nullable
+              : ipfsGatewaysLastUpdate as DateTime?,
       isLoading: isLoading == const $CopyWithPlaceholder()
           ? _value.isLoading
           // ignore: cast_nullable_to_non_nullable
@@ -140,8 +259,33 @@ NodeListState _$NodeListStateFromJson(Map<String, dynamic> json) =>
           NodeListState._nodesFromJson(json['endpointNodes'] as List),
       duniterIndexerNodes:
           NodeListState._nodesFromJson(json['duniterIndexerNodes'] as List),
+      duniterDataNodes:
+          NodeListState._nodesFromJson(json['duniterDataNodes'] as List),
+      ipfsGateways: NodeListState._nodesFromJson(json['ipfsGateways'] as List),
       currentGvaNode: NodeListState._nodeFromJson(
           json['currentGvaNode'] as Map<String, dynamic>?),
+      duniterNodesLastUpdate: json['duniterNodesLastUpdate'] == null
+          ? null
+          : DateTime.parse(json['duniterNodesLastUpdate'] as String),
+      cesiumPlusNodesLastUpdate: json['cesiumPlusNodesLastUpdate'] == null
+          ? null
+          : DateTime.parse(json['cesiumPlusNodesLastUpdate'] as String),
+      gvaNodesLastUpdate: json['gvaNodesLastUpdate'] == null
+          ? null
+          : DateTime.parse(json['gvaNodesLastUpdate'] as String),
+      endpointNodesLastUpdate: json['endpointNodesLastUpdate'] == null
+          ? null
+          : DateTime.parse(json['endpointNodesLastUpdate'] as String),
+      duniterIndexerNodesLastUpdate:
+          json['duniterIndexerNodesLastUpdate'] == null
+              ? null
+              : DateTime.parse(json['duniterIndexerNodesLastUpdate'] as String),
+      duniterDataNodesLastUpdate: json['duniterDataNodesLastUpdate'] == null
+          ? null
+          : DateTime.parse(json['duniterDataNodesLastUpdate'] as String),
+      ipfsGatewaysLastUpdate: json['ipfsGatewaysLastUpdate'] == null
+          ? null
+          : DateTime.parse(json['ipfsGatewaysLastUpdate'] as String),
       isLoading: json['isLoading'] as bool?,
     );
 
@@ -153,6 +297,21 @@ Map<String, dynamic> _$NodeListStateToJson(NodeListState instance) =>
       'endpointNodes': NodeListState._nodesToJson(instance.endpointNodes),
       'duniterIndexerNodes':
           NodeListState._nodesToJson(instance.duniterIndexerNodes),
+      'duniterDataNodes': NodeListState._nodesToJson(instance.duniterDataNodes),
+      'ipfsGateways': NodeListState._nodesToJson(instance.ipfsGateways),
+      'duniterNodesLastUpdate':
+          instance.duniterNodesLastUpdate?.toIso8601String(),
+      'cesiumPlusNodesLastUpdate':
+          instance.cesiumPlusNodesLastUpdate?.toIso8601String(),
+      'gvaNodesLastUpdate': instance.gvaNodesLastUpdate?.toIso8601String(),
+      'endpointNodesLastUpdate':
+          instance.endpointNodesLastUpdate?.toIso8601String(),
+      'duniterIndexerNodesLastUpdate':
+          instance.duniterIndexerNodesLastUpdate?.toIso8601String(),
+      'duniterDataNodesLastUpdate':
+          instance.duniterDataNodesLastUpdate?.toIso8601String(),
+      'ipfsGatewaysLastUpdate':
+          instance.ipfsGatewaysLastUpdate?.toIso8601String(),
       'isLoading': instance.isLoading,
       'currentGvaNode': NodeListState._nodeToJson(instance.currentGvaNode),
     };