Addtl fixes for addtl fixes.

CryptoDragonLady · Mar 5, 2019 · 2173100 · 2173100
1 parent fd11a67
commit 2173100
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/spork.cpp b/src/spork.cpp
@@ -104,7 +104,8 @@ bool IsSporkActive(int nSporkID)
         if (nSporkID == SPORK_14_NEW_PROTOCOL_ENFORCEMENT) r = SPORK_14_NEW_PROTOCOL_ENFORCEMENT_DEFAULT;
 	if (nSporkID == SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2) r = SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2_DEFAULT;
         if (nSporkID == SPORK_16_MN_WINNER_MINIMUM_AGE) r = SPORK_16_MN_WINNER_MINIMUM_AGE_DEFAULT;
-
+        if (nSporkID == SPORK_17_PROPOSAL_VETO) r = SPORK_17_PROPOSAL_VETO_DEFAULT;
+	if (nSporkID == SPORK_18_KILL_STRAGGLERS) r = SPORK_18_KILL_STRAGGLERS_DEFAULT;
         if (r == -1) LogPrintf("GetSpork::Unknown Spork %d\n", nSporkID);
     }
     if (r == -1) r = 4070908800; //return 2099-1-1 by default
@@ -133,6 +134,8 @@ int64_t GetSporkValue(int nSporkID)
         if (nSporkID == SPORK_14_NEW_PROTOCOL_ENFORCEMENT) r = SPORK_14_NEW_PROTOCOL_ENFORCEMENT_DEFAULT;
 	if (nSporkID == SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2) r = SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2_DEFAULT;
         if (nSporkID == SPORK_16_MN_WINNER_MINIMUM_AGE) r = SPORK_16_MN_WINNER_MINIMUM_AGE_DEFAULT;
+        if (nSporkID == SPORK_17_PROPOSAL_VETO) r = SPORK_17_PROPOSAL_VETO_DEFAULT; 
+        if (nSporkID == SPORK_18_KILL_STRAGGLERS) r = SPORK_18_KILL_STRAGGLERS_DEFAULT; 
 
         if (r == -1) LogPrintf("GetSpork::Unknown Spork %d\n", nSporkID);
     }

diff --git a/src/spork.h b/src/spork.h
@@ -41,6 +41,8 @@ using namespace boost;
 #define SPORK_14_NEW_PROTOCOL_ENFORCEMENT 10013
 #define SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2 10014
 #define SPORK_16_MN_WINNER_MINIMUM_AGE 10015
+#define SPORK_17_PROPOSAL_VETO 10016
+#define SPORK_18_KILL_STRAGGLERS 10017
 
 #define SPORK_2_INSTANTX_DEFAULT 978307200                         //2001-1-1
 #define SPORK_3_INSTANTX_BLOCK_FILTERING_DEFAULT 1424217600        //2015-2-18
@@ -54,8 +56,10 @@ using namespace boost;
 #define SPORK_13_ENABLE_SUPERBLOCKS_DEFAULT 1512864000            //OFF
 #define SPORK_14_NEW_PROTOCOL_ENFORCEMENT_DEFAULT 4070908800      //OFF
 #define SPORK_15_NEW_PROTOCOL_ENFORCEMENT_2_DEFAULT 4070908800              // Age in seconds. This should be > MASTERNODE_REMOVAL_SECONDS to avoid
-#define SPORK_16_MN_WINNER_MINIMUM_AGE_DEFAULT 8001                                                                 // misconfigured new nodes in the list. 
-                                                                  // Set this to zero to emulate classic behaviour
+#define SPORK_16_MN_WINNER_MINIMUM_AGE_DEFAULT 8001                                                                 // misconfigured new nodes in the list.  Set this to zero to emulate classic behaviour
+#define SPORK_17_PROPOSAL_VETO_DEFAULT 2000000001
+#define SPORK_18_KILL_STRAGGLERS_DEFAULT 1
+
 class CSporkMessage;
 class CSporkManager;