NotifyBlockTip signal: switch from hash (uint256) to CBlockIndex*

jonasschnelli · jonasschnelli · commit 012fc91511b1 · 2015-11-30T08:50:59.000+01:00
- also adds a boolean for indication if the tip update was happening during initial sync
- emit notification also during initial sync
diff --git a/src/init.cpp b/src/init.cpp
@@ -515,11 +515,14 @@ std::string LicenseInfo()
            "\n";
 }
 
-static void BlockNotifyCallback(const uint256& hashNewTip)
+static void BlockNotifyCallback(bool initialSync, const CBlockIndex *pBlockIndex)
 {
+    if (initialSync || !pBlockIndex)
+        return;
+
     std::string strCmd = GetArg("-blocknotify", "");
 
-    boost::replace_all(strCmd, "%s", hashNewTip.GetHex());
+    boost::replace_all(strCmd, "%s", pBlockIndex->GetBlockHash().GetHex());
     boost::thread t(runCommand, strCmd); // thread runs free
 }
 
diff --git a/src/main.cpp b/src/main.cpp
@@ -2636,9 +2636,11 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
             // Notify external listeners about the new tip.
             if (!vHashes.empty()) {
                 GetMainSignals().UpdatedBlockTip(pindexNewTip);
-                uiInterface.NotifyBlockTip(vHashes.front());
             }
         }
+        if (!vHashes.empty()) {
+            uiInterface.NotifyBlockTip(fInitialDownload, pindexNewTip);
+        }
     } while(pindexMostWork != chainActive.Tip());
     CheckBlockIndex(chainparams.GetConsensus());
 
diff --git a/src/ui_interface.h b/src/ui_interface.h
@@ -15,6 +15,7 @@
 class CBasicKeyStore;
 class CWallet;
 class uint256;
+class CBlockIndex;
 
 /** General change type (added, updated, removed). */
 enum ChangeType
@@ -94,7 +95,7 @@ class CClientUIInterface
     boost::signals2::signal<void (const std::string &title, int nProgress)> ShowProgress;
 
     /** New block has been accepted */
-    boost::signals2::signal<void (const uint256& hash)> NotifyBlockTip;
+    boost::signals2::signal<void (bool, const CBlockIndex *)> NotifyBlockTip;
 
     /** Banlist did change. */
     boost::signals2::signal<void (void)> BannedListChanged;

Original file line number	Diff line number	Diff line change
`@@ -515,11 +515,14 @@ std::string LicenseInfo()`
`515`	`515`	`"\n";`
`516`	`516`	`}`
`517`	`517`
`518`		`-static void BlockNotifyCallback(const uint256& hashNewTip)`
	`518`	`+static void BlockNotifyCallback(bool initialSync, const CBlockIndex *pBlockIndex)`
`519`	`519`	`{`
	`520`	`+ if (initialSync \|\| !pBlockIndex)`
	`521`	`+ return;`
	`522`	`+`
`520`	`523`	`std::string strCmd = GetArg("-blocknotify", "");`
`521`	`524`
`522`		`- boost::replace_all(strCmd, "%s", hashNewTip.GetHex());`
	`525`	`+ boost::replace_all(strCmd, "%s", pBlockIndex->GetBlockHash().GetHex());`
`523`	`526`	`boost::thread t(runCommand, strCmd); // thread runs free`
`524`	`527`	`}`
`525`	`528`
Original file line number	Diff line number	Diff line change
`@@ -2636,9 +2636,11 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,`
`2636`	`2636`	`// Notify external listeners about the new tip.`
`2637`	`2637`	`if (!vHashes.empty()) {`
`2638`	`2638`	`GetMainSignals().UpdatedBlockTip(pindexNewTip);`
`2639`		`- uiInterface.NotifyBlockTip(vHashes.front());`
`2640`	`2639`	`}`
`2641`	`2640`	`}`
	`2641`	`+ if (!vHashes.empty()) {`
	`2642`	`+ uiInterface.NotifyBlockTip(fInitialDownload, pindexNewTip);`
	`2643`	`+ }`
`2642`	`2644`	`} while(pindexMostWork != chainActive.Tip());`
`2643`	`2645`	`CheckBlockIndex(chainparams.GetConsensus());`
`2644`	`2646`