Merge #6480: include the chaintip blockindex in the SyncTransaction signal, add signal UpdateTip()

7d0bf0b include the chaintip *blockIndex in the SyncTransaction signal (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan
2016-02-04 17:02:57 +01:00
7 changed files with 16 additions and 15 deletions

View File

@@ -896,7 +896,7 @@ void CWallet::MarkConflicted(const uint256& hashBlock, const uint256& hashTx)
}
}
void CWallet::SyncTransaction(const CTransaction& tx, const CBlock* pblock)
void CWallet::SyncTransaction(const CTransaction& tx, const CBlockIndex *pindex, const CBlock* pblock)
{
LOCK2(cs_main, cs_wallet);