|
|
|
@ -3478,48 +3478,43 @@ void CWallet::GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) c
@@ -3478,48 +3478,43 @@ void CWallet::GetKeyBirthTimes(std::map<CTxDestination, int64_t> &mapKeyBirth) c
|
|
|
|
|
unsigned int CWallet::ComputeTimeSmart(const CWalletTx& wtx) const |
|
|
|
|
{ |
|
|
|
|
unsigned int nTimeSmart = wtx.nTimeReceived; |
|
|
|
|
if (!wtx.hashUnset()) |
|
|
|
|
{ |
|
|
|
|
if (mapBlockIndex.count(wtx.hashBlock)) |
|
|
|
|
{ |
|
|
|
|
if (!wtx.hashUnset()) { |
|
|
|
|
if (mapBlockIndex.count(wtx.hashBlock)) { |
|
|
|
|
int64_t latestNow = wtx.nTimeReceived; |
|
|
|
|
int64_t latestEntry = 0; |
|
|
|
|
{ |
|
|
|
|
// Tolerate times up to the last timestamp in the wallet not more than 5 minutes into the future
|
|
|
|
|
int64_t latestTolerated = latestNow + 300; |
|
|
|
|
const TxItems & txOrdered = wtxOrdered; |
|
|
|
|
for (TxItems::const_reverse_iterator it = txOrdered.rbegin(); it != txOrdered.rend(); ++it) |
|
|
|
|
{ |
|
|
|
|
CWalletTx *const pwtx = (*it).second.first; |
|
|
|
|
if (pwtx == &wtx) |
|
|
|
|
continue; |
|
|
|
|
CAccountingEntry *const pacentry = (*it).second.second; |
|
|
|
|
int64_t nSmartTime; |
|
|
|
|
if (pwtx) |
|
|
|
|
{ |
|
|
|
|
nSmartTime = pwtx->nTimeSmart; |
|
|
|
|
if (!nSmartTime) |
|
|
|
|
nSmartTime = pwtx->nTimeReceived; |
|
|
|
|
|
|
|
|
|
// Tolerate times up to the last timestamp in the wallet not more than 5 minutes into the future
|
|
|
|
|
int64_t latestTolerated = latestNow + 300; |
|
|
|
|
const TxItems& txOrdered = wtxOrdered; |
|
|
|
|
for (auto it = txOrdered.rbegin(); it != txOrdered.rend(); ++it) { |
|
|
|
|
CWalletTx* const pwtx = it->second.first; |
|
|
|
|
if (pwtx == &wtx) { |
|
|
|
|
continue; |
|
|
|
|
} |
|
|
|
|
CAccountingEntry* const pacentry = it->second.second; |
|
|
|
|
int64_t nSmartTime; |
|
|
|
|
if (pwtx) { |
|
|
|
|
nSmartTime = pwtx->nTimeSmart; |
|
|
|
|
if (!nSmartTime) { |
|
|
|
|
nSmartTime = pwtx->nTimeReceived; |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
nSmartTime = pacentry->nTime; |
|
|
|
|
if (nSmartTime <= latestTolerated) |
|
|
|
|
{ |
|
|
|
|
latestEntry = nSmartTime; |
|
|
|
|
if (nSmartTime > latestNow) |
|
|
|
|
latestNow = nSmartTime; |
|
|
|
|
break; |
|
|
|
|
} else { |
|
|
|
|
nSmartTime = pacentry->nTime; |
|
|
|
|
} |
|
|
|
|
if (nSmartTime <= latestTolerated) { |
|
|
|
|
latestEntry = nSmartTime; |
|
|
|
|
if (nSmartTime > latestNow) { |
|
|
|
|
latestNow = nSmartTime; |
|
|
|
|
} |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
int64_t blocktime = mapBlockIndex[wtx.hashBlock]->GetBlockTime(); |
|
|
|
|
nTimeSmart = std::max(latestEntry, std::min(blocktime, latestNow)); |
|
|
|
|
} else { |
|
|
|
|
LogPrintf("%s: found %s in block %s not in index\n", __func__, wtx.GetHash().ToString(), wtx.hashBlock.ToString()); |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
LogPrintf("AddToWallet(): found %s in block %s not in index\n", |
|
|
|
|
wtx.GetHash().ToString(), |
|
|
|
|
wtx.hashBlock.ToString()); |
|
|
|
|
} |
|
|
|
|
return nTimeSmart; |
|
|
|
|
} |
|
|
|
|