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

Merge c5e67be03b into merged_master (Bitcoin PR bitcoin/bitcoin#24032)

Browse source
This commit is contained in:
James Dorfman 2024-09-06 16:19:12 +00:00
commit d8660ae865
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/consensus/params.h Normal file → Executable file
View file

@ -46,13 +46,13 @@ constexpr bool ValidDeployment(DeploymentPos dep) { return DEPLOYMENT_TESTDUMMY
*/
struct BIP9Deployment {
/** Bit position to select the particular bit in nVersion. */
int bit;
int bit{28};
/** Start MedianTime for version bits miner confirmation. Can be a date in the past */
// ELEMENTS: Interpreted as block height!
int64_t nStartTime;
int64_t nStartTime{NEVER_ACTIVE};
/** Timeout/expiry MedianTime for the deployment attempt. */
// ELEMENTS: Interpreted as block height!
int64_t nTimeout;
int64_t nTimeout{NEVER_ACTIVE};
/** If lock in occurs, delay activation until at least this block
* height. Note that activation will only occur on a retarget
* boundary.

1
src/test/versionbits_tests.cpp
View file

@ -273,6 +273,7 @@ static void check_computeblockversion(VersionBitsCache& versionbitscache, const
nStartTime == Consensus::BIP9Deployment::NEVER_ACTIVE)
{
BOOST_CHECK_EQUAL(min_activation_height, 0);
BOOST_CHECK_EQUAL(nTimeout, Consensus::BIP9Deployment::NO_TIMEOUT);
return;
}