Skip to content

DIP3 compatibility code#2255

Merged
UdjinM6 merged 11 commits into
dashpay:developfrom
codablock:pr_dip3_logic
Sep 3, 2018
Merged

DIP3 compatibility code#2255
UdjinM6 merged 11 commits into
dashpay:developfrom
codablock:pr_dip3_logic

Conversation

@codablock
Copy link
Copy Markdown

@codablock codablock commented Sep 3, 2018 •
edited
Loading

This PR is extracted from #2083. It adds compatibility code to CMasternode and CMosternodeMan so that all code using these classes switch to deterministic mode when spork15 is activated.

I omitted the MN rewards/payments related changes for now and will put these into their own PR as they contain the most critical code.

@UdjinM6 UdjinM6 added this to the 12.4 milestone Sep 3, 2018
@codablock
Copy link
Copy Markdown
Author

codablock commented Sep 3, 2018 •
edited
Loading

FYI, I'm aware that the many if(spork15Active) blocks that I introduced are very bad code quality and style. I however chose to go this way so that the changes outside CMasternode and CMasternodeMan are as non-intrusive as possible. After 12.4 has been rolled out and the BIP9 and spork15 deployment logic is activated, I will cleanup all the code. Cleanup means, that most of the legacy code will actually vanish and most places would directly use CDeterministicMNManager instead of going through the old CMasternodeMan code.

UdjinM6
UdjinM6 reviewed Sep 3, 2018
View reviewed changes
Copy link
Copy Markdown

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small code style issue, otherwise looks good imo 👍

Comment thread src/activemasternode.cpp Outdated
Copy link
Copy Markdown

@UdjinM6 UdjinM6 Sep 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code style: Braces on new lines for namespaces, classes, functions, methods.

Comment thread src/activemasternode.cpp Outdated
Copy link
Copy Markdown

@UdjinM6 UdjinM6 Sep 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment thread src/activemasternode.cpp Outdated
Copy link
Copy Markdown

@UdjinM6 UdjinM6 Sep 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment thread src/activemasternode.h Outdated
Copy link
Copy Markdown

@UdjinM6 UdjinM6 Sep 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Comment thread src/activemasternode.h Outdated
Copy link
Copy Markdown

@UdjinM6 UdjinM6 Sep 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same or make it one-liner

Comment thread src/activemasternode.h Outdated
Copy link
Copy Markdown

@UdjinM6 UdjinM6 Sep 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

Comment thread src/masternodeman.cpp Outdated
Copy link
Copy Markdown

@UdjinM6 UdjinM6 Sep 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@codablock
Implement CActiveDeterministicMasternodeManager
d90b139
@codablock
Skip initial masternode list sync if spork 15 is active
6764daf
@codablock
Stop executing legacy MN list code when spork 15 is activated
27e8b48
@codablock
Add compatibility code to CMasternodeMan so that old code is still co…
7d14566 
…mpatible

...when deterministic MNs are activated.
@codablock
Add methods to add/remove (non-)deterministic MNs
cc73422
@codablock
Add compatibility code for FindRandomNotInVec and GetMasternodeScores
5050a92
@codablock
Throw exception when trying to invoke start-xxx RPC in deterministic …
50ac6fb 
…mode
@codablock
Better "masternode status" for deterministic masternodes
e2a9dbb
@codablock
Implement 'masternode info <proTxHash>' RPC
2d8f124
@codablock
Forbid starting of legacy masternodes with non matching ProTx collate…
31b4f83 
…ral values

If the masternode is already upgraded to ProTx, it's address and key
must match with the started masternode.
@codablock
Put all masternodes in MASTERNODE_ENABLED state when spork15 is active
d4530eb
@codablock
Copy link
Copy Markdown
Author

codablock commented Sep 3, 2018

Pushed review fixes

UdjinM6
UdjinM6 approved these changes Sep 3, 2018
View reviewed changes
Copy link
Copy Markdown

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

utACK

@UdjinM6 UdjinM6 merged commit 794921b into dashpay:develop Sep 3, 2018
@codablock codablock deleted the pr_dip3_logic branch September 14, 2018 12:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

13.0

Development

Successfully merging this pull request may close these issues.

2 participants

@codablock @UdjinM6