|
|
@ -960,8 +960,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) |
|
|
|
::minRelayTxFee = CFeeRate(n); |
|
|
|
::minRelayTxFee = CFeeRate(n); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !Params().RequireStandard()); |
|
|
|
fRequireStandard = !GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard()); |
|
|
|
if (Params().RequireStandard() && !fRequireStandard) |
|
|
|
if (chainparams.RequireStandard() && !fRequireStandard) |
|
|
|
return InitError(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.NetworkIDString())); |
|
|
|
return InitError(strprintf("acceptnonstdtxn is not currently supported for %s chain", chainparams.NetworkIDString())); |
|
|
|
nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp); |
|
|
|
nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp); |
|
|
|
|
|
|
|
|
|
|
@ -996,7 +996,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) |
|
|
|
|
|
|
|
|
|
|
|
if (!mapMultiArgs["-bip9params"].empty()) { |
|
|
|
if (!mapMultiArgs["-bip9params"].empty()) { |
|
|
|
// Allow overriding BIP9 parameters for testing
|
|
|
|
// Allow overriding BIP9 parameters for testing
|
|
|
|
if (!Params().MineBlocksOnDemand()) { |
|
|
|
if (!chainparams.MineBlocksOnDemand()) { |
|
|
|
return InitError("BIP9 parameters may only be overridden on regtest."); |
|
|
|
return InitError("BIP9 parameters may only be overridden on regtest."); |
|
|
|
} |
|
|
|
} |
|
|
|
const vector<string>& deployments = mapMultiArgs["-bip9params"]; |
|
|
|
const vector<string>& deployments = mapMultiArgs["-bip9params"]; |
|
|
@ -1447,7 +1447,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (Params().GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) { |
|
|
|
if (chainparams.GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) { |
|
|
|
// Only advertize witness capabilities if they have a reasonable start time.
|
|
|
|
// Only advertize witness capabilities if they have a reasonable start time.
|
|
|
|
// This allows us to have the code merged without a defined softfork, by setting its
|
|
|
|
// This allows us to have the code merged without a defined softfork, by setting its
|
|
|
|
// end time to 0.
|
|
|
|
// end time to 0.
|
|
|
|