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.

Sign up for GitHub

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

Jump to bottom

[Core] Spork code overhaul #1000

Merged
merged 16 commits into from
Sep 26, 2019
Merged

[Core] Spork code overhaul #1000

merged 16 commits into from
Sep 26, 2019

Conversation

random-zebra
Copy link

@random-zebra random-zebra commented Sep 10, 2019 •
edited
Loading

Chengeset:

  • move ProcessSpork, GetSporkValue, IsSporkActive, ExecuteSpork and mapSporksActive to CSporkManager
  • move Sign, CheckSignature, Relay to CSporkMessage
  • move ReprocessBlocks out of sporks to main.cpp / rename DisconnectBlocksAndReprocess to DisconnectBlocks
  • rename SporkKey to SporkPubKey
  • bugfix: only set strMasterPrivKey if spork signature produced by that key was verified successfully
  • few log format changes, cleaned up includes
  • Protect CSporkManager with critical section
  • bugfix: do not accept sporks with nTimeSigned way too far into the future
  • remove unused sporks: 7, 11, 12
  • Refactor code to get rid of repeated if/else blocks (introduce CSporkDef)

Mostly based off of:

@random-zebra random-zebra self-assigned this Sep 10, 2019
@random-zebra random-zebra added this to the 4.0.0 milestone Sep 10, 2019
@random-zebra random-zebra force-pushed the 2019_sporks_overhaul branch 3 times, most recently from 59546e1 to 530558e Compare September 11, 2019 16:31
@random-zebra
Copy link
Author

random-zebra commented Sep 12, 2019 •
edited
Loading

Must be merged before #975 and #995 which are based on top of this.

@random-zebra
[Refactor] rename SporkKey to SporkPubKey
ab603a1
@random-zebra
[Refactor] refactor/fix CSporkManager and CSporkMessage classes
c41dd7c 
- move ProcessSpork, GetSporkValue, IsSporkActive, ExecuteSpork and
mapSporksActive to CSporkManager
- move Sign, CheckSignature, Relay to CSporkMessage
- move ReprocessBlocks out of sporks to main.cpp
- rename DisconnectBlocksAndReprocess to DisconnectBlocks
- bugfix: only set strMasterPrivKey if spork signature produced by that
key was verified successfully
- few log format changes, cleaned up includes
@random-zebra
[Spork] Protect CSporkManager with critical section
cd33d3c
@random-zebra
[Spork] CSporkManager class serialization
806f607
@random-zebra
[Spork] Do not accept sporks signed too far into the future
5124b89
@random-zebra
[Spork] Remove unused SPORK_7_MASTERNODE_SCANNING
459e41a
@random-zebra
[Spork] Remove unused SPORK_11 and SPORK_12
41effbf
@random-zebra
[Spork] Define SporkId enum (with its serialization)
4df1046
@random-zebra
[Spork] Introduce CSporkDef and remove if/else blocks
3709ba8
@random-zebra
[Spork] Make CSporkMessage::vchSig private
fd05256
@random-zebra
Fix spork RPC to use new spork defs
50bfe70 
This also removes the need for SPORK_START/SPORK_END
@random-zebra
[Core] ReprocessBlocks: adjust to PIVX blocktime
8f6d6e1
@random-zebra
[Tests] spork functional test: check spork value after node restart
3ec2f61
@random-zebra
[Spork] fix CSporkManager maps
3df34c6
@random-zebra
Copy link
Author

Rebased on master

This was referenced Sep 23, 2019
Merged
Merged
CaveSpectre11
CaveSpectre11 reviewed Sep 23, 2019
View reviewed changes
src/spork.cpp Outdated Show resolved Hide resolved
Warrows
Warrows approved these changes Sep 24, 2019
View reviewed changes
Copy link

@Warrows Warrows left a comment

Choose a reason for hiding this comment

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

ACK 84930b9

