GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:15 +00:00
commit 5f280a6068
22 changed files with 248 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/init.cpp
View file

@ -1734,12 +1734,9 @@ bool AppInitMain(InitInterfaces& interfaces)
}
}
if (chainparams.GetConsensus().vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout != 0) {
// Only advertise witness capabilities if they have a reasonable start time.
// This allows us to have the code merged without a defined softfork, by setting its
// end time to 0.
// Note that setting NODE_WITNESS is never required: the only downside from not
// doing so is that after activation, no upgraded nodes will fetch from you.
if (chainparams.GetConsensus().SegwitHeight != std::numeric_limits<int>::max()) {
// Advertise witness capabilities.
// The option to not set NODE_WITNESS is only used in the tests and should be removed.
nLocalServices = ServiceFlags(nLocalServices | NODE_WITNESS);
}