[Core] Add threshold for P2CS value (hardcoded to 10 PIV)

random-zebra · random-zebra · commit c723ab69d450 · 2019-10-23T02:22:26.000+02:00
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -168,6 +168,7 @@ class CMainParams : public CChainParams
         nFutureTimeDriftPoS = 180;
         nMasternodeCountDrift = 20;
         nMaxMoneyOut = 21000000 * COIN;
+        nMinColdStakingAmount = 10 * COIN;
 
         /** Height or Time Based Activations **/
         nLastPOWBlock = 259200;
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -104,6 +104,8 @@ class CChainParams
     int GetBudgetCycleBlocks() const { return nBudgetCycleBlocks; }
     int64_t GetProposalEstablishmentTime() const { return nProposalEstablishmentTime; }
 
+    CAmount GetMinColdStakingAmount() const { return nMinColdStakingAmount; }
+
     /** Spork key and Masternode Handling **/
     std::string SporkPubKey() const { return strSporkPubKey; }
     std::string SporkPubKeyOld() const { return strSporkPubKeyOld; }
@@ -231,6 +233,7 @@ class CChainParams
     int nBlockStakeModifierlV2;
     int nBlockEnforceNewMessageSignatures;
     int nColdStakingStart;
+    CAmount nMinColdStakingAmount;
 
     // fake serial attack
     int nFakeSerialBlockheightEnd = 0;
diff --git a/src/main.cpp b/src/main.cpp
@@ -1210,13 +1210,13 @@ bool CheckTransaction(const CTransaction& tx, bool fZerocoinActive, bool fReject
         return state.DoS(100, error("CheckTransaction() : size limits failed"),
             REJECT_INVALID, "bad-txns-oversize");
 
+    const CAmount minColdStakingAmount = Params().GetMinColdStakingAmount();
+
     // Check for negative or overflow output values
     CAmount nValueOut = 0;
     for (const CTxOut& txout : tx.vout) {
         if (txout.IsEmpty() && !tx.IsCoinBase() && !tx.IsCoinStake())
             return state.DoS(100, error("CheckTransaction(): txout empty for user transaction"));
-        if (txout.scriptPubKey.IsPayToColdStaking() && !fColdStakingActive)
-            return state.DoS(100, error("CheckTransaction(): cold staking not active"));
         if (txout.nValue < 0)
             return state.DoS(100, error("CheckTransaction() : txout.nValue negative"),
                 REJECT_INVALID, "bad-txns-vout-negative");
@@ -1231,11 +1231,19 @@ bool CheckTransaction(const CTransaction& tx, bool fZerocoinActive, bool fReject
             if(!CheckZerocoinMint(tx.GetHash(), txout, state, true))
                 return state.DoS(100, error("CheckTransaction() : invalid zerocoin mint"));
         }
+        // check cold staking enforcement and value out
+        if (txout.scriptPubKey.IsPayToColdStaking()) {
+            if (!fColdStakingActive)
+                return state.DoS(100, error("%s: cold staking not active", __func__), REJECT_INVALID, "bad-txns-cold-stake");
+            if (txout.nValue < minColdStakingAmount)
+                return state.DoS(100, error("%s: dust amount (%d) not allowed for cold staking. Min amount: %d",
+                        __func__, txout.nValue, minColdStakingAmount), REJECT_INVALID, "bad-txns-cold-stake");
+        }
     }
 
     // Additional check for cold staking
     if (tx.IsCoinStake() && !tx.HasZerocoinSpendInputs() && !CheckColdStake(tx, state, fColdStakingActive))
-        return state.DoS(100, error("CheckTransaction() : invalid cold stake"), REJECT_INVALID, "bad-txns-cold-stake");
+        return state.DoS(100, error("%s: invalid cold stake", __func__), REJECT_INVALID, "bad-txns-cold-stake");
 
     std::set<COutPoint> vInOutPoints;
     std::set<CBigNum> vZerocoinSpendSerials;
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -512,8 +512,9 @@ UniValue CreateColdStakeDelegation(const UniValue& params, CWalletTx& wtxNew, CR
 
     // Get Amount
     CAmount nValue = AmountFromValue(params[1]);
-    if (nValue <= 0)
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid amount");
+    if (nValue <= Params().GetMinColdStakingAmount())
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Invalid amount (%d). Min amount: %d",
+                nValue, Params().GetMinColdStakingAmount()));
 
     // Get Owner Address
     CBitcoinAddress ownerAddr;
diff --git a/test/functional/feature_coldStaking.py b/test/functional/feature_coldStaking.py
@@ -125,6 +125,13 @@ def run_test(self):
         assert(res is not None and res != "")
         self.log.info("Good. Warning NOT triggered.")
         self.log.info("Now delegate with internal owner address..")
+        self.log.info("Try first with a value (5) below the threshold")
+        try:
+            self.nodes[0].delegatestake(staker_address, 5, owner_address)
+            assert(False)
+        except JSONRPCException as e:
+            assert("Invalid amount" in str(e))
+            self.log.info("Nice. it was not possible.")
         self.log.info("Creating %d stake-delegation txes..." % NUM_OF_INPUTS)
         for i in range(NUM_OF_INPUTS):
             res = self.nodes[0].delegatestake(staker_address, INPUT_VALUE, owner_address)
