Backport Bitcoin#9424, Bitcoin#10123 and Bitcoin#10153#2918
Merged
UdjinM6 merged 22 commits intodashpay:developfrom May 22, 2019
Merged
Backport Bitcoin#9424, Bitcoin#10123 and Bitcoin#10153#2918UdjinM6 merged 22 commits intodashpay:developfrom
UdjinM6 merged 22 commits intodashpay:developfrom
Conversation
PastaPastaPasta
force-pushed
the
backport-9424-10123
branch
from
ddd9b0d to
7b9a01e
Compare
|
UdjinM6
requested changes
May 16, 2019
|
Pls see commits in https://github.com/UdjinM6/dash/commits/pr2918 (note: it's based on 31570c2, so you have to drop ab74a79 if you want to cherry-pick them without conflicts). |
PastaPastaPasta
force-pushed
the
backport-9424-10123
branch
2 times, most recently
from
caf42a3 to
460fdc3
Compare
Member
Author
|
Applied commits |
|
missed UdjinM6@966f9db |
Merge bitcoin#9424: Change LogAcceptCategory to use uint32_t rather than sets of strings. 6b3bb3d Change LogAcceptCategory to use uint32_t rather than sets of strings. (Gregory Maxwell) Tree-SHA512: ebb5bcf9a7d00a32dd1390b727ff4d29330a038423611da01268d8e1d2c0229e52a1098e751d4e6db73ef4ae862e1e96d38249883fcaf12b68f55ebb01035b34 Signed-off-by: Pasta <[email protected]> 31 -> 32 Signed-off-by: Pasta <[email protected]>
…omponent 3bde556 Add -debugexclude option to switch off logging for specified components (John Newbery) Tree-SHA512: 30202e3f2085fc2fc5dd4bedb92988f4cb162c612a42cf8f6395a7da326f34975ddc347f82bc4ddca6c84c438dc0cc6e87869f90c7ff88105dbeaa52a947fa43
Signed-off-by: Pasta <[email protected]>
Signed-off-by: Pasta <[email protected]>
Signed-off-by: Pasta <[email protected]>
Signed-off-by: Pasta <[email protected]>
Specifically: - use PRIVATESEND in `CPrivateSendClientManager::GetRandomNotUsedMasternode()` - use ZMQ in `CZMQPublishRawGovernanceVoteNotifier::NotifyGovernanceVote()` and `CZMQPublishRawGovernanceObjectNotifier::NotifyGovernanceObject()`
… potential future conflicts with bitcoin ones
faab624 logging: Fix off-by-one for shrinkdebugfile (MarcoFalke) Tree-SHA512: d6153e06067906172ff0611af9e585a3ecf0a7d56925b6ad7c12e75aa802441047059b9b6f6c78e79916c3f2abc8f1998bfd2d5b84201ec6421f727c08da3c21
PastaPastaPasta
force-pushed
the
backport-9424-10123
branch
from
c1f2caf to
4e5791c
Compare
Member
Author
|
rebased on develop |
UdjinM6
requested changes
May 22, 2019
UdjinM6
changed the title
Signed-off-by: Pasta <[email protected]>
Merged
Member
Author
|
Travis building :) possibly @codablock review |
|
Yep, Travis looks ok-ish - 64 bit linux build failed by timeout (as usual :/) but 32 bit succeeded so I think we should be good. |
When adding new entries here, we'll otherwise get confused with ordering and might end up forgetting that adding something Dash specific must continue with the bit after 43.
codablock
approved these changes
May 22, 2019
There was a problem hiding this comment.
utACK
Ignoring that we haven't clarified my question about bitcoin#10150 yet as we can do this in a later PR.
|
Lets wait for #2932 to be merged and then merge this one. I'd like to make sure that Travis actually becomes constantly green again (last time we ignored this, a whole bunch of flaky test failures creeped in) |
|
|
This was referenced May 22, 2019
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
4 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.
decided to break this one off since 9424 is quite big and could conflict with a lot of stuff. See individual commits. Due to the new setup I can't think of an easy way to do a
-debug dashso yeah...