Merge pull request #8 from ShieldCoin/develop

Hardfork planned for block 370000

Author: ShieldCoin

configure.ac

@@ -1,11 +1,11 @@
 dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 2)
-define(_CLIENT_VERSION_MINOR, 1)
+define(_CLIENT_VERSION_MINOR, 3)
 define(_CLIENT_VERSION_REVISION, 0)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2016)
+define(_COPYRIGHT_YEAR, 2017)
 AC_INIT([SHIELD Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/ShieldCoin/shield/issues],[SHIELD],[http://ShieldCoin.github.io/])
 AC_CONFIG_AUX_DIR([src/build-aux])
 AC_CONFIG_MACRO_DIR([src/m4])

src/clientversion.h

@@ -9,7 +9,7 @@
 //
 // These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
 #define CLIENT_VERSION_MAJOR       2
-#define CLIENT_VERSION_MINOR       2
+#define CLIENT_VERSION_MINOR       3
 #define CLIENT_VERSION_REVISION    0
 #define CLIENT_VERSION_BUILD       0
 

src/init.cpp

@@ -622,7 +622,7 @@ bool AppInit2()
             struct in_addr inaddr_any;
             inaddr_any.s_addr = INADDR_ANY;
             fBound |= Bind(CService(in6addr_any, GetListenPort()), BF_NONE);
-            fBound |= Bind(CService(inaddr_any, GetListenPort()), !fBound ? BF_REPORT_ERROR : BF_NONE);
+            fBound |= Bind(CService(inaddr_any, GetListenPort()), (!fBound) ? (BF_REPORT_ERROR & 0x01) : BF_NONE);//FIXME: test if it works
         }
         if (!fBound)
             return InitError(_("Failed to listen on any port. Use -listen=0 if you want this."));

src/main.cpp

@@ -49,7 +49,7 @@ static CBigNum bnProofOfStakeLimitTestNet(~uint256(0) >> 20);
 unsigned int nStakeMinAge = 10000 * 10000;	// minimum age disabled
 unsigned int nStakeMaxAge = 10000 * 10000;	// stake max age disabled
 unsigned int nStakeTargetSpacing = 30;		// 30 seconds POS block spacing
-unsigned int nProofOfWorkTargetSpacing = 15; 	// 30 seconds PoW block spacing
+//unsigned int nProofOfWorkTargetSpacing = 15; 	// 30 seconds PoW block spacing
 
 int64 nChainStartTime = 1507311620;
 int nCoinbaseMaturity = 240;
@@ -1088,7 +1088,7 @@ void avgRecentTimestamps(const CBlockIndex* pindexLast, int64_t *avgOf5, int64_t
     }
     else
     { // genesis block or previous
-    blocktime -= nProofOfWorkTargetSpacing;
+    blocktime -= GetTargetSpacing(pindexLast->nHeight);
     }
     // for each block, add interval.
     if (blockoffset < 5) *avgOf5 += (oldblocktime - blocktime);
@@ -1116,8 +1116,8 @@ unsigned int GetNextTargetRequired_V2(const CBlockIndex* pindexLast, bool fProof
     int64_t now;
     int64_t BlockHeightTime;
 
-    int64_t nFastInterval = (nProofOfWorkTargetSpacing * 9 ) / 10; // seconds per block desired when far behind schedule
-    int64_t nSlowInterval = (nProofOfWorkTargetSpacing * 11) / 10; // seconds per block desired when far ahead of schedule
+    int64_t nFastInterval = (GetTargetSpacing(pindexLast->nHeight) * 9 ) / 10; // seconds per block desired when far behind schedule
+    int64_t nSlowInterval = (GetTargetSpacing(pindexLast->nHeight) * 11) / 10; // seconds per block desired when far ahead of schedule
     int64_t nIntervalDesired;
 
 
@@ -1136,15 +1136,15 @@ unsigned int GetNextTargetRequired_V2(const CBlockIndex* pindexLast, bool fProof
 
     now = pindexLast->GetBlockTime();
 
-    BlockHeightTime = pindexGenesisBlock->nTime + pindexLast->nHeight * nProofOfWorkTargetSpacing;
+    BlockHeightTime = pindexGenesisBlock->nTime + pindexLast->nHeight * GetTargetSpacing(pindexLast->nHeight);
 
     if (now < BlockHeightTime + nTargetTimespan && now > BlockHeightTime )
     // ahead of schedule by less than one interval.
-    nIntervalDesired = ((nTargetTimespan - (now - BlockHeightTime)) * nProofOfWorkTargetSpacing +  
-                (now - BlockHeightTime) * nFastInterval) / nProofOfWorkTargetSpacing;
+    nIntervalDesired = ((nTargetTimespan - (now - BlockHeightTime)) * GetTargetSpacing(pindexLast->nHeight) +  
+                (now - BlockHeightTime) * nFastInterval) / GetTargetSpacing(pindexLast->nHeight);
     else if (now + nTargetTimespan > BlockHeightTime && now < BlockHeightTime)
     // behind schedule by less than one interval.
-    nIntervalDesired = ((nTargetTimespan - (BlockHeightTime - now)) * nProofOfWorkTargetSpacing + 
+    nIntervalDesired = ((nTargetTimespan - (BlockHeightTime - now)) * GetTargetSpacing(pindexLast->nHeight) + 
                 (BlockHeightTime - now) * nSlowInterval) / nTargetTimespan;
 
     // ahead by more than one interval;
@@ -1212,7 +1212,7 @@ unsigned int GetNextTargetRequired_V2(const CBlockIndex* pindexLast, bool fProof
 
     printf("difficulty: ctual time %" PRId64 ", Scheduled time for this block height = %" PRId64 "\n", now, BlockHeightTime );
     printf("difficulty: Nominal block interval = %u, regulating on interval %" PRId64 " to get back to schedule.\n", 
-          nProofOfWorkTargetSpacing, nIntervalDesired );
+          GetTargetSpacing(pindexLast->nHeight), nIntervalDesired );
     printf("difficulty: Intervals of last 5/7/9/17 blocks = %" PRId64 "/ %" PRId64 " / %" PRId64 " / %" PRId64 ".\n",
           avgOf5, avgOf7, avgOf9, avgOf17);
     printf("difficulty: Difficulty Before Adjustment: %u  %s\n", pindexLast->nBits, bnOld.ToString().c_str());
@@ -1361,7 +1361,7 @@ unsigned int GetNextTargetRequired(const CBlockIndex* pindexLast, bool fProofOfS
         {
                 return GetNextTargetRequired_V2(pindexLast, fProofOfStake, algo);
         }
-        return DarkGravityWave3(pindexLast, nProofOfWorkTargetSpacing, algo);//Then DarkGravityWave3
+        return DarkGravityWave3(pindexLast, GetTargetSpacing(pindexLast->nHeight), algo);//Then DarkGravityWave3
 }
 
 

src/main.h

@@ -155,6 +155,21 @@ enum
     BLOCK_VERSION_LYRA2RE	 = (10 << 11),
 };
 
+inline int GetTargetSpacing(int Height=nBestHeight, bool fProofOfStake=false)
+{
+    if(fProofOfStake){
+        return 45;
+    }
+    else
+    {
+        if (Height < 370000){
+            return 15;//15/5 = 3sec
+        }else{
+            return 225;//225/5 = 45sec
+        }
+    }
+}
+
 inline int GetAlgo(int nVersion)
 {
     switch (nVersion & BLOCK_VERSION_ALGO)
@@ -165,10 +180,10 @@ inline int GetAlgo(int nVersion)
             return ALGO_GROESTL;
         case BLOCK_VERSION_LYRA2RE:
             return ALGO_LYRA2RE;
-	case BLOCK_VERSION_X17:
-	    return ALGO_X17;
-	case BLOCK_VERSION_BLAKE:
-	    return ALGO_BLAKE;
+        case BLOCK_VERSION_X17:
+            return ALGO_X17;
+        case BLOCK_VERSION_BLAKE:
+            return ALGO_BLAKE;
     }
     return ALGO_SCRYPT;
 }
@@ -183,10 +198,10 @@ inline std::string GetAlgoName(int Algo)
             return std::string("groestl");
         case ALGO_LYRA2RE:
             return std::string("lyra2re");
-	case ALGO_BLAKE:
-	    return std::string("blake");
-	case ALGO_X17:
-	    return std::string("x17");
+        case ALGO_BLAKE:
+            return std::string("blake");
+        case ALGO_X17:
+            return std::string("x17");
 
     }
     return std::string("unknown");

src/version.h

@@ -26,7 +26,7 @@ static const int DATABASE_VERSION = 70509;
 // network protocol versioning
 //
 
-static const int PROTOCOL_VERSION = 90004;
+static const int PROTOCOL_VERSION = 90005;
 
 // clients with smaller version number are disconnected
 static const int MIN_PROTO_VERSION = 90002;