Update consensus that blocks must be in chronological order (#2933)

* Update consensus that blocks must be in chronological order * Add option to test forward staking * Rename arg * Rename arg
DeFiCh · Jul 5, 2024 · 44ab45a · 44ab45a
1 parent 6096226
commit 44ab45a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -539,6 +539,7 @@ void SetupServerArgs()
     gArgs.AddArg("-blocktimeordering", strprintf("(Deprecated) Whether to order transactions by time, otherwise ordered by fee (default: %u)", false), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     gArgs.AddArg("-txordering", strprintf("Whether to order transactions by entry time, fee or both randomly (0: mixed, 1: fee based, 2: entry time) (default: %u)", DEFAULT_TX_ORDERING), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
     gArgs.AddArg("-ethstartstate", strprintf("Initialise Ethereum state trie using JSON input"), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
+    gArgs.AddArg("-ascendingstaketime", strprintf("Test staking forward in time from the current block"), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
 #ifdef USE_UPNP
 #if USE_UPNP
     gArgs.AddArg("-upnp", "Use UPnP to map the listening port (default: 1 when listening and no -proxy)", ArgsManager::ALLOW_ANY, OptionsCategory::CONNECTION);

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -1177,8 +1177,14 @@ namespace pos {
                     nLastCoinStakeSearchTime = tip->GetMedianTimePast() + 1;
                 }
             } else {
-                // Plus one to avoid time-too-old error on exact median time.
-                nLastCoinStakeSearchTime = tip->GetMedianTimePast() + 1;
+                if (gArgs.GetBoolArg("-ascendingstaketime", false) ||
+                    blockHeight >= static_cast<int64_t>(Params().GetConsensus().DF24Height)) {
+                    // Set time to last block time. New blocks must be after the last block.
+                    nLastCoinStakeSearchTime = tip->GetBlockTime();
+                } else {
+                    // Plus one to avoid time-too-old error on exact median time.
+                    nLastCoinStakeSearchTime = tip->GetMedianTimePast() + 1;
+                }
             }
 
             lastBlockSeen = tip->GetBlockHash();

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -5047,13 +5047,22 @@ static bool ContextualCheckBlockHeader(const CBlockHeader &block,
     }
 
     // Check timestamp against prev
-    if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast()) {
-        return state.Invalid(ValidationInvalidReason::BLOCK_INVALID_HEADER,
-                             false,
-                             "time-too-old",
-                             strprintf("block's timestamp is too early. Block time: %d Min time: %d",
-                                       block.GetBlockTime(),
-                                       pindexPrev->GetMedianTimePast()));
+    if (nHeight >= consensusParams.DF24Height) {
+        if (block.GetBlockTime() <= pindexPrev->GetBlockTime()) {
+            return state.Invalid(ValidationInvalidReason::BLOCK_INVALID_HEADER,
+                                 false,
+                                 "time-before-prev",
+                                 "block's timestamp cannot be the same or before previous block's timestamp");
+        }
+    } else {
+        if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast()) {
+            return state.Invalid(ValidationInvalidReason::BLOCK_INVALID_HEADER,
+                                 false,
+                                 "time-too-old",
+                                 strprintf("block's timestamp is too early. Block time: %d Min time: %d",
+                                           block.GetBlockTime(),
+                                           pindexPrev->GetMedianTimePast()));
+        }
     }
 
     // Check timestamp