Mining: Toggle ascending via Gov var (#3041)

* Mining: Toggle ascending via Gov var * simplify check * fmt --------- Co-authored-by: Prasanna Loganathar <[email protected]>
DeFiCh · Sep 10, 2024 · ac6dfea · ac6dfea
1 parent 87dec63
commit ac6dfea
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -1204,6 +1204,7 @@ namespace pos {
         uint32_t mintedBlocks{};
         int64_t blockTime{};
         int64_t subNodeBlockTime{};
+        bool ascendingEnabled{};
 
         {
             LOCK(cs_main);
@@ -1221,6 +1222,10 @@ namespace pos {
             }
             subNodeBlockTime =
                 pcustomcsview->GetBlockTimes(operatorId, blockHeight, creationHeight, *timeLock)[subNode];
+            const auto attributes = pcustomcsview->GetAttributes();
+            CDataStructureV0 enabledKey{AttributeTypes::Param, ParamIDs::Feature, DFIPKeys::AscendingBlockTime};
+            ascendingEnabled =
+                attributes->GetValue(enabledKey, false) || gArgs.GetBoolArg("-ascendingstaketime", false);
         }
 
         auto nBits = pos::GetNextWorkRequired(tip, blockTime, chainparams.GetConsensus());
@@ -1235,8 +1240,7 @@ namespace pos {
                     nLastCoinStakeSearchTime = tip->GetMedianTimePast() + 1;
                 }
             } else {
-                if (gArgs.GetBoolArg("-ascendingstaketime", false) ||
-                    blockHeight >= static_cast<int64_t>(Params().GetConsensus().DF24Height)) {
+                if (ascendingEnabled) {
                     // Set time to last block time. New blocks must be after the last block.
                     nLastCoinStakeSearchTime = tip->GetBlockTime();
                 } else {