fix: sync pong handlers

dashpay · Jul 11, 2024 · 3a6b246 · 3a6b246
1 parent 5e49827
commit 3a6b246
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/DashSync/shared/Models/Managers/Chain Managers/DSPeerManager.m b/DashSync/shared/Models/Managers/Chain Managers/DSPeerManager.m
@@ -706,10 +706,6 @@ - (void)connect {
                     dispatch_async(self.networkingQueue, ^{ [self.chain saveBlockLocators]; });
                     [self chainSyncStopped];
                 }];
-                [self.backgroundManager createBlockLocatorsTask:^{
-                    dispatch_async(self.networkingQueue, ^{ [self.chain saveBlockLocators]; });
-                    [self chainSyncStopped];
-                }];
             }
 
             if (self.chainManager.syncState.chainSyncProgress < 1.0) {

diff --git a/DashSync/shared/Models/Network/DSPeer.m b/DashSync/shared/Models/Network/DSPeer.m
@@ -1638,11 +1638,16 @@ - (void)acceptPongMessage:(NSData *)message {
     DSLogWithLocation(self, @"got pong in %fs", self.pingTime);
 #endif
     if (self->_status == DSPeerStatus_Connected && self.pongHandlers.count) {
-        void (^handler)(BOOL) = [self.pongHandlers objectAtIndex:0];
-        [self.pongHandlers removeObjectAtIndex:0];
-        [self dispatchAsyncInDelegateQueue:^{
-            handler(YES);
-        }];
+        void (^handler)(BOOL) = nil;
+        @synchronized(self.pongHandlers) {
+            if (self.pongHandlers.count > 0) {
+                handler = [self.pongHandlers objectAtIndex:0];
+                [self.pongHandlers removeObjectAtIndex:0];
+            }
+        }
+        if (handler) {
+            [self dispatchAsyncInDelegateQueue:^{ handler(YES); }];
+        }
     }
 }