[TierTwo] Request missing mnw signer during initial sync

random-zebra · furszy · commit 3e05c82aadcf · 2022-01-04T09:04:41.000-03:00
And remove extra call to SetBlockchainSync(false) from CMasternodeSync after calling CMasternodeSync::Reset()
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -470,9 +470,8 @@ bool CMasternodePayments::ProcessMNWinner(CMasternodePaymentWinner& winner, CNod
         if (pmn == nullptr) {
             // it could be a non-synced masternode. ask for the mnb
             LogPrint(BCLog::MASTERNODE, "mnw - unknown masternode %s\n", winner.vinMasternode.prevout.hash.ToString());
-            // Only ask for missing items after the initial syncing process is complete
-            //   otherwise will think a full sync succeeded when they return a result
-            if (pfrom && g_tiertwo_sync_state.IsSynced()) mnodeman.AskForMN(pfrom, winner.vinMasternode);
+            // Only ask for missing items after the initial mnlist sync is complete
+            if (pfrom && g_tiertwo_sync_state.IsMasternodeListSynced()) mnodeman.AskForMN(pfrom, winner.vinMasternode);
             return state.Error("Non-existent mnwinner voter");
         }
     }
diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
@@ -197,7 +197,6 @@ void CMasternodeSync::Process()
     int64_t now = GetTime();
     if (lastProcess != 0 && now > lastProcess + 60 * 60) {
         Reset();
-        g_tiertwo_sync_state.SetBlockchainSync(false, 0);
     }
     lastProcess = now;
 

Original file line number	Diff line number	Diff line change
`@@ -470,9 +470,8 @@ bool CMasternodePayments::ProcessMNWinner(CMasternodePaymentWinner& winner, CNod`
`470`	`470`	`if (pmn == nullptr) {`
`471`	`471`	`// it could be a non-synced masternode. ask for the mnb`
`472`	`472`	`LogPrint(BCLog::MASTERNODE, "mnw - unknown masternode %s\n", winner.vinMasternode.prevout.hash.ToString());`
`473`		`- // Only ask for missing items after the initial syncing process is complete`
`474`		`- // otherwise will think a full sync succeeded when they return a result`
`475`		`- if (pfrom && g_tiertwo_sync_state.IsSynced()) mnodeman.AskForMN(pfrom, winner.vinMasternode);`
	`473`	`+ // Only ask for missing items after the initial mnlist sync is complete`
	`474`	`+ if (pfrom && g_tiertwo_sync_state.IsMasternodeListSynced()) mnodeman.AskForMN(pfrom, winner.vinMasternode);`
`476`	`475`	`return state.Error("Non-existent mnwinner voter");`
`477`	`476`	`}`
`478`	`477`	`}`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,6 @@ void CMasternodeSync::Process()`
`197`	`197`	`int64_t now = GetTime();`
`198`	`198`	`if (lastProcess != 0 && now > lastProcess + 60 * 60) {`
`199`	`199`	`Reset();`
`200`		`- g_tiertwo_sync_state.SetBlockchainSync(false, 0);`
`201`	`200`	`}`
`202`	`201`	`lastProcess = now;`
`203`	`202`