Debug Only: Inspect FactorInstancesCache

RadixWallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "7d3590b225945abb1bc0ab6c684b005c28c64bdc204afcc2d34c3e379ef8a3c8",
+  "originHash" : "60b889ccc513476448aa6483246b773f242561a612324e9d081205fc3041851f",
   "pins" : [
     {
       "identity" : "anycodable",
@@ -109,15 +109,6 @@
         "version" : "11.6.4"
       }
     },
-    {
-      "identity" : "sargon",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/radixdlt/sargon",
-      "state" : {
-        "revision" : "6af408a3252888560a9c401bf3be61512dba1035",
-        "version" : "1.1.50"
-      }
-    },
     {
       "identity" : "screenshotpreventing-ios",
       "kind" : "remoteSourceControl",

RadixWallet/Clients/ProfileStore/ProfileStore.swift

@@ -37,7 +37,13 @@ extension ProfileStore {
 
 extension ProfileStore {
 	func createNewProfile() async throws {
-		try await SargonOS.shared.newWallet()
+		let shouldPrederiveInstances: Bool
+		#if DEBUG
+		shouldPrederiveInstances = true
+		#else
+		shouldPrederiveInstances = false
+		#endif
+		return try await SargonOS.shared.newWallet(shouldPrederiveInstances: shouldPrederiveInstances)
 	}
 
 	func finishOnboarding(

RadixWallet/Features/InteractionReview/Sections/Sections+ExecutionSummary.swift

@@ -273,6 +273,8 @@ extension InteractionReview.Sections {
 				accountDepositSetting: accountDepositSetting,
 				accountDepositExceptions: accountDepositExceptions
 			)
+		case .some(.deleteAccounts(accountAddresses: let accountAddresses)):
+			fatalError()
 		}
 	}
 

RadixWallet/Features/SettingsFeature/DebugSettings/Children/DebugFactorInstancesCacheContents/DebugFactorInstancesCacheContents+View.swift

@@ -0,0 +1,74 @@
+import Sargon
+import SwiftUI
+
+// MARK: - DebugFactorInstancesCacheContents.View
+extension DebugFactorInstancesCacheContents {
+	struct View: SwiftUI.View {
+		let store: StoreOf<DebugFactorInstancesCacheContents>
+
+		var body: some SwiftUI.View {
+			WithPerceptionTracking {
+				VStack(spacing: .small2) {
+					Button("Delete Cache File") {
+						store.send(.view(.deleteButtonTapped))
+					}
+					.buttonStyle(.primaryRectangular(isDestructive: true))
+					loadable(store.factorInstances) {
+						ProgressView()
+					} successContent: { instances in
+						content(instances: instances)
+					}
+				}
+				.padding()
+				.navigationTitle("FactorInstances cache")
+			}.task {
+				store.send(.view(.task))
+			}
+		}
+
+		@ViewBuilder
+		private func content(instances: Instances) -> some SwiftUI.View {
+			ScrollView {
+				VStack(alignment: .leading) {
+					ForEach(Array(instances.keys), id: \.self) { (key: FactorSourceIDFromHash) in
+						Section {
+							let listOfList: [[FactorInstanceForDebugPurposes]] = instances[key]!
+							ForEach(listOfList, id: \.self) { (instancesForFactorForPath: [FactorInstanceForDebugPurposes]) in
+								if let firstInstance = instancesForFactorForPath.first {
+									Section {
+										ForEach(instancesForFactorForPath, id: \.self) { (instance: FactorInstanceForDebugPurposes) in
+											VStack(alignment: .leading) {
+												Text("Index `\(instance.derivationEntityIndex)`")
+
+												Text("PublicKey `\(String(reflecting: instance.publicKeyHex.prefix(8)))`")
+											}
+											.frame(maxWidth: .infinity)
+											.padding(.horizontal, .medium3)
+											.padding(.vertical, .small2)
+											.border(Color.gray, width: 1)
+										}
+									} header: {
+										VStack {
+											Text("Agnostic `\(firstInstance.indexAgnosticDerivationPath)`").font(.title)
+											Text("#\(instancesForFactorForPath.count) instances")
+										}
+										.padding()
+									}
+								}
+							}
+						} header: {
+							Text("Source `\(key.idPrefix())`")
+								.font(.largeTitle)
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+extension FactorSourceIDFromHash {
+	fileprivate func idPrefix() -> String {
+		String(toString().prefix(10))
+	}
+}

RadixWallet/Features/SettingsFeature/DebugSettings/Children/DebugFactorInstancesCacheContents/DebugFactorInstancesCacheContents.swift

@@ -0,0 +1,61 @@
+import Sargon
+
+public typealias Instances = [FactorSourceIDFromHash: [[FactorInstanceForDebugPurposes]]]
+
+// MARK: - DebugFactorInstancesCacheContents
+@Reducer
+struct DebugFactorInstancesCacheContents: Sendable, FeatureReducer {
+	@ObservableState
+	struct State: Sendable, Hashable {
+		var factorInstances: Loadable<Instances> = .idle
+		init() {}
+	}
+
+	typealias Action = FeatureAction<Self>
+
+	enum ViewAction: Sendable, Equatable {
+		case task
+		case deleteButtonTapped
+	}
+
+	enum InternalAction: Sendable, Equatable {
+		case loadedInstances(Instances)
+		case failedToDelete(String)
+	}
+
+	var body: some ReducerOf<Self> {
+		Reduce(core)
+	}
+
+	func reduce(into state: inout State, internalAction: InternalAction) -> Effect<Action> {
+		switch internalAction {
+		case let .failedToDelete(error):
+			struct Err: LocalizedError {
+				let localizedDescription: String
+			}
+			state.factorInstances = .failure(Err(localizedDescription: error))
+			return .none
+		case let .loadedInstances(instances):
+			state.factorInstances = .success(instances)
+			return .none
+		}
+	}
+
+	func reduce(into state: inout State, viewAction: ViewAction) -> Effect<Action> {
+		switch viewAction {
+		case .deleteButtonTapped:
+			return .run { send in
+				try await FileSystem.shared.deleteFactorInstancesCache()
+				await send(.internal(.loadedInstances([:])))
+			} catch: { error, send in
+				await send(.internal(.failedToDelete(error.localizedDescription)))
+			}
+		case .task:
+			state.factorInstances = .loading
+			return .run { send in
+				let instances = await SargonOS.shared.debugFactorInstancesInCache()
+				await send(.internal(.loadedInstances(instances)))
+			}
+		}
+	}
+}

RadixWallet/Features/SettingsFeature/DebugSettings/Coordinator/DebugSettingsCoordinator+Reducer.swift

@@ -23,6 +23,7 @@ struct DebugSettingsCoordinator: Sendable, FeatureReducer {
 		case debugUserDefaultsContentsButtonTapped
 		case debugTestKeychainButtonTapped
 		case debugKeychainContentsButtonTapped
+        case debugFactorInstancesCacheContentsButtonTapped
 	}
 
 	enum InternalAction: Sendable, Equatable {
@@ -36,7 +37,8 @@ struct DebugSettingsCoordinator: Sendable, FeatureReducer {
 			case debugManageFactorSources(DebugManageFactorSources.State)
 			#if DEBUG
 			case debugKeychainTest(DebugKeychainTest.State)
-			case debugKeychainContents(DebugKeychainContents.State)
+            case debugKeychainContents(DebugKeychainContents.State)
+			case debugFactorInstancesCacheContents(DebugFactorInstancesCacheContents.State)
 			#endif // DEBUG
 		}
 
@@ -45,7 +47,8 @@ struct DebugSettingsCoordinator: Sendable, FeatureReducer {
 			case debugInspectProfile(DebugInspectProfile.Action)
 			#if DEBUG
 			case debugKeychainTest(DebugKeychainTest.Action)
-			case debugKeychainContents(DebugKeychainContents.Action)
+            case debugKeychainContents(DebugKeychainContents.Action)
+			case debugFactorInstancesCacheContents(DebugFactorInstancesCacheContents.Action)
 			#endif // DEBUG
 			case debugManageFactorSources(DebugManageFactorSources.Action)
 		}
@@ -64,6 +67,9 @@ struct DebugSettingsCoordinator: Sendable, FeatureReducer {
 			Scope(state: /State.debugKeychainContents, action: /Action.debugKeychainContents) {
 				DebugKeychainContents()
 			}
+            Scope(state: /State.debugFactorInstancesCacheContents, action: /Action.debugFactorInstancesCacheContents) {
+                DebugFactorInstancesCacheContents()
+            }
 			#endif // DEBUG
 			Scope(state: /State.debugManageFactorSources, action: /Action.debugManageFactorSources) {
 				DebugManageFactorSources()
@@ -110,6 +116,12 @@ struct DebugSettingsCoordinator: Sendable, FeatureReducer {
 			#endif // DEBUG
 			return .none
 
+        case .debugFactorInstancesCacheContentsButtonTapped:
+            #if DEBUG
+            state.destination = .debugFactorInstancesCacheContents(.init())
+            #endif // DEBUG
+            return .none
+
 		case .debugUserDefaultsContentsButtonTapped:
 			state.destination = .debugUserDefaultsContents(.init())
 			return .none

RadixWallet/Features/SettingsFeature/DebugSettings/Coordinator/DebugSettingsCoordinator+View.swift

@@ -65,6 +65,12 @@ extension DebugSettingsCoordinator.View {
 				icon: .systemImage("key"),
 				action: .debugKeychainContentsButtonTapped
 			),
+            // ONLY DEBUG EVER
+            .model(
+                title: "FactorInstances Cache",
+                icon: .systemImage("key"),
+                action: .debugFactorInstancesCacheContentsButtonTapped
+            ),
 		]
 	}
 }
@@ -88,7 +94,8 @@ private extension View {
 			.debugUserDefaultsContents(with: destinationStore)
 		#if DEBUG
 			.debugKeychainTest(with: destinationStore)
-			.debugKeychainContents(with: destinationStore)
+            .debugKeychainContents(with: destinationStore)
+			.debugFactorInstancesCacheContents(with: destinationStore)
 		#endif
 			.debugInspectProfile(with: destinationStore)
 	}
@@ -126,6 +133,18 @@ private extension View {
 			destination: { DebugKeychainContents.View(store: $0) }
 		)
 	}
+
+
+    private func debugFactorInstancesCacheContents(
+        with destinationStore: PresentationStoreOf<DebugSettingsCoordinator.Destination>
+    ) -> some View {
+        navigationDestination(
+            store: destinationStore,
+            state: /DebugSettingsCoordinator.Destination.State.debugFactorInstancesCacheContents,
+            action: DebugSettingsCoordinator.Destination.Action.debugFactorInstancesCacheContents,
+            destination: { DebugFactorInstancesCacheContents.View(store: $0) }
+        )
+    }
 	#endif // DEBUG
 
 	private func factorSources(

RadixWallet/MIGRATE_TO_SARGON/Stage1/Stage1MigrateToSargon+Account.swift

@@ -42,11 +42,11 @@ extension Account {
 	}
 
 	mutating func hide() {
-		flags.append(.deletedByUser)
+		flags.append(.hiddenByUser)
 	}
 
 	mutating func unhide() {
-		entityFlags.remove(.deletedByUser)
+		entityFlags.remove(.hiddenByUser)
 	}
 }
 

RadixWallet/MIGRATE_TO_SARGON/Stage2/Atoms/Stage2MigrateToSargon+Persona.swift

@@ -3,11 +3,11 @@ import Sargon
 
 extension Persona {
 	mutating func hide() {
-		entityFlags.append(.deletedByUser)
+		entityFlags.append(.hiddenByUser)
 	}
 
 	mutating func unhide() {
-		entityFlags.remove(.deletedByUser)
+		entityFlags.remove(.hiddenByUser)
 	}
 }