Merge 88067dd into merged_master (Elements PR ElementsProject#912)

Also fixed an intermittent failure in feature_assetsdir.py that has been bugging me for the entire rebase.
apoelstra · Nov 30, 2020 · 9f6be26 · 9f6be26
2 parents bcfa6d9 + 88067dd
commit 9f6be26
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -953,9 +953,9 @@ class CLiquidV1Params : public CChainParams {
         consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
 
         // Not active yet.
-        consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].bit = 0;
-        consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = 0;
-        consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nTimeout = 0;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].bit = 25;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nStartTime = 1000000;
+        consensus.vDeployments[Consensus::DEPLOYMENT_DYNA_FED].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
 
 
         // Finally, create genesis block

diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -30,8 +30,10 @@ struct BIP9Deployment {
     /** Bit position to select the particular bit in nVersion. */
     int bit;
     /** Start MedianTime for version bits miner confirmation. Can be a date in the past */
+    // ELEMENTS: Interpreted as block height!
     int64_t nStartTime;
     /** Timeout/expiry MedianTime for the deployment attempt. */
+    // ELEMENTS: Interpreted as block height!
     int64_t nTimeout;
 
     /** Constant for nTimeout very far in the future. */

diff --git a/test/functional/feature_assetsdir.py b/test/functional/feature_assetsdir.py
@@ -30,6 +30,7 @@ def setup_network(self, split=False):
 
     def run_test(self):
         self.nodes[0].generate(101)
+        self.wait_until(lambda: self.nodes[0].getblockcount() == 101, timeout=5)
 
         #Issue two assets that we will later label using the assetdir parameter
         issuance1 = self.nodes[0].issueasset(100, 1, False)