Implement and enforce ChainLocks

dashpay · Jan 28, 2019 · 29532ba · 29532ba
1 parent 2bf6eb1
commit 29532ba
Show file tree

Hide file tree

Showing 12 changed files with 548 additions and 4 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -144,6 +144,7 @@ BITCOIN_CORE_H = \
   llmq/quorums.h \
   llmq/quorums_blockprocessor.h \
   llmq/quorums_commitment.h \
+  llmq/quorums_chainlocks.h \
   llmq/quorums_debug.h \
   llmq/quorums_dkgsessionhandler.h \
   llmq/quorums_dkgsessionmgr.h \
@@ -259,6 +260,7 @@ libdash_server_a_SOURCES = \
   llmq/quorums.cpp \
   llmq/quorums_blockprocessor.cpp \
   llmq/quorums_commitment.cpp \
+  llmq/quorums_chainlocks.cpp \
   llmq/quorums_debug.cpp \
   llmq/quorums_dkgsessionhandler.cpp \
   llmq/quorums_dkgsessionmgr.cpp \

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -331,6 +331,7 @@ class CMainParams : public CChainParams {
         vSporkAddresses = {"Xgtyuk76vhuFW2iT7UAiHgNdWXCf3J34wh"};
         nMinSporkKeys = 1;
         fBIP9CheckMasternodesUpgraded = true;
+        consensus.llmqChainLocks = Consensus::LLMQ_400_60;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -498,6 +499,7 @@ class CTestNetParams : public CChainParams {
         vSporkAddresses = {"yjPtiKh2uwk3bDutTEA2q9mCtXyiZRWn55"};
         nMinSporkKeys = 1;
         fBIP9CheckMasternodesUpgraded = true;
+        consensus.llmqChainLocks = Consensus::LLMQ_400_60;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -644,6 +646,7 @@ class CDevNetParams : public CChainParams {
         nMinSporkKeys = 1;
         // devnets are started with no blocks and no MN, so we can't check for upgraded MN (as there are none)
         fBIP9CheckMasternodesUpgraded = false;
+        consensus.llmqChainLocks = Consensus::LLMQ_400_60;
 
         checkpointData = (CCheckpointData) {
             boost::assign::map_list_of
@@ -758,6 +761,7 @@ class CRegTestParams : public CChainParams {
         nMinSporkKeys = 1;
         // regtest usually has no masternodes in most tests, so don't check for upgraged MNs
         fBIP9CheckMasternodesUpgraded = false;
+        consensus.llmqChainLocks = Consensus::LLMQ_10_60;
 
         checkpointData = (CCheckpointData){
             boost::assign::map_list_of

diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -181,6 +181,7 @@ struct Params {
     int nHighSubsidyFactor{1};
 
     std::map<LLMQType, LLMQParams> llmqs;
+    LLMQType llmqChainLocks;
 };
 } // namespace Consensus
 

diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
@@ -9,15 +9,17 @@
 #include "masternode-payments.h"
 #include "masternode-sync.h"
 #include "privatesend.h"
-#include "llmq/quorums.h"
-#include "llmq/quorums_dkgsessionmgr.h"
 #ifdef ENABLE_WALLET
 #include "privatesend-client.h"
 #endif // ENABLE_WALLET
 #include "validation.h"
 
 #include "evo/deterministicmns.h"
 
+#include "llmq/quorums.h"
+#include "llmq/quorums_chainlocks.h"
+#include "llmq/quorums_dkgsessionmgr.h"
+
 void CDSNotificationInterface::InitializeCurrentBlockTip()
 {
     LOCK(cs_main);
@@ -26,6 +28,7 @@ void CDSNotificationInterface::InitializeCurrentBlockTip()
 
 void CDSNotificationInterface::AcceptedBlockHeader(const CBlockIndex *pindexNew)
 {
+    llmq::chainLocksHandler->AcceptedBlockHeader(pindexNew);
     masternodeSync.AcceptedBlockHeader(pindexNew);
 }
 
@@ -55,6 +58,8 @@ void CDSNotificationInterface::UpdatedBlockTip(const CBlockIndex *pindexNew, con
     if (fLiteMode)
         return;
 
+    llmq::chainLocksHandler->UpdatedBlockTip(pindexNew, pindexFork);
+
     CPrivateSend::UpdatedBlockTip(pindexNew);
 #ifdef ENABLE_WALLET
     privateSendClient.UpdatedBlockTip(pindexNew);