Merge 4a0ab355b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24626)

This commit is contained in:
Byron Hambly 2024-02-02 11:54:04 +02:00
commit 7629e72362
2 changed files with 7 additions and 1 deletions

View file

@ -897,12 +897,14 @@ bool AppInitParameterInteraction(const ArgsManager& args)
nLocalServices = ServiceFlags(nLocalServices | NODE_COMPACT_FILTERS);
}
// if using block pruning, then disallow txindex and coinstatsindex
if (args.GetIntArg("-prune", 0)) {
if (args.GetBoolArg("-txindex", DEFAULT_TXINDEX))
return InitError(_("Prune mode is incompatible with -txindex."));
if (args.GetBoolArg("-coinstatsindex", DEFAULT_COINSTATSINDEX))
return InitError(_("Prune mode is incompatible with -coinstatsindex."));
if (args.GetBoolArg("-reindex-chainstate", false)) {
return InitError(_("Prune mode is incompatible with -reindex-chainstate. Use full -reindex instead."));
}
}
// If -forcednsseed is set to true, ensure -dnsseed has not been set to false