build 13.2.4

src/chainparams.cpp

@@ -163,6 +163,10 @@ class CMainParams : public CChainParams
         // + Is surrounded by blocks with reasonable timestamps
         //   (no blocks before with a timestamp after, none after with timestamp before)
         // + Contains no strange transactions
+        // Getting a checkpoint
+        //   first: get the blockhash, getblockhash 5000, for example
+        //   second: get stats from the windows: getchaintxstats 4999 hash
+
         checkpointData = {
             {
                 {     0, nHashGenesisBlock},
@@ -236,15 +240,16 @@ class CTestNetParams : public CMainParams
 
         checkpointData = {
             {
-                {     0, nHashGenesisBlock}
+                {     0, nHashGenesisBlock},
+                {5000, uint256S("0x5871e36a46456ac2cd9d4985dc7671d2a97fb0df4ff1e5282b4ebfa9276d5c48")}
             }
         };
 
         chainTxData = ChainTxData{
         // Data from rpc: getchaintxstats
-        /* nTime    */ genesis.GetBlockTime(),
-        /* nTxCount */ 0,
-        /* dTxRate  */ 0
+        /* nTime    */ 1560331326,
+        /* nTxCount */ 10000,
+        /* dTxRate  */ 0.02409597902266439
         };
     }
 };

src/miner.cpp

@@ -1198,25 +1198,25 @@ void updateStaking2KoreConf( bool staking )
 
     std::ostringstream strTemp;
 
-    bool isConfExist = false;
+    bool isStakingAlreadyinKoreConf = false;
 
-    if (streamConfig.peek() == std::ifstream::traits_type::eof())
-        strTemp << strNew << std::endl;
-    else {
-        for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it) {
-            std::string strKey =    it->string_key;
-            std::string strValue =  it->value[0];
-            if((strKey + "=" + strValue) == strReplace){
-                strTemp << strNew << std::endl;
-                isConfExist = true;
-                continue;
-            }
-            strTemp << strKey << "=" << strValue << std::endl;
-        }
-        if(!isConfExist)
+    for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it) {
+        std::string strKey = it->string_key;
+        std::string strValue = it->value[0];
+        if (strKey == "staking") {
+            // Let's put the new value
             strTemp << strNew << std::endl;
+            isStakingAlreadyinKoreConf = true;
+            continue;
+        }
+        // the key is different, se lets keep its value
+        strTemp << strKey << "=" << strValue << std::endl;
+    }
+    if (!isStakingAlreadyinKoreConf) {
+        // our key is not in the file yet, so lets add it
+        strTemp << strNew << std::endl;
     }
-    
+
     std::ofstream newKoreConfig;
     newKoreConfig.open(pathConfig.string().c_str(),fstream::out);
 

src/qt/bitcoingui.cpp

@@ -1126,6 +1126,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
         encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
         // Let's show how this affets staking
         labelStakingIcon->setEnabled(true);
+        labelStakingIcon->checkStakingTimer();
 
         break;
     case WalletModel::UnlockedForAnonymizationOnly:
@@ -1139,6 +1140,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
         encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
         // Let's show how this affets staking
         labelStakingIcon->setEnabled(true);
+        labelStakingIcon->checkStakingTimer();
 
         break;
     case WalletModel::Locked:
@@ -1152,6 +1154,7 @@ void BitcoinGUI::setEncryptionStatus(int status)
         encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
         // Let's show how this affets staking
         labelStakingIcon->setEnabled(false);
+        labelStakingIcon->checkStakingTimer();
 
         break;
     }
@@ -1375,7 +1378,7 @@ void StakingStatusBarControl::setOptionsModel(OptionsModel* optionsModel)
         enableStaking->setEnabled(staking);
         disableStaking->setEnabled(!staking);
         //StakingCoins(staking);
-        updateStakingIcon(staking);
+        updateStakingIcon(staking, false);
     }
 }
 
@@ -1398,7 +1401,7 @@ void StakingStatusBarControl::updateStakingIcon(bool staking, bool action)
 
     if (staking) {
         setPixmap(QIcon(":/icons/staking_active").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
-        setToolTip(tr("Staking is active\n MultiSend: %1").arg(fMultiSend ? tr("Active") : tr("Not Active")));
+        setToolTip(tr("Staking is active%1\n MultiSend: %2").arg( pwalletMain->IsLocked() ? tr(", when unlocked") : tr(" ")).arg(fMultiSend ? tr("Active") : tr("Not Active")));
         if (action && enableStaking->isEnabled() == true) {
             updateStaking2KoreConf(true);
             StakingCoins(true);

src/qt/bitcoingui.h

@@ -304,6 +304,8 @@ private slots:
     void updateStakingIcon(bool staking);
     /** Tells underlying optionsModel to update its current display unit. */
     void onMenuSelection(QAction* action);
+
+public slots:
     void checkStakingTimer();
 
 };