Fixed locking order for tpos. Fixed nLastPowBlock for testnet and mainnet which were breaking reindex

Author: durkmurder

src/chainparams.cpp

@@ -73,6 +73,7 @@ class CMainParams : public CChainParams {
 public:
     CMainParams() {
         strNetworkID = "main";
+        consensus.nLastPoWBlock = 75;
         consensus.nFirstBlocksEmpty = 20000;
         consensus.nSubsidyHalvingInterval = 43200; // Note: actual number of blocks per calendar year with DGW v3 is ~200700 (for example 449750 - 249050)
         consensus.nMasternodePaymentsStartBlock = 20100; // not true, but it's ok as long as it's less then nMasternodePaymentsIncreaseBlock
@@ -102,7 +103,6 @@ class CMainParams : public CChainParams {
         consensus.nStakeMaxAge = 60 * 60 * 24; // one day
         consensus.nCoinbaseMaturity = 20;
         consensus.nTPoSContractSignatureDeploymentTime = 1523127600;
-        consensus.nLastPoWBlock = 75;
         consensus.nPowKGWHeight = 15200;
         consensus.nPowDGWHeight = 24;
         consensus.fPowAllowMinDifficultyBlocks = false;
@@ -204,6 +204,7 @@ class CTestNetParams : public CChainParams {
 public:
     CTestNetParams() {
         strNetworkID = "test";
+        consensus.nLastPoWBlock = 75;
         consensus.nSubsidyHalvingInterval = 10000;
         consensus.nFirstBlocksEmpty = 20;
         consensus.nMasternodePaymentsStartBlock = 4010; // not true, but it's ok as long as it's less then nMasternodePaymentsIncreaseBlock
@@ -233,7 +234,6 @@ class CTestNetParams : public CChainParams {
         consensus.fPowNoRetargeting = false;
         consensus.nPowKGWHeight = 4001; // nPowKGWHeight >= nPowDGWHeight means "no KGW"
         consensus.nPowDGWHeight = 4001;
-        consensus.nLastPoWBlock = 75;
         consensus.nStakeMinAge = 60 * 60;
         consensus.nStakeMaxAge = 60 * 60 * 24; // one day
         consensus.nCoinbaseMaturity = 20;

src/qt/tposaddressestablemodel.cpp

@@ -197,7 +197,7 @@ TPoSAddressesTableModel::Entry TPoSAddressesTableModel::GetAmountForAddress(CBit
     for (auto &&walletTx : walletInterface.getWalletTxs())
     {
         const auto& tx = *walletTx.tx;
-        if (tx.IsCoinBase() || !CheckFinalTx(tx))
+        if (tx.IsCoinBase())
             continue;
 
         for(size_t i = 0; i < tx.vout.size(); ++i)

src/qt/walletframe.cpp

@@ -206,6 +206,13 @@ void WalletFrame::unlockWallet()
         walletView->unlockWallet();
 }
 
+void WalletFrame::lockWallet()
+{
+    WalletView *walletView = currentWalletView();
+    if (walletView)
+        walletView->lockWallet();
+}
+
 void WalletFrame::usedSendingAddresses()
 {
     WalletView *walletView = currentWalletView();

src/qt/walletframe.h

@@ -89,6 +89,8 @@ public Q_SLOTS:
     void changePassphrase();
     /** Ask for passphrase to unlock wallet temporarily */
     void unlockWallet();
+    /** Lock wallet */
+    void lockWallet();
 
     /** Show used sending addresses */
     void usedSendingAddresses();

src/qt/walletview.cpp

@@ -326,6 +326,14 @@ void WalletView::unlockWallet()
     }
 }
 
+void WalletView::lockWallet()
+{
+    if(!walletModel)
+        return;
+
+    walletModel->setWalletLocked(true);
+}
+
 void WalletView::usedSendingAddresses()
 {
     if(!walletModel)

src/qt/walletview.h

@@ -112,6 +112,8 @@ public Q_SLOTS:
     void changePassphrase();
     /** Ask for passphrase to unlock wallet temporarily */
     void unlockWallet();
+    /** Lock wallet */
+    void lockWallet();
 
     /** Show used sending addresses */
     void usedSendingAddresses();

src/wallet/wallet.cpp

@@ -152,6 +152,7 @@ class CAffectedKeysVisitor : public boost::static_visitor<void> {
 
 void CWallet::LoadContractsFromDB()
 {
+    LOCK(cs_wallet);
     for(auto &&contractTx : std::move(tposContractsTxLoadedFromDB))
     {
         if(!LoadTPoSContract(contractTx))