Feat/account factory selection

assets/config/v5/debug.json

@@ -0,0 +1,74 @@
+{
+  "ipfs": {
+    "url": "https://ipfs.internal.citizenwallet.xyz"
+  },
+  "scan": {
+    "url": "https://celoscan.io",
+    "name": "Celo Explorer"
+  },
+  "chains": {
+    "42220": {
+      "id": 42220,
+      "node": {
+        "url": "https://42220.engine.citizenwallet.xyz",
+        "ws_url": "wss://42220.engine.citizenwallet.xyz"
+      }
+    }
+  },
+  "tokens": {
+    "42220:0x56744910f7dEcD48c1a7FA61B4C317b15E99F156": {
+      "name": "KFMEDIA℠ Pathways for LATAM™",
+      "symbol": "KFMPFL",
+      "address": "0x56744910f7dEcD48c1a7FA61B4C317b15E99F156",
+      "chain_id": 42220,
+      "decimals": 0,
+      "standard": "erc1155"
+    }
+  },
+  "version": 5,
+  "accounts": {
+    "42220:0x7cC54D54bBFc65d1f0af7ACee5e4042654AF8185": {
+      "chain_id": 42220,
+      "paymaster_type": "cw-safe",
+      "paymaster_address": "0x02BDA8370d9497A5C808B2db237cfaA8f0733F36",
+      "entrypoint_address": "0x7079253c0358eF9Fd87E16488299Ef6e06F403B6",
+      "account_factory_address": "0x7cC54D54bBFc65d1f0af7ACee5e4042654AF8185"
+    }
+  },
+  "sessions": {
+    "42220:0xE2F3DC3E638113b9496060349e5332963d9C1152": {
+      "chain_id": 42220,
+      "module_address": "0xE2F3DC3E638113b9496060349e5332963d9C1152",
+      "factory_address": "0xEd0cD3886b84369A0e29Db9a4480ADF5051c76C9",
+      "provider_address": "0xF3004A1690f97Cf5d307eDc5958a7F76b62f9FC9"
+    }
+  },
+  "community": {
+    "url": "https://kingfishersmedia.io",
+    "logo": "https://assets.citizenwallet.xyz/wallet-config/_images/kfmpfl.png",
+    "name": "KFMEDIA℠",
+    "alias": "wallet.kingfishersmedia.io",
+    "theme": {
+      "primary": "#88292c"
+    },
+    "profile": {
+      "address": "0x5f6FEb03ad8EfeCdD2a837FAA1a29DEA2bAcfd55",
+      "chain_id": 42220
+    },
+    "description": "Certified Education Organization. Solving systemic educational disparity using Web3 solutions, removing barriers of entry for underdeveloped economies.",
+    "custom_domain": "wallet.kingfishersmedia.io",
+    "primary_token": {
+      "address": "0x56744910f7dEcD48c1a7FA61B4C317b15E99F156",
+      "chain_id": 42220
+    },
+    "primary_account_factory": {
+      "address": "0x7cC54D54bBFc65d1f0af7ACee5e4042654AF8185",
+      "chain_id": 42220
+    },
+    "primary_session_manager": {
+      "address": "0xE2F3DC3E638113b9496060349e5332963d9C1152",
+      "chain_id": 42220
+    }
+  },
+  "config_location": "https://my.citizenwallet.xyz/api/communities/wallet.kingfishersmedia.io"
+}

ios/Podfile.lock

@@ -13,7 +13,7 @@ PODS:
     - Flutter
   - connectivity_plus (0.0.1):
     - Flutter
-  - credential_manager (1.0.4):
+  - credential_manager_ios (2.0.5):
     - Flutter
   - DKImagePickerController/Core (4.3.9):
     - DKImagePickerController/ImageDataManager
@@ -49,37 +49,37 @@ PODS:
   - file_picker (0.0.1):
     - DKImagePickerController/PhotoGallery
     - Flutter
-  - Firebase/CoreOnly (11.10.0):
-    - FirebaseCore (~> 11.10.0)
-  - Firebase/Messaging (11.10.0):
+  - Firebase/CoreOnly (11.15.0):
+    - FirebaseCore (~> 11.15.0)
+  - Firebase/Messaging (11.15.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 11.10.0)
-  - firebase_core (3.13.1):
-    - Firebase/CoreOnly (= 11.10.0)
+    - FirebaseMessaging (~> 11.15.0)
+  - firebase_core (3.15.2):
+    - Firebase/CoreOnly (= 11.15.0)
     - Flutter
-  - firebase_messaging (15.2.6):
-    - Firebase/Messaging (= 11.10.0)
+  - firebase_messaging (15.2.10):
+    - Firebase/Messaging (= 11.15.0)
     - firebase_core
     - Flutter
