[Init] Add -mnoperatorprivatekey to flag the active mn as deterministic

PIVX-Project · Mar 26, 2021 · 95b79fb · 95b79fb
1 parent 4c48e47
commit 95b79fb
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 17 deletions.
diff --git a/src/activemasternode.cpp b/src/activemasternode.cpp
@@ -61,11 +61,9 @@ OperationResult CActiveDeterministicMasternodeManager::SetOperatorKey(const std:
     if (strMNOperatorPrivKey.empty()) {
         return errorOut("ERROR: Masternode operator priv key cannot be empty.");
     }
-    CPubKey pubkey;
-    if (!CMessageSigner::GetKeysFromSecret(strMNOperatorPrivKey, info.keyOperator, pubkey)) {
+    if (!CMessageSigner::GetKeysFromSecret(strMNOperatorPrivKey, info.keyOperator, info.keyIDOperator)) {
         return errorOut(_("Invalid mnoperatorprivatekey. Please see the documentation."));
     }
-    info.keyIDOperator = pubkey.GetID();
     return OperationResult(true);
 }
 

diff --git a/src/init.cpp b/src/init.cpp
@@ -316,7 +316,7 @@ void PrepareShutdown()
         pEvoNotificationInterface = nullptr;
     }
 
-    if (fMasterNode) {
+    if (activeMasternodeManager) {
         UnregisterValidationInterface(activeMasternodeManager);
     }
 
@@ -573,6 +573,7 @@ std::string HelpMessage(HelpMessageMode mode)
     strUsage += HelpMessageOpt("-masternodeprivkey=<n>", _("Set the masternode private key"));
     strUsage += HelpMessageOpt("-masternodeaddr=<n>", strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:51472"));
     strUsage += HelpMessageOpt("-budgetvotemode=<mode>", _("Change automatic finalized budget voting behavior. mode=auto: Vote for only exact finalized budget match to my generated budget. (string, default: auto)"));
+    strUsage += HelpMessageOpt("-mnoperatorprivatekey=<WIF>", _("Set the masternode operator private key. Only valid with -masternode=1. When set, the masternode acts as a deterministic masternode."));
 
     strUsage += HelpMessageGroup(_("Node relay options:"));
     strUsage += HelpMessageOpt("-datacarrier", strprintf(_("Relay and mine data carrier transactions (default: %u)"), DEFAULT_ACCEPT_DATACARRIER));
@@ -1908,14 +1909,35 @@ bool AppInitMain()
     }
 
     if (fMasterNode) {
-        LogPrintf("IS MASTER NODE\n");
-
-        // init and register activeMasternodeManager
-        activeMasternodeManager = new CActiveDeterministicMasternodeManager();
-        RegisterValidationInterface(activeMasternodeManager);
-
-        auto res = initMasternode(gArgs.GetArg("-masternodeprivkey", ""), gArgs.GetArg("-masternodeaddr", ""), true);
-        if (!res) { return UIError(res.getError()); }
+        const bool isDIP3Enforced = deterministicMNManager->IsDIP3Enforced();
+        const std::string& mnoperatorkeyStr = gArgs.GetArg("-mnoperatorprivatekey", "");
+        const bool fDeterministic = !mnoperatorkeyStr.empty();
+        LogPrintf("IS %sMASTERNODE\n", (fDeterministic ? "DETERMINISTIC " : ""));
+
+        if (fDeterministic) {
+            // Check enforcement
+            if (!isDIP3Enforced) {
+                const std::string strError = "Cannot start deterministic masternode before enforcement. Remove -mnoperatorprivatekey to start as legacy masternode";
+                LogPrintf("-- ERROR: %s\n", strError);
+                return UIError(_(strError.c_str()));
+            }
+            // Create and register activeMasternodeManager
+            activeMasternodeManager = new CActiveDeterministicMasternodeManager();
+            auto res = activeMasternodeManager->SetOperatorKey(mnoperatorkeyStr);
+            if (!res) { return UIError(res.getError()); }
+            RegisterValidationInterface(activeMasternodeManager);
+            // Init active masternode
+            activeMasternodeManager->Init();
+        } else {
+            // Check enforcement
+            if (isDIP3Enforced) {
+                const std::string strError = "Legacy masternode system disabled. Use -mnoperatorprivatekey to start as deterministic masternode";
+                LogPrintf("-- ERROR: %s\n", strError);
+                return UIError(_(strError.c_str()));
+            }
+            auto res = initMasternode(gArgs.GetArg("-masternodeprivkey", ""), gArgs.GetArg("-masternodeaddr", ""), true);
+            if (!res) { return UIError(res.getError()); }
+        }
     }
 
     //get the mode of budget voting for this masternode
@@ -1952,11 +1974,6 @@ bool AppInitMain()
         return false;
     }
 
-    if (fMasterNode) {
-        assert(activeMasternodeManager);
-        activeMasternodeManager->Init();
-    }
-
     // ********************************************************* Step 11: start node
 
     if (!strErrors.str().empty())

diff --git a/src/messagesigner.cpp b/src/messagesigner.cpp
@@ -22,6 +22,16 @@ bool CMessageSigner::GetKeysFromSecret(const std::string& strSecret, CKey& keyRe
     return true;
 }
 
+bool CMessageSigner::GetKeysFromSecret(const std::string& strSecret, CKey& keyRet, CKeyID& keyIDRet)
+{
+    CPubKey pubkey;
+    if (!GetKeysFromSecret(strSecret, keyRet, pubkey)) {
+        return false;
+    }
+    keyIDRet = pubkey.GetID();
+    return true;
+}
+
 uint256 CMessageSigner::GetMessageHash(const std::string& strMessage)
 {
     CHashWriter ss(SER_GETHASH, 0);

diff --git a/src/messagesigner.h b/src/messagesigner.h
@@ -23,6 +23,7 @@ class CMessageSigner
 public:
     /// Set the private/public key values, returns true if successful
     static bool GetKeysFromSecret(const std::string& strSecret, CKey& keyRet, CPubKey& pubkeyRet);
+    static bool GetKeysFromSecret(const std::string& strSecret, CKey& keyRet, CKeyID& keyIDRet);
     /// Get the hash based on the input message
     static uint256 GetMessageHash(const std::string& strMessage);
     /// Sign the message, returns true if successful