chore: some dashpay adjustments

Author: pankcuf

DashSyncCurrentCommit

@@ -1 +1 @@
-f8061dcfb95a4d43ff567dff9ec9db7f9e8c51f7
+6c7a5d3ea25c845e58f7965e4614532bff52f09f

DashWallet/Sources/Application/Syncyng Activity Monitor/SyncingActivityMonitor.swift

@@ -153,7 +153,7 @@ class SyncingActivityMonitor: NSObject, NetworkReachabilityHandling {
 
     @objc
     func peerManagerConnectedPeersDidChangeNotification(notification: Notification) {
-       if model.peerManagerConnected {
+        if model.peersSyncInfo.peerManagerConnected {
             removeChainObserver(.peerManagerConnectedPeersDidChange)
             startSyncingIfNeeded()
         }
@@ -172,7 +172,7 @@ class SyncingActivityMonitor: NSObject, NetworkReachabilityHandling {
 extension SyncingActivityMonitor {
 
     private func startSyncingIfNeeded() {
-        guard model.peerManagerConnected else {
+        guard model.peersSyncInfo.peerManagerConnected else {
             addChainObserver(.peerManagerConnectedPeersDidChange, #selector(peerManagerConnectedPeersDidChangeNotification(notification:)))
             return
         }
@@ -183,7 +183,7 @@ extension SyncingActivityMonitor {
     private func startSyncingActivity() {
         guard !isSyncing else { return }
 
-        progress = model.combinedSyncProgress
+        progress = model.progress
         lastPeakDate = nil
 
         NSObject.cancelPreviousPerformRequests(withTarget: self, selector: #selector(syncLoop), object: nil)
@@ -211,7 +211,7 @@ extension SyncingActivityMonitor {
     }
 
     private func updateProgress() {
-        let progress = model.combinedSyncProgress
+        let progress = model.progress
         if progress < kSyncingCompleteProgress {
             isSyncing = true
 
@@ -277,7 +277,7 @@ extension SyncingActivityMonitor {
 
 extension SyncingActivityMonitor {
     private var chainSyncProgress: Double {
-        model.combinedSyncProgress
+        model.progress
     }
 
     private var shouldStopSyncing: Bool {

DashWallet/Sources/UI/Home/Models/DWDashPayModel.m

@@ -446,7 +446,7 @@ - (void)updateRegistrationStatusForIdentity:(DSIdentity *)identity
         if (isDone) {
             [DWGlobalOptions sharedInstance].dashpayRegistrationCompleted = YES;
             [DWGlobalOptions sharedInstance].dashpayUsername = nil;
-            NSAssert(self.username != nil, @"Default DSIdentity has an empty username");
+            // NSAssert(self.username != nil, @"Default DSIdentity has an empty username");
 
             [self.userProfile update];
         }

DashWallet/Sources/UI/Home/Syncing Views/Alert/SyncingAlertContentView.swift

@@ -119,12 +119,19 @@ final class SyncingAlertContentView: UIView {
                     model.lastTerminalBlockHeight,
                     model.estimatedBlockHeight)
             } else if kind == .masternodes {
-                let masternodeListsReceived = model.masternodeListSyncInfo.retrievalQueueCount
-                let masternodeListsTotal = model.masternodeListSyncInfo.retrievalQueueMaxAmount
+                let masternodeListsReceived = model.masternodeListSyncInfo.queueCount
+                let masternodeListsTotal = model.masternodeListSyncInfo.queueMaxAmount
                 subtitleLabel.text = localized(
                     template: "masternode list #%d of %d",
                     masternodeListsReceived > masternodeListsTotal ? 0 : masternodeListsTotal - masternodeListsTotal,
                     masternodeListsTotal)
+            } else if kind == .platform {
+                let identitiesKeysCount = model.platformSyncInfo.queueCount
+                let identitiesKeysTotal = model.platformSyncInfo.queueMaxAmount
+                subtitleLabel.text = localized(
+                    template: "platform #%d of %d",
+                    identitiesKeysCount > identitiesKeysTotal ? 0 : identitiesKeysTotal - identitiesKeysCount,
+                    identitiesKeysTotal)
             } else {
                 subtitleLabel.text = localized(
                     template: "block #%d of %d",
@@ -193,7 +200,7 @@ final class SyncingAlertContentView: UIView {
             let model = notification.userInfo?[kChainManagerNotificationSyncStateKey] as? DSSyncState else {
             return
         }
-        self.update(with: model.combinedSyncProgress)
+        self.update(with: model.progress)
     }
 
 }

DashWallet/Sources/UI/Home/Syncing Views/Sync View/SyncView.swift

@@ -99,8 +99,8 @@ final class SyncView: UIView {
                         model.lastTerminalBlockHeight,
                         model.estimatedBlockHeight)
                 } else if kind == .masternodes {
-                    let masternodeListsReceived = model.masternodeListSyncInfo.retrievalQueueCount
-                    let masternodeListsTotal = model.masternodeListSyncInfo.retrievalQueueMaxAmount
+                    let masternodeListsReceived = model.masternodeListSyncInfo.queueCount
+                    let masternodeListsTotal = model.masternodeListSyncInfo.queueMaxAmount
                     descriptionLabel.text = String(format: NSLocalizedString("masternode list #%d of %d", comment: ""),
                         masternodeListsReceived > masternodeListsTotal ? 0 : masternodeListsTotal - masternodeListsTotal,
                         masternodeListsTotal)

DashWallet/Sources/UI/Onboarding/Stubs/DWReceiveModelStub.m

@@ -71,7 +71,7 @@ - (void)updateReceivingInfo {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
         NSString *paymentAddress = @"XrUv3aniSvZEKx2VoFe5fTqFfYL5JYFkbg";
 
-        DSChain *chain = nil;
+        DSChain *chain = DSChain.testnet;
         DSPaymentRequest *paymentRequest = [DSPaymentRequest requestWithString:paymentAddress onChain:chain];
 
         const uint64_t amount = self.amount;

Podfile

@@ -71,6 +71,10 @@ post_install do |installer|
     # fixes warnings about unsupported Deployment Target in Xcode
     target.build_configurations.each do |config|
       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)']
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] << 'DASHCORE_QUORUM_VALIDATION=1'
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] << 'DPP_STATE_TRANSITIONS=1'
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] << 'PLATFORM_VALUE_STD=1'
     end
   end
   # update info about current DashSync version