Skip to content

Commit da4908c

Browse files
sdaftuarMarcoFalke
sdaftuar
authored and
MarcoFalke
committed
Allow setting nMinimumChainWork on command line
Github-Pull: #10357 Rebased-From: 0311836
1 parent 4108879 commit da4908c

File tree

7 files changed

+68
-5
lines changed

7 files changed

+68
-5
lines changed

‎src/init.cpp‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,9 @@ std::string HelpMessage(HelpMessageMode mode)
362362
strUsage += HelpMessageOpt("-maxorphantx=<n>", strprintf(_("Keep at most <n> unconnectable transactions in memory (default: %u)"), DEFAULT_MAX_ORPHAN_TRANSACTIONS));
363363
strUsage += HelpMessageOpt("-maxmempool=<n>", strprintf(_("Keep the transaction memory pool below <n> megabytes (default: %u)"), DEFAULT_MAX_MEMPOOL_SIZE));
364364
strUsage += HelpMessageOpt("-mempoolexpiry=<n>", strprintf(_("Do not keep transactions in the mempool longer than <n> hours (default: %u)"), DEFAULT_MEMPOOL_EXPIRY));
365+
if (showDebug) {
366+
strUsage += HelpMessageOpt("-minimumchainwork=<hex>", strprintf("Minimum work assumed to exist on a valid chain in hex (default: %s, testnet: %s)", defaultChainParams->GetConsensus().nMinimumChainWork.GetHex(), testnetChainParams->GetConsensus().nMinimumChainWork.GetHex()));
367+
}
365368
strUsage += HelpMessageOpt("-persistmempool", strprintf(_("Whether to save the mempool on shutdown and load on restart (default: %u)"), DEFAULT_PERSIST_MEMPOOL));
366369
strUsage += HelpMessageOpt("-blockreconstructionextratxn=<n>", strprintf(_("Extra transactions to keep in memory for compact block reconstructions (default: %u)"), DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN));
367370
strUsage += HelpMessageOpt("-par=<n>", strprintf(_("Set the number of script verification threads (%u to %d, 0 = auto, <0 = leave that many cores free, default: %d)"),
@@ -979,6 +982,20 @@ bool AppInitParameterInteraction()
979982
else
980983
LogPrintf("Validating signatures for all blocks.\n");
981984

985+
if (gArgs.IsArgSet("-minimumchainwork")) {
986+
const std::string minChainWorkStr = gArgs.GetArg("-minimumchainwork", "");
987+
if (!IsHexNumber(minChainWorkStr)) {
988+
return InitError(strprintf("Invalid non-hex (%s) minimum chain work value specified", minChainWorkStr));
989+
}
990+
nMinimumChainWork = UintToArith256(uint256S(minChainWorkStr));
991+
} else {
992+
nMinimumChainWork = UintToArith256(chainparams.GetConsensus().nMinimumChainWork);
993+
}
994+
LogPrintf("Setting nMinimumChainWork=%s\n", nMinimumChainWork.GetHex());
995+
if (nMinimumChainWork < UintToArith256(chainparams.GetConsensus().nMinimumChainWork)) {
996+
LogPrintf("Warning: nMinimumChainWork set below default value of %s\n", chainparams.GetConsensus().nMinimumChainWork.GetHex());
997+
}
998+
982999
// mempool limits
9831000
int64_t nMempoolSizeMax = gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
9841001
int64_t nMempoolSizeMin = gArgs.GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) * 1000 * 40;

‎src/net_processing.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ void FindNextBlocksToDownload(NodeId nodeid, unsigned int count, std::vector<con
466466
// Make sure pindexBestKnownBlock is up to date, we'll need it.
467467
ProcessBlockAvailability(nodeid);
468468

469-
if (state->pindexBestKnownBlock == nullptr || state->pindexBestKnownBlock->nChainWork < chainActive.Tip()->nChainWork || state->pindexBestKnownBlock->nChainWork < UintToArith256(consensusParams.nMinimumChainWork)) {
469+
if (state->pindexBestKnownBlock == nullptr || state->pindexBestKnownBlock->nChainWork < chainActive.Tip()->nChainWork || state->pindexBestKnownBlock->nChainWork < nMinimumChainWork) {
470470
// This peer has nothing interesting.
471471
return;
472472
}

‎src/test/util_tests.cpp‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,31 @@ BOOST_AUTO_TEST_CASE(util_IsHex)
253253
BOOST_CHECK(!IsHex("0x0000"));
254254
}
255255

256+
BOOST_AUTO_TEST_CASE(util_IsHexNumber)
257+
{
258+
BOOST_CHECK(IsHexNumber("0x0"));
259+
BOOST_CHECK(IsHexNumber("0"));
260+
BOOST_CHECK(IsHexNumber("0x10"));
261+
BOOST_CHECK(IsHexNumber("10"));
262+
BOOST_CHECK(IsHexNumber("0xff"));
263+
BOOST_CHECK(IsHexNumber("ff"));
264+
BOOST_CHECK(IsHexNumber("0xFfa"));
265+
BOOST_CHECK(IsHexNumber("Ffa"));
266+
BOOST_CHECK(IsHexNumber("0x00112233445566778899aabbccddeeffAABBCCDDEEFF"));
267+
BOOST_CHECK(IsHexNumber("00112233445566778899aabbccddeeffAABBCCDDEEFF"));
268+
269+
BOOST_CHECK(!IsHexNumber("")); // empty string not allowed
270+
BOOST_CHECK(!IsHexNumber("0x")); // empty string after prefix not allowed
271+
BOOST_CHECK(!IsHexNumber("0x0 ")); // no spaces at end,
272+
BOOST_CHECK(!IsHexNumber(" 0x0")); // or beginning,
273+
BOOST_CHECK(!IsHexNumber("0x 0")); // or middle,
274+
BOOST_CHECK(!IsHexNumber(" ")); // etc.
275+
BOOST_CHECK(!IsHexNumber("0x0ga")); // invalid character
276+
BOOST_CHECK(!IsHexNumber("x0")); // broken prefix
277+
BOOST_CHECK(!IsHexNumber("0x0x00")); // two prefixes not allowed
278+
279+
}
280+
256281
BOOST_AUTO_TEST_CASE(util_seed_insecure_rand)
257282
{
258283
SeedInsecureRand(true);

‎src/utilstrencodings.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,19 @@ bool IsHex(const std::string& str)
6565
return (str.size() > 0) && (str.size()%2 == 0);
6666
}
6767

68+
bool IsHexNumber(const std::string& str)
69+
{
70+
size_t starting_location = 0;
71+
if (str.size() > 2 && *str.begin() == '0' && *(str.begin()+1) == 'x') {
72+
starting_location = 2;
73+
}
74+
for (auto c : str.substr(starting_location)) {
75+
if (HexDigit(c) < 0) return false;
76+
}
77+
// Return false for empty string or "0x".
78+
return (str.size() > starting_location);
79+
}
80+
6881
std::vector<unsigned char> ParseHex(const char* psz)
6982
{
7083
// convert hex dump to vector

‎src/utilstrencodings.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,13 @@ std::string SanitizeString(const std::string& str, int rule = SAFE_CHARS_DEFAULT
3838
std::vector<unsigned char> ParseHex(const char* psz);
3939
std::vector<unsigned char> ParseHex(const std::string& str);
4040
signed char HexDigit(char c);
41+
/* Returns true if each character in str is a hex character, and has an even
42+
* number of hex digits.*/
4143
bool IsHex(const std::string& str);
44+
/**
45+
* Return true if the string is a hex number, optionally prefixed with "0x"
46+
*/
47+
bool IsHexNumber(const std::string& str);
4248
std::vector<unsigned char> DecodeBase64(const char* p, bool* pfInvalid = nullptr);
4349
std::string DecodeBase64(const std::string& str);
4450
std::string EncodeBase64(const unsigned char* pch, size_t len);

‎src/validation.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE;
8080
bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT;
8181

8282
uint256 hashAssumeValid;
83+
arith_uint256 nMinimumChainWork;
8384

8485
CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE);
8586
CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE;
@@ -1032,8 +1033,6 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
10321033

10331034
bool IsInitialBlockDownload()
10341035
{
1035-
const CChainParams& chainParams = Params();
1036-
10371036
// Once this function has returned false, it must remain false.
10381037
static std::atomic<bool> latchToFalse{false};
10391038
// Optimization: pre-test latch before taking the lock.
@@ -1047,7 +1046,7 @@ bool IsInitialBlockDownload()
10471046
return true;
10481047
if (chainActive.Tip() == nullptr)
10491048
return true;
1050-
if (chainActive.Tip()->nChainWork < UintToArith256(chainParams.GetConsensus().nMinimumChainWork))
1049+
if (chainActive.Tip()->nChainWork < nMinimumChainWork)
10511050
return true;
10521051
if (chainActive.Tip()->GetBlockTime() < (GetTime() - nMaxTipAge))
10531052
return true;
@@ -1664,7 +1663,7 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd
16641663
if (it != mapBlockIndex.end()) {
16651664
if (it->second->GetAncestor(pindex->nHeight) == pindex &&
16661665
pindexBestHeader->GetAncestor(pindex->nHeight) == pindex &&
1667-
pindexBestHeader->nChainWork >= UintToArith256(chainparams.GetConsensus().nMinimumChainWork)) {
1666+
pindexBestHeader->nChainWork >= nMinimumChainWork) {
16681667
// This block is a member of the assumed verified chain and an ancestor of the best header.
16691668
// The equivalent time check discourages hash power from extorting the network via DOS attack
16701669
// into accepting an invalid block through telling users they must manually set assumevalid.

‎src/validation.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ extern bool fEnableReplacement;
186186
/** Block hash whose ancestors we will assume to have valid scripts without checking them. */
187187
extern uint256 hashAssumeValid;
188188

189+
/** Minimum work we will assume exists on some valid chain. */
190+
extern arith_uint256 nMinimumChainWork;
191+
189192
/** Best header we've seen so far (used for getheaders queries' starting points). */
190193
extern CBlockIndex *pindexBestHeader;
191194

0 commit comments

Comments
 (0)