GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MERGE-FIX: Fix linter (mostly RPC help)

Browse source 
I also moved some RPC methods that were not at the end of the file with
the other ELEMENTS RPC methods. This makes the diff on my machine look
crazy. Let's hope GitHub has more intelligent diffs..
This commit is contained in:
Steven Roose 2019-05-25 01:41:22 +01:00
parent efe4e8ff04
commit de81c0d97e
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
18 changed files with 1010 additions and 866 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/validation.cpp
View file

@ -3013,7 +3013,7 @@ bool CChainState::InvalidateBlock(CValidationState& state, const CChainParams& c
bool ret = DisconnectTip(state, chainparams, &disconnectpool);
// DisconnectTip will add transactions to disconnectpool.
// Adjust the mempool to be consistent with the new tip, adding
// transactions back to the mempool if disconnecting was succesful,
// transactions back to the mempool if disconnecting was successful,
// and we're not doing a very deep invalidation (in which case
// keeping the mempool up to date is probably futile anyway).
UpdateMempoolForReorg(disconnectpool, /* fAddToMempool = */ (++disconnected <= 10) && ret);