Backport Bitcoin#9424, Bitcoin#10123 and Bitcoin#10153 by PastaPastaPasta · Pull Request #2918 · dashpay/dash

PastaPastaPasta · 2019-05-12T06:03:08Z

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 dash so yeah...

UdjinM6 · 2019-05-15T16:43:39Z

util.h:130:31: error: enumerator value -2147483648 is outside the range of underlying type 'uint32_t {aka unsigned int}'
         SPORK       = (1 << 31),

https://travis-ci.org/dashpay/dash/jobs/531324485#L1871

UdjinM6

https://travis-ci.org/dashpay/dash/jobs/533114481#L3941 + see below

UdjinM6 · 2019-05-17T09:05:54Z

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).

Travis: https://travis-ci.org/UdjinM6/dash/builds/533565523

PastaPastaPasta · 2019-05-17T16:21:55Z

Applied commits

UdjinM6 · 2019-05-17T17:32:13Z

missed UdjinM6@966f9db

UdjinM6

utACK

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 <Pasta@dash.org> 31 -> 32 Signed-off-by: Pasta <Pasta@dash.org>

…omponent 3bde556 Add -debugexclude option to switch off logging for specified components (John Newbery) Tree-SHA512: 30202e3f2085fc2fc5dd4bedb92988f4cb162c612a42cf8f6395a7da326f34975ddc347f82bc4ddca6c84c438dc0cc6e87869f90c7ff88105dbeaa52a947fa43

Signed-off-by: Pasta <Pasta@dash.org>

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 · 2019-05-21T13:55:31Z

rebased on develop

Signed-off-by: Pasta <Pasta@dash.org>

UdjinM6

utACK

PastaPastaPasta · 2019-05-22T16:49:31Z

Travis building :) possibly @codablock review

UdjinM6 · 2019-05-22T16:59:52Z

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.

codablock

See these commits/fixes:

Also, what about bitcoin#10150 and the logging RPC? Should we backport it as well or only stick with our custom debug RPC?

…!= BCLog::NONE

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

utACK

Ignoring that we haven't clarified my question about bitcoin#10150 yet as we can do this in a later PR.

codablock · 2019-05-22T18:00:29Z

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)

UdjinM6 · 2019-05-22T21:51:16Z

develop is green https://travis-ci.org/dashpay/dash/builds/535988472.

PastaPastaPasta force-pushed the backport-9424-10123 branch from ddd9b0d to 7b9a01e Compare May 12, 2019 06:07

UdjinM6 requested changes May 16, 2019

View reviewed changes

Comment thread src/util.cpp Outdated

Comment thread src/util.cpp Outdated

Comment thread src/util.cpp Outdated

Comment thread src/init.cpp Outdated

Comment thread src/init.cpp Outdated

PastaPastaPasta force-pushed the backport-9424-10123 branch 2 times, most recently from caf42a3 to 460fdc3 Compare May 17, 2019 16:21

UdjinM6 added this to the 14.1 milestone May 17, 2019

UdjinM6 previously approved these changes May 19, 2019

View reviewed changes

PastaPastaPasta and others added 17 commits May 21, 2019 08:53

bump to uint64_t due to added Dash codes

9d4a853

Signed-off-by: Pasta <Pasta@dash.org>

bump to uint64_t due to added Dash codes cont.

6d96c3e

Signed-off-by: Pasta <Pasta@dash.org>

string -> BCLog format

d86aa0f

Signed-off-by: Pasta <Pasta@dash.org>

uint32_t -> uint64_t

f3b95ee

Signed-off-by: Pasta <Pasta@dash.org>

Fix CBatchedLogger

424fc41

Fix most fDebug-s

eaac520

Fix debug rpc

9935e7f

Fix BENCH and RAND conflicts

fd067bf

Add ALERT and use it

3d82bfa

Update LogPrint-s in dash-specific code

9a72d85

Tweak few log categories

8459763

Specifically: - use PRIVATESEND in `CPrivateSendClientManager::GetRandomNotUsedMasternode()` - use ZMQ in `CZMQPublishRawGovernanceVoteNotifier::NotifyGovernanceVote()` and `CZMQPublishRawGovernanceObjectNotifier::NotifyGovernanceObject()`

Drop no longer used MASTERNODE category

87ae8c9

Shift dash-specific log categories to start from 1ul << 32 to avoid…

fcd39a3

… potential future conflicts with bitcoin ones

Fix dash category

8f67fcc

Merge bitcoin#10153: logging: Fix off-by-one for shrinkdebugfile default

4e5791c

faab624 logging: Fix off-by-one for shrinkdebugfile (MarcoFalke) Tree-SHA512: d6153e06067906172ff0611af9e585a3ecf0a7d56925b6ad7c12e75aa802441047059b9b6f6c78e79916c3f2abc8f1998bfd2d5b84201ec6421f727c08da3c21

PastaPastaPasta dismissed UdjinM6’s stale review via 4e5791c May 21, 2019 13:55

PastaPastaPasta force-pushed the backport-9424-10123 branch from c1f2caf to 4e5791c Compare May 21, 2019 13:55

UdjinM6 requested changes May 22, 2019

View reviewed changes

Comment thread src/init.cpp Outdated

UdjinM6 changed the title ~~Backport Bitcoin#9424 and Bitcoin#10123~~ Backport Bitcoin#9424, Bitcoin#10123 and Bitcoin#10153 May 22, 2019

remove debugCategories

96f3f64

Signed-off-by: Pasta <Pasta@dash.org>

PastaPastaPasta mentioned this pull request May 22, 2019

Backports 0.15 pr11 #2931

Merged

UdjinM6 previously approved these changes May 22, 2019

View reviewed changes

UdjinM6 requested a review from codablock May 22, 2019 16:52

codablock reviewed May 22, 2019

View reviewed changes

codablock added 4 commits May 22, 2019 12:40

Prepend "std::" to find call

8998edf

Check for BCLog::PRIVATESEND instead of logCategories != BCLog::NONE

e696792

Use BCLog::MNPAYMENTS category instead of checking for logCategories …

3b14196

…!= BCLog::NONE

Move "End Dash" comment below "ALERT"

e9a80f2

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.

PastaPastaPasta dismissed UdjinM6’s stale review via e9a80f2 May 22, 2019 17:41

codablock approved these changes May 22, 2019

View reviewed changes

UdjinM6 merged commit 29194b1 into dashpay:develop May 22, 2019

PastaPastaPasta deleted the backport-9424-10123 branch May 22, 2019 22:13

This was referenced May 22, 2019

Implement rawchainlocksig and rawtxlocksig #2930

Merged

Tighten rules for DSVIN/DSTX #2897

Merged

Uh oh!

Conversation

PastaPastaPasta commented May 12, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

UdjinM6 commented May 15, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

UdjinM6 commented May 17, 2019

Uh oh!

PastaPastaPasta commented May 17, 2019

Uh oh!

UdjinM6 commented May 17, 2019

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta commented May 21, 2019

Uh oh!

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta commented May 22, 2019

Uh oh!

UdjinM6 commented May 22, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codablock left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codablock left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codablock commented May 22, 2019

Uh oh!

UdjinM6 commented May 22, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

PastaPastaPasta commented May 12, 2019 •

edited

Loading

UdjinM6 commented May 22, 2019 •

edited

Loading

codablock left a comment •

edited

Loading

codablock left a comment •

edited

Loading