Merge branch 'master-0.17' of https://github.com/LIMXTEC/BitSend into master-0.17

Author: limxdev

README.md

@@ -1,7 +1,6 @@
 Bitsend Core integration/staging tree
 =====================================
 
-[![Build Status](https://travis-ci.org/LIMXTEC/BitSend.svg?branch=master)](https://travis-ci.org/LIMXTEC/BitSend)
 
 https://bitsend.cc
 

configure.ac

@@ -2,10 +2,10 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 17)
-define(_CLIENT_VERSION_REVISION, 0)
+define(_CLIENT_VERSION_REVISION, 9)
 define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2020)
+define(_COPYRIGHT_YEAR, 2021)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitsend Core]])
 AC_INIT([Bitsend Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/LIMXTEC/BitSend/issues],[bitsend],[https://bitsend.cc/])

src/chainparams.cpp

@@ -277,8 +277,8 @@ class CRegTestParams : public CChainParams {
         consensus.BIP65Height = 1351; // BIP65 activated on regtest (Used in rpc activation tests)
         consensus.BIP66Height = 1251; // BIP66 activated on regtest (Used in rpc activation tests)
         consensus.powLimit = uint256S("7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
-        consensus.nPowTargetTimespan = 14 * 24 * 60 * 60; // two weeks
-        consensus.nPowTargetSpacing = 10 * 60;
+        consensus.nPowTargetTimespan = 160 * 60; // BSD 17.9
+        consensus.nPowTargetSpacing = 2.5 * 60; // BSD 17.9
         consensus.fPowAllowMinDifficultyBlocks = true;
         consensus.fPowNoRetargeting = true;
         consensus.nRuleChangeActivationThreshold = 108; // 75% for testchains

src/pow.cpp

@@ -16,8 +16,6 @@
 
 unsigned int static DUAL_KGW3(const CBlockIndex* pindexLast, const Consensus::Params& params, const CBlockHeader *pblock)
 {
-	// current difficulty formula, ERC3 - DUAL_KGW3, written by Christian Knoepke - apfelbaum@email.de
-	// BitSend and Eropecoin Developer
     const CBlockIndex *BlockLastSolved = pindexLast;
     const CBlockIndex *BlockReading = pindexLast;
 	bool kgwdebug=false;
@@ -150,7 +148,56 @@ unsigned int static DUAL_KGW3(const CBlockIndex* pindexLast, const Consensus::Pa
 unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock, const Consensus::Params& params)
 {
     //Initial DK3
-    return DUAL_KGW3(pindexLast, params, pblock);
+    int Diff_Fork1 = 951000;
+    assert(pindexLast != nullptr);
+    unsigned int nProofOfWorkLimit = UintToArith256(params.powLimit).GetCompact();
+    if (pindexLast->nHeight+1 <= Diff_Fork1)
+    {
+        return DUAL_KGW3(pindexLast, params, pblock);
+    }
+    //// Update 0.17.9 BSD
+            // Genesis block
+        if (pindexLast == NULL)
+            return nProofOfWorkLimit;
+
+        // Only change once per difficulty adjustment interval
+        if ((pindexLast->nHeight+1) % params.DifficultyAdjustmentInterval() != 0)
+        {
+            if (params.fPowAllowMinDifficultyBlocks)
+            {
+                // Special difficulty rule for testnet:
+                // If the new block's timestamp is more than 2* 10 minutes
+                // then allow mining of a min-difficulty block.
+                if (pblock->GetBlockTime() > pindexLast->GetBlockTime() + params.nPowTargetSpacing*2)
+                    return nProofOfWorkLimit;
+                else
+                {
+                    // Return the last non-special-min-difficulty-rules-block
+                    const CBlockIndex* pindex = pindexLast;
+                    while (pindex->pprev && pindex->nHeight % params.DifficultyAdjustmentInterval() != 0 && pindex->nBits == nProofOfWorkLimit)
+                        pindex = pindex->pprev;
+                    return pindex->nBits;
+                }
+            }
+            // LogPrintf("difficulty adjustment interval %d  \n",(pindexLast->nHeight+1) % params.DifficultyAdjustmentInterval());
+            return pindexLast->nBits;
+        }
+
+        // Go back by what we want to be 14 days worth of blocks
+        // Litecoin: This fixes an issue where a 51% attack can change difficulty at will.
+        // Go back the full period unless it's the first retarget after genesis. Code courtesy of Art Forz
+        int blockstogoback = params.DifficultyAdjustmentInterval()-1;
+        if ((pindexLast->nHeight+1) != params.DifficultyAdjustmentInterval())
+            blockstogoback = params.DifficultyAdjustmentInterval();
+
+        // Go back by what we want to be 14 days worth of blocks
+        const CBlockIndex* pindexFirst = pindexLast;
+        for (int i = 0; pindexFirst && i < blockstogoback; i++)
+            pindexFirst = pindexFirst->pprev;
+
+        assert(pindexFirst);
+        return CalculateNextWorkRequired(pindexLast, pindexFirst->GetBlockTime(), params);
+        //// Update 0.17.9 BSD END
 
 }
 
@@ -161,10 +208,10 @@ unsigned int CalculateNextWorkRequired(const CBlockIndex* pindexLast, int64_t nF
 
     // Limit adjustment step
     int64_t nActualTimespan = pindexLast->GetBlockTime() - nFirstBlockTime;
-    if (nActualTimespan < params.nPowTargetTimespan/4)
-        nActualTimespan = params.nPowTargetTimespan/4;
-    if (nActualTimespan > params.nPowTargetTimespan*4)
-        nActualTimespan = params.nPowTargetTimespan*4;
+    if (nActualTimespan < params.nPowTargetTimespan/1.2)
+        nActualTimespan = params.nPowTargetTimespan/1.2;
+    if (nActualTimespan > params.nPowTargetTimespan*1.2)
+        nActualTimespan = params.nPowTargetTimespan*1.2;
 
     // Retarget
     const arith_uint256 bnPowLimit = UintToArith256(params.powLimit);

src/qt/splashscreen.cpp

@@ -43,7 +43,7 @@ SplashScreen::SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const Netw
     QString titleText       = tr(PACKAGE_NAME);
     QString versionText     = QString("Version %1").arg(QString::fromStdString(FormatFullVersion()));
     versionText = versionText.rightJustified(25, '.', true);
-    QString copyrightText   = "Welcome to Bitsend Core\n0.17.0.x\n\nOfficial website\nbitsend.cc";
+    QString copyrightText   = "Welcome to Bitsend Core\n\nOfficial website\nbitsend.cc";
     //QString copyrightText   = QString::fromUtf8(CopyrightHolders(strprintf("\xc2\xA9 %u-%u ", 2009, COPYRIGHT_YEAR)).c_str());
     QString titleAddText    = networkStyle->getTitleAddText();
 

src/validation.cpp

@@ -1220,14 +1220,19 @@ bool ReadRawBlockFromDisk(std::vector<uint8_t>& block, const CBlockIndex* pindex
 CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
 {
 
+   //FORKX17_Main_Net = 240000
 	CAmount nSubsidy = 50 * COIN;
 
 	if (nHeight <= 2)
 		nSubsidy = 1306400 * COIN;
 
+    
     if (nHeight > (FORKX17_Main_Net-1000))nSubsidy = 25 * COIN;
-	if (nHeight >= ((FORKX17_Main_Net*33)-50256))nSubsidy = 1/10 * COIN;
-
+    if (nHeight > (950000))nSubsidy = 12.5 * COIN;
+    if (nHeight > (1000000))nSubsidy = 6.25 * COIN;
+    if (nHeight > (1050000))nSubsidy = 3.125 * COIN;
+    if (nHeight > (1100000))nSubsidy = 1.5625 * COIN;
+    // In the last stage we will generate 315000 BSD per year
 
     return nSubsidy;
 }
@@ -1236,7 +1241,12 @@ CAmount GetMasternodePayment(int nHeight, CAmount blockValue)
 {
     CAmount ret = blockValue/5; // start at 20%
 
-
+   if(nHeight >= 1000000)
+   {
+       // We change it to 50% 
+       ret = blockValue / 2;
+       return ret;
+   }
 
    if(nHeight > 140500) ret += blockValue / 20;
 	// 140500
@@ -1262,30 +1272,6 @@ CAmount GetMasternodePayment(int nHeight, CAmount blockValue)
 	// 235540
 	if(nHeight > 140500+((288*30)* 11)) ret += blockValue / 20;
 	//  244180
-	/* For later Stop by 20% /80%
-	if(nHeight > 140500+((288*30)* 12)) ret += blockValue / 50;
-	// 252820
-	if(nHeight > 140500+((288*30)* 13)) ret += blockValue / 50;
-	// 261460
-	if(nHeight > 140500+((288*30)* 14)) ret += blockValue / 50;
-	// 270100
-	if(nHeight > 140500+((288*30)* 15)) ret += blockValue / 50;
-	// 278740
-	if(nHeight > 140500+((288*30)* 16)) ret += blockValue / 50;
-	// 287380
-	if(nHeight > 140500+((288*30)* 17)) ret += blockValue / 50;
-	// 296020
-	if(nHeight > 140500+((288*30)* 18)) ret += blockValue / 50;
-	// 304660
-	if(nHeight > 140500+((288*30)* 19)) ret += blockValue / 50;
-	// 313300
-	if(nHeight > 140500+((288*30)* 20)) ret += blockValue / 50;
-	//  321940
-	if(nHeight > 140500+((288*30)* 21)) ret += blockValue / 100;
-	*/
-  //  LogPrintf("Zugriff main.cpp 1448 blockValue %u\n", blockValue);
-
-
     return ret;
 }