-  - FirebaseCore (11.10.0):
-    - FirebaseCoreInternal (~> 11.10.0)
-    - GoogleUtilities/Environment (~> 8.0)
-    - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreInternal (11.10.0):
-    - "GoogleUtilities/NSData+zlib (~> 8.0)"
-  - FirebaseInstallations (11.10.0):
-    - FirebaseCore (~> 11.10.0)
-    - GoogleUtilities/Environment (~> 8.0)
-    - GoogleUtilities/UserDefaults (~> 8.0)
+  - FirebaseCore (11.15.0):
+    - FirebaseCoreInternal (~> 11.15.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Logger (~> 8.1)
+  - FirebaseCoreInternal (11.15.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+  - FirebaseInstallations (11.15.0):
+    - FirebaseCore (~> 11.15.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
     - PromisesObjC (~> 2.4)
-  - FirebaseMessaging (11.10.0):
-    - FirebaseCore (~> 11.10.0)
+  - FirebaseMessaging (11.15.0):
+    - FirebaseCore (~> 11.15.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleDataTransport (~> 10.0)
-    - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
-    - GoogleUtilities/Environment (~> 8.0)
-    - GoogleUtilities/Reachability (~> 8.0)
-    - GoogleUtilities/UserDefaults (~> 8.0)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Reachability (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
     - nanopb (~> 3.30910.0)
   - Flutter (1.0.0)
   - flutter_inappwebview_ios (0.0.1):
@@ -178,7 +178,7 @@ PODS:
 DEPENDENCIES:
   - audioplayers_darwin (from `.symlinks/plugins/audioplayers_darwin/ios`)
   - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
-  - credential_manager (from `.symlinks/plugins/credential_manager/ios`)
+  - credential_manager_ios (from `.symlinks/plugins/credential_manager_ios/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
@@ -225,8 +225,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/audioplayers_darwin/ios"
   connectivity_plus:
     :path: ".symlinks/plugins/connectivity_plus/ios"
-  credential_manager:
-    :path: ".symlinks/plugins/credential_manager/ios"
+  credential_manager_ios:
+    :path: ".symlinks/plugins/credential_manager_ios/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
   firebase_core:
@@ -267,18 +267,18 @@ SPEC CHECKSUMS:
   AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f
   audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
   connectivity_plus: 2a701ffec2c0ae28a48cf7540e279787e77c447d
-  credential_manager: feb21034894e469e3686461dc96fb24bb7d350e4
+  credential_manager_ios: fd1d96ef11fa3d76f868f038342de171c3bc2b28
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
   file_picker: be9a674155d9f334323856cb266e0d145d75d5c0
-  Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2
-  firebase_core: 3c2f323cae65c97a636a05a23b17730ef93df2cf
-  firebase_messaging: 456e01ff29a451c90097d0b45925551d5be0c143
-  FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7
-  FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679
-  FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3
-  FirebaseMessaging: 2b9f56aa4ed286e1f0ce2ee1d413aabb8f9f5cb9
-  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  Firebase: d99ac19b909cd2c548339c2241ecd0d1599ab02e
+  firebase_core: 99a37263b3c27536063a7b601d9e2a49400a433c
+  firebase_messaging: bf6697c61f31c7cc0f654131212ff04c0115c2c7
+  FirebaseCore: efb3893e5b94f32b86e331e3bd6dadf18b66568e
+  FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4
+  FirebaseInstallations: 317270fec08a5d418fdbc8429282238cab3ac843
+  FirebaseMessaging: 3b26e2cee503815e01c3701236b020aa9b576f09
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_inappwebview_ios: 6f63631e2c62a7c350263b13fa5427aedefe81d4
   flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
   google_sign_in_ios: 7411fab6948df90490dc4620ecbcabdc3ca04017

lib/main.dart

@@ -76,7 +76,7 @@ FutureOr<void> appRunner() async {
   }
 
   final AppDBService appDBService = AppDBService();
-  await appDBService.init('appv4');
+  await appDBService.init('appv5');
   final numConfigs = (await appDBService.communities.getAll()).length;
 
   config.singleCommunityMode = numConfigs < 2;

lib/services/accounts/accounts.dart

@@ -14,7 +14,7 @@ abstract class AccountsOptionsInterface {}
 ///
 /// This is used to store wallet backups and the implementation is platform specific.
 abstract class AccountsServiceInterface {
-  final int _version = 4;
+  final int _version = 7;
 
   int get version => _version;
 

lib/services/accounts/backup.dart

@@ -81,3 +81,31 @@ class BackupWallet {
   String get key => '$address@$alias';
   String get value => privateKey;
 }
+
+class BackupWalletV5 extends BackupWallet {
+  final String accountFactoryAddress;
+
+  BackupWalletV5({
+    required super.address,
+    required super.alias,
+    required super.privateKey,
+    required String accountFactoryAddress,
+  }) : accountFactoryAddress =
+            EthereumAddress.fromHex(accountFactoryAddress).hexEip55;
+
+  // Fixes the 'json' super parameter lint
+  BackupWalletV5.fromJson(super.json)
+      : accountFactoryAddress =
+            EthereumAddress.fromHex(json['accountFactoryAddress']).hexEip55,
+        super.fromJson();
+
+  @override
+  Map<String, dynamic> toJson() {
+    final json = super.toJson();
+    json['accountFactoryAddress'] = accountFactoryAddress;
+    return json;
+  }
+
+  @override
+  String get key => '$address@$accountFactoryAddress@$alias';
+}