[trello.com/c/kie7Tdnq] Improve secret wallet service

Lainaaa · Lainaaa · commit 212c7b4c0d51 · 2025-02-26T11:10:32.000+07:00
diff --git a/Adamant.xcodeproj/project.pbxproj b/Adamant.xcodeproj/project.pbxproj
@@ -189,7 +189,7 @@
 		41E3C9CC2A0E20F500AF0985 /* AdamantCoinTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E3C9CB2A0E20F500AF0985 /* AdamantCoinTools.swift */; };
 		4803FC9A2D6715AF00452D2C /* SecretWalletsFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4803FC992D6715AF00452D2C /* SecretWalletsFactory.swift */; };
 		481558702D65A7660011B470 /* SecretWalletsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4815586F2D65A7660011B470 /* SecretWalletsService.swift */; };
-		481558722D65A7BD0011B470 /* AdamantSecretWalletsManagerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 481558712D65A7BD0011B470 /* AdamantSecretWalletsManagerProtocol.swift */; };
+		481558722D65A7BD0011B470 /* SecretWalletsManagerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 481558712D65A7BD0011B470 /* SecretWalletsManagerProtocol.swift */; };
 		48B6A8EB2D5738D800326EE8 /* WalletsStoreService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B6A8EA2D5738D800326EE8 /* WalletsStoreService.swift */; };
 		48B6A8ED2D57390400326EE8 /* AdamantWalletsStoreService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B6A8EC2D57390400326EE8 /* AdamantWalletsStoreService.swift */; };
 		48B6A8EF2D573A3C00326EE8 /* AdamantWalletStoreServiceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48B6A8EE2D573A3C00326EE8 /* AdamantWalletStoreServiceProvider.swift */; };
@@ -487,14 +487,14 @@
 		AA8FFFC42D4C1174001D8576 /* NativeAdamantCoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8FFFC32D4C1168001D8576 /* NativeAdamantCoreTests.swift */; };
 		AA8FFFCA2D4E6435001D8576 /* CryptoSwift in Frameworks */ = {isa = PBXBuildFile; productRef = AA8FFFC92D4E6435001D8576 /* CryptoSwift */; };
 		AA8FFFCC2D50D503001D8576 /* NodeOrigin+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8FFFCB2D50D4F8001D8576 /* NodeOrigin+Extensions.swift */; };
-		AA8FFFE32D513681001D8576 /* CustomFieldRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8FFFE22D513670001D8576 /* CustomFieldRow.swift */; };
-		AA8FFFE52D513787001D8576 /* EdgeInsetTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8FFFE42D513780001D8576 /* EdgeInsetTextField.swift */; };
 		AA8FFFD52D50DCEF001D8576 /* dash_send_transation_response.json in Resources */ = {isa = PBXBuildFile; fileRef = AA8FFFD42D50DCE4001D8576 /* dash_send_transation_response.json */; };
 		AA8FFFD72D50DD0E001D8576 /* Data+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8FFFD62D50DD07001D8576 /* Data+Extensions.swift */; };
 		AA8FFFD82D50DF63001D8576 /* dash_unspent_transaction_intergration_test.json in Resources */ = {isa = PBXBuildFile; fileRef = AA8FFFD22D50DC0C001D8576 /* dash_unspent_transaction_intergration_test.json */; };
 		AA8FFFDA2D50DFB2001D8576 /* dash_unspent_transaction_unit_test.json in Resources */ = {isa = PBXBuildFile; fileRef = AA8FFFD92D50DFA3001D8576 /* dash_unspent_transaction_unit_test.json */; };
 		AA8FFFDC2D50E079001D8576 /* dash_unverified_unspent_transactions.json in Resources */ = {isa = PBXBuildFile; fileRef = AA8FFFDB2D50E063001D8576 /* dash_unverified_unspent_transactions.json */; };
 		AA8FFFE12D50E175001D8576 /* dash_send_transaction_unit_response.json in Resources */ = {isa = PBXBuildFile; fileRef = AA8FFFDF2D50E13F001D8576 /* dash_send_transaction_unit_response.json */; };
