highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 06:28:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[wallet] Keep track of the best block time in the wallet

Browse Source 
Move nTimeBestReceived (which is only used for wallet
rebroadcasts) into the wallet.
This commit is contained in:
John Newbery
2019-03-28 13:15:47 -04:00
parent f3ecf3025f
commit f463cd1073
7 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/interfaces/chain.cpp
View File

@@ -202,8 +202,12 @@ public:
{
m_notifications->BlockDisconnected(*block);
}
void UpdatedBlockTip(const CBlockIndex* index, const CBlockIndex* fork_index, bool is_ibd) override
{
m_notifications->UpdatedBlockTip();
}
void ChainStateFlushed(const CBlockLocator& locator) override { m_notifications->ChainStateFlushed(locator); }
void ResendWalletTransactions(int64_t best_block_time, CConnman*) override
void ResendWalletTransactions(CConnman*) override
{
// `cs_main` is always held when this method is called, so it is safe to
// call `assumeLocked`. This is awkward, and the `assumeLocked` method
@@ -211,7 +215,7 @@ public:
// is replaced by a wallet timer as suggested in
// https://github.com/bitcoin/bitcoin/issues/15619
auto locked_chain = m_chain.assumeLocked();
m_notifications->ResendWalletTransactions(*locked_chain, best_block_time);
m_notifications->ResendWalletTransactions(*locked_chain);
}
Chain& m_chain;
Chain::Notifications* m_notifications;

3
src/interfaces/chain.h
View File

@@ -256,8 +256,9 @@ public:
virtual void TransactionRemovedFromMempool(const CTransactionRef& ptx) {}
virtual void BlockConnected(const CBlock& block, const std::vector<CTransactionRef>& tx_conflicted) {}
virtual void BlockDisconnected(const CBlock& block) {}
virtual void UpdatedBlockTip() {}
virtual void ChainStateFlushed(const CBlockLocator& locator) {}
virtual void ResendWalletTransactions(Lock& locked_chain, int64_t best_block_time) {}
virtual void ResendWalletTransactions(Lock& locked_chain) {}
};
//! Register handler for notifications.