Add -checkpoints-file flag to defid

src/chainparams.cpp

@@ -3,6 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file LICENSE or http://www.opensource.org/licenses/mit-license.php.
 
+#include <core_io.h>
+
 #include <chainparams.h>
 #include <chainparamsseeds.h>
 #include <consensus/merkle.h>
@@ -1067,3 +1069,38 @@ void SelectParams(const std::string& network)
 void ClearCheckpoints(CChainParams &params) {
     params.checkpointData = {};
 }
+
+Res UpdateCheckpointsFromFile(CChainParams &params, const std::string &fileName) {
+    std::ifstream file(fileName);
+    if (!file.good()) {
+        return Res::Err("Could not read %s. Ensure it exists and has read permissions", fileName);
+    }
+
+    ClearCheckpoints(params);
+
+    std::string line;
+    while (std::getline(file, line)) {
+        auto trimmed = trim_ws(line);
+        if (trimmed.rfind('#', 0) == 0 || trimmed.find_first_not_of(" \n\r\t") == std::string::npos)
+            continue;
+
+        std::istringstream iss(trimmed);
+        std::string hashStr, heightStr;
+        if (!(iss >> heightStr >> hashStr)) {
+            return Res::Err("Error parsing line %s", trimmed);
+        }
+
+        uint256 hash;
+        if (!ParseHashStr(hashStr, hash)) {
+            return Res::Err("Invalid hash: %s", hashStr);
+        }
+
+        int32_t height;
+        if (!ParseInt32(heightStr, &height)) {
+            return Res::Err("Invalid height: %s", heightStr);
+        }
+
+        params.checkpointData.mapCheckpoints[height] = hash;
+    }
+    return Res::Ok();
+}

src/chainparams.h

@@ -123,6 +123,7 @@ class CChainParams
     std::set<CKeyID> genesisTeam;
 
     friend void ClearCheckpoints(CChainParams &params);
+    friend Res UpdateCheckpointsFromFile(CChainParams &params, const std::string &fileName);
 };
 
 const auto SMART_CONTRACT_DFIP_2201 = "DFIP2201";

src/init.cpp

@@ -394,7 +394,8 @@ void SetupServerArgs()
     std::vector<std::string> hidden_args = {
         "-dbcrashratio", "-forcecompactdb",
         "-interrupt-block=<hash|height>", "-stop-block=<hash|height>",
-        "-mocknet", "-mocknet-blocktime=<secs>", "-mocknet-key=<pubkey>"
+        "-mocknet", "-mocknet-blocktime=<secs>", "-mocknet-key=<pubkey>",
+        "-checkpoints-file",
         // GUI args. These will be overwritten by SetupUIArgs for the GUI
         "-choosedatadir", "-lang=<lang>", "-min", "-resetguisettings", "-splash"};
 
@@ -1119,6 +1120,14 @@ bool AppInitParameterInteraction()
         mempool.setSanityCheck(1.0 / ratio);
     }
     fCheckBlockIndex = gArgs.GetBoolArg("-checkblockindex", chainparams.DefaultConsistencyChecks());
+
+    auto checkpoints_file = gArgs.GetArg("-checkpoints-file", "");
+    if (!checkpoints_file.empty()) {
+        auto res = UpdateCheckpointsFromFile(const_cast<CChainParams&>(chainparams), checkpoints_file);
+        if (!res)
+            return InitError(strprintf(_("Error in checkpoints file : %s").translated, res.msg));
+    }
+
     if (!gArgs.GetBoolArg("-checkpoints", DEFAULT_CHECKPOINTS_ENABLED)) {
         LogPrintf("conf: checkpoints disabled.\n");
         // Safe to const_cast, as we know it's always allocated, and is always in the global var

src/masternodes/tokens.cpp

@@ -8,25 +8,14 @@
 #include <chainparams.h> // Params()
 #include <core_io.h>
 #include <primitives/transaction.h>
+#include <util/strencodings.h>
 
 #include <univalue.h>
 
 const DCT_ID CTokensView::DCT_ID_START = DCT_ID{128};
 
 extern const std::string CURRENCY_UNIT;
 
-std::string trim_ws(std::string const & str)
-{
-    std::string const ws = " \n\r\t";
-    size_t first = str.find_first_not_of(ws);
-    if (std::string::npos == first)
-    {
-        return str;
-    }
-    size_t last = str.find_last_not_of(ws);
-    return str.substr(first, (last - first + 1));
-}
-
 std::optional<CTokensView::CTokenImpl> CTokensView::GetToken(DCT_ID id) const
 {
     return ReadBy<ID, CTokenImpl>(id);

src/masternodes/tokens.h

@@ -16,8 +16,6 @@
 class CTransaction;
 class UniValue;
 
-std::string trim_ws(std::string const & str);
-
 class CToken
 {
 public:

src/util/strencodings.cpp

@@ -566,3 +566,15 @@ std::string Capitalize(std::string str)
     str[0] = ToUpper(str.front());
     return str;
 }
+
+std::string trim_ws(std::string const & str)
+{
+    std::string const ws = " \n\r\t";
+    size_t first = str.find_first_not_of(ws);
+    if (std::string::npos == first)
+    {
+        return str;
+    }
+    size_t last = str.find_last_not_of(ws);
+    return str.substr(first, (last - first + 1));
+}

src/util/strencodings.h

@@ -39,6 +39,7 @@ std::string SanitizeString(const std::string& str, int rule = SAFE_CHARS_DEFAULT
 std::vector<unsigned char> ParseHex(const char* psz);
 std::vector<unsigned char> ParseHex(const std::string& str);
 signed char HexDigit(char c);
+std::string trim_ws(std::string const & str);
 /* Returns true if each character in str is a hex character, and has an even
  * number of hex digits.*/
 bool IsHex(const std::string& str);

test/lint/check-doc.py

@@ -23,7 +23,7 @@
 CMD_GREP_WALLET_HIDDEN_ARGS = r"git grep --function-context 'void DummyWalletInit::AddWalletOptions' -- {}".format(CMD_ROOT_DIR)
 CMD_GREP_DOCS = r"git grep --perl-regexp '{}' {}".format(REGEX_DOC, CMD_ROOT_DIR)
 # list unsupported, deprecated and duplicate args as they need no documentation
-SET_DOC_OPTIONAL = set(['-h', '-help', '-dbcrashratio', '-forcecompactdb', '-interrupt-block', '-stop-block', '-mocknet', '-mocknet-key', '-mocknet-blocktime'])
+SET_DOC_OPTIONAL = set(['-h', '-help', '-dbcrashratio', '-forcecompactdb', '-interrupt-block', '-stop-block', '-mocknet', '-mocknet-key', '-mocknet-blocktime', '-checkpoints-file'])
 
 
 def lint_missing_argument_documentation():