+		AA8FFFE32D513681001D8576 /* CustomFieldRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8FFFE22D513670001D8576 /* CustomFieldRow.swift */; };
+		AA8FFFE52D513787001D8576 /* EdgeInsetTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8FFFE42D513780001D8576 /* EdgeInsetTextField.swift */; };
 		AAB01CAD2D3AE44B007D6BF4 /* BitcoinKitTransactionFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB01CAC2D3AE449007D6BF4 /* BitcoinKitTransactionFactory.swift */; };
 		AAB01CAF2D3AECED007D6BF4 /* DogeWalletServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB01CAE2D3AECE6007D6BF4 /* DogeWalletServiceTests.swift */; };
 		AAB01CB12D3AF01B007D6BF4 /* DogeApiServiceProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAB01CB02D3AF015007D6BF4 /* DogeApiServiceProtocol.swift */; };
@@ -921,7 +921,7 @@
 		41E3C9CB2A0E20F500AF0985 /* AdamantCoinTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantCoinTools.swift; sourceTree = "<group>"; };
 		4803FC992D6715AF00452D2C /* SecretWalletsFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsFactory.swift; sourceTree = "<group>"; };
 		4815586F2D65A7660011B470 /* SecretWalletsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsService.swift; sourceTree = "<group>"; };
-		481558712D65A7BD0011B470 /* AdamantSecretWalletsManagerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantSecretWalletsManagerProtocol.swift; sourceTree = "<group>"; };
+		481558712D65A7BD0011B470 /* SecretWalletsManagerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsManagerProtocol.swift; sourceTree = "<group>"; };
 		48B6A8EA2D5738D800326EE8 /* WalletsStoreService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletsStoreService.swift; sourceTree = "<group>"; };
 		48B6A8EC2D57390400326EE8 /* AdamantWalletsStoreService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantWalletsStoreService.swift; sourceTree = "<group>"; };
 		48B6A8EE2D573A3C00326EE8 /* AdamantWalletStoreServiceProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantWalletStoreServiceProvider.swift; sourceTree = "<group>"; };
@@ -1187,14 +1187,14 @@
 		AA8FFFBF2D4AC00B001D8576 /* AdamantCoreMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantCoreMock.swift; sourceTree = "<group>"; };
 		AA8FFFC32D4C1168001D8576 /* NativeAdamantCoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeAdamantCoreTests.swift; sourceTree = "<group>"; };
 		AA8FFFCB2D50D4F8001D8576 /* NodeOrigin+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NodeOrigin+Extensions.swift"; sourceTree = "<group>"; };
-		AA8FFFE22D513670001D8576 /* CustomFieldRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomFieldRow.swift; sourceTree = "<group>"; };
-		AA8FFFE42D513780001D8576 /* EdgeInsetTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EdgeInsetTextField.swift; sourceTree = "<group>"; };
 		AA8FFFD22D50DC0C001D8576 /* dash_unspent_transaction_intergration_test.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = dash_unspent_transaction_intergration_test.json; sourceTree = "<group>"; };
 		AA8FFFD42D50DCE4001D8576 /* dash_send_transation_response.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = dash_send_transation_response.json; sourceTree = "<group>"; };
 		AA8FFFD62D50DD07001D8576 /* Data+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Data+Extensions.swift"; sourceTree = "<group>"; };
 		AA8FFFD92D50DFA3001D8576 /* dash_unspent_transaction_unit_test.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = dash_unspent_transaction_unit_test.json; sourceTree = "<group>"; };
 		AA8FFFDB2D50E063001D8576 /* dash_unverified_unspent_transactions.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = dash_unverified_unspent_transactions.json; sourceTree = "<group>"; };
 		AA8FFFDF2D50E13F001D8576 /* dash_send_transaction_unit_response.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = dash_send_transaction_unit_response.json; sourceTree = "<group>"; };
+		AA8FFFE22D513670001D8576 /* CustomFieldRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CustomFieldRow.swift; sourceTree = "<group>"; };
+		AA8FFFE42D513780001D8576 /* EdgeInsetTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EdgeInsetTextField.swift; sourceTree = "<group>"; };
 		AAB01CAC2D3AE449007D6BF4 /* BitcoinKitTransactionFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BitcoinKitTransactionFactory.swift; sourceTree = "<group>"; };
 		AAB01CAE2D3AECE6007D6BF4 /* DogeWalletServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DogeWalletServiceTests.swift; sourceTree = "<group>"; };
 		AAB01CB02D3AF015007D6BF4 /* DogeApiServiceProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DogeApiServiceProtocol.swift; sourceTree = "<group>"; };
@@ -2585,7 +2585,7 @@
 				E93D7ABD2052CEE1005D19DC /* NotificationsService.swift */,
 				E9215972206119FB0000CA5C /* ReachabilityMonitor.swift */,
 				9304F8C1292F895C00173F18 /* PushNotificationsTokenService.swift */,
-				481558712D65A7BD0011B470 /* AdamantSecretWalletsManagerProtocol.swift */,
+				481558712D65A7BD0011B470 /* SecretWalletsManagerProtocol.swift */,
 				41047B73294C61D10039E956 /* VisibleWalletsService.swift */,
 				48B6A8EA2D5738D800326EE8 /* WalletsStoreService.swift */,
 				4153045A29C09C6C000E4BEA /* IncreaseFeeService.swift */,
@@ -4000,7 +4000,7 @@
 				E98FC34420F920BD00032D65 /* UIFont+adamant.swift in Sources */,
 				644EC35720EFAAB700F40C73 /* DelegatesListViewController.swift in Sources */,
 				4153045B29C09C6C000E4BEA /* IncreaseFeeService.swift in Sources */,
-				481558722D65A7BD0011B470 /* AdamantSecretWalletsManagerProtocol.swift in Sources */,
+				481558722D65A7BD0011B470 /* SecretWalletsManagerProtocol.swift in Sources */,
 				E9C51EF12013F18000385EB7 /* NewChatViewController.swift in Sources */,
 				E9B4E1A8210F079E007E77FC /* DoubleDetailsTableViewCell.swift in Sources */,
 				E9502740202E257E002C1098 /* RepeaterService.swift in Sources */,
diff --git a/Adamant/App/DI/AppAssembly.swift b/Adamant/App/DI/AppAssembly.swift
@@ -82,12 +82,6 @@ struct AppAssembly: MainThreadAssembly {
             )
         }.inObjectScope(.container)
         
-        container.register(WalletStoreServiceProviderProtocol.self) { r in
-            AdamantWalletStoreServiceProvider(
-                secretWalletsManager: r.resolve(AdamantSecretWalletsManagerProtocol.self)!
-            )
-        }.inObjectScope(.container)
-        
         // MARK: Secret Wallets
         container.register(SecretWalletsFactory.self) { r in
             SecretWalletsFactory(
@@ -97,12 +91,18 @@ struct AppAssembly: MainThreadAssembly {
             )
         }.inObjectScope(.container)
         
-        container.register(AdamantSecretWalletsManagerProtocol.self) { r in
+        container.register(SecretWalletsManagerProtocol.self) { r in
             AdamantSecretWalletsManager(
                 walletsStoreService: r.resolve(WalletStoreServiceProtocol.self)!,
                 secretWalletsFactory: r.resolve(SecretWalletsFactory.self)!
             )
-        }
+        }.inObjectScope(.container)
+        
+        container.register(WalletStoreServiceProviderProtocol.self) { r in
+            AdamantWalletStoreServiceProvider(
+                secretWalletsManager: r.resolve(SecretWalletsManagerProtocol.self)!
+            )
+        }.inObjectScope(.container)
         
         // MARK: IncreaseFeeService
         container.register(IncreaseFeeService.self) { r in
diff --git a/Adamant/ServiceProtocols/AdamantSecretWalletsManagerProtocol.swift b/Adamant/ServiceProtocols/AdamantSecretWalletsManagerProtocol.swift
diff --git a/Adamant/ServiceProtocols/SecretWalletsManagerProtocol.swift b/Adamant/ServiceProtocols/SecretWalletsManagerProtocol.swift
@@ -0,0 +1,26 @@
+//
+//  SecretWalletsManagerProtocol.swift
+//  Adamant
+//
+//  Created by Dmitrij Meidus on 19.02.25.
+//  Copyright © 2025 Adamant. All rights reserved.
+//
+
+import CommonKit
+
+protocol SecretWalletsManagerProtocol {
+    var statePublisher: AnyObservable<SecretWalletsManagerStateProtocol> { get }
+        
+    func createSecretWallet(withPassword password: String)
+    func removeSecretWallet(at index: Int) -> WalletStoreServiceProtocol?
+    func getCurrentWallet() -> WalletStoreServiceProtocol
+    func getSecretWallets() -> [WalletStoreServiceProtocol]
+    func activateSecretWallet(at index: Int)
+    func activateDefaultWallet()
+}
+
+protocol SecretWalletsManagerStateProtocol {
+    var currentWallet: WalletStoreServiceProtocol { get set }
+    var defaultWallet: WalletStoreServiceProtocol { get }
+    var secretWallets: [WalletStoreServiceProtocol] { get set }
+}
diff --git a/Adamant/Services/DataProviders/AdamantWalletStoreServiceProvider.swift b/Adamant/Services/DataProviders/AdamantWalletStoreServiceProvider.swift
@@ -16,7 +16,7 @@ protocol WalletStoreServiceProviderProtocol: WalletStoreServiceProtocol {
 }
 
 final class AdamantWalletStoreServiceProvider: WalletStoreServiceProviderProtocol {
-    private let secretWalletsManager: AdamantSecretWalletsManagerProtocol
+    private let secretWalletsManager: SecretWalletsManagerProtocol
     
     private var cancellables = Set<AnyCancellable>()
     
@@ -25,7 +25,7 @@ final class AdamantWalletStoreServiceProvider: WalletStoreServiceProviderProtoco
         $currentWallet.map { _ in () }.eraseToAnyPublisher()
     }
     
-    init(secretWalletsManager: AdamantSecretWalletsManagerProtocol) {
+    init(secretWalletsManager: SecretWalletsManagerProtocol) {
         self.secretWalletsManager = secretWalletsManager
         self._currentWallet = ObservableValue(secretWalletsManager.getCurrentWallet())
         
diff --git a/Adamant/Services/SecretWalletsService.swift b/Adamant/Services/SecretWalletsService.swift
@@ -11,14 +11,14 @@ import Swinject
 import CommonKit
 
 extension AdamantSecretWalletsManager {
-    struct State {
+    struct State: SecretWalletsManagerStateProtocol {
         var currentWallet: WalletStoreServiceProtocol
         let defaultWallet: WalletStoreServiceProtocol
         var secretWallets: [WalletStoreServiceProtocol] = []
     }
 }
 
-final class AdamantSecretWalletsManager: AdamantSecretWalletsManagerProtocol {
+final class AdamantSecretWalletsManager: SecretWalletsManagerProtocol {
     private let secretWalletsFactory: SecretWalletsFactory
     private let lock = NSLock()
     
@@ -33,8 +33,8 @@ final class AdamantSecretWalletsManager: AdamantSecretWalletsManagerProtocol {
         self.secretWalletsFactory = secretWalletsFactory
     }
     
-    @ObservableValue private var state: State
-    var statePublisher: AnyObservable<State> {
+    @ObservableValue private var state: SecretWalletsManagerStateProtocol
+    var statePublisher: AnyObservable<SecretWalletsManagerStateProtocol> {
         $state.eraseToAnyPublisher()
     }
     
@@ -44,7 +44,6 @@ final class AdamantSecretWalletsManager: AdamantSecretWalletsManagerProtocol {
         lock.lock()
         defer { lock.unlock() }
         state.secretWallets.append(wallet)
-        activateSecretWallet(at: state.secretWallets.count - 1)
     }
     
     func removeSecretWallet(at index: Int) -> WalletStoreServiceProtocol? {
@@ -58,8 +57,8 @@ final class AdamantSecretWalletsManager: AdamantSecretWalletsManagerProtocol {
         state.currentWallet
     }
     
-    func getWallets() -> [WalletStoreServiceProtocol] {
-        [state.currentWallet] + state.secretWallets
+    func getSecretWallets() -> [WalletStoreServiceProtocol] {
+        state.secretWallets
     }
     
     func activateSecretWallet(at index: Int) {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ protocol WalletStoreServiceProviderProtocol: WalletStoreServiceProtocol {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`final class AdamantWalletStoreServiceProvider: WalletStoreServiceProviderProtocol {`
`19`		`- private let secretWalletsManager: AdamantSecretWalletsManagerProtocol`
	`19`	`+ private let secretWalletsManager: SecretWalletsManagerProtocol`
`20`	`20`
`21`	`21`	`private var cancellables = Set<AnyCancellable>()`
`22`	`22`
`@@ -25,7 +25,7 @@ final class AdamantWalletStoreServiceProvider: WalletStoreServiceProviderProtoco`
`25`	`25`	`$currentWallet.map { _ in () }.eraseToAnyPublisher()`
`26`	`26`	`}`
`27`	`27`
`28`		`- init(secretWalletsManager: AdamantSecretWalletsManagerProtocol) {`
	`28`	`+ init(secretWalletsManager: SecretWalletsManagerProtocol) {`
`29`	`29`	`self.secretWalletsManager = secretWalletsManager`
`30`	`30`	`self._currentWallet = ObservableValue(secretWalletsManager.getCurrentWallet())`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@ import Swinject`
`11`	`11`	`import CommonKit`
`12`	`12`
`13`	`13`	`extension AdamantSecretWalletsManager {`
`14`		`- struct State {`
	`14`	`+ struct State: SecretWalletsManagerStateProtocol {`
`15`	`15`	`var currentWallet: WalletStoreServiceProtocol`
`16`	`16`	`let defaultWallet: WalletStoreServiceProtocol`
`17`	`17`	`var secretWallets: [WalletStoreServiceProtocol] = []`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`21`		`-final class AdamantSecretWalletsManager: AdamantSecretWalletsManagerProtocol {`
	`21`	`+final class AdamantSecretWalletsManager: SecretWalletsManagerProtocol {`
`22`	`22`	`private let secretWalletsFactory: SecretWalletsFactory`
`23`	`23`	`private let lock = NSLock()`
`24`	`24`
`@@ -33,8 +33,8 @@ final class AdamantSecretWalletsManager: AdamantSecretWalletsManagerProtocol {`
`33`	`33`	`self.secretWalletsFactory = secretWalletsFactory`
`34`	`34`	`}`
`35`	`35`
`36`		`- @ObservableValue private var state: State`
`37`		`- var statePublisher: AnyObservable<State> {`
	`36`	`+ @ObservableValue private var state: SecretWalletsManagerStateProtocol`
	`37`	`+ var statePublisher: AnyObservable<SecretWalletsManagerStateProtocol> {`
`38`	`38`	`$state.eraseToAnyPublisher()`
`39`	`39`	`}`
`40`	`40`
`@@ -44,7 +44,6 @@ final class AdamantSecretWalletsManager: AdamantSecretWalletsManagerProtocol {`
`44`	`44`	`lock.lock()`
`45`	`45`	`defer { lock.unlock() }`
`46`	`46`	`state.secretWallets.append(wallet)`
`47`		`- activateSecretWallet(at: state.secretWallets.count - 1)`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`func removeSecretWallet(at index: Int) -> WalletStoreServiceProtocol? {`
`@@ -58,8 +57,8 @@ final class AdamantSecretWalletsManager: AdamantSecretWalletsManagerProtocol {`
`58`	`57`	`state.currentWallet`
`59`	`58`	`}`
`60`	`59`
`61`		`- func getWallets() -> [WalletStoreServiceProtocol] {`
`62`		`- [state.currentWallet] + state.secretWallets`
	`60`	`+ func getSecretWallets() -> [WalletStoreServiceProtocol] {`
	`61`	`+ state.secretWallets`
`63`	`62`	`}`
`64`	`63`
`65`	`64`	`func activateSecretWallet(at index: Int) {`