Update libs

UnstoppableWallet/UnstoppableWallet/Core/Adapters/ZcashAdapter.swift

@@ -502,6 +502,7 @@ extension ZcashAdapter {
             fsBlockDbRoot: fsBlockDbRootURL(uniqueId: uniqueId, network: network),
             generalStorageURL: generalStorageURL(uniqueId: uniqueId, network: network),
             dataDbURL: dataDbURL(uniqueId: uniqueId, network: network),
+            torDirURL: torDirURL(uniqueId: uniqueId, network: network),
             endpoint: LightWalletEndpoint(address: endPoint, port: 443, secure: true, streamingCallTimeoutInMillis: 10 * 60 * 60 * 1000),
             network: network,
             spendParamsURL: spendParamsURL(uniqueId: uniqueId),
@@ -550,6 +551,10 @@ extension ZcashAdapter {
         try dataDirectoryUrl().appendingPathComponent(network.constants.defaultDbNamePrefix + uniqueId + ZcashSDK.defaultDataDbName, isDirectory: false)
     }
 
+    private static func torDirURL(uniqueId: String, network: ZcashNetwork) throws -> URL {
+        try dataDirectoryUrl().appendingPathComponent(network.constants.defaultDbNamePrefix + uniqueId + ZcashSDK.defaultTorDirName, isDirectory: true)
+    }
+
     private static func spendParamsURL(uniqueId: String) throws -> URL {
         try dataDirectoryUrl().appendingPathComponent("sapling-spend_\(uniqueId).params")
     }
@@ -741,7 +746,7 @@ extension ZcashAdapter: ISendZcashAdapter {
             switch try Recipient(address, network: network.networkType) {
             case .transparent:
                 return .transparent
-            case .sapling, .unified: // I'm keeping changes to the minimum. Unified Address should be treated as a different address type which will include some shielded pool and possibly others as well.
+            case .sapling, .unified, .tex: // I'm keeping changes to the minimum. Unified Address should be treated as a different address type which will include some shielded pool and possibly others as well.
                 return .shielded
             }
         } catch {

UnstoppableWallet/UnstoppableWallet/Core/Managers/WalletConnectSessionManager.swift

@@ -1,7 +1,6 @@
 import MarketKit
 import RxCocoa
 import RxSwift
-import WalletConnectPairing
 import WalletConnectSign
 import WalletConnectUtils
 
@@ -16,7 +15,6 @@ class WalletConnectSessionManager {
 
     private let sessionsRelay = BehaviorRelay<[WalletConnectSign.Session]>(value: [])
     private let activePendingRequestsRelay = BehaviorRelay<[WalletConnectSign.Request]>(value: [])
-    private let pairingsRelay = BehaviorRelay<[WalletConnectPairing.Pairing]>(value: [])
     private let sessionRequestReceivedRelay = PublishRelay<WalletConnectRequest>()
 
     init(service: WalletConnectService, storage: WalletConnectSessionStorage, accountManager: AccountManager, requestHandler: IWalletConnectRequestHandler, currentDateProvider: CurrentDateProvider) {
@@ -41,12 +39,8 @@ class WalletConnectSessionManager {
         subscribe(disposeBag, service.pendingRequestsUpdatedObservable) { [weak self] in
             self?.syncPendingRequest()
         }
-        subscribe(disposeBag, service.pairingUpdatedObservable) { [weak self] in
-            self?.syncPairings()
-        }
 
         syncSessions()
-        syncPairings()
     }
 
     private func handleDeleted(account: Account) {
@@ -124,10 +118,6 @@ class WalletConnectSessionManager {
         activePendingRequestsRelay.accept(activePendingRequests)
     }
 
-    private func syncPairings() {
-        pairingsRelay.accept(service.pairings)
-    }
-
     private func requests(accountId: String? = nil) -> [WalletConnectSign.Request] {
         let allRequests = service.pendingRequests
         let dbSessions = storage.sessions(accountId: accountId)
@@ -181,19 +171,7 @@ extension WalletConnectSessionManager {
         activePendingRequestsRelay.asObservable()
     }
 
-    public var pairings: [WalletConnectPairing.Pairing] {
-        service.pairings
-    }
-
-    public var pairingsObservable: Observable<[WalletConnectPairing.Pairing]> {
-        pairingsRelay.asObservable()
-    }
-
     public var sessionRequestReceivedObservable: Observable<WalletConnectRequest> {
         sessionRequestReceivedRelay.asObservable()
     }
-
-    public func disconnectPairing(topic: String) -> Single<Void> {
-        service.disconnectPairing(topic: topic)
-    }
 }

UnstoppableWallet/UnstoppableWallet/Models/Stats.swift

@@ -126,7 +126,6 @@ enum StatPage: String {
     case transactions
     case unlinkWallet = "unlink_wallet"
     case walletConnect = "wallet_connect"
-    case walletConnectPairings = "wallet_connect_pairings"
     case walletConnectRequest = "wallet_connect_request"
     case walletConnectSession = "wallet_connect_session"
     case watchlist

UnstoppableWallet/UnstoppableWallet/Modules/WalletConnect/List/WalletConnectListService.swift

@@ -3,7 +3,6 @@ import MarketKit
 import RxCocoa
 import RxRelay
 import RxSwift
-import WalletConnectPairing
 import WalletConnectSign
 import WalletConnectUtils
 
@@ -46,10 +45,6 @@ extension WalletConnectListService {
         sessionManager.sessions.isEmpty
     }
 
-    var emptyPairingList: Bool {
-        sessionManager.pairings.isEmpty
-    }
-
     var items: [Item] {
         items(sessions: sessionManager.sessions)
     }
@@ -68,14 +63,6 @@ extension WalletConnectListService {
         sessionManager.activePendingRequestsObservable
     }
 
-    var pairings: [WalletConnectPairing.Pairing] {
-        sessionManager.pairings
-    }
-
-    var pairingsObservable: Observable<[WalletConnectPairing.Pairing]> {
-        sessionManager.pairingsObservable
-    }
-
     var showSessionObservable: Observable<WalletConnectSign.Session> {
         showSessionRelay.asObservable()
     }

UnstoppableWallet/UnstoppableWallet/Modules/WalletConnect/List/WalletConnectListViewController.swift

@@ -18,7 +18,6 @@ class WalletConnectListViewController: ThemeViewController {
     private let tableView = SectionsTableView(style: .grouped)
 
     private var viewItems = [WalletConnectListViewModel.ViewItem]()
-    private var pairingCount: Int = 0
 
     init(viewModel: WalletConnectListViewModel) {
         self.viewModel = viewModel
@@ -69,15 +68,13 @@ class WalletConnectListViewController: ThemeViewController {
         subscribe(disposeBag, viewModel.disableNewConnectionSignal) { [weak self] in self?.disableNewConnection($0) }
         subscribe(disposeBag, viewModel.showErrorSignal) { [weak self] in self?.showError(text: $0) }
         subscribe(disposeBag, viewModel.viewItemsDriver) { [weak self] in self?.sync(viewItems: $0) }
-        subscribe(disposeBag, viewModel.pairingCountDriver) { [weak self] in self?.sync(pairingCount: $0) }
         subscribe(disposeBag, viewModel.showDisconnectingSignal) { HudHelper.instance.show(banner: .disconnectingWalletConnect) }
         subscribe(disposeBag, viewModel.showSuccessSignal) { HudHelper.instance.show(banner: .disconnectedWalletConnect) }
         subscribe(disposeBag, viewModel.showWalletConnectSessionSignal) { [weak self] in self?.show(session: $0) }
     }
 
-    private func sync(viewItems: [WalletConnectListViewModel.ViewItem]? = nil, pairingCount: Int? = nil) {
+    private func sync(viewItems: [WalletConnectListViewModel.ViewItem]? = nil) {
         if let viewItems { self.viewItems = viewItems }
-        if let pairingCount { self.pairingCount = pairingCount }
 
         emptyView.isHidden = !viewModel.emptyList
 
@@ -110,13 +107,6 @@ class WalletConnectListViewController: ThemeViewController {
         navigationController?.present(viewController, animated: true)
     }
 
-    private func showPairings() {
-        let viewController = WalletConnectPairingModule.viewController()
-
-        stat(page: .walletConnect, event: .open(page: .walletConnectPairings))
-        navigationController?.pushViewController(viewController, animated: true)
-    }
-
     private func disableNewConnection(_ isDisabled: Bool) {
         bottomButton.isEnabled = !isDisabled
         navigationItem.rightBarButtonItem?.isEnabled = !isDisabled
@@ -200,39 +190,13 @@ class WalletConnectListViewController: ThemeViewController {
         )
     }
 
-    private func pairingCountCell(tableView: SectionsTableView, pairingCount: Int) -> RowProtocol {
-        tableView.universalRow48(id: "session-pairing",
-                                 title: .body("wallet_connect.list.pairings".localized),
-                                 value: .subhead1("\(pairingCount)", color: .themeGray),
-                                 accessoryType: .disclosure,
-                                 autoDeselect: true,
-                                 isFirst: true,
-                                 isLast: true,
-                                 action: { [weak self] in self?.showPairings() })
-    }
-
-    private func pairingSection(tableView: SectionsTableView, showHeader: Bool) -> SectionProtocol? {
-        guard pairingCount != 0 else {
-            return nil
-        }
-
-        let cell = pairingCountCell(tableView: tableView, pairingCount: pairingCount)
-        return Section(
-            id: "section_pairing",
-            headerState: showHeader ? tableView.sectionHeader(text: "wallet_connect.list.version_text".localized("2.0")) : .margin(height: 0),
-            footerState: .margin(height: .margin24),
-            rows: [cell]
-        )
-    }
-
     private func section(tableView: SectionsTableView, viewItems: [WalletConnectListViewModel.ViewItem]) -> SectionProtocol? {
         guard !viewItems.isEmpty else {
             return nil
         }
 
         return Section(
-            id: "section_2",
-            headerState: tableView.sectionHeader(text: "wallet_connect.list.version_text".localized("2.0")),
+            id: "section",
             footerState: .margin(height: .margin24),
             rows: viewItems.enumerated().compactMap { index, viewItem in
                 let isFirst = index == 0
@@ -252,7 +216,6 @@ extension WalletConnectListViewController: SectionsDataSource {
 
         sections.append(contentsOf: [
             section(tableView: tableView, viewItems: viewItems),
-            pairingSection(tableView: tableView, showHeader: viewItems.isEmpty),
         ].compactMap { $0 })
 
         return sections

UnstoppableWallet/UnstoppableWallet/Modules/WalletConnect/List/WalletConnectListViewModel.swift

@@ -2,7 +2,6 @@ import Foundation
 import RxCocoa
 import RxRelay
 import RxSwift
-import WalletConnectPairing
 import WalletConnectSign
 
 class WalletConnectListViewModel {
@@ -17,7 +16,6 @@ class WalletConnectListViewModel {
     private let disableNewConnectionRelay = PublishRelay<Bool>()
 
     private let viewItemsRelay = BehaviorRelay<[WalletConnectListViewModel.ViewItem]>(value: [])
-    private let pairingCountRelay = BehaviorRelay<Int>(value: 0)
     private let showDisconnectingRelay = PublishRelay<Void>()
     private let showSuccessRelay = PublishRelay<Void>()
 
@@ -27,13 +25,11 @@ class WalletConnectListViewModel {
 
         subscribe(disposeBag, service.itemsObservable) { [weak self] in self?.sync(items: $0) }
         subscribe(disposeBag, service.pendingRequestsObservable) { [weak self] in self?.sync(pendingRequests: $0) }
-        subscribe(disposeBag, service.pairingsObservable) { [weak self] in self?.sync(pairings: $0) }
         subscribe(disposeBag, service.showSessionObservable) { [weak self] in self?.show(session: $0) }
         subscribe(disposeBag, service.sessionKillingObservable) { [weak self] in self?.sync(sessionKillingState: $0) }
 
         sync(items: service.items)
         sync(pendingRequests: service.pendingRequests)
-        sync(pairings: service.pairings)
     }
 
     private func sync(items: [WalletConnectListService.Item]) {
@@ -57,10 +53,6 @@ class WalletConnectListViewModel {
         viewItemsRelay.accept(viewItems)
     }
 
-    private func sync(pairings: [WalletConnectPairing.Pairing]) {
-        pairingCountRelay.accept(pairings.count)
-    }
-
     private func sync(pendingRequests _: [WalletConnectSign.Request]) {
         sync(items: service.items)
     }
@@ -87,10 +79,6 @@ extension WalletConnectListViewModel {
         viewItemsRelay.asDriver()
     }
 
-    var pairingCountDriver: Driver<Int> {
-        pairingCountRelay.asDriver()
-    }
-
     var showDisconnectingSignal: Signal<Void> {
         showDisconnectingRelay.asSignal()
     }
@@ -101,7 +89,7 @@ extension WalletConnectListViewModel {
 
     // NewConnection section
     var emptyList: Bool {
-        service.emptySessionList && service.emptyPairingList
+        service.emptySessionList
     }
 
     var disableNewConnectionSignal: Signal<Bool> {