Minimal fix for litemode vs bad-protx-key-not-same issue#2694
Merged
UdjinM6 merged 1 commit intodashpay:v0.13.xfrom Feb 12, 2019
Merged
Minimal fix for litemode vs bad-protx-key-not-same issue#2694UdjinM6 merged 1 commit intodashpay:v0.13.xfrom
UdjinM6 merged 1 commit intodashpay:v0.13.xfrom
Conversation
UdjinM6
changed the title
Author
|
Postponing this till 13.2 |
|
As noted in Slack last week, I think we can actually merge this already now, as the v13 branch was already tagged/released for v13.1 |
UdjinM6
changed the title
MIPPL
pushed a commit
to biblepay/biblepay
that referenced
this pull request
May 26, 2019
* commit '4570079e53ad859c571aeac3f132cf2969888e14': Add missing entry to changelog (dashpay#2769) Move IS block filtering into ConnectBlock (dashpay#2766) [0.13.x] Bump version to 0.13.2 and add release notes (dashpay#2749) Bump minChainWork and AssumeValid to block #1033120 (dashpay#2750) Fix error message for invalid voting addresses (dashpay#2747) Make -masternodeblsprivkey mandatory when -masternode is given (dashpay#2745) Implement 2-stage commit for CEvoDB to avoid inconsistencies after crashes (dashpay#2744) Add collateraladdress into masternode/protx list rpc output (dashpay#2740) Only include selected TX types into CMerkleBlock (dashpay#2737) Stop g_connman first before deleting it (dashpay#2734) Fix incorrect usage of begin() when genesis block is requested in "protx diff" (dashpay#2699) Do not process blocks in CDeterministicMNManager before dip3 activation (dashpay#2698) Backport bitcoin#14701: build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (dashpay#2687) Fix some typos in doc/guide-startmany.md (dashpay#2711) Minimal fix for litemode vs bad-protx-key-not-same issue (dashpay#2694) Release notes v0.13.1.0 (dashpay#2689) # Conflicts: # configure.ac # doc/guide-startmany.md # doc/release-notes.md # src/chainparams.cpp # src/clientversion.h # src/validation.cpp
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #2693
"Minimal" because we should probably disable all of the evo/llmq stuff in
-litemodecompletely but that would be much more invasive and would require some testing to make sure we did that in a safe way (developis not affected by #2693 btw because it uses fixed height instead of a spork).EDIT: This actually might be not an issue at all if we release 0.14 shortly after spork15 activation which seems feasible.