[trello.com/c/vawidi4o] Remove secret wallets storing in KVS

Lainaaa · Lainaaa · commit a4d95c19e64a · 2025-03-14T17:31:43.000+07:00
diff --git a/Adamant/Modules/Wallets/Adamant/AdmWalletService.swift b/Adamant/Modules/Wallets/Adamant/AdmWalletService.swift
@@ -225,7 +225,7 @@ final class AdmWalletService: NSObject, WalletCoreProtocol, WalletStaticCoreProt
         .init(sentDate: nil, status: .notInitiated)
     }
     
-    func initWallet(withPassphrase: String, withPassword: String) async throws -> WalletAccount {
+    func initWallet(withPassphrase: String, withPassword: String, storeInKVC: Bool) async throws -> WalletAccount {
         throw InternalAPIError.unknownError
     }
     
diff --git a/Adamant/Modules/Wallets/Bitcoin/BtcWalletService.swift b/Adamant/Modules/Wallets/Bitcoin/BtcWalletService.swift
@@ -445,7 +445,7 @@ extension BtcWalletService {
         btcWallet = nil
     }
     
-    func initWallet(withPassphrase passphrase: String, withPassword password: String) async throws -> WalletAccount {
+    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {
         guard let adamant = accountService.account else {
             throw WalletServiceError.notLogged
         }
@@ -483,6 +483,7 @@ extension BtcWalletService {
             NotificationCenter.default.post(name: self.serviceEnabledChanged, object: self)
         }
         
+        guard storeInKVC else { return eWallet }
         // MARK: 4. Save address into KVS
         let service = self
         do {
diff --git a/Adamant/Modules/Wallets/Dash/DashWalletService.swift b/Adamant/Modules/Wallets/Dash/DashWalletService.swift
@@ -300,7 +300,7 @@ extension DashWalletService {
     }
     
     @MainActor
-    func initWallet(withPassphrase passphrase: String, withPassword password: String) async throws -> WalletAccount {
+    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {
         guard let adamant = accountService.account else {
             throw WalletServiceError.notLogged
         }
@@ -340,6 +340,8 @@ extension DashWalletService {
             NotificationCenter.default.post(name: self.serviceEnabledChanged, object: self)
         }
         
+        guard storeInKVC else { return eWallet }
+        
         // MARK: 4. Save address into KVS
         do {
             let address = try await getWalletAddress(byAdamantAddress: adamant.address)
diff --git a/Adamant/Modules/Wallets/Doge/DogeWalletService.swift b/Adamant/Modules/Wallets/Doge/DogeWalletService.swift
@@ -319,7 +319,7 @@ extension DogeWalletService {
         dogeWallet = nil
     }
     
-    func initWallet(withPassphrase passphrase: String, withPassword password: String) async throws -> WalletAccount {
+    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {
         guard let adamant = accountService.account else {
             throw WalletServiceError.notLogged
         }
@@ -358,6 +358,8 @@ extension DogeWalletService {
             NotificationCenter.default.post(name: self.serviceEnabledChanged, object: self)
         }
         
+        guard storeInKVC else { return eWallet }
+        
         // MARK: 4. Save address into KVS
         let service = self
         do {
diff --git a/Adamant/Modules/Wallets/ERC20/ERC20WalletService.swift b/Adamant/Modules/Wallets/ERC20/ERC20WalletService.swift
@@ -368,7 +368,7 @@ final class ERC20WalletService: WalletCoreProtocol, @unchecked Sendable {
 
 // MARK: - WalletInitiatedWithPassphrase
 extension ERC20WalletService {
-    func initWallet(withPassphrase passphrase: String, withPassword password: String) async throws -> WalletAccount {
+    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {
         
         // MARK: 1. Prepare
         setState(.notInitiated)
diff --git a/Adamant/Modules/Wallets/Ethereum/EthWalletService.swift b/Adamant/Modules/Wallets/Ethereum/EthWalletService.swift
@@ -403,7 +403,7 @@ final class EthWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, Smar
 
 // MARK: - WalletInitiatedWithPassphrase
 extension EthWalletService {
-    func initWallet(withPassphrase passphrase: String, withPassword password: String) async throws -> WalletAccount {
+    func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {
         guard let adamant = accountService?.account else {
             throw WalletServiceError.notLogged
         }
@@ -444,6 +444,8 @@ extension EthWalletService {
             NotificationCenter.default.post(name: serviceEnabledChanged, object: self)
         }
         
+        guard storeInKVC else { return eWallet }
+        
         // MARK: 4. Save into KVS
         let service = self
         do {
diff --git a/Adamant/Modules/Wallets/Klayr/WalletService/KlyWalletService.swift b/Adamant/Modules/Wallets/Klayr/WalletService/KlyWalletService.swift
@@ -99,9 +99,9 @@ final class KlyWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unc
     // MARK: -
     
     func initWallet(
-        withPassphrase passphrase: String, withPassword password: String
+        withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool
     ) async throws -> WalletAccount {
-        try await initWallet(passphrase: passphrase, password: password)
+        try await initWallet(passphrase: passphrase, password: password, storeInKVC: storeInKVC)
     }
     
     func setInitiationFailed(reason: String) {
@@ -413,7 +413,7 @@ private extension KlyWalletService {
 
 // MARK: - Init Wallet
 private extension KlyWalletService {
-    func initWallet(passphrase: String, password: String) async throws -> WalletAccount {
+    func initWallet(passphrase: String, password: String, storeInKVC: Bool) async throws -> WalletAccount {
         guard let adamant = accountService.account else {
             throw WalletServiceError.notLogged
         }
@@ -465,6 +465,8 @@ private extension KlyWalletService {
             throw WalletServiceError.accountNotFound
         }
         
+        guard storeInKVC else { return eWallet }
+        
         // Save into KVS
         
         do {
diff --git a/Adamant/Modules/Wallets/WalletsService/WalletCoreProtocol.swift b/Adamant/Modules/Wallets/WalletsService/WalletCoreProtocol.swift
@@ -305,7 +305,7 @@ protocol WalletCoreProtocol: AnyObject, Sendable {
     func updateStatus(for id: String, status: TransactionStatus?)
     func isExist(address: String) async throws -> Bool
     func statusInfoFor(transaction: CoinTransaction) async -> TransactionStatusInfo
-    func initWallet(withPassphrase: String, withPassword: String) async throws -> WalletAccount
+    func initWallet(withPassphrase: String, withPassword: String, storeInKVC: Bool) async throws -> WalletAccount
     func setInitiationFailed(reason: String)
     func shortDescription(for transaction: RichMessageTransaction) -> NSAttributedString
     func getFee(comment: String) -> Decimal
diff --git a/Adamant/Services/AdamantAccountService.swift b/Adamant/Services/AdamantAccountService.swift
@@ -423,7 +423,8 @@ extension AdamantAccountService {
                 group.addTask {
                     let result = try? await wallet.core.initWallet(
                         withPassphrase: passphrase,
-                        withPassword: .empty
+                        withPassword: .empty,
+                        storeInKVC: true
                     )
                     return result
                 }
diff --git a/Adamant/Services/AdamantSecretWalletsManager+SecretWalletsFactory.swift b/Adamant/Services/AdamantSecretWalletsManager+SecretWalletsFactory.swift
@@ -9,7 +9,6 @@
 import CommonKit
 import Swinject
 
-//TODO: ‼️‼️‼️ Double check wallets initialization and dependencies injection while making the review ‼️‼️‼️
 extension AdamantSecretWalletsManager{
     struct SecretWalletsFactory {
         private let visibleWalletsService: VisibleWalletsService
@@ -73,7 +72,8 @@ extension AdamantSecretWalletsManager{
                     taskGroup.addTask {
                         _ = try? await wallet.core.initWallet(
                             withPassphrase: passphrase,
-                            withPassword: password
+                            withPassword: password,
+                            storeInKVC: false
                         )
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ final class AdmWalletService: NSObject, WalletCoreProtocol, WalletStaticCoreProt`
`225`	`225`	`.init(sentDate: nil, status: .notInitiated)`
`226`	`226`	`}`
`227`	`227`
`228`		`- func initWallet(withPassphrase: String, withPassword: String) async throws -> WalletAccount {`
	`228`	`+ func initWallet(withPassphrase: String, withPassword: String, storeInKVC: Bool) async throws -> WalletAccount {`
`229`	`229`	`throw InternalAPIError.unknownError`
`230`	`230`	`}`
`231`	`231`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ extension BtcWalletService {`
`445`	`445`	`btcWallet = nil`
`446`	`446`	`}`
`447`	`447`
`448`		`- func initWallet(withPassphrase passphrase: String, withPassword password: String) async throws -> WalletAccount {`
	`448`	`+ func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {`
`449`	`449`	`guard let adamant = accountService.account else {`
`450`	`450`	`throw WalletServiceError.notLogged`
`451`	`451`	`}`
`@@ -483,6 +483,7 @@ extension BtcWalletService {`
`483`	`483`	`NotificationCenter.default.post(name: self.serviceEnabledChanged, object: self)`
`484`	`484`	`}`
`485`	`485`
	`486`	`+ guard storeInKVC else { return eWallet }`
`486`	`487`	`// MARK: 4. Save address into KVS`
`487`	`488`	`let service = self`
`488`	`489`	`do {`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ extension DashWalletService {`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`@MainActor`
`303`		`- func initWallet(withPassphrase passphrase: String, withPassword password: String) async throws -> WalletAccount {`
	`303`	`+ func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {`
`304`	`304`	`guard let adamant = accountService.account else {`
`305`	`305`	`throw WalletServiceError.notLogged`
`306`	`306`	`}`
`@@ -340,6 +340,8 @@ extension DashWalletService {`
`340`	`340`	`NotificationCenter.default.post(name: self.serviceEnabledChanged, object: self)`
`341`	`341`	`}`
`342`	`342`
	`343`	`+ guard storeInKVC else { return eWallet }`
	`344`	`+`
`343`	`345`	`// MARK: 4. Save address into KVS`
`344`	`346`	`do {`
`345`	`347`	`let address = try await getWalletAddress(byAdamantAddress: adamant.address)`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ extension DogeWalletService {`
`319`	`319`	`dogeWallet = nil`
`320`	`320`	`}`
`321`	`321`
`322`		`- func initWallet(withPassphrase passphrase: String, withPassword password: String) async throws -> WalletAccount {`
	`322`	`+ func initWallet(withPassphrase passphrase: String, withPassword password: String, storeInKVC: Bool) async throws -> WalletAccount {`
`323`	`323`	`guard let adamant = accountService.account else {`
`324`	`324`	`throw WalletServiceError.notLogged`
`325`	`325`	`}`
`@@ -358,6 +358,8 @@ extension DogeWalletService {`
`358`	`358`	`NotificationCenter.default.post(name: self.serviceEnabledChanged, object: self)`
`359`	`359`	`}`
`360`	`360`
	`361`	`+ guard storeInKVC else { return eWallet }`
	`362`	`+`
`361`	`363`	`// MARK: 4. Save address into KVS`
`362`	`364`	`let service = self`
`363`	`365`	`do {`
Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,8 @@ extension AdamantAccountService {`
`423`	`423`	`group.addTask {`
`424`	`424`	`let result = try? await wallet.core.initWallet(`
`425`	`425`	`withPassphrase: passphrase,`
`426`		`- withPassword: .empty`
	`426`	`+ withPassword: .empty,`
	`427`	`+ storeInKVC: true`
`427`	`428`	`)`
`428`	`429`	`return result`
`429`	`430`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`import CommonKit`
`10`	`10`	`import Swinject`
`11`	`11`
`12`		`-//TODO: ‼️‼️‼️ Double check wallets initialization and dependencies injection while making the review ‼️‼️‼️`
`13`	`12`	`extension AdamantSecretWalletsManager{`
`14`	`13`	`struct SecretWalletsFactory {`
`15`	`14`	`private let visibleWalletsService: VisibleWalletsService`
`@@ -73,7 +72,8 @@ extension AdamantSecretWalletsManager{`
`73`	`72`	`taskGroup.addTask {`
`74`	`73`	`_ = try? await wallet.core.initWallet(`
`75`	`74`	`withPassphrase: passphrase,`
`76`		`- withPassword: password`
	`75`	`+ withPassword: password,`
	`76`	`+ storeInKVC: false`
`77`	`77`	`)`
`78`	`78`	`}`
`79`	`79`	`}`