forked from dashpay/dash
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit Dash 0.14.0.5 into Biblepay develop (fix important DoS a…
…ttack vector) * commit '2ae1ce4800a22c717b67aea97680bbe1eeffa07b': [v0.14.0.x] Update release notes with notable changes and changelog (dashpay#3229) [v0.14.0.x] Make sure mempool txes are properly processed by CChainLocksHandler despite node restarts (dashpay#3230) [v0.14.0.x] Bump version and prepare release notes (dashpay#3228) More fixes in llmq-is-retroactive tests Make llmq-is-retroactive test compatible with 0.14.0.x Make wait_for_xxx methods compatible with 0.14.0.x Allow re-signing of IS locks when performing retroactive signing (dashpay#3219) Add wait_for_xxx methods as found in develop More/better logging for InstantSend Tests: Fix the way nodes are connected to each other in setup_network/start_masternodes (dashpay#3221) More fixes related to extra_args Tests: Allow specifying different cmd-line params for each masternode (dashpay#3222) Don't join thread in CQuorum::~CQuorum when called from within the thread (dashpay#3223) Merge bitcoin#12392: Fix ignoring tx data requests when fPauseSend is set on a peer (dashpay#3225) # Conflicts: # configure.ac # doc/man/biblepay-cli.1 # doc/man/biblepay-qt.1 # doc/man/biblepay-tx.1 # doc/man/biblepayd.1 # doc/release-notes.md # qa/pull-tester/rpc-tests.py # qa/rpc-tests/test_framework/test_framework.py # src/clientversion.h
- Loading branch information
Showing
27 changed files
with
1,185 additions
and
346 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.