make initial block download reporting somewhat better by tracking version responses

[VerusCoin.git] / src / qt / clientmodel.cpp

diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 10cafaf1afec93a6a38844f0f6fa9eb91d29de3e..c147aa5a6e44a702992a6e804c0045fc304bd455 100644 (file)
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -1,15 +1,17 @@
 #include "clientmodel.h"
-#include "main.h"
 #include "guiconstants.h"
 #include "optionsmodel.h"
 #include "addresstablemodel.h"
 #include "transactiontablemodel.h"
 
+#include "headers.h"
+
 #include <QTimer>
+#include <QDateTime>
 
-ClientModel::ClientModel(QObject *parent) :
-    QObject(parent), optionsModel(0), addressTableModel(0),
-    transactionTableModel(0)
+ClientModel::ClientModel(CWallet *wallet, QObject *parent) :
+    QObject(parent), wallet(wallet), optionsModel(0),
+    cachedNumConnections(0), cachedNumBlocks(0)
 {
     // Until signal notifications is built into the bitcoin core,
     //  simply update everything after polling using a timer.
@@ -17,138 +19,59 @@ ClientModel::ClientModel(QObject *parent) :
     connect(timer, SIGNAL(timeout()), this, SLOT(update()));
     timer->start(MODEL_UPDATE_DELAY);
 
-    optionsModel = new OptionsModel(this);
-    addressTableModel = new AddressTableModel(this);
-    transactionTableModel = new TransactionTableModel(this);
-}
-
-qint64 ClientModel::getBalance()
-{
-    return GetBalance();
-}
-
-QString ClientModel::getAddress()
-{
-    std::vector<unsigned char> vchPubKey;
-    if (CWalletDB("r").ReadDefaultKey(vchPubKey))
-    {
-        return QString::fromStdString(PubKeyToAddress(vchPubKey));
-    }
-    else
-    {
-        return QString();
-    }
+    optionsModel = new OptionsModel(wallet, this);
 }
 
-int ClientModel::getNumConnections()
+int ClientModel::getNumConnections() const
 {
     return vNodes.size();
 }
 
-int ClientModel::getNumBlocks()
+int ClientModel::getNumBlocks() const
 {
     return nBestHeight;
 }
 
-int ClientModel::getNumTransactions()
+QDateTime ClientModel::getLastBlockDate() const
 {
-    int numTransactions = 0;
-    CRITICAL_BLOCK(cs_mapWallet)
-    {
-        numTransactions = mapWallet.size();
-    }
-    return numTransactions;
+    return QDateTime::fromTime_t(pindexBest->GetBlockTime());
 }
 
 void ClientModel::update()
 {
-    // Plainly emit all signals for now. To be more efficient this should check
-    //   whether the values actually changed first.
-    emit balanceChanged(getBalance());
-    emit addressChanged(getAddress());
-    emit numConnectionsChanged(getNumConnections());
-    emit numBlocksChanged(getNumBlocks());
-    emit numTransactionsChanged(getNumTransactions());
+    int newNumConnections = getNumConnections();
+    int newNumBlocks = getNumBlocks();
+
+    if(cachedNumConnections != newNumConnections)
+        emit numConnectionsChanged(newNumConnections);
+    if(cachedNumBlocks != newNumBlocks)
+        emit numBlocksChanged(newNumBlocks);
+
+    cachedNumConnections = newNumConnections;
+    cachedNumBlocks = newNumBlocks;
 }
 
-void ClientModel::setAddress(const QString &defaultAddress)
+bool ClientModel::isTestNet() const
 {
-    uint160 hash160;
-    std::string strAddress = defaultAddress.toStdString();
-    if (!AddressToHash160(strAddress, hash160))
-        return;
-    if (!mapPubKeys.count(hash160))
-        return;
-    CWalletDB().WriteDefaultKey(mapPubKeys[hash160]);
+    return fTestNet;
 }
 
-ClientModel::StatusCode ClientModel::sendCoins(const QString &payTo, qint64 payAmount)
+bool ClientModel::inInitialBlockDownload() const
 {
-    uint160 hash160 = 0;
-    bool valid = false;
-
-    if(!AddressToHash160(payTo.toUtf8().constData(), hash160))
-    {
-        return InvalidAddress;
-    }
-
-    if(payAmount <= 0)
-    {
-        return InvalidAmount;
-    }
-
-    if(payAmount > getBalance())
-    {
-        return AmountExceedsBalance;
-    }
-
-    if((payAmount + nTransactionFee) > getBalance())
-    {
-        return AmountWithFeeExceedsBalance;
-    }
-
-    CRITICAL_BLOCK(cs_main)
-    {
-        // Send to bitcoin address
-        CWalletTx wtx;
-        CScript scriptPubKey;
-        scriptPubKey << OP_DUP << OP_HASH160 << hash160 << OP_EQUALVERIFY << OP_CHECKSIG;
-
-        std::string strError = SendMoney(scriptPubKey, payAmount, wtx, true);
-        if (strError == "")
-        {
-            return OK;
-        }
-        else if (strError == "ABORTED")
-        {
-            return Aborted;
-        }
-        else
-        {
-            emit error(tr("Sending..."), QString::fromStdString(strError));
-            return MiscError;
-        }
-    }
-    // Add addresses that we've sent to to the address book
-    std::string strAddress = payTo.toStdString();
-    CRITICAL_BLOCK(cs_mapAddressBook)
-        if (!mapAddressBook.count(strAddress))
-            SetAddressBookName(strAddress, "");
-
-    return OK;
+    return IsInitialBlockDownload();
 }
 
-OptionsModel *ClientModel::getOptionsModel()
+int ClientModel::getTotalBlocksEstimate() const
 {
-    return optionsModel;
+    return GetTotalBlocksEstimate();
 }
 
-AddressTableModel *ClientModel::getAddressTableModel()
+OptionsModel *ClientModel::getOptionsModel()
 {
-    return addressTableModel;
+    return optionsModel;
 }
 
-TransactionTableModel *ClientModel::getTransactionTableModel()
+QString ClientModel::formatFullVersion() const
 {
-    return transactionTableModel;
+    return QString::fromStdString(FormatFullVersion());
 }