Revert "v1.1.0.1 (#13)" (#14)

This reverts commit 1d87da1.

.gitignore

@@ -173,4 +173,4 @@ config.status
 .vs/CCBC/v15/ipch/AutoPCH/17a9e86b3fc8b7b0/BITCOINGUI.ipch
 .vs/CCBC/v15/ipch/AutoPCH/177e9d87b59f1805/PRIVACYDIALOG.ipch
 .vs/CCBC/v15/ipch/AutoPCH/97cdf6ca85efe74/PROTOCOL.ipch
-.vs/CCBC/v15/ipch/AutoPCH/f836824dc3c97f9a/CCBC-CLI.ipch
+.vs/CCBC/v15/ipch/AutoPCH/f836824dc3c97f9a/CCBC-CLI.ipch

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 define(_CLIENT_VERSION_MINOR, 1)
 define(_CLIENT_VERSION_REVISION, 0)
-define(_CLIENT_VERSION_BUILD, 1)
+define(_CLIENT_VERSION_BUILD, 0)
 
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2018)

src/chainparams.cpp

@@ -59,7 +59,6 @@ boost::assign::map_list_of
 
 (0, uint256("0xa9f081734c579a25872ce366d5520482755d26ff3db73fbe7bdd4e973bc0e173"));
 
-
 static const Checkpoints::CCheckpointData data = {
 	&mapCheckpoints,
 	1534438799, // * UNIX timestamp of last checkpoint block
@@ -159,9 +158,6 @@ class CMainParams : public CChainParams
 		genesis.nNonce = 647688;
 
 
-		nEnforceNewSporkKey = 1546300800; //!> Sporks signed after (GMT): Tuesday, Jan 1, 2018 12:00:00 AM GMT must use the new spork key
-    nRejectOldSporkKey = 1548979200;  //!> Fully reject old spork key after (GMT): Friday, Feb 1, 2018 12:00:00 AM
-
 		hashGenesisBlock = genesis.GetHash();
 
 		//printf("genesis.GetHash = %s\n", genesis.GetHash().ToString().c_str());
@@ -202,10 +198,8 @@ class CMainParams : public CChainParams
 		fHeadersFirstSyncingActive = false;
 
 		nPoolMaxTransactions = 3;
-
-    strSporkKey = "0257aa5bdba5b2458ac8acb5eb80277cee5c69e21a55299b5d7ac506c49d958984";
-    strSporkKeyOld = "030262a2a0679d01ab026d375c42b0a4122477123631b870e09665526c322c8899";
-
+		//strSporkKey = "030262a2a0679d01ab026d375c42b0a4122477123631b870e09665526c322c8899";
+		strSporkKey = "0257aa5bdba5b2458ac8acb5eb80277cee5c69e21a55299b5d7ac506c49d958984";
 		strObfuscationPoolDummyAddress = "XCNAsFGy8k7amqRG26ikKyfVDwK8585Z6b";
 		nStartMasternodePayments = 1534438799;
 

src/chainparams.h

@@ -91,17 +91,10 @@ class CChainParams
     const std::vector<CAddress>& FixedSeeds() const { return vFixedSeeds; }
     virtual const Checkpoints::CCheckpointData& Checkpoints() const = 0;
     int PoolMaxTransactions() const { return nPoolMaxTransactions; }
-
-	//Spork Related items
-    //std::string SporkKey() const { return strSporkKey; }
     std::string SporkKey() const { return strSporkKey; }
-    std::string SporkKeyOld() const { return strSporkKeyOld; }
-    int64_t NewSporkStart() const { return nEnforceNewSporkKey; }
-    int64_t RejectOldSporkKey() const { return nRejectOldSporkKey; }
     std::string ObfuscationPoolDummyAddress() const { return strObfuscationPoolDummyAddress; }
     int64_t StartMasternodePayments() const { return nStartMasternodePayments; }
     int64_t Budget_Fee_Confirmations() const { return nBudget_Fee_Confirmations; }
-
     CBaseChainParams::Network NetworkID() const { return networkID; }
 
     /** Zerocoin **/
@@ -173,13 +166,7 @@ class CChainParams
     bool fTestnetToBeDeprecatedFieldRPC;
     bool fHeadersFirstSyncingActive;
     int nPoolMaxTransactions;
-
-    //std::string strSporkKey;
     std::string strSporkKey;
-    std::string strSporkKeyOld;
-    int64_t nEnforceNewSporkKey;
-    int64_t nRejectOldSporkKey;
-
     std::string strObfuscationPoolDummyAddress;
     int64_t nStartMasternodePayments;
     std::string zerocoinModulus;

src/clientversion.h

@@ -18,7 +18,7 @@
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 1
 #define CLIENT_VERSION_REVISION 0
-#define CLIENT_VERSION_BUILD 1
+#define CLIENT_VERSION_BUILD 0
 
 //! Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE true