DIP3 MN reward payment logic #2258

codablock · 2018-09-04T07:01:03Z

This is extracted from #2083. It introduces the new MN reward payment logic for deterministic masternodes.

It also enforces MN reward payments when superblocks are paid out (no more lucky miners getting 100% of the reward). This happens after spork15 activation.

UdjinM6

A couple of my usual complains :) otherwise looks good 👍

UdjinM6 · 2018-09-04T11:52:08Z

src/masternode-payments.cpp

map prefix + too general (mapPayments?)

UdjinM6 · 2018-09-04T11:53:08Z

src/masternode-payments.cpp

UdjinM6 · 2018-09-04T11:53:46Z

src/masternode-payments.cpp

UdjinM6 · 2018-09-04T11:55:34Z

src/rpc/masternode.cpp

not a string anymore (mapPayments?)

UdjinM6 · 2018-09-04T12:06:06Z

src/dsnotificationinterface.cpp

should remove the one below then (line 18)

UdjinM6 · 2018-09-04T12:10:19Z

src/privatesend.cpp

codablock · 2018-09-04T12:41:21Z

Pushed review fixes

UdjinM6

utACK

PastaPastaPasta

See inline for formatting corrections

PastaPastaPasta · 2018-09-04T23:39:16Z

src/masternode-payments.cpp

if( -> if (

PastaPastaPasta · 2018-09-04T23:39:57Z

src/masternode-payments.cpp

if( -> if (

PastaPastaPasta · 2018-09-04T23:40:17Z

src/masternode-payments.cpp

for( -> for (

PastaPastaPasta · 2018-09-04T23:42:40Z

src/masternode-payments.cpp

technically should be one line or brackets. ¯\(ツ)/¯ @nmarley

PastaPastaPasta · 2018-09-04T23:42:49Z

src/masternode-payments.cpp

PastaPastaPasta · 2018-09-04T23:42:54Z

src/masternode-payments.cpp

PastaPastaPasta · 2018-09-04T23:43:01Z

src/masternode-payments.cpp

PastaPastaPasta · 2018-09-04T23:45:04Z

src/rpc/masternode.cpp

above - brackets or same line

PastaPastaPasta · 2018-09-04T23:45:10Z

src/rpc/masternode.cpp

nit: could probably squash 2 ifs above into || thing

PastaPastaPasta · 2018-09-04T23:45:15Z

src/rpc/masternode.cpp

codablock · 2018-09-05T11:36:17Z

@PastaPastaPasta applied a few of your suggestions, but left the ones out that are surrounded by the same type of code style violation. Better to create a PR with a general cleanup later.

UdjinM6

re-utACK

A couple of things here are not quite good for readability but let's get to it in some another cleanup PR.

UdjinM6 · 2018-09-05T12:05:07Z

ooops, merge conflit. sorry 🙈

Ensure correct locking order to fix deadlock.

1. Enforce payment to masternodes in IsBlockPayeeValid even if superblocks are triggered. This new rule only gets activated when spork15 activates. 2. Always enforce masternode payments when spork15 is activated and ignore spork8 in that case. spork8 can be removed after spork15 activation and hardening of the spork15 height into consensus params.

Needed for privatesend when choosing masternodes

Related to dashpay#2237

codablock · 2018-09-05T12:07:11Z

Merge conflicts fixed. These were just minor ones caused by code cleanups

UdjinM6

re-utACK

Related to dashpay/dash#2258

* Content - RPC - Update quick reference * RPC - Update getblockchaininfo to show BIP-9 progress Related to dashpay/dash#2435 * RPC - Update gobject prepare with new params Use-IS (dashpay/dash#2452) Use specific UTXO for fee (dashpay/dash#2482) * RPC - Update mode name * RPC - Update protx default mode dashpay/dash#2513 * Content - Add spork 17 * Content - Special transactions Add info for Quorum commitment Remove messages not in 13.0 (SubTx) * P2P - Add new txlvote fields masternodeProTxHash (dashpay/dash#2484) quorumModifierHash (dashpay/dash#2505) * RPC - Update protx list Make all options follow the same parameter format (dashpay/dash#2559) * Content - version bump 0.13.0.0 bumped to 70213 (dashpay/dash#2557) * Guide - PrivateSend dstx message limit Up to 5 simultaneous dstxs per MN allowed (dashpay/dash#2552) * RPC - Update getblock Add missing versionHex field (dashpay/dash@e7d9ffa) Change to use verbosity syntax (dashpay/dash#2506 and bitcoin/bitcoin#8704) * P2P - Add qfcommit message (no hexdump example) DIP6 quorum final commitment (dashpay/dash#2477) * P2P - qfcommit typo Change description of llmqType field * P2P - Special tx payload size clarification * Guide - Update MN payment description Related to dashpay/dash#2258 * Guide - fix broken link * Guide - Update some example txs Change to hashes on the chain following the 12.3.4 reset * P2P - Add QcTx hexdump * P2P - DIP4 message updates Add SML entry Update hexdump to include new fields Add getmnlistd and mnlistdiff to cross ref * P2P - minor DIP3-related comments

codablock changed the title ~~Pr dip3 paymentlogic~~ DIP3 MN reward payment logic Sep 4, 2018

UdjinM6 added this to the 12.4 milestone Sep 4, 2018

UdjinM6 requested changes Sep 4, 2018

View reviewed changes

codablock force-pushed the pr_dip3_paymentlogic branch from b5e2618 to a0e45d8 Compare September 4, 2018 12:41

UdjinM6 previously approved these changes Sep 4, 2018

View reviewed changes

PastaPastaPasta requested changes Sep 4, 2018

View reviewed changes

codablock dismissed UdjinM6’s stale review via 3837215 September 5, 2018 11:35

codablock force-pushed the pr_dip3_paymentlogic branch from a0e45d8 to 3837215 Compare September 5, 2018 11:35

codablock force-pushed the pr_dip3_paymentlogic branch from 3837215 to 96e5695 Compare September 5, 2018 11:49

UdjinM6 previously approved these changes Sep 5, 2018

View reviewed changes

codablock added 7 commits September 5, 2018 14:06

Implement new MN payments logic and add compatibility code

dc7292a

Move cs_main lock from CMasternode::UpdateLastPaid to CMasternodeMan

19fbf8a

Ensure correct locking order to fix deadlock.

Implement projection of MN reward winners in "masternode winners"

44706dc

Implement deterministic version of CMasternodePayments::IsScheduled

2c481f0

Needed for privatesend when choosing masternodes

Payout and enforce operator reward payments

60002b7

Use refactored payment logic when spork15 is active

d8247df

Related to dashpay#2237

codablock dismissed UdjinM6’s stale review via d8247df September 5, 2018 12:07

codablock force-pushed the pr_dip3_paymentlogic branch from 96e5695 to d8247df Compare September 5, 2018 12:07

UdjinM6 approved these changes Sep 5, 2018

View reviewed changes

UdjinM6 merged commit f016638 into dashpay:develop Sep 5, 2018

codablock deleted the pr_dip3_paymentlogic branch September 14, 2018 12:51

thephez added a commit to dash-docs/dash-docs that referenced this pull request Dec 18, 2018

Guide - Update MN payment description

de08d26

Related to dashpay/dash#2258

DIP3 MN reward payment logic #2258

DIP3 MN reward payment logic #2258

Uh oh!

Conversation

codablock commented Sep 4, 2018

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codablock commented Sep 4, 2018

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PastaPastaPasta Sep 4, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

UdjinM6 Sep 5, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codablock commented Sep 5, 2018

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

UdjinM6 commented Sep 5, 2018

Uh oh!

codablock commented Sep 5, 2018

Uh oh!

UdjinM6 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

PastaPastaPasta Sep 4, 2018 •

edited

Loading

UdjinM6 Sep 5, 2018 •

edited

Loading