diff options
| author | John Newbery <john@johnnewbery.com> | 2019-03-28 13:15:47 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2019-04-09 10:37:49 -0400 |
| commit | f463cd107361a172a17e4c5510b06eb8a67aade0 (patch) | |
| tree | 713da4c32558cf5acbc57a2805895482a3322a90 /src/interfaces | |
| parent | f3ecf3025f82f84d42ec463990ff787647cc7bf5 (diff) | |
[wallet] Keep track of the best block time in the wallet
Move nTimeBestReceived (which is only used for wallet
rebroadcasts) into the wallet.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/chain.cpp | 8 | ||||
| -rw-r--r-- | src/interfaces/chain.h | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/interfaces/chain.cpp b/src/interfaces/chain.cpp index e409ced601..6c918b73f9 100644 --- a/src/interfaces/chain.cpp +++ b/src/interfaces/chain.cpp @@ -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; diff --git a/src/interfaces/chain.h b/src/interfaces/chain.h index d11a59241e..82e2c7eb23 100644 --- a/src/interfaces/chain.h +++ b/src/interfaces/chain.h @@ -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. |