Only accept fixed lockin times for MN collateral (#620)

DeFiCh · Jul 19, 2021 · 719932c · 719932c
1 parent 700a8cc
commit 719932c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/src/masternodes/masternodes.h b/src/masternodes/masternodes.h
@@ -51,6 +51,12 @@ class CMasternode
         UNKNOWN // unreachable
     };
 
+    enum TimeLock {
+        ZEROYEAR,
+        FIVEYEAR = 260,
+        TENYEAR = 520
+    };
+
     //! Minted blocks counter
     uint32_t mintedBlocks;
 

diff --git a/src/masternodes/mn_checks.cpp b/src/masternodes/mn_checks.cpp
@@ -687,7 +687,16 @@ class CCustomTxApplyVisitor : public CCustomTxVisitor
             return Res::Err("masternode creation needs owner auth");
         }
 
-        if (height < static_cast<uint32_t>(Params().GetConsensus().EunosPayaHeight) && obj.timelock != 0) {
+        if (height >= static_cast<uint32_t>(Params().GetConsensus().EunosPayaHeight)) {
+            switch(obj.timelock) {
+                case CMasternode::ZEROYEAR:
+                case CMasternode::FIVEYEAR:
+                case CMasternode::TENYEAR:
+                    break;
+                default:
+                    return Res::Err("Timelock must be set to either 0, 5 or 10 years");
+            }
+        } else if (obj.timelock != 0) {
             return Res::Err("collateral timelock cannot be set below EunosPaya");
         }
 

diff --git a/src/masternodes/rpc_masternodes.cpp b/src/masternodes/rpc_masternodes.cpp
@@ -141,9 +141,9 @@ UniValue createmasternode(const JSONRPCRequest& request)
         }
         std::string timelockStr = request.params[3].getValStr();
         if (timelockStr == "FIVEYEARTIMELOCK") {
-            timelock = 5 * 52;
+            timelock = CMasternode::FIVEYEAR;
         } else if (timelockStr == "TENYEARTIMELOCK") {
-            timelock = 10 * 52;
+            timelock = CMasternode::TENYEAR;
         }
     }
 

diff --git a/test/functional/feature_longterm_lockin.py b/test/functional/feature_longterm_lockin.py
@@ -25,6 +25,7 @@ def run_test(self):
         collateral = self.nodes[0].getnewaddress("", "legacy")
         collateral5 = self.nodes[0].getnewaddress("", "legacy")
         collateral10 = self.nodes[0].getnewaddress("", "legacy")
+        collateral20 = self.nodes[0].getnewaddress("", "legacy")
 
         # Try to set time lock before EunosPaya
         try:
@@ -37,11 +38,25 @@ def run_test(self):
         self.nodes[0].generate(39)
 
         # Create MNs with locked funds
+        self.nodes[0].sendtoaddress(collateral20, 1)
         nodeid = self.nodes[0].createmasternode(collateral)
         nodeid5 = self.nodes[0].createmasternode(collateral5, "", [], "FIVEYEARTIMELOCK")
         nodeid10 = self.nodes[0].createmasternode(collateral10, "", [], "TENYEARTIMELOCK")
         self.nodes[0].generate(1)
 
+        # Test MN creation with non-standard 20 year lock-in
+        nodeid20 = self.nodes[0].createmasternode(collateral20, "", [], "TENYEARTIMELOCK")
+        nodeid20_raw = self.nodes[0].getrawtransaction(nodeid20)
+        self.nodes[0].clearmempool()
+        pos = nodeid20_raw.find('446654784301')
+        nodeid20_raw = nodeid20_raw[:pos + 52] + '1004' + nodeid20_raw[pos + 52 + 4:]
+
+        try:
+            self.nodes[0].sendrawtransaction(nodeid20_raw)
+        except JSONRPCException as e:
+            errorString = e.error['message']
+        assert("Timelock must be set to either 0, 5 or 10 years" in errorString)
+
         # Check state and timelock length
         result = self.nodes[0].getmasternode(nodeid)
         assert_equal(result[nodeid]['state'], 'PRE_ENABLED')