softwareexpiry: Defer rejecting blocks an extra day

Author: luke-jr

src/validation.cpp

@@ -3911,10 +3911,6 @@ static bool CheckBlockHeader(const CBlockHeader& block, BlockValidationState& st
     if (fCheckPOW && !CheckProofOfWork(block.GetHash(), block.nBits, consensusParams))
         return state.Invalid(BlockValidationResult::BLOCK_INVALID_HEADER, "high-hash", "proof of work failed");
 
-    if (IsThisSoftwareExpired(block.nTime)) {
-        return state.Invalid(BlockValidationResult::BLOCK_TIME_FUTURE, "node-expired", "node software has expired");
-    }
-
     return true;
 }
 
@@ -4211,6 +4207,19 @@ static bool ContextualCheckBlockHeader(const CBlockHeader& block, BlockValidatio
                                  strprintf("rejected nVersion=0x%08x block", block.nVersion));
     }
 
+    if (IsThisSoftwareExpired(block.nTime)) {
+        // Wait an extra day before we start rejecting blocks
+        CBlockIndex const *blockindex_old = pindexPrev;
+        for (int i = 0; i < 144; ++i) {
+            assert(blockindex_old);
+            blockindex_old = blockindex_old->pprev;
+        }
+        assert(blockindex_old);
+        if (IsThisSoftwareExpired(blockindex_old->GetMedianTimePast())) {
+            return state.Invalid(BlockValidationResult::BLOCK_TIME_FUTURE, "node-expired", "node software has expired");
+        }
+    }
+
     return true;
 }