|
|
|
@ -915,7 +915,7 @@ CWalletTx* CWallet::AddToWallet(CTransactionRef tx, const TxState& state, const
|
|
|
|
|
bool fInsertedNew = ret.second;
|
|
|
|
|
bool fUpdated = update_wtx && update_wtx(wtx, fInsertedNew);
|
|
|
|
|
if (fInsertedNew) {
|
|
|
|
|
wtx.nTimeReceived = chain().getAdjustedTime();
|
|
|
|
|
wtx.nTimeReceived = GetTime();
|
|
|
|
|
wtx.nOrderPos = IncOrderPosNext(&batch);
|
|
|
|
|
wtx.m_it_wtxOrdered = wtxOrdered.insert(std::make_pair(wtx.nOrderPos, &wtx));
|
|
|
|
|
wtx.nTimeSmart = ComputeTimeSmart(wtx, rescanning_old_block);
|
|
|
|
@ -1286,7 +1286,6 @@ void CWallet::updatedBlockTip()
|
|
|
|
|
m_best_block_time = GetTime();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void CWallet::BlockUntilSyncedToCurrentChain() const {
|
|
|
|
|
AssertLockNotHeld(cs_wallet);
|
|
|
|
|
// Skip the queue-draining stuff if we know we're caught up with
|
|
|
|
|