Add fields to getgovproposal

src/chainparams.cpp

@@ -195,9 +195,9 @@ class CMainParams : public CChainParams {
         consensus.vaultCreationFee = 2 * COIN;
 
         consensus.props.cfp.fee = COIN / 100; // 1%
-        consensus.props.cfp.majorityThreshold = COIN / 2; // vote pass with over 50% majority
+        consensus.props.cfp.approvalThreshold = COIN / 2; // vote pass with over 50% majority
         consensus.props.voc.fee = 50 * COIN;
-        consensus.props.voc.majorityThreshold = 66670000; // vote pass with over 66.67% majority
+        consensus.props.voc.approvalThreshold = 66670000; // vote pass with over 66.67% majority
         consensus.props.quorum = COIN / 100; // 1% of the masternodes must vote
         consensus.props.votingPeriod = 130000; // tally votes every 130K blocks
 
@@ -443,9 +443,9 @@ class CTestNetParams : public CChainParams {
         consensus.vaultCreationFee = 1 * COIN;
 
         consensus.props.cfp.fee = COIN / 100; // 1%
-        consensus.props.cfp.majorityThreshold = COIN / 2; // vote pass with over 50% majority
+        consensus.props.cfp.approvalThreshold = COIN / 2; // vote pass with over 50% majority
         consensus.props.voc.fee = 50 * COIN;
-        consensus.props.voc.majorityThreshold = 66670000; // vote pass with over 66.67% majority
+        consensus.props.voc.approvalThreshold = 66670000; // vote pass with over 66.67% majority
         consensus.props.quorum = COIN / 100; // 1% of the masternodes must vote
         consensus.props.votingPeriod = 70000; // tally votes every 70K blocks
 
@@ -644,9 +644,9 @@ class CDevNetParams : public CChainParams {
         consensus.vaultCreationFee = 1 * COIN;
 
         consensus.props.cfp.fee = COIN / 100; // 1%
-        consensus.props.cfp.majorityThreshold = COIN / 2; // vote pass with over 50% majority
+        consensus.props.cfp.approvalThreshold = COIN / 2; // vote pass with over 50% majority
         consensus.props.voc.fee = 5 * COIN;
-        consensus.props.voc.majorityThreshold = 66670000; // vote pass with over 66.67% majority
+        consensus.props.voc.approvalThreshold = 66670000; // vote pass with over 66.67% majority
         consensus.props.quorum = COIN / 100; // 1% of the masternodes must vote
         consensus.props.votingPeriod = 100; // tally votes every 1K blocks
 
@@ -837,9 +837,9 @@ class CRegTestParams : public CChainParams {
         consensus.spv.minConfirmations = 6;
 
         consensus.props.cfp.fee = COIN / 100; // 1%
-        consensus.props.cfp.majorityThreshold = COIN / 2; // vote pass with over 50% majority
+        consensus.props.cfp.approvalThreshold = COIN / 2; // vote pass with over 50% majority
         consensus.props.voc.fee = 5 * COIN;
-        consensus.props.voc.majorityThreshold = 66670000; // vote pass with over 66.67% majority
+        consensus.props.voc.approvalThreshold = 66670000; // vote pass with over 66.67% majority
         consensus.props.quorum = COIN / 100; // 1% of the masternodes must vote
         consensus.props.votingPeriod = 70; // tally votes every 70 blocks
 

src/consensus/params.h

@@ -206,7 +206,7 @@ struct Params {
     struct CPropsParams {
         struct CPropsSpecs {
             CAmount fee;
-            CAmount majorityThreshold;
+            CAmount approvalThreshold;
         } cfp, brp, voc;
         uint32_t votingPeriod;
         CAmount quorum;

src/masternodes/masternodes.cpp

@@ -1340,9 +1340,9 @@ CAmount CCustomCSView::GetMajorityFromAttributes(const CPropType& type) const
 
     switch(type) {
         case CPropType::CommunityFundProposal:
-            return attributes->GetValue(CFPKey, Params().GetConsensus().props.cfp.majorityThreshold) / 10000;
+            return attributes->GetValue(CFPKey, Params().GetConsensus().props.cfp.approvalThreshold) / 10000;
         case CPropType::VoteOfConfidence:
-            return attributes->GetValue(VOCKey, Params().GetConsensus().props.voc.majorityThreshold) / 10000;
+            return attributes->GetValue(VOCKey, Params().GetConsensus().props.voc.approvalThreshold) / 10000;
     }
 
     return 0;

src/masternodes/rpc_proposals.cpp

@@ -3,8 +3,27 @@
 
 #include <functional>
 
-UniValue propToJSON(CPropId const& propId, CPropObject const& prop)
+UniValue propToJSON(CPropId const& propId, CPropObject const& prop, CCustomCSView const& view)
 {
+    CDataStructureV0 cfpMajority{AttributeTypes::Governance, GovernanceIDs::Proposals, GovernanceKeys::CFPMajority};
+    CDataStructureV0 vocMajority{AttributeTypes::Governance, GovernanceIDs::Proposals, GovernanceKeys::VOCMajority};
+    CDataStructureV0 quorumKey{AttributeTypes::Governance, GovernanceIDs::Proposals, GovernanceKeys::Quorum};
+
+    auto attributes = view.GetAttributes();
+    if (!attributes)
+        throw JSONRPCError(RPC_INTERNAL_ERROR, "Attributes access failure");
+    auto quorum = attributes->GetValue(quorumKey, Params().GetConsensus().props.quorum); 
+
+    uint32_t approvalThreshold{0};
+    switch(prop.type) {
+        case CPropType::CommunityFundProposal:
+            approvalThreshold = attributes->GetValue(cfpMajority, Params().GetConsensus().props.cfp.approvalThreshold) / 10000;
+            break;
+        case CPropType::VoteOfConfidence:
+            approvalThreshold = attributes->GetValue(vocMajority, Params().GetConsensus().props.voc.approvalThreshold) / 10000;
+            break;
+    }
+
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("proposalId", propId.GetHex());
     ret.pushKV("title", prop.title);
@@ -20,6 +39,11 @@ UniValue propToJSON(CPropId const& propId, CPropObject const& prop)
     ret.pushKV("cycleEndHeight", static_cast<int32_t>(prop.cycleEndHeight));
     ret.pushKV("proposalEndHeight", static_cast<int32_t>(prop.proposalEndHeight));
     ret.pushKV("payoutAddress", ScriptToString(prop.address));
+    ret.pushKV("votingPeriod", static_cast<int32_t>(prop.votingPeriod));
+    ret.pushKV("approvalThreshold", strprintf("%d.%02d%%", approvalThreshold / 100, approvalThreshold % 100));
+    ret.pushKV("quorum", strprintf("%d.%02d%%", quorum / 10000, quorum % 10000));
+    ret.pushKV("fee", ValueFromAmount(prop.fee));
+    ret.pushKV("feeBurnAmount", ValueFromAmount(prop.feeBurnAmount));
     if (prop.options)
     {
         UniValue opt = UniValue(UniValue::VARR);
@@ -490,7 +514,7 @@ UniValue getgovproposal(const JSONRPCRequest& request)
         throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Proposal <%s> does not exist", propId.GetHex()));
     }
     if (prop->status != CPropStatusType::Voting) {
-        return propToJSON(propId, *prop);
+        return propToJSON(propId, *prop, view);
     }
 
     int targetHeight;
@@ -509,7 +533,7 @@ UniValue getgovproposal(const JSONRPCRequest& request)
     });
 
     if (activeMasternodes.empty()) {
-        return propToJSON(propId, *prop);
+        return propToJSON(propId, *prop, view);
     }
 
     uint32_t voteYes = 0, voters = 0;
@@ -527,10 +551,10 @@ UniValue getgovproposal(const JSONRPCRequest& request)
     }, CMnVotePerCycle{propId, prop->cycle});
 
     if (!voters) {
-        return propToJSON(propId, *prop);
+        return propToJSON(propId, *prop, view);
     }
 
-    uint32_t majorityThreshold = 0, votes = 0;
+    uint32_t approvalThreshold = 0, votes = 0;
     auto allVotes = lround(voters * 10000.f / activeMasternodes.size());
     CDataStructureV0 cfpMajority{AttributeTypes::Governance, GovernanceIDs::Proposals, GovernanceKeys::CFPMajority};
     CDataStructureV0 vocMajority{AttributeTypes::Governance, GovernanceIDs::Proposals, GovernanceKeys::VOCMajority};
@@ -540,16 +564,16 @@ UniValue getgovproposal(const JSONRPCRequest& request)
     if (!attributes)
         throw JSONRPCError(RPC_INTERNAL_ERROR, "Attributes access failure");
 
-    auto quorum = attributes->GetValue(quorumKey, Params().GetConsensus().props.quorum) / 10000;
-    auto valid = allVotes > quorum;
+    auto quorum = attributes->GetValue(quorumKey, Params().GetConsensus().props.quorum); 
+    auto valid = allVotes > (quorum / 10000.f);
 
     if (valid) {
         switch(prop->type) {
             case CPropType::CommunityFundProposal:
-                majorityThreshold = attributes->GetValue(cfpMajority, Params().GetConsensus().props.cfp.majorityThreshold) / 10000;
+                approvalThreshold = attributes->GetValue(cfpMajority, Params().GetConsensus().props.cfp.approvalThreshold) / 10000;
                 break;
             case CPropType::VoteOfConfidence:
-                majorityThreshold = attributes->GetValue(vocMajority, Params().GetConsensus().props.voc.majorityThreshold) / 10000;
+                approvalThreshold = attributes->GetValue(vocMajority, Params().GetConsensus().props.voc.approvalThreshold) / 10000;
                 break;
         }
         votes = lround(voteYes * 10000.f / voters);
@@ -562,7 +586,7 @@ UniValue getgovproposal(const JSONRPCRequest& request)
     ret.pushKV("contextHash", prop->contextHash);
     auto type = static_cast<CPropType>(prop->type);
     ret.pushKV("type", CPropTypeToString(type));
-    if (valid && votes >= majorityThreshold) {
+    if (valid && votes >= approvalThreshold) {
         ret.pushKV("status", "Approved");
     } else {
         ret.pushKV("status", "Rejected");
@@ -572,6 +596,12 @@ UniValue getgovproposal(const JSONRPCRequest& request)
     ret.pushKV("cycleEndHeight", static_cast<int32_t>(prop->cycleEndHeight));
     ret.pushKV("proposalEndHeight", static_cast<int32_t>(prop->proposalEndHeight));
     ret.pushKV("payoutAddress", ScriptToString(prop->address));
+    ret.pushKV("votingPeriod", static_cast<int32_t>(prop->votingPeriod));
+    ret.pushKV("approvalThreshold", strprintf("%d.%02d%%", approvalThreshold / 100, approvalThreshold % 100));
+    ret.pushKV("quorum", strprintf("%d.%02d%%", quorum / 10000, quorum % 10000));
+    ret.pushKV("fee", ValueFromAmount(prop->fee));
+    ret.pushKV("feeBurnAmount", ValueFromAmount(prop->feeBurnAmount));
+
 
     if (prop->options)
     {
@@ -585,8 +615,9 @@ UniValue getgovproposal(const JSONRPCRequest& request)
         ret.pushKV("options", array);
     }
 
-    ret.pushKV("votes", strprintf("%d.%02d of %d.%02d%%", votes / 100, votes % 100, majorityThreshold / 100, majorityThreshold % 100));
-    ret.pushKV("votingPercent", strprintf("%d.%02d of %d.%02d%%", allVotes / 100, allVotes % 100, quorum / 100, quorum % 100));
+    ret.pushKV("votes", strprintf("%d.%02d of %d.%02d%%", votes / 100, votes % 100, approvalThreshold / 100, approvalThreshold % 100));
+    ret.pushKV("votingPercent", strprintf("%d.%02d of %d.%02d%%", allVotes / 100, allVotes % 100, quorum / 10000, quorum % 10000));
+
 
     return ret;
 }
@@ -648,7 +679,7 @@ UniValue listgovproposals(const JSONRPCRequest& request)
         if (type && type != uint8_t(prop.type)) {
             return true;
         }
-        ret.push_back(propToJSON(propId, prop));
+        ret.push_back(propToJSON(propId, prop, view));
         return true;
     }, status);
 

src/validation.cpp

@@ -4268,10 +4268,10 @@ void CChainState::ProcessProposalEvents(const CBlockIndex* pindex, CCustomCSView
 
         switch(prop.type) {
             case CPropType::CommunityFundProposal:
-                majorityThreshold = attributes->GetValue(cfpMajority, chainparams.GetConsensus().props.cfp.majorityThreshold) / 10000;
+                majorityThreshold = attributes->GetValue(cfpMajority, chainparams.GetConsensus().props.cfp.approvalThreshold) / 10000;
                 break;
             case CPropType::VoteOfConfidence:
-                majorityThreshold = attributes->GetValue(vocMajority, chainparams.GetConsensus().props.voc.majorityThreshold) / 10000;
+                majorityThreshold = attributes->GetValue(vocMajority, chainparams.GetConsensus().props.voc.approvalThreshold) / 10000;
                 break;
         }
 

test/functional/feature_on_chain_government.py

@@ -286,7 +286,7 @@ def run_test(self):
         assert_equal(result["cycleEndHeight"], cycle1)
         assert_equal(result["payoutAddress"], '')
         assert_equal(result["totalCycles"], 2)
-        assert_equal(result["votingPercent"], "100.00 of 1.00%")
+        assert_equal(result["votingPercent"], "100.00 of 100.00%")
         assert_equal(result["proposalEndHeight"], proposalEndHeight)
 
         assert_equal(len(self.nodes[0].listgovproposals("all", "voting")), 1)
@@ -473,7 +473,7 @@ def run_test(self):
         assert_equal(result["cycleEndHeight"], cycle1)
         assert_equal(result["payoutAddress"], '')
         assert_equal(result["totalCycles"], 1)
-        assert_equal(result["votingPercent"], "100.00 of 1.00%")
+        assert_equal(result["votingPercent"], "100.00 of 100.00%")
         assert_equal(result["options"], ["Emergency"])
         assert_equal(result["proposalEndHeight"], proposalEndHeight)