V0.12.1.x -- merging trigger/generic object/superblock changes for testnet phase II#932
Closed
eduffield222 wants to merge 44 commits into
Closed
V0.12.1.x -- merging trigger/generic object/superblock changes for testnet phase II#932eduffield222 wants to merge 44 commits into
eduffield222 wants to merge 44 commits into
Conversation
- disable fCached values - use two maps for storing votes, by hash and parent-hash/type - disable part of flatdb.dump (still overwriting) - fixed govobj/votes relay and sync
- Uncommented sync block - Protocol min 70201 - Fixed bug which flags invalid votes incorrectly - Formatting
- Should not collide based on the outcome
- Recalculate the cached status flags of various items when masternodes change status
- Added some more debugging messages to track handling of trigger objects - Fixed GetDataAsString - Fixed handling of JSON structure from sentinel in LoadData - Fixed missing iterator increment in GetActiveTriggers
trigger manager access is now protected only by the governance.cs mutex - Removed unsafe caching of govobj pointer in CSuperblock - Moved status from map to CSuperblock - Reduced width of public interfaces to CTriggerManager and CSuperblockManager - Implemented removal of executed and invalid (but not expired) triggers - Reordered CSporkMessage members to avoid structure padding (note serialization format is unchanged) - Replaced X11 hash with CHashWriter for CSporkMessage
now causes the removal of the underlying govobj - Added many LOCK(governance.cs) calls to hopefully make access to CGovernanceManager safe. This needs heavy testing or better yet static analysis to guarantee correctness. Deadlock conditions cannot yet be excluded.
…to remotes/upstream/v0.12.1.x-triggers Merged change from upstream.
- Implemented caching of block height in CGovernanceManager to avoid
possible deadlock between cs_main and governance.cs mutexes
- Implemented expiration of unexecuted triggers approximately
one month after their scheduled trigger time (per Evan's request)
- Removed unused chain tip pointer in rpcgovernance.cpp. Fixes compiler
warning and avoids an unnecessary lock on cs_main.
Remotes/upstream/v0.12.1.x triggers
|
Nice - it needs to be rebased though :-) |
| consensus.nMasternodePaymentsIncreaseBlock = 158000; // actual historical value | ||
| consensus.nMasternodePaymentsIncreasePeriod = 576*30; // 17280 - actual historical value | ||
| consensus.nBudgetPaymentsStartBlock = 328008; // actual historical value | ||
| consensus.nSuperblockCycle = 576; // Superblocks can be issued daily |
There was a problem hiding this comment.
AFAIK this value is to high, there are only ~554 blocks/day
|
some file permissions are broken |
Author
|
Closing in favor of #944 |
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
5 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.
These are changes from Timothy Flynn and I that recreate the superblock creation process in sentinel, using generic objects and triggers. The code implements the following: