Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finish moving tier two initialization code from init.cpp to tiertwo/init.cpp and add disabledkg init flag #2723

Merged
merged 4 commits into from
Jan 25, 2022

Conversation

furszy
Copy link

@furszy furszy commented Jan 14, 2022

Follow-up to #2684, built on top of #2647. Starting in 296e6fa.

Focused on the following points:

  1. Move init arguments help messages to a new GetTierTwoHelpString(), the tier two objects initializers and the Masternodes collateral output locking process to the tiertwo/init files.
  2. Improve DMN collateral locking process:
    • Walking through the DMN list only once instead of one-time per wallet.
    • Removing the wallet dependency on evo/deterministicmns.h.
  3. Add -disabledkg init argument so the p2p_quorum_connect.py functional test does not get affected by the automatic DKG sessions processes (coming in Long Living Masternode Quorums - Part 3, DKG #2722). The same flag will be used in other future tests that perform manual operations as well.

1) Walk-through the DMN list only once instead of one-time per wallet.
2) Remove wallet dependency on evo/deterministicmns.h.
…al transactions' output lock in wallet to the tiertwo/init.cpp file.
@furszy
Copy link
Author

furszy commented Jan 19, 2022

Rebased on master, ready to go.

Forgot to mention on the PR description that this is removing another circular dependency:
"evo/deterministicmns -> masternode -> wallet/wallet -> evo/deterministicmns"

Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

Code ACK cc0fdeb

src/tiertwo/init.cpp Outdated Show resolved Hide resolved
src/tiertwo/init.cpp Outdated Show resolved Hide resolved
src/tiertwo/init.cpp Outdated Show resolved Hide resolved
Updating p2p_quorum_connect.py test with it

And move -pushversion to GetTierTwoHelpString as well.
@furszy
Copy link
Author

furszy commented Jan 19, 2022

updated per feedback.

Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

utACK c445333

@furszy furszy requested a review from Fuzzbawls January 24, 2022 20:48
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

ACK c445333

@furszy furszy merged commit 1eaa10c into PIVX-Project:master Jan 25, 2022
@Fuzzbawls Fuzzbawls modified the milestones: 6.0.0, 5.5.0 Sep 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants