map<uint256, CBlockIndex*> mapBlockIndex;
uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
+const int nTotalBlocksEstimate = 131000; // Conservative estimate of total nr of blocks on main chain
CBlockIndex* pindexGenesisBlock = NULL;
int nBestHeight = -1;
CBigNum bnBestChainWork = 0;
return true;
}
+// Return conservative estimate of total number of blocks, 0 if unknown
+int GetTotalBlocksEstimate()
+{
+ if(fTestNet)
+ {
+ return 0;
+ }
+ else
+ {
+ return nTotalBlocksEstimate;
+ }
+}
+
bool IsInitialBlockDownload()
{
- if (pindexBest == NULL || (!fTestNet && nBestHeight < 118000))
+ if (pindexBest == NULL || nBestHeight < GetTotalBlocksEstimate())
return true;
static int64 nLastUpdate;
static CBlockIndex* pindexLastBest;
bool CheckWork(CBlock* pblock, CReserveKey& reservekey);
void BitcoinMiner();
bool CheckProofOfWork(uint256 hash, unsigned int nBits);
+int GetTotalBlocksEstimate();
bool IsInitialBlockDownload();
std::string GetWarnings(std::string strFor);
#include <QSortFilterProxyModel>
#include <QClipboard>
#include <QMessageBox>
+#include <QProgressBar>
#include <QDebug>
labelTransactions->setMinimumWidth(130);
labelTransactions->setToolTip(tr("Number of transactions in your wallet"));
+ // Progress bar for blocks download
+ progressBarLabel = new QLabel(tr("Downloading initial data..."));
+ progressBarLabel->setVisible(false);
+ progressBar = new QProgressBar();
+ progressBar->setToolTip(tr("Initial block chain download in progress"));
+ progressBar->setVisible(false);
+
+ statusBar()->addWidget(progressBarLabel);
+ statusBar()->addWidget(progressBar);
statusBar()->addPermanentWidget(labelConnections);
statusBar()->addPermanentWidget(labelBlocks);
statusBar()->addPermanentWidget(labelTransactions);
-
+
// Action bindings
connect(button_new, SIGNAL(clicked()), this, SLOT(newAddressClicked()));
connect(button_clipboard, SIGNAL(clicked()), this, SLOT(copyClipboardClicked()));
void BitcoinGUI::setNumBlocks(int count)
{
+ int total = model->getTotalBlocksEstimate();
+ if(count < total)
+ {
+ progressBarLabel->setVisible(true);
+ progressBar->setVisible(true);
+ progressBar->setMaximum(total);
+ progressBar->setValue(count);
+ }
+ else
+ {
+ progressBarLabel->setVisible(false);
+ progressBar->setVisible(false);
+ }
+
labelBlocks->setText(QLocale::system().toString(count)+" "+tr("block(s)", "", count));
}
class QTableView;
class QAbstractItemModel;
class QModelIndex;
+class QProgressBar;
QT_END_NAMESPACE
class BitcoinGUI : public QMainWindow
QLabel *labelConnectionsIcon;
QLabel *labelBlocks;
QLabel *labelTransactions;
+ QLabel *progressBarLabel;
+ QProgressBar *progressBar;
QAction *quit;
QAction *sendcoins;
return IsInitialBlockDownload();
}
+int ClientModel::getTotalBlocksEstimate() const
+{
+ return GetTotalBlocksEstimate();
+}
+
+
OptionsModel *ClientModel::getOptionsModel()
{
return optionsModel;
/* Return true if core is doing initial block download */
bool inInitialBlockDownload() const;
+ /* Return conservative estimate of total number of blocks, or 0 if unknown */
+ int getTotalBlocksEstimate() const;
/* Set default address */
void setAddress(const QString &defaultAddress);