Fix mocknet activation params (#1286)

DeFiCh · May 25, 2022 · f6fdfec · f6fdfec
1 parent 7c8e1a6
commit f6fdfec
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -330,15 +330,10 @@ class CMainParams : public CChainParams {
             /* dTxRate  */ 0.1841462153145931
         };
 
-        if (fMockNetwork) {
-            consensus.pos.nTargetSpacing = nMockBlockTimeSecs;
-            consensus.pos.nTargetTimespanV2 = 10 * consensus.pos.nTargetSpacing;
-            // Add additional foundation members here for testing
-            if (!sMockFoundationPubKey.empty()) {
-                consensus.foundationMembers.insert(GetScriptForDestination(DecodeDestination(sMockFoundationPubKey, *this)));
-            }
-        }
+        UpdateActivationParametersFromArgs();
     }
+
+    void UpdateActivationParametersFromArgs();
 };
 
 /**
@@ -1008,6 +1003,29 @@ void CRegTestParams::UpdateActivationParametersFromArgs()
     }
 }
 
+void CMainParams::UpdateActivationParametersFromArgs() {
+    fMockNetwork = gArgs.IsArgSet("-mocknet");
+    if (fMockNetwork) {
+        LogPrintf("============================================\n");
+        LogPrintf("WARNING: MOCKNET ACTIVE. THIS IS NOT MAINNET\n");
+        LogPrintf("============================================\n");
+        sMockFoundationPubKey = gArgs.GetArg("-mocknet-key", "");
+        nMockBlockTimeSecs = gArgs.GetArg("-mocknet-blocktime", 10);
+    }
+
+    if (fMockNetwork) {
+        consensus.pos.nTargetSpacing = nMockBlockTimeSecs;
+        consensus.pos.nTargetTimespanV2 = 10 * consensus.pos.nTargetSpacing;
+        LogPrintf("mocknet: block-time: %s secs\n", nMockBlockTimeSecs);
+        // Add additional foundation members here for testing
+        if (!sMockFoundationPubKey.empty()) {
+            consensus.foundationMembers.insert(GetScriptForDestination(DecodeDestination(sMockFoundationPubKey, *this)));
+            LogPrintf("mocknet: key: %s\n", sMockFoundationPubKey);
+        }
+    }
+}
+
+
 static std::unique_ptr<const CChainParams> globalChainParams;
 
 const CChainParams &Params() {

diff --git a/src/init.cpp b/src/init.cpp
@@ -1219,12 +1219,7 @@ bool AppInitParameterInteraction()
     nMaxTipAge = gArgs.GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
     fIsFakeNet = Params().NetworkIDString() == "regtest" && gArgs.GetArg("-dummypos", false);
     CTxOut::SERIALIZE_FORCED_TO_OLD_IN_TESTS = Params().NetworkIDString() == "regtest" && gArgs.GetArg("-txnotokens", false);
-
-    fMockNetwork = gArgs.IsArgSet("-mocknet");
-    if (fMockNetwork) {
-        sMockFoundationPubKey = gArgs.GetArg("-mocknet-key", "");
-        nMockBlockTimeSecs = gArgs.GetArg("-mocknet-blocktime", 10);
-    }
+
     return true;
 }