RecoverBull

ios/Podfile.lock

@@ -1,6 +1,14 @@
 PODS:
+  - AppAuth (1.7.6):
+    - AppAuth/Core (= 1.7.6)
+    - AppAuth/ExternalUserAgent (= 1.7.6)
+  - AppAuth/Core (1.7.6)
+  - AppAuth/ExternalUserAgent (1.7.6):
+    - AppAuth/Core
   - bdk_flutter (0.31.2):
     - Flutter
+  - bip85 (0.0.1):
+    - Flutter
   - boltz (0.1.6)
   - DKImagePickerController/Core (4.3.9):
     - DKImagePickerController/ImageDataManager
@@ -49,6 +57,24 @@ PODS:
     - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
+  - google_sign_in_ios (0.0.1):
+    - AppAuth (>= 1.7.4)
+    - Flutter
+    - FlutterMacOS
+    - GoogleSignIn (~> 7.1)
+    - GTMSessionFetcher (>= 3.4.0)
+  - GoogleSignIn (7.1.0):
+    - AppAuth (< 2.0, >= 1.7.3)
+    - GTMAppAuth (< 5.0, >= 4.1.1)
+    - GTMSessionFetcher/Core (~> 3.3)
+  - GTMAppAuth (4.1.1):
+    - AppAuth/Core (~> 1.7)
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3)
+  - GTMSessionFetcher (3.5.0):
+    - GTMSessionFetcher/Full (= 3.5.0)
+  - GTMSessionFetcher/Core (3.5.0)
+  - GTMSessionFetcher/Full (3.5.0):
+    - GTMSessionFetcher/Core
   - integration_test (0.0.1):
     - Flutter
   - lwk (0.1.5)
@@ -73,6 +99,7 @@ PODS:
 
 DEPENDENCIES:
   - bdk_flutter (from `.symlinks/plugins/bdk_flutter/ios`)
+  - bip85 (from `.symlinks/plugins/bip85/ios`)
   - boltz (from `.symlinks/plugins/boltz/ios`)
   - document_file_save_plus (from `.symlinks/plugins/document_file_save_plus/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
@@ -82,6 +109,7 @@ DEPENDENCIES:
   - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
+  - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`)
   - integration_test (from `.symlinks/plugins/integration_test/ios`)
   - lwk (from `.symlinks/plugins/lwk/ios`)
   - no_screenshot (from `.symlinks/plugins/no_screenshot/ios`)
@@ -93,15 +121,21 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - AppAuth
     - DKImagePickerController
     - DKPhotoGallery
+    - GoogleSignIn
+    - GTMAppAuth
+    - GTMSessionFetcher
     - ScreenProtectorKit
     - SDWebImage
     - SwiftyGif
 
 EXTERNAL SOURCES:
   bdk_flutter:
     :path: ".symlinks/plugins/bdk_flutter/ios"
+  bip85:
+    :path: ".symlinks/plugins/bip85/ios"
   boltz:
     :path: ".symlinks/plugins/boltz/ios"
   document_file_save_plus:
@@ -120,6 +154,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_native_splash/ios"
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
+  google_sign_in_ios:
+    :path: ".symlinks/plugins/google_sign_in_ios/darwin"
   integration_test:
     :path: ".symlinks/plugins/integration_test/ios"
   lwk:
@@ -138,29 +174,35 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  bdk_flutter: fb57a7400a7f3f181c5977bcdc2a5ef347ae4e7f
+  AppAuth: d4f13a8fe0baf391b2108511793e4b479691fb73
+  bdk_flutter: 08274535b7bd58a09bfa9c3733474fb44133484c
+  bip85: 3059e217a3a606a100dd244f21d2fc61b0a1aa83
   boltz: 6388ec2412f3753b63a9e65c97f87ea26f43bddc
   DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
   DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
-  document_file_save_plus: 913d440d8b611ae19add4522ed578e3ed1483a2f
-  file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
+  document_file_save_plus: 47b52a647efb29f7d431af45a856ce1a841f32fc
+  file_picker: 9b3292d7c8bc68c8a7bf8eb78f730e49c8efc517
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_barcode_scanner: 7a1144744c28dc0c57a8de7218ffe5ec59a9e4bf
-  flutter_file_dialog: 4c014a45b105709a27391e266c277d7e588e9299
-  flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
-  flutter_native_splash: f71420956eb811e6d310720fee915f1d42852e7a
-  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
-  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  flutter_barcode_scanner: c5aa9f51c150a6242fa392386bd52b64bb27fcb5
+  flutter_file_dialog: ca8d7fbd1772d4f0c2777b4ab20a7787ef4e7dd8
+  flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
+  flutter_native_splash: 6cad9122ea0fad137d23137dd14b937f3e90b145
+  flutter_secure_storage: 1ed9476fba7e7a782b22888f956cce43e2c62f13
+  google_sign_in_ios: 0ab078e60da6dfe23cbc55c83502b52bba1aad63
+  GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db
+  GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
+  GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
+  integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e
   lwk: 22e06bc5664247d6b2dac91cfe209b63b70dd580
-  no_screenshot: 67d110f12466f4913b488803d4e498d03ef2889e
-  path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
+  no_screenshot: 6d183496405a3ab709a67a54e5cd0f639e94729e
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
   payjoin_flutter: 6397d7b698cdad6453be4949ab6aca1863f6c5e5
-  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   ScreenProtectorKit: 83a6281b02c7a5902ee6eac4f5045f674e902ae4
   SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
-  share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
+  share_plus: 011d6fb4f9d2576b83179a3a5c5e323202cdabcf
   SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 

ios/Runner.xcodeproj/project.pbxproj

@@ -515,7 +515,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.bbMobile.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.mobile.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -533,7 +533,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.bbMobile.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.mobile.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -549,7 +549,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.bbMobile.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.bullbitcoin.mobile.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";

ios/Runner/Info.plist

@@ -45,5 +45,23 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
+	<key>UIFileSharingEnabled</key>
+	<true/>
+	<!-- Google Drive -->
+	<key>GIDClientID</key>
+	<string>249304738825-k5vfkegjtqv85pffdmcdr1hv6chusth6.apps.googleusercontent.com</string>
+	<key>BUNDLE_ID</key>
+	<string>com.bullbitcoin.mobile</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+	<dict>
+		<key>CFBundleURLSchemes</key>
+		<array>
+		<string>com.googleusercontent.apps.249304738825-k5vfkegjtqv85pffdmcdr1hv6chusth6</string>
+		</array>
+	</dict>
+	</array>
 </dict>
-</plist>
+</plist>

lib/_model/backup.dart

@@ -0,0 +1,25 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'backup.freezed.dart';
+part 'backup.g.dart';
+
+@freezed
+class Backup with _$Backup {
+  const factory Backup({
+    @Default(1) int version,
+    @Default('') String name,
+    @Default(<String>[]) List<String> mnemonic,
+    @Default('') String passphrase,
+    @Default('') String mnemonicFingerPrint,
+    @Default('') String network,
+    @Default('') String layer,
+    @Default('') String type,
+    @Default('') String script,
+  }) = _Backup;
+
+  factory Backup.fromJson(Map<String, dynamic> json) => _$BackupFromJson(json);
+
+  const Backup._();
+
+  bool get isEmpty => mnemonic.isEmpty && passphrase.isEmpty;
+}

lib/_model/wallet.dart

@@ -11,7 +11,31 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 part 'wallet.freezed.dart';
 part 'wallet.g.dart';
 
-enum BBNetwork { Testnet, Mainnet }
+enum BBNetwork {
+  Testnet,
+
+  Mainnet;
+
+  static BBNetwork fromString(String network) {
+    switch (network) {
+      case 'Testnet':
+        return BBNetwork.Testnet;
+      case 'Mainnet':
+        return BBNetwork.Mainnet;
+      default:
+        return BBNetwork.Mainnet;
+    }
+  }
+
+  bdk.Network toBdkNetwork() {
+    switch (this) {
+      case BBNetwork.Testnet:
+        return bdk.Network.testnet;
+      case BBNetwork.Mainnet:
+        return bdk.Network.bitcoin;
+    }
+  }
+}
 
 enum BBWalletType { main, xpub, descriptors, words, coldcard }
 
@@ -37,6 +61,7 @@ class Wallet with _$Wallet {
     @Default('') String externalPublicDescriptor,
     @Default('') String internalPublicDescriptor,
     // public
+    @Default({}) Map<String, BIP85Derivation> bip85Derivations,
     @Default('') String mnemonicFingerprint,
     @Default('') String sourceFingerprint,
     required BBNetwork network,
@@ -46,8 +71,10 @@ class Wallet with _$Wallet {
     String? path,
     int? balance,
     Balance? fullBalance,
-    @Default(false) bool backupTested,
-    DateTime? lastBackupTested,
+    @Default(false) bool physicalBackupTested,
+    DateTime? lastPhysicalBackupTested,
+    @Default(false) bool vaultBackupTested,
+    @Default(false) bool lastVaultBackupTested,
     @Default(false) bool hide,
     @Default(false) bool mainWallet,
     required BaseWalletType baseWalletType,
@@ -178,6 +205,19 @@ class Wallet with _$Wallet {
     return exDescDerivedKey;
   }
 
+  //TODO; re-create this to derive any bip85 path
+  String generateNextBIP85BackupKey() {
+    const prefix = "m/1608'/";
+    final highestIndex = bip85Derivations.keys
+        .where((path) => path.startsWith(prefix))
+        .map(
+          (path) =>
+              int.tryParse(path.split('/').last.replaceAll("'", "")) ?? -1,
+        )
+        .fold(-1, (max, index) => index > max ? index : max);
+    return "$prefix${highestIndex + 1}'";
+  }
+
   // storage key
   String getRelatedSeedStorageString() {
     // TODO: Sai: Uncomment this (or) add :testnet while saving testnet seed (later)
@@ -522,6 +562,19 @@ class Wallet with _$Wallet {
   String balanceStr() => ((balance ?? 0) / 100000000).toStringAsFixed(8);
 }
 
+enum BIP85DerivationStatus { active, revoked }
+
+@freezed
+class BIP85Derivation with _$BIP85Derivation {
+  const factory BIP85Derivation({
+    required String label,
+    @Default(BIP85DerivationStatus.active) BIP85DerivationStatus status,
+  }) = _BIP85Derivation;
+
+  factory BIP85Derivation.fromJson(Map<String, dynamic> json) =>
+      _$BIP85DerivationFromJson(json);
+}
+
 @freezed
 class Balance with _$Balance {
   const factory Balance({