diff options
author | John Newbery <john@johnnewbery.com> | 2019-11-11 10:43:34 -0500 |
---|---|---|
committer | John Newbery <john@johnnewbery.com> | 2020-03-11 18:38:33 -0400 |
commit | cdb893443cc16edf974f099b8485e04b3db1b1d7 (patch) | |
tree | e18f5ecc5fa42220d222a926c47ba702d28bfb44 /src/wallet | |
parent | 1168394d759b13af68acec6d5bfa04aaa24561f8 (diff) |
[validation interface] Remove vtxConflicted from BlockConnected
The wallet now uses TransactionRemovedFromMempool to be notified about
conflicted wallet, and no other clients use vtxConflicted.
Diffstat (limited to 'src/wallet')
-rw-r--r-- | src/wallet/wallet.cpp | 2 | ||||
-rw-r--r-- | src/wallet/wallet.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 8c63f5b907..4b705f4e77 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1110,7 +1110,7 @@ void CWallet::TransactionRemovedFromMempool(const CTransactionRef &ptx) { } } -void CWallet::BlockConnected(const CBlock& block, const std::vector<CTransactionRef>& vtxConflicted, int height) +void CWallet::BlockConnected(const CBlock& block, int height) { const uint256& block_hash = block.GetHash(); auto locked_chain = chain().lock(); diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 6c1c3040c2..34c3cd3818 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -874,7 +874,7 @@ public: bool AddToWallet(const CWalletTx& wtxIn, bool fFlushOnClose=true); void LoadToWallet(CWalletTx& wtxIn) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); void TransactionAddedToMempool(const CTransactionRef& tx) override; - void BlockConnected(const CBlock& block, const std::vector<CTransactionRef>& vtxConflicted, int height) override; + void BlockConnected(const CBlock& block, int height) override; void BlockDisconnected(const CBlock& block, int height) override; void UpdatedBlockTip() override; int64_t RescanFromTime(int64_t startTime, const WalletRescanReserver& reserver, bool update); |