Merge pull request bitcoin#515 from peercoin/release-0.8

Release 0.8
lateminer · Feb 15, 2020 · 6708361 · 6708361
2 parents 84979d7 + 72a4369
commit 6708361
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 29 deletions.
diff --git a/configure.ac b/configure.ac
@@ -6,7 +6,7 @@ define(_CLIENT_VERSION_REVISION, 3)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_PEERCOIN_VERSION_MAJOR, 0)
 define(_PEERCOIN_VERSION_MINOR, 8)
-define(_PEERCOIN_VERSION_REVISION, 4)
+define(_PEERCOIN_VERSION_REVISION, 5)
 define(_PEERCOIN_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2020)

diff --git a/doc/README.md b/doc/README.md
@@ -1,4 +1,4 @@
-Peercoin 0.8.4 BETA
+Peercoin 0.8.5 BETA
 
 Setup
 ---------------------

diff --git a/doc/README_windows.txt b/doc/README_windows.txt
@@ -1,4 +1,4 @@
-Peercoin 0.8.4 BETA
+Peercoin 0.8.5 BETA
 
 Copyright (c) 2011-2020 Peercoin Developers
 Distributed under the MIT software license, see the accompanying

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -153,16 +153,17 @@ class CMainParams : public CChainParams {
                 {407813, uint256S("0x00000000000000012730b0f48bed8afbeb08164c9d63597afb082e82ea05cec9")},
                 {443561, uint256S("0xf81cea8e4e40b2cfcc13a8bd82436399c35a55df951b95e7128601c1838029ed")},
                 {455470, uint256S("0xd1472c26229f90b8589d331aa47ba9023cb953b92dce342c753e7a6b3431bf1e")},
+                {479189, uint256S("0xc9c065028b20a23fbb9627bbca5946c7497f11e1f72433d4d215c79047cf06f2")},
             }
         };
 
         chainTxData = ChainTxData{
-            // Data as of block d1472c26229f90b8589d331aa47ba9023cb953b92dce342c753e7a6b3431bf1e (height 455470).
-            1569932237, // * UNIX timestamp of last known number of transactions
-            1691955,    // * total number of transactions between genesis and that timestamp
+            // Data as of block c9c065028b20a23fbb9627bbca5946c7497f11e1f72433d4d215c79047cf06f2 (height 479189).
+            1580808868, // * UNIX timestamp of last known number of transactions
+            1743720,    // * total number of transactions between genesis and that timestamp
                         //   (the tx=... number in the SetBestChain debug.log lines)
-            0.007535478 // * estimated number of transactions per second after that timestamp
-                        // 1691955/(1569932237-1345400356) = 0.007535478
+            0.007407208 // * estimated number of transactions per second after that timestamp
+                        // 1743720/(1580808868-1345400356) = 0.007407208
         };
     }
 };
@@ -250,16 +251,17 @@ class CTestNetParams : public CChainParams {
                 {382019, uint256S("0x3ab75769d7957d9bf0857b5019d0a0e41044fa9ecf30b2f9c32aa457b0864ce5")},
                 {408500, uint256S("0x1636ac08b073d26b28fa40243d58dd5deb215752efe094c92c61998e4e9baf3f")},
                 {412691, uint256S("0x0e20318be88f07f521453435b37cfc516c3de07264a78ed7170985a1126126ab")},
+                {441667, uint256S("0x4636d75163248acd32c212bd1b17f556bdeb3f40316eef662f6736d1c529ae07")},
             }
         };
 
         chainTxData = ChainTxData{
-            // Data as of block 0e20318be88f07f521453435b37cfc516c3de07264a78ed7170985a1126126ab (height 412691)
-            1564144519, // * UNIX timestamp of last known number of transactions
-            804913,     // * total number of transactions between genesis and that timestamp
+            // Data as of block 4636d75163248acd32c212bd1b17f556bdeb3f40316eef662f6736d1c529ae07 (height 441667)
+            1580809121, // * UNIX timestamp of last known number of transactions
+            861789,     // * total number of transactions between genesis and that timestamp
                         //   (the tx=... number in the SetBestChain debug.log lines)
-            0.003690315 // * estimated number of transactions per second after that timestamp
-                        // 804913/(1564144519-1346029522) = 0.003690315
+            0.003670629 // * estimated number of transactions per second after that timestamp
+                        // 861789/(1580809121-1346029522) = 0.003670629
         };
     }
 };

diff --git a/src/kernel.cpp b/src/kernel.cpp
@@ -52,6 +52,7 @@ static std::map<int, unsigned int> mapStakeModifierCheckpoints =
     (407813, 0x46fe50b5u )
     (443561, 0x114a6e38u )
     (455470, 0x9b7af181u )
+    (479189, 0xe04fb8e0u )
     ;
 
 static std::map<int, unsigned int> mapStakeModifierTestnetCheckpoints =
@@ -66,6 +67,7 @@ static std::map<int, unsigned int> mapStakeModifierTestnetCheckpoints =
     (382019, 0x7f5cf5ebu )
     (408500, 0x68cadee2u )
     (412691, 0x93138e67u )
+    (441667, 0x3303fc25u )
     ;
 
 // Whether the given coinstake is subject to new v0.3 protocol

diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp
@@ -161,6 +161,8 @@ void WalletView::setWalletModel(WalletModel *_walletModel)
 
         // Show progress dialog
         connect(_walletModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int)));
+
+        this->unlockWallet();
     }
 }
 

diff --git a/src/script/standard.h b/src/script/standard.h
@@ -28,10 +28,10 @@ class CScriptID : public uint160
 };
 
 /**
- * Default setting for nMaxDatacarrierBytes. 80 bytes of data, +1 for OP_RETURN,
+ * Default setting for nMaxDatacarrierBytes. 256 bytes of data, +1 for OP_RETURN,
  * +2 for the pushdata opcodes.
  */
-static const unsigned int MAX_OP_RETURN_RELAY = 83;
+static const unsigned int MAX_OP_RETURN_RELAY = 259;
 
 /**
  * A data carrying output is an unspendable output containing data. The script

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -725,20 +725,8 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
         unsigned int currentBlockScriptVerifyFlags = GetBlockScriptFlags(chainActive.Tip(), Params().GetConsensus());
         if (!CheckInputsFromMempoolAndCache(tx, state, view, pool, currentBlockScriptVerifyFlags, true, txdata))
         {
-            // If we're using promiscuousmempoolflags, we may hit this normally
-            // Check if current block has some flags that scriptVerifyFlags
-            // does not before printing an ominous warning
-            if (!(~scriptVerifyFlags & currentBlockScriptVerifyFlags)) {
-                return error("%s: BUG! PLEASE REPORT THIS! ConnectInputs failed against latest-block but not STANDARD flags %s, %s",
-                    __func__, hash.ToString(), FormatStateMessage(state));
-            } else {
-                if (!CheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS, true, false, txdata)) {
-                    return error("%s: ConnectInputs failed against MANDATORY but not STANDARD flags due to promiscuous mempool %s, %s",
-                        __func__, hash.ToString(), FormatStateMessage(state));
-                } else {
-                    LogPrintf("Warning: -promiscuousmempool flags set to not include currently enforced soft forks, this may break mining or otherwise cause instability!\n");
-                }
-            }
+            return error("%s: BUG! PLEASE REPORT THIS! ConnectInputs failed against latest-block but not STANDARD flags %s, %s",
+                __func__, hash.ToString(), FormatStateMessage(state));
         }
 
         // Store transaction in memory