New version message and back to 30 second minimum default

catcoiner · Jul 11, 2015 · d5ac954 · d5ac954
1 parent 14862b1
commit d5ac954
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,14 +9,14 @@
 #define CLIENT_VERSION_MAJOR       0
 #define CLIENT_VERSION_MINOR       9
 #define CLIENT_VERSION_REVISION    2
-#define CLIENT_VERSION_BUILD       3
+#define CLIENT_VERSION_BUILD       4
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true
 
 // Copyright year (2009-this)
 // Todo: update this when changing our copyright comments in the source
-#define COPYRIGHT_YEAR 2014
+#define COPYRIGHT_YEAR 2015
 
 // Converts the parameter X to a string after macro replacement on X has been performed.
 // Don't merge these into one macro!

diff --git a/src/init.cpp b/src/init.cpp
@@ -623,7 +623,7 @@ bool AppInit2(boost::thread_group& threadGroup)
     extern int64 nMinBlockTime;
     if (mapArgs.count("-minblocktime"))
     {
-        int nNewMin = GetArg("-minblocktime", 180);
+        int nNewMin = GetArg("-minblocktime", 30);
             if (nNewMin > 0 && nNewMin < 15*60){
                 nMinBlockTime = nNewMin;
             InitWarning(strprintf(_("HARD minimum block time (nMinBlockTime) set to %d"), nMinBlockTime));

diff --git a/src/main.cpp b/src/main.cpp
@@ -1075,7 +1075,7 @@ int64 static GetBlockValue(int nHeight, int64 nFees)
 static const int64 nTargetTimespan = 6 * 60 * 60; // 6 hours
 static const int64 nTargetSpacing = 10 * 60;
 static const int64 nInterval = nTargetTimespan / nTargetSpacing;
-int64 nMinBlockTime = 180; 	// Absolute minimum spacing
+int64 nMinBlockTime = 30; 	// Absolute minimum spacing
 
 static const int64 nTargetTimespanOld = 14 * 24 * 60 * 60; // two weeks
 static const int64 nIntervalOld = nTargetTimespanOld / nTargetSpacing;

diff --git a/src/version.cpp b/src/version.cpp
@@ -8,7 +8,7 @@
 // Name of client reported in the 'version' message. Report the same name
 // for both bitcoind and bitcoin-qt, to make it harder for attackers to
 // target servers or GUI users specifically.
-const std::string CLIENT_NAME("Satoshi");
+const std::string CLIENT_NAME("Catcoin");
 
 // Client version number
 #define CLIENT_VERSION_SUFFIX   "-beta"