Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b0e9ca334f |
+1
-1
@@ -6,7 +6,7 @@ if(POLICY CMP0167)
|
||||
endif()
|
||||
|
||||
project(Triangles
|
||||
VERSION 5.7.8.0
|
||||
VERSION 5.7.9.0
|
||||
DESCRIPTION "Cryptographic Triangles Wallet"
|
||||
LANGUAGES C CXX
|
||||
)
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
// These need to be macros, as version.cpp's and triangles-qt.rc's voodoo requires it
|
||||
#define CLIENT_VERSION_MAJOR 5
|
||||
#define CLIENT_VERSION_MINOR 7
|
||||
#define CLIENT_VERSION_REVISION 8
|
||||
#define CLIENT_VERSION_REVISION 9
|
||||
#define CLIENT_VERSION_BUILD 0
|
||||
|
||||
// Converts the parameter X to a string after macro replacement on X has been performed.
|
||||
|
||||
+9
-3
@@ -247,7 +247,7 @@ static bool AddHeaderSyncNode(const CBlock& header, const uint256& hashHeader)
|
||||
return false;
|
||||
}
|
||||
|
||||
if (header.GetBlockTime() > FutureDrift(GetAdjustedTime()))
|
||||
if (header.GetBlockTime() > GetTime() + 15 * 60)
|
||||
{
|
||||
printf("IBD-DIAG: header rejected (future time) hash=%s time=%u\n",
|
||||
hashHeader.ToString().substr(0,20).c_str(), header.nTime);
|
||||
@@ -2829,8 +2829,14 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c
|
||||
if (fCheckPOW && IsProofOfWork() && !CheckProofOfWork(GetHash(), nBits))
|
||||
return DoS(50, error("CheckBlock() : proof of work failed"));
|
||||
|
||||
// Check timestamp
|
||||
if (GetBlockTime() > FutureDrift(GetAdjustedTime()))
|
||||
// Check timestamp: reject blocks obviously too far in the future.
|
||||
// Use a generous 15-minute window from the raw system clock.
|
||||
// GetAdjustedTime() is NOT used here because it incorporates peer-reported
|
||||
// time offsets that differ between Tor nodes, causing nondeterministic
|
||||
// block rejection — the primary cause of persistent chain splits.
|
||||
// The deterministic timestamp checks in AcceptBlock (median-time-past,
|
||||
// prev-block-time with 3-min drift) still enforce tight rules.
|
||||
if (GetBlockTime() > GetTime() + 15 * 60)
|
||||
return error("CheckBlock() : block timestamp too far in the future");
|
||||
|
||||
// First transaction must be coinbase, the rest must not be
|
||||
|
||||
Reference in New Issue
Block a user