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

Merge ElementsProject/elements#1062: Implement vbparams equivalent for elements

Browse source 
85c3c2b819 Deprecate con_dyna_deploy_start in favor of evbparams (Pablo Greco)
d15d08c605 Dynafed is already activated in liquidv1, remove start argument parsing (Pablo Greco)
a06aac152a Make dynafed signaling opt-out instead of opt-in (Pablo Greco)
19f54eb5e0 Make sure command line takes precedence when processing evbparams (Pablo Greco)
24cafa50cf Implement vbparams for Elements (evbparams) (Pablo Greco)

Pull request description:

  Fixes: https://github.com/ElementsProject/elements/issues/1061

ACKs for top commit:
  stevenroose:
    Looks good, utACK 85c3c2b

Tree-SHA512: 124a25d762e8c5053d388153374ac629779df5dc8af09308cb5f794c707c890fd379e81b72ecc9892e5a02e414bc6539082d95fb69dcb2512e7f91b3f8bcffdd
This commit is contained in:
Steven Roose 2021-11-26 12:27:30 +00:00
commit 586e5c7dd7
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
13 changed files with 117 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/validation.cpp
View file

@ -1982,7 +1982,7 @@ int32_t ComputeBlockVersion(const CBlockIndex* pindexPrev, const Consensus::Para
}
// Undo default signalling behavior for dynafed unless explicitly enabled.
if (!gArgs.GetBoolArg("-con_dyna_deploy_signal", false)) {
if (!gArgs.GetBoolArg("-con_dyna_deploy_signal", true)) {
auto dynafed = Consensus::DeploymentPos::DEPLOYMENT_DYNA_FED;
int bit = params.vDeployments[dynafed].bit;
if (bit > 0 && bit < VERSIONBITS_NUM_BITS) {