Merge pull request #3 from uhlik-mdfkbtc-veles-development/0.18

change collateral to 500 VLS, force at block 240k
velescore · Aug 13, 2019 · cd8ced0 · cd8ced0
2 parents 0be8f60 + e695eef
commit cd8ced0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -82,6 +82,7 @@ class CMainParams : public CChainParams {
         consensus.nMasternodePaymentsIncreasePeriod = 365 * 576 * 5; // 5 years, activated with VCIP01
         consensus.nMasternodeCollateralMinimum = 2000; // starting MN collateral
         consensus.nMasternodeCollateralMaximum = 2000; // MN collateral at infinity
+        consensus.nMasternodeCollateral201908  = 500; // MN collateral
         // VELES BEGIN
         consensus.nMasternodePaymentsStartPercent =  5;     // at VCIP01 this should equal to approx same VLS amount as before
         consensus.nMasternodePaymentsFinalPercent =  60;    // will be reached in ca 5 years
@@ -245,6 +246,7 @@ class CTestNetParams : public CChainParams {
         consensus.nMasternodePaymentsIncreasePeriod = 25;
         consensus.nMasternodeCollateralMinimum = 10; // starting MN collateral
         consensus.nMasternodeCollateralMaximum = 1000; // MN collateral at infinity
+        consensus.nMasternodeCollateral201908  = 500; // MN collateral
         // VELES BEGIN
          consensus.nMasternodePaymentsStartPercent =  5;
          consensus.nMasternodePaymentsFinalPercent =  60; // will be reached in ca 5 yrs
@@ -393,6 +395,7 @@ class CRegTestParams : public CChainParams {
         consensus.nMasternodePaymentsIncreasePeriod = 10;
         consensus.nMasternodeCollateralMinimum = 1; // starting MN collateral
         consensus.nMasternodeCollateralMaximum = 100; // MN collateral at infinity
+        consensus.nMasternodeCollateral201908  = 500; // MN collateral
         // VELES BEGIN
         consensus.nMasternodePaymentsStartPercent =  5;
         consensus.nMasternodePaymentsFinalPercent =  60; // will be reached in ca 5 yrs

diff --git a/src/consensus/params.h b/src/consensus/params.h
@@ -74,6 +74,7 @@ struct Params {
     int nMasternodePaymentsIncreasePeriod; // in blocks
     int nMasternodeCollateralMinimum; // in coins
     int nMasternodeCollateralMaximum; // in coins
+    int nMasternodeCollateral201908;  // in coins
     // VELES BEGIN
     int nMasternodePaymentsStartPercent;
     int nMasternodePaymentsFinalPercent;

diff --git a/src/masternode.cpp b/src/masternode.cpp
@@ -134,30 +134,26 @@ CMasternode::CollateralStatus CMasternode::CheckCollateral(const COutPoint& outp
     return COLLATERAL_OK;
 }
 
-// FXTC BEGIN
+// VELES BEGIN
 bool CMasternode::CollateralValueCheck(int nHeight, CAmount TxValue)
 {
-    CAmount MNCollateral = CollateralValue(nHeight);
+    if (TxValue == CollateralValue(nHeight))
+        return true;
+
+    if (nHeight >= 240000)
+        return false;
 
     CAmount MinCollateral = Params().GetConsensus().nMasternodeCollateralMinimum * COIN;
     CAmount MaxCollateral = Params().GetConsensus().nMasternodeCollateralMaximum * COIN;
 
-    return (TxValue >= MinCollateral && TxValue >= 0.999 * MNCollateral && TxValue <= 1.001 * MNCollateral && TxValue <= MaxCollateral);
+    return (TxValue >= MinCollateral && TxValue <= MaxCollateral);
 }
 
 CAmount CMasternode::CollateralValue(int nHeight)
 {
-    // Maximum 100000 FTC in infinity, starting 1000 FTC
-
-    int nMNPIPeriod = Params().GetConsensus().nMasternodePaymentsIncreasePeriod;
-    CAmount MinCollateral = Params().GetConsensus().nMasternodeCollateralMinimum;
-    CAmount MaxCollateral = Params().GetConsensus().nMasternodeCollateralMaximum;
-
-    CAmount MnCollateral = (MaxCollateral - (MaxCollateral - MinCollateral) * (100.00 * nMNPIPeriod / (1.00 * nHeight + 100.00 * nMNPIPeriod ))) * COIN;
-
-    return MnCollateral;
+    return Params().GetConsensus().nMasternodeCollateral201908 * COIN;
 }
-//
+// VELES END
 
 void CMasternode::Check(bool fForce)
 {