[#1106] Zashi-iOS audit Issue G

- storedWallet is no longer held in memory
- unit tests fixed

modules/Sources/Features/Root/RootInitialization.swift

@@ -240,15 +240,8 @@ extension RootReducer {
                 /// When initialization succeeds user is taken to the home screen.
             case .initialization(.initializeSDK(let walletMode)):
                 do {
-                    state.storedWallet = try walletStorage.exportWallet()
+                    let storedWallet = try walletStorage.exportWallet()
-
+                    let birthday = storedWallet.birthday?.value() ?? zcashSDKEnvironment.latestCheckpoint
-                    guard let storedWallet = state.storedWallet else {
-                        state.appInitializationState = .failed
-                        state.alert = AlertState.cantLoadSeedPhrase()
-                        return .none
-                    }
-
-                    let birthday = state.storedWallet?.birthday?.value() ?? zcashSDKEnvironment.latestCheckpoint
 
                     try mnemonic.isValid(storedWallet.seedPhrase.value())
                     let seedBytes = try mnemonic.toSeed(storedWallet.seedPhrase.value())
@@ -273,35 +266,34 @@ extension RootReducer {
                 return .send(.initialization(.registerForSynchronizersUpdate))
 
             case .initialization(.checkBackupPhraseValidation):
-                guard let storedWallet = state.storedWallet else {
+                do {
-                    state.appInitializationState = .failed
+                    let storedWallet = try walletStorage.exportWallet()
-                    state.alert = AlertState.cantLoadSeedPhrase()
+                    var landingDestination = RootReducer.DestinationState.Destination.tabs
-                    return .none
-                }
-
-                var landingDestination = RootReducer.DestinationState.Destination.tabs
-                
-                if !storedWallet.hasUserPassedPhraseBackupTest {
-                    let phraseWords = mnemonic.asWords(storedWallet.seedPhrase.value())
                     
-                    let recoveryPhrase = RecoveryPhrase(words: phraseWords.map { $0.redacted })
+                    if !storedWallet.hasUserPassedPhraseBackupTest {
-                    state.phraseDisplayState.phrase = recoveryPhrase
+                        let phraseWords = mnemonic.asWords(storedWallet.seedPhrase.value())
-                    state.phraseDisplayState.birthday = storedWallet.birthday
+                        
-                    if let value = storedWallet.birthday?.value() {
+                        let recoveryPhrase = RecoveryPhrase(words: phraseWords.map { $0.redacted })
-                        let latestBlock = numberFormatter.string(NSDecimalNumber(value: value))
+                        state.phraseDisplayState.phrase = recoveryPhrase
-                        state.phraseDisplayState.birthdayValue = "\(String(describing: latestBlock ?? ""))"
+                        state.phraseDisplayState.birthday = storedWallet.birthday
+                        if let value = storedWallet.birthday?.value() {
+                            let latestBlock = numberFormatter.string(NSDecimalNumber(value: value))
+                            state.phraseDisplayState.birthdayValue = "\(String(describing: latestBlock ?? ""))"
+                        }
+                        landingDestination = .phraseDisplay
                     }
-                    landingDestination = .phraseDisplay
+                    
+                    state.appInitializationState = .initialized
+                    
+                    return .run { [landingDestination] send in
+                        try await mainQueue.sleep(for: .seconds(2.5))
+                        await send(.destination(.updateDestination(landingDestination)))
+                    }
+                    .cancellable(id: CancelId.timer, cancelInFlight: true)
+                } catch {
+                    return Effect.send(.initialization(.initializationFailed(error.toZcashError())))
                 }
 
-                state.appInitializationState = .initialized
-
-                return .run { [landingDestination] send in
-                    try await mainQueue.sleep(for: .seconds(2.5))
-                    await send(.destination(.updateDestination(landingDestination)))
-                }
-                .cancellable(id: CancelId.timer, cancelInFlight: true)
-
             case .initialization(.nukeWalletRequest):
                 state.alert = AlertState.wipeRequest()
                 return .none

modules/Sources/Features/Root/RootStore.swift

@@ -46,7 +46,6 @@ public struct RootReducer: Reducer {
         public var phraseDisplayState: RecoveryPhraseDisplay.State
         public var sandboxState: SandboxReducer.State
         public var splashAppeared = false
-        public var storedWallet: StoredWallet?
         public var tabsState: TabsReducer.State
         public var walletConfig: WalletConfig
         public var welcomeState: WelcomeReducer.State
@@ -62,7 +61,6 @@ public struct RootReducer: Reducer {
             onboardingState: OnboardingFlowReducer.State,
             phraseDisplayState: RecoveryPhraseDisplay.State,
             sandboxState: SandboxReducer.State,
-            storedWallet: StoredWallet? = nil,
             tabsState: TabsReducer.State,
             walletConfig: WalletConfig,
             welcomeState: WelcomeReducer.State
@@ -77,7 +75,6 @@ public struct RootReducer: Reducer {
             self.onboardingState = onboardingState
             self.phraseDisplayState = phraseDisplayState
             self.sandboxState = sandboxState
-            self.storedWallet = storedWallet
             self.tabsState = tabsState
             self.walletConfig = walletConfig
             self.welcomeState = welcomeState

secantTests/RootTests/AppInitializationTests.swift

@@ -75,9 +75,7 @@ class AppInitializationTests: XCTestCase {
 
         await testQueue.advance(by: 3.00)
 
-        await store.receive(.initialization(.initializeSDK(.existingWallet))) { state in
+        await store.receive(.initialization(.initializeSDK(.existingWallet)))
-            state.storedWallet = storedWallet
-        }
 
         await store.receive(.initialization(.checkBackupPhraseValidation)) { state in
             state.appInitializationState = .initialized
@@ -151,9 +149,7 @@ class AppInitializationTests: XCTestCase {
 
         await testQueue.advance(by: 3.00)
 
-        await store.receive(.initialization(.initializeSDK(.existingWallet))) { state in
+        await store.receive(.initialization(.initializeSDK(.existingWallet)))
-            state.storedWallet = storedWallet
-        }
 
         let recoveryPhrase = RecoveryPhrase(words: try store.dependencies.mnemonic.randomMnemonicWords().map { $0.redacted })
 

secantTests/RootTests/RestoreWalletTests.swift

@@ -35,9 +35,7 @@ final class RestoreWalletTests: XCTestCase {
             state.isRestoringWallet = true
         }
         
-        await store.receive(.initialization(.initializeSDK(.restoreWallet))) { state in
+        await store.receive(.initialization(.initializeSDK(.restoreWallet)))
-            state.storedWallet = .placeholder
-        }
         
         await store.receive(.initialization(.initializationSuccessfullyDone(nil)))
 

secantTests/RootTests/RootTests.swift

@@ -165,11 +165,9 @@ class RootTests: XCTestCase {
             state.alert = AlertState.initializationFailed(zcashError)
         }
 
-        await store.receive(.initialization(.checkBackupPhraseValidation)) { state in
+        await store.receive(.initialization(.checkBackupPhraseValidation))
-            // failed is expected because environment is throwing errors
+        
-            state.appInitializationState = .failed
+        await store.receive(.initialization(.initializationFailed(zcashError)))
-            state.alert = AlertState.cantLoadSeedPhrase()
-        }
         
         await store.finish()
     }
@@ -191,16 +189,15 @@ class RootTests: XCTestCase {
 
         await store.receive(.initialization(.initializeSDK(.existingWallet)))
 
-        await store.receive(.initialization(.checkBackupPhraseValidation)) { state in
+        await store.receive(.initialization(.checkBackupPhraseValidation))
-            // failed is expected because environment is throwing errors
-            state.appInitializationState = .failed
-            state.alert = AlertState.cantLoadSeedPhrase()
-        }
         
         await store.receive(.initialization(.initializationFailed(zcashError))) { state in
+            state.appInitializationState = .failed
             state.alert = AlertState.initializationFailed(zcashError)
         }
         
+        await store.receive(.initialization(.initializationFailed(zcashError)))
+
         await store.finish()
     }