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/validation.cpp | |
| parent | 1168394d759b13af68acec6d5bfa04aaa24561f8 (diff) | |
| download | bitcoin-cdb893443cc16edf974f099b8485e04b3db1b1d7.tar.xz | |
[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/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index bab04b8e34..3f6f358092 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2881,7 +2881,7 @@ bool CChainState::ActivateBestChain(BlockValidationState &state, const CChainPar for (const PerBlockConnectTrace& trace : connectTrace.GetBlocksConnected()) { assert(trace.pblock && trace.pindex); - GetMainSignals().BlockConnected(trace.pblock, trace.pindex, trace.conflictedTxs); + GetMainSignals().BlockConnected(trace.pblock, trace.pindex); } } while (!m_chain.Tip() || (starting_tip && CBlockIndexWorkComparator()(m_chain.Tip(), starting_tip))); if (!blocks_connected) return true; |