@random-zebra random-zebra mentioned this pull request Sep 26, 2019
Merged
furszy
furszy reviewed Sep 26, 2019
View reviewed changes
src/spork.cpp Show resolved Hide resolved
@furszy furszy self-requested a review September 26, 2019 19:57
furszy
furszy approved these changes Sep 26, 2019
View reviewed changes
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

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

ACK 84930b9

random-zebra added a commit that referenced this pull request Sep 26, 2019
@random-zebra
Merge #1000: [Core] Spork code overhaul
34e11dd 
84930b9 [Trivial] Align the format of the log messages in kernel.cpp (random-zebra)
faa9090 [Trivial] rename DisconnectBlocks argument for consistency (random-zebra)
3df34c6 [Spork] fix CSporkManager maps (random-zebra)
3ec2f61 [Tests] spork functional test: check spork value after node restart (random-zebra)
8f6d6e1 [Core] ReprocessBlocks: adjust to PIVX blocktime (random-zebra)
50bfe70 Fix spork RPC to use new spork defs (random-zebra)
fd05256 [Spork] Make CSporkMessage::vchSig private (random-zebra)
3709ba8 [Spork] Introduce CSporkDef and remove if/else blocks (random-zebra)
4df1046 [Spork] Define SporkId enum (with its serialization) (random-zebra)
41effbf [Spork] Remove unused SPORK_11 and SPORK_12 (random-zebra)
459e41a [Spork] Remove unused SPORK_7_MASTERNODE_SCANNING (random-zebra)
5124b89 [Spork] Do not accept sporks signed too far into the future (random-zebra)
806f607 [Spork] CSporkManager class serialization (random-zebra)
cd33d3c [Spork] Protect CSporkManager with critical section (random-zebra)
c41dd7c [Refactor] refactor/fix CSporkManager and CSporkMessage classes (random-zebra)
ab603a1 [Refactor] rename SporkKey to SporkPubKey (random-zebra)

Pull request description:

  Chengeset:

  - move ProcessSpork, GetSporkValue, IsSporkActive, ExecuteSpork and mapSporksActive to CSporkManager
  - move Sign, CheckSignature, Relay to CSporkMessage
  - move ReprocessBlocks out of sporks to main.cpp / rename DisconnectBlocksAndReprocess to DisconnectBlocks
  - rename SporkKey to SporkPubKey
  - bugfix: only set strMasterPrivKey if spork signature produced by that key was verified successfully
  - few log format changes, cleaned up includes
  - Protect CSporkManager with critical section
  - bugfix:  do not accept sporks with nTimeSigned way too far into the future
  - remove unused sporks: 7, 11, 12
  - Refactor code to get rid of repeated if/else blocks (introduce CSporkDef)

  Mostly based off of:
  - dashpay#922
  - dashpay#2213
  - dashpay#2578
  - dashpay#2607
  - dashpay#2946

ACKs for top commit:
  Warrows:
    ACK 84930b9
  furszy:
    ACK [`84930b9`](84930b9)

Tree-SHA512: 17f923e85371c444aa2092b12b025db1894c55679549d1a6a3d9f4525f8d78e9225d3f05e296643e7c79d02414bef1613f14d441901dc5f52531c3f30dce357c
@random-zebra random-zebra merged commit 84930b9 into PIVX-Project:master Sep 26, 2019
@random-zebra random-zebra deleted the 2019_sporks_overhaul branch September 24, 2020 00:25
@lyricidal lyricidal mentioned this pull request Jan 13, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CaveSpectre11 CaveSpectre11 CaveSpectre11 left review comments

@Warrows Warrows Warrows approved these changes

@furszy furszy furszy approved these changes

@Mrs-X Mrs-X Awaiting requested review from Mrs-X

@Fuzzbawls Fuzzbawls Awaiting requested review from Fuzzbawls

Assignees

@random-zebra random-zebra

Labels
Consensus Masternode
Projects
None yet
Milestone
4.0.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@random-zebra @Warrows @furszy @CaveSpectre11