Add background thread for bitcoin listeners. (#245)

- Make Demo App create and start kit on background thread
horizontalsystems · Feb 18, 2019 · d55d988 · d55d988
1 parent c48dffe
commit d55d988
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 16 deletions.
diff --git a/HSBitcoinKit/HSBitcoinKit/Core/BitcoinKit.swift b/HSBitcoinKit/HSBitcoinKit/Core/BitcoinKit.swift
@@ -8,6 +8,7 @@ import RxSwift
 public class BitcoinKit {
 
     public weak var delegate: BitcoinKitDelegate?
+    public var delegateQueue = DispatchQueue(label: "bitcoin_delegate_queue")
 
     private var unspentOutputsNotificationToken: NotificationToken?
     private var transactionsNotificationToken: NotificationToken?
@@ -246,26 +247,42 @@ extension BitcoinKit {
 extension BitcoinKit: IDataProviderDelegate {
 
     func transactionsUpdated(inserted: [TransactionInfo], updated: [TransactionInfo]) {
-        delegate?.transactionsUpdated(bitcoinKit: self, inserted: inserted, updated: updated)
+        delegateQueue.async { [weak self] in
+            if let kit = self {
+                kit.delegate?.transactionsUpdated(bitcoinKit: kit, inserted: inserted, updated: updated)
+            }
+        }
     }
 
     func transactionsDeleted(hashes: [String]) {
-        delegate?.transactionsDeleted(hashes: hashes)
+        delegateQueue.async { [weak self] in
+            self?.delegate?.transactionsDeleted(hashes: hashes)
+        }
     }
 
     func balanceUpdated(balance: Int) {
-        delegate?.balanceUpdated(bitcoinKit: self, balance: balance)
+        delegateQueue.async { [weak self] in
+            if let kit = self {
+                kit.delegate?.balanceUpdated(bitcoinKit: kit, balance: balance)
+            }
+        }
     }
 
     func lastBlockInfoUpdated(lastBlockInfo: BlockInfo) {
-        delegate?.lastBlockInfoUpdated(bitcoinKit: self, lastBlockInfo: lastBlockInfo)
+        delegateQueue.async { [weak self] in
+            if let kit = self {
+                kit.delegate?.lastBlockInfoUpdated(bitcoinKit: kit, lastBlockInfo: lastBlockInfo)
+            }
+        }
     }
 
 }
 
 extension BitcoinKit: IKitStateProviderDelegate {
     func handleKitStateUpdate(state: KitState) {
-        delegate?.kitStateUpdated(state: state)
+        delegateQueue.async { [weak self] in
+            self?.delegate?.kitStateUpdated(state: state)
+        }
     }
 }
 

diff --git a/HSBitcoinKit/HSBitcoinKit/Core/DataProvider.swift b/HSBitcoinKit/HSBitcoinKit/Core/DataProvider.swift
@@ -38,10 +38,10 @@ class DataProvider {
         self.balance = unspentOutputProvider.balance
         self.lastBlockInfo = realmFactory.realm.objects(Block.self).sorted(byKeyPath: "height").last.map { blockInfo(fromBlock: $0) }
 
-        balanceUpdateSubject.debounce(debounceTime, scheduler: MainScheduler.instance).subscribeAsync(disposeBag: disposeBag, onNext: {
+        balanceUpdateSubject.debounce(debounceTime, scheduler: ConcurrentDispatchQueueScheduler(qos: .background)).subscribe(onNext: {
             self.balance = unspentOutputProvider.balance
             self.delegate?.balanceUpdated(balance: self.balance)
-        })
+        }).disposed(by: disposeBag)
     }
 
     private func transactionInfo(fromTransaction transaction: Transaction) -> TransactionInfo {

diff --git a/HSBitcoinKit/HSBitcoinKit/Managers/FeeRateManager.swift b/HSBitcoinKit/HSBitcoinKit/Managers/FeeRateManager.swift
@@ -17,7 +17,7 @@ class FeeRateManager {
 
         self.timer.delegate = self
 
-        reachabilityManager.subject
+        reachabilityManager.subject.observeOn(ConcurrentDispatchQueueScheduler(qos: .background))
                 .subscribe(onNext: { [weak self] connected in
                     if connected {
                         self?.updateFeeRate()

diff --git a/HSBitcoinKit/HSBitcoinKit/Managers/FeeRateSyncer.swift b/HSBitcoinKit/HSBitcoinKit/Managers/FeeRateSyncer.swift
@@ -24,9 +24,8 @@ extension FeeRateSyncer: IFeeRateSyncer {
         var observable = networkManager.getFeeRate()
 
         if async {
-            observable = observable.subscribeOn(ConcurrentDispatchQueueScheduler(qos: .background)).observeOn(MainScheduler.instance)
+            observable = observable.subscribeOn(ConcurrentDispatchQueueScheduler(qos: .background))
         }
-
         observable
                 .subscribe(onNext: { [weak self] feeRate in
                     self?.timer.schedule()

diff --git a/HSBitcoinKitDemo/HSBitcoinKitDemo/BalanceController.swift b/HSBitcoinKitDemo/HSBitcoinKitDemo/BalanceController.swift
@@ -25,7 +25,16 @@ class BalanceController: UIViewController {
 
         navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Logout", style: .plain, target: self, action: #selector(logout))
         navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Start", style: .plain, target: self, action: #selector(start))
+        navigationItem.rightBarButtonItem?.isEnabled = false
 
+        Manager.shared.kitInitializationCompleted.subscribe(onNext: { [weak self] status in
+            if status {
+                self?.initializeBitcoinKit()
+            }
+        }).disposed(by: disposeBag)
+    }
+
+    func initializeBitcoinKit() {
         let bitcoinKit = Manager.shared.bitcoinKit!
 
         update(balance: bitcoinKit.balance)
@@ -45,6 +54,8 @@ class BalanceController: UIViewController {
         Manager.shared.lastBlockInfoSubject.observeOn(MainScheduler.instance).subscribe(onNext: { [weak self] info in
             self?.update(lastBlockInfo: info)
         }).disposed(by: disposeBag)
+
+        navigationItem.rightBarButtonItem?.isEnabled = true
     }
 
     @objc func logout() {
@@ -58,10 +69,12 @@ class BalanceController: UIViewController {
     }
 
     @objc func start() {
-        do {
-            try Manager.shared.bitcoinKit.start()
-        } catch {
-            print("Start Error: \(error)")
+        DispatchQueue.global(qos: .userInitiated).async {
+            do {
+                try Manager.shared.bitcoinKit.start()
+            } catch {
+                print("Start Error: \(error)")
+            }
         }
     }
 

diff --git a/HSBitcoinKitDemo/HSBitcoinKitDemo/Manager.swift b/HSBitcoinKitDemo/HSBitcoinKitDemo/Manager.swift
@@ -12,6 +12,8 @@ class Manager {
 
     var bitcoinKit: BitcoinKit!
 
+    let kitInitializationCompleted = BehaviorSubject<Bool>(value: false)
+
     let balanceSubject = PublishSubject<Int>()
     let lastBlockInfoSubject = PublishSubject<BlockInfo>()
     let progressSubject = PublishSubject<BitcoinKit.KitState>()
@@ -36,12 +38,18 @@ class Manager {
         }
 
         clearWords()
+
+        kitInitializationCompleted.onNext(false)
         bitcoinKit = nil
     }
 
     private func initWalletKit(words: [String]) {
-        bitcoinKit = BitcoinKit(withWords: words, coin: coin, walletId: "SomeId", confirmationsThreshold: 1)
-        bitcoinKit.delegate = self
+        DispatchQueue.global(qos: .userInitiated).async {
+            self.bitcoinKit = BitcoinKit(withWords: words, coin: self.coin, walletId: "SomeId", confirmationsThreshold: 1)
+            self.bitcoinKit.delegate = self
+
+            self.kitInitializationCompleted.onNext(true)
+        }
     }
 
     private var savedWords: [String]? {