From 3e934d1ab50e81b71474f4b2adf6f8782b0e39cf Mon Sep 17 00:00:00 2001 From: amancera <1596328+alejandromgk@users.noreply.github.com> Date: Mon, 11 Feb 2019 13:00:18 -0600 Subject: [PATCH 1/2] [WIP] new proposal fee and reward percentages. --- src/chainparams.cpp | 2 +- src/governance-object.h | 2 +- src/validation.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index f193cbe395478..16066fd20beba 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -121,7 +121,7 @@ class CMainParams : public CChainParams { strNetworkID = "main"; consensus.nSubsidyHalvingInterval = 210240; // Note: actual number of blocks per calendar year with DGW v3 is ~200700 (for example 449750 - 249050) consensus.nMasternodePaymentsStartBlock = 200; // not true, but it's ok as long as it's less then nMasternodePaymentsIncreaseBlock - consensus.nMasternodePaymentsIncreaseBlock = 50000; // 50000 height aproximately April 20th + consensus.nMasternodePaymentsIncreaseBlock = 217160; // 217160 height aproximately February 20th consensus.nMasternodePaymentsIncreasePeriod = 576*30; // Not used consensus.nFeeChangeBlock = 155000; // Aproximately October 29th 2018 consensus.nInstantSendKeepLock = 24; diff --git a/src/governance-object.h b/src/governance-object.h index c971e479a541d..115073d38aaaa 100644 --- a/src/governance-object.h +++ b/src/governance-object.h @@ -34,7 +34,7 @@ static const int GOVERNANCE_OBJECT_PROPOSAL = 1; static const int GOVERNANCE_OBJECT_TRIGGER = 2; static const int GOVERNANCE_OBJECT_WATCHDOG = 3; -static const CAmount GOVERNANCE_PROPOSAL_FEE_TX = (5000.0*COIN); +static const CAmount GOVERNANCE_PROPOSAL_FEE_TX = (50000.0*COIN); static const int64_t GOVERNANCE_FEE_CONFIRMATIONS = 6; static const int64_t GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS = 1; diff --git a/src/validation.cpp b/src/validation.cpp index 00c7b243a4e96..a2d567f79e1b5 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1268,9 +1268,9 @@ CAmount GetMasternodePayment(int nHeight, CAmount blockValue, const Consensus::P double dMasternodePart; if(nHeight < consensusParams.nMasternodePaymentsIncreaseBlock){ - dMasternodePart = 9.0/16.0; // 56.25% of the block reward. - } else { dMasternodePart = 15.0/16.0; // 93.75% of the block reward. + } else { + dMasternodePart = 13.0/16.0; // 81.25% of the corresponding reward for miners/masternodes, or 65% of the total block reward. } return (blockValue * dMasternodePart); From 18a45597881bcff59eb81d6c496daa0402b25bb1 Mon Sep 17 00:00:00 2001 From: amancera <1596328+alejandromgk@users.noreply.github.com> Date: Tue, 12 Feb 2019 12:46:59 -0600 Subject: [PATCH 2/2] Rollback proposal fee --- src/governance-object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/governance-object.h b/src/governance-object.h index 115073d38aaaa..c971e479a541d 100644 --- a/src/governance-object.h +++ b/src/governance-object.h @@ -34,7 +34,7 @@ static const int GOVERNANCE_OBJECT_PROPOSAL = 1; static const int GOVERNANCE_OBJECT_TRIGGER = 2; static const int GOVERNANCE_OBJECT_WATCHDOG = 3; -static const CAmount GOVERNANCE_PROPOSAL_FEE_TX = (50000.0*COIN); +static const CAmount GOVERNANCE_PROPOSAL_FEE_TX = (5000.0*COIN); static const int64_t GOVERNANCE_FEE_CONFIRMATIONS = 6; static const int64_t GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS = 1;