diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-04-17 14:45:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-04-17 14:46:04 +0200 |
| commit | 2584925077f9658b3953ad931b74779006e59807 (patch) | |
| tree | 63b71527f3fb125e0b7fe98e73ccb524a508059f /src/wallet/wallet.h | |
| parent | a077a90da88f12d9f10c8b85840bdb847a98b0a0 (diff) | |
| parent | 9fececb2cbabc52cc375b84bf840fac018cc8121 (diff) | |
| download | bitcoin-2584925077f9658b3953ad931b74779006e59807.tar.xz | |
Merge #10178: Remove CValidationInterface::UpdatedTransaction
9fececb Remove CValidationInterface::UpdatedTransaction (Matt Corallo)
d89f8ad Make DisconnectBlock and ConnectBlock static in validation.cpp (Matt Corallo)
Tree-SHA512: 146597b538c09c1e8071f4f88ffeba0645c6816f86030b142174bd298cc18ae09a400e6ca8de04d091e37b635f99f4c05982c09e6729691eb8ca6b8439ab97ca
Diffstat (limited to 'src/wallet/wallet.h')
| -rw-r--r-- | src/wallet/wallet.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index cc1a6b7183..2eb6bd9504 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -713,6 +713,10 @@ private: */ bool AddWatchOnly(const CScript& dest) override; + // Used to NotifyTransactionChanged of the previous block's coinbase when + // the next block comes in + uint256 hashPrevBestCoinbase; + public: /* * Main wallet lock. @@ -978,8 +982,6 @@ public: bool DelAddressBook(const CTxDestination& address); - void UpdatedTransaction(const uint256 &hashTx) override; - void Inventory(const uint256 &hash) override { { |