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

V0.12.1.x Sync Processing #806

Merged
merged 11 commits into from
May 25, 2016

Conversation

eduffield222
Copy link

  1. Removed calc-score, I don't believe this serves any use anymore. Score calculation is done on a case-by-case basis depending on the item which needs updating, not as one giant queue
  2. Completely all 12.1 todo's that were related to wiring issues.
  3. Refactored some governance function names to more apt names
  4. Removed bounty signals because the payment system is going to more or less work how 12.0 works, bounties will be defined in 12.2
  5. Removed register signals, this will be used for Dashdrive eventually, but I would like to be clearer on the implementation before continuing
  6. Removed MNQUORUM and MNSCANERROR. These are going to be moved out of core and into sentinel
  7. Reenabled governance item syncing (still not working correctly)
  8. Fixed masternode winner calculation and listing (not sure if payments are working yet though)
  9. Removed hybrid reference node implementation for masternode payments. It appears 12.0 worked fine without having to utilize "safe-mode", so it appears safe to remove.
  10. fCache Signals should now be calculated correctly and are triggered at a minimum of 10% absolute network support (sum of yes-no votes)

Evan Duffield added 9 commits May 23, 2016 15:52
- Scanning errors should be implemented via sentinel
- removed some old comments
- renamed sync tracking requests to friendlier names
…re was added to 12.0 incase we had network troubles and required a "safe-mode" to run in. We've experiences no issues like so it should be safe to remove

- fixed masternode winners calculation and listing
@@ -13,6 +13,7 @@
#include "base58.h"
#include "masternode.h"
#include "governance-vote.h"
#include "masternodeman.cpp"

Choose a reason for hiding this comment

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

Include .cpp in .h?

Copy link

Choose a reason for hiding this comment

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

pretty sure that's the reason for failed build, should be .h

Copy link

@schinzelh schinzelh May 25, 2016

Choose a reason for hiding this comment

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

Yep, this fixes the Windows/Linux builds --> https://travis-ci.org/dashpay/dash/builds/132753565

--- a/src/governance.h
+++ b/src/governance.h
@@ -13,7 +13,7 @@
 #include "base58.h"
 #include "masternode.h"
 #include "governance-vote.h"
-#include "masternodeman.cpp"
+#include "masternodeman.h"
 #include <boost/lexical_cast.hpp>
 #include "init.h"

Copy link
Author

Choose a reason for hiding this comment

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

yep, thanks

@crowning-
Copy link

crowning- commented May 25, 2016

in src/masternode-sync.cpp:

pnode->ClearFulfilledRequest("spork-sync");
pnode->ClearFulfilledRequest("masternode-winner-sync");
pnode->ClearFulfilledRequest("governance-sync");
pnode->ClearFulfilledRequest("masternode-sync");

I would prefer to have those strings defined somewhere to be able to let the compiler check for typos.

@UdjinM6 : how do you create those line notes?

@schinzelh
Copy link

@crowning- just open the diff, there you can add line notes :)

e.g. https://github.com/dashpay/dash/pull/806/files

image

@schinzelh
Copy link

All green, good for merge :)

@eduffield222 eduffield222 merged commit 7f52065 into dashpay:v0.12.1.x May 25, 2016
schinzelh pushed a commit that referenced this pull request May 29, 2016
If we want to be compatible to 12.0 on network layer we need them back in ppszTypeName[] to keep inv type consistent (allNetMessageTypes[] should not have them, we shouldn't accept non-implmented messages)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants