Tip lock handling in tier two.

src/Makefile.am

@@ -109,6 +109,7 @@ BITCOIN_CORE_H = \
   primitives/block.h \
   primitives/transaction.h \
   core_io.h \
+  dsnotificationinterface.h \
   crypter.h \
   pairresult.h \
   addressbook.h \
@@ -272,6 +273,7 @@ libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libbitcoin_wallet_a_SOURCES = \
   activemasternode.cpp \
   bip38.cpp \
+  dsnotificationinterface.cpp \
   denomination_functions.cpp \
   addressbook.cpp \
   crypter.cpp \

src/dsnotificationinterface.cpp

@@ -0,0 +1,23 @@
+// Copyright (c) 2015 The Dash Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "dsnotificationinterface.h"
+#include "masternode-budget.h"
+#include "masternode-payments.h"
+#include "masternode-sync.h"
+
+CDSNotificationInterface::CDSNotificationInterface()
+{
+}
+
+CDSNotificationInterface::~CDSNotificationInterface()
+{
+}
+
+void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindex)
+{
+    masternodePayments.UpdatedBlockTip(pindex);
+    budget.UpdatedBlockTip(pindex);
+    masternodeSync.UpdatedBlockTip(pindex);
+}

src/dsnotificationinterface.h

@@ -0,0 +1,24 @@
+// Copyright (c) 2015 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_DSNOTIFICATIONINTERFACE_H
+#define BITCOIN_DSNOTIFICATIONINTERFACE_H
+
+#include "validationinterface.h"
+
+class CDSNotificationInterface : public CValidationInterface
+{
+public:
+    // virtual CDSNotificationInterface();
+    CDSNotificationInterface();
+    virtual ~CDSNotificationInterface();
+
+protected:
+    // CValidationInterface
+    void UpdatedBlockTip(const CBlockIndex *pindex);
+
+private:
+};
+
+#endif // BITCOIN_DSNOTIFICATIONINTERFACE_H

src/init.cpp

@@ -47,6 +47,8 @@
 #include "validationinterface.h"
 #include "zpivchain.h"
 
+#include "dsnotificationinterface.h"
+
 #ifdef ENABLE_WALLET
 #include "wallet/db.h"
 #include "wallet/wallet.h"
@@ -85,6 +87,8 @@ volatile bool fRestartRequested = false; // true: restart false: shutdown
 static CZMQNotificationInterface* pzmqNotificationInterface = NULL;
 #endif
 
+static CDSNotificationInterface* pdsNotificationInterface = nullptr;
+
 #ifdef WIN32
 // Win32 LevelDB doesn't use filedescriptors, and the ones used for
 // accessing block files, don't count towards to fd_set size limit
@@ -266,6 +270,12 @@ void PrepareShutdown()
     // Disconnect all slots
     UnregisterAllValidationInterfaces();
 
+    if (pdsNotificationInterface) {
+        UnregisterValidationInterface(pdsNotificationInterface);
+        delete pdsNotificationInterface;
+        pdsNotificationInterface = nullptr;
+    }
+
 #ifndef WIN32
     try {
         boost::filesystem::remove(GetPidFile());
@@ -1412,6 +1422,10 @@ bool AppInit2()
     }
 #endif
 
+    // Register tier two interface
+    pdsNotificationInterface = new CDSNotificationInterface();
+    RegisterValidationInterface(pdsNotificationInterface);
+
     // ********************************************************* Step 7: load block chain
 
     fReindex = GetBoolArg("-reindex", false);
@@ -1979,6 +1993,12 @@ bool AppInit2()
     LogPrintf("nSwiftTXDepth %d\n", nSwiftTXDepth);
     LogPrintf("Budget Mode %s\n", strBudgetMode.c_str());
 
+    // force UpdatedBlockTip to initialize pCurrentBlockIndex for DS, MN payments and budgets
+    {
+        LOCK(cs_main);
+        GetMainSignals().UpdatedBlockTip(chainActive.Tip());
+    }
+
     threadGroup.create_thread(boost::bind(&ThreadCheckMasternodes));
 
     if (ShutdownRequested()) {

src/main.cpp

@@ -4281,12 +4281,14 @@ bool ProcessNewBlock(CValidationState& state, CNode* pfrom, CBlock* pblock, CDis
     if (!ActivateBestChain(state, pblock, checked))
         return error("%s : ActivateBestChain failed", __func__);
 
+    /*
     if (!fLiteMode) {
         if (masternodeSync.RequestedMasternodeAssets > MASTERNODE_SYNC_LIST) {
             masternodePayments.ProcessBlock(GetHeight() + 10);
             budget.NewBlock();
         }
     }
+     */
 
     if (pwalletMain) {
         /* disable multisend