kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #3240 from laanwj/2013_11_rebase_no_wallet 

Introduce disable-wallet / no-wallet mode (rebased)
0.10
Wladimir J. van der Laan 11 years ago
parent
d6c434d97e 146ba964e4
commit
2830a9051d
6 changed files with 177 additions and 123 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 226
      src/init.cpp
  2. 19
      src/qt/bitcoin.cpp
  3. 21
      src/qt/bitcoingui.cpp
  4. 3
      src/qt/bitcoingui.h
  5. 29
      src/qt/walletframe.cpp
  6. 2
      src/qt/walletframe.h

226
src/init.cpp
Unescape View File

@ -499,6 +499,7 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer)
fPrintToConsole = GetBoolArg("-printtoconsole", false); fPrintToConsole = GetBoolArg("-printtoconsole", false);
fPrintToDebugger = GetBoolArg("-printtodebugger", false); fPrintToDebugger = GetBoolArg("-printtodebugger", false);
fLogTimestamps = GetBoolArg("-logtimestamps", true); fLogTimestamps = GetBoolArg("-logtimestamps", true);
bool fDisableWallet = GetBoolArg("-disablewallet", false);
if (mapArgs.count("-timeout")) if (mapArgs.count("-timeout"))
{ {
@ -587,49 +588,51 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer)
// ********************************************************* Step 5: verify wallet database integrity // ********************************************************* Step 5: verify wallet database integrity
uiInterface.InitMessage(_("Verifying wallet...")); if (!fDisableWallet) {
uiInterface.InitMessage(_("Verifying wallet..."));
if (!bitdb.Open(GetDataDir())) if (!bitdb.Open(GetDataDir()))
{ {
// try moving the database env out of the way // try moving the database env out of the way
boost::filesystem::path pathDatabase = GetDataDir() / "database"; boost::filesystem::path pathDatabase = GetDataDir() / "database";
boost::filesystem::path pathDatabaseBak = GetDataDir() / strprintf("database.%"PRId64".bak", GetTime()); boost::filesystem::path pathDatabaseBak = GetDataDir() / strprintf("database.%"PRId64".bak", GetTime());
try { try {
boost::filesystem::rename(pathDatabase, pathDatabaseBak); boost::filesystem::rename(pathDatabase, pathDatabaseBak);
LogPrintf("Moved old %s to %s. Retrying.\n", pathDatabase.string().c_str(), pathDatabaseBak.string().c_str()); LogPrintf("Moved old %s to %s. Retrying.\n", pathDatabase.string().c_str(), pathDatabaseBak.string().c_str());
} catch(boost::filesystem::filesystem_error &error) { } catch(boost::filesystem::filesystem_error &error) {
// failure is ok (well, not really, but it's not worse than what we started with) // failure is ok (well, not really, but it's not worse than what we started with)
} }
// try again // try again
if (!bitdb.Open(GetDataDir())) { if (!bitdb.Open(GetDataDir())) {
// if it still fails, it probably means we can't even create the database env // if it still fails, it probably means we can't even create the database env
string msg = strprintf(_("Error initializing wallet database environment %s!"), strDataDir.c_str()); string msg = strprintf(_("Error initializing wallet database environment %s!"), strDataDir.c_str());
return InitError(msg); return InitError(msg);
}
} }
}
if (GetBoolArg("-salvagewallet", false)) if (GetBoolArg("-salvagewallet", false))
{ {
// Recover readable keypairs: // Recover readable keypairs:
if (!CWalletDB::Recover(bitdb, strWalletFile, true)) if (!CWalletDB::Recover(bitdb, strWalletFile, true))
return false; return false;
} }
if (filesystem::exists(GetDataDir() / strWalletFile)) if (filesystem::exists(GetDataDir() / strWalletFile))
{
CDBEnv::VerifyResult r = bitdb.Verify(strWalletFile, CWalletDB::Recover);
if (r == CDBEnv::RECOVER_OK)
{ {
string msg = strprintf(_("Warning: wallet.dat corrupt, data salvaged!" CDBEnv::VerifyResult r = bitdb.Verify(strWalletFile, CWalletDB::Recover);
" Original wallet.dat saved as wallet.{timestamp}.bak in %s; if" if (r == CDBEnv::RECOVER_OK)
" your balance or transactions are incorrect you should" {
" restore from a backup."), strDataDir.c_str()); string msg = strprintf(_("Warning: wallet.dat corrupt, data salvaged!"
InitWarning(msg); " Original wallet.dat saved as wallet.{timestamp}.bak in %s; if"
" your balance or transactions are incorrect you should"
" restore from a backup."), strDataDir.c_str());
InitWarning(msg);
}
if (r == CDBEnv::RECOVER_FAIL)
return InitError(_("wallet.dat corrupt, salvage failed"));
} }
if (r == CDBEnv::RECOVER_FAIL) } // (!fDisableWallet)
return InitError(_("wallet.dat corrupt, salvage failed"));
}
// ********************************************************* Step 6: network initialization // ********************************************************* Step 6: network initialization
@ -898,92 +901,97 @@ bool AppInit2(boost::thread_group& threadGroup, bool fForceServer)
// ********************************************************* Step 8: load wallet // ********************************************************* Step 8: load wallet
uiInterface.InitMessage(_("Loading wallet...")); if (fDisableWallet) {
pwalletMain = NULL;
LogPrintf("Wallet disabled!\n");
} else {
uiInterface.InitMessage(_("Loading wallet..."));
nStart = GetTimeMillis(); nStart = GetTimeMillis();
bool fFirstRun = true; bool fFirstRun = true;
pwalletMain = new CWallet(strWalletFile); pwalletMain = new CWallet(strWalletFile);
DBErrors nLoadWalletRet = pwalletMain->LoadWallet(fFirstRun); DBErrors nLoadWalletRet = pwalletMain->LoadWallet(fFirstRun);
if (nLoadWalletRet != DB_LOAD_OK) if (nLoadWalletRet != DB_LOAD_OK)
{
if (nLoadWalletRet == DB_CORRUPT)
strErrors << _("Error loading wallet.dat: Wallet corrupted") << "\n";
else if (nLoadWalletRet == DB_NONCRITICAL_ERROR)
{ {
string msg(_("Warning: error reading wallet.dat! All keys read correctly, but transaction data" if (nLoadWalletRet == DB_CORRUPT)
" or address book entries might be missing or incorrect.")); strErrors << _("Error loading wallet.dat: Wallet corrupted") << "\n";
InitWarning(msg); else if (nLoadWalletRet == DB_NONCRITICAL_ERROR)
{
string msg(_("Warning: error reading wallet.dat! All keys read correctly, but transaction data"
" or address book entries might be missing or incorrect."));
InitWarning(msg);
}
else if (nLoadWalletRet == DB_TOO_NEW)
strErrors << _("Error loading wallet.dat: Wallet requires newer version of Bitcoin") << "\n";
else if (nLoadWalletRet == DB_NEED_REWRITE)
{
strErrors << _("Wallet needed to be rewritten: restart Bitcoin to complete") << "\n";
LogPrintf("%s", strErrors.str().c_str());
return InitError(strErrors.str());
}
else
strErrors << _("Error loading wallet.dat") << "\n";
} }
else if (nLoadWalletRet == DB_TOO_NEW)
strErrors << _("Error loading wallet.dat: Wallet requires newer version of Bitcoin") << "\n"; if (GetBoolArg("-upgradewallet", fFirstRun))
else if (nLoadWalletRet == DB_NEED_REWRITE)
{ {
strErrors << _("Wallet needed to be rewritten: restart Bitcoin to complete") << "\n"; int nMaxVersion = GetArg("-upgradewallet", 0);
LogPrintf("%s", strErrors.str().c_str()); if (nMaxVersion == 0) // the -upgradewallet without argument case
return InitError(strErrors.str()); {
LogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST);
nMaxVersion = CLIENT_VERSION;
pwalletMain->SetMinVersion(FEATURE_LATEST); // permanently upgrade the wallet immediately
}
else
LogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion);
if (nMaxVersion < pwalletMain->GetVersion())
strErrors << _("Cannot downgrade wallet") << "\n";
pwalletMain->SetMaxVersion(nMaxVersion);
} }
else
strErrors << _("Error loading wallet.dat") << "\n";
}
if (GetBoolArg("-upgradewallet", fFirstRun)) if (fFirstRun)
{
int nMaxVersion = GetArg("-upgradewallet", 0);
if (nMaxVersion == 0) // the -upgradewallet without argument case
{ {
LogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST); // Create new keyUser and set as default key
nMaxVersion = CLIENT_VERSION; RandAddSeedPerfmon();
pwalletMain->SetMinVersion(FEATURE_LATEST); // permanently upgrade the wallet immediately
} CPubKey newDefaultKey;
else if (pwalletMain->GetKeyFromPool(newDefaultKey)) {
LogPrintf("Allowing wallet upgrade up to %i\n", nMaxVersion); pwalletMain->SetDefaultKey(newDefaultKey);
if (nMaxVersion < pwalletMain->GetVersion()) if (!pwalletMain->SetAddressBook(pwalletMain->vchDefaultKey.GetID(), "", "receive"))
strErrors << _("Cannot downgrade wallet") << "\n"; strErrors << _("Cannot write default address") << "\n";
pwalletMain->SetMaxVersion(nMaxVersion); }
}
if (fFirstRun) pwalletMain->SetBestChain(chainActive.GetLocator());
{
// Create new keyUser and set as default key
RandAddSeedPerfmon();
CPubKey newDefaultKey;
if (pwalletMain->GetKeyFromPool(newDefaultKey)) {
pwalletMain->SetDefaultKey(newDefaultKey);
if (!pwalletMain->SetAddressBook(pwalletMain->vchDefaultKey.GetID(), "", "receive"))
strErrors << _("Cannot write default address") << "\n";
} }
pwalletMain->SetBestChain(chainActive.GetLocator()); LogPrintf("%s", strErrors.str().c_str());
} LogPrintf(" wallet %15"PRId64"ms\n", GetTimeMillis() - nStart);
LogPrintf("%s", strErrors.str().c_str());
LogPrintf(" wallet %15"PRId64"ms\n", GetTimeMillis() - nStart);
RegisterWallet(pwalletMain); RegisterWallet(pwalletMain);
CBlockIndex *pindexRescan = chainActive.Tip(); CBlockIndex *pindexRescan = chainActive.Tip();
if (GetBoolArg("-rescan", false)) if (GetBoolArg("-rescan", false))
pindexRescan = chainActive.Genesis();
else
{
CWalletDB walletdb(strWalletFile);
CBlockLocator locator;
if (walletdb.ReadBestBlock(locator))
pindexRescan = chainActive.FindFork(locator);
else
pindexRescan = chainActive.Genesis(); pindexRescan = chainActive.Genesis();
} else
if (chainActive.Tip() && chainActive.Tip() != pindexRescan) {
{ CWalletDB walletdb(strWalletFile);
uiInterface.InitMessage(_("Rescanning...")); CBlockLocator locator;
LogPrintf("Rescanning last %i blocks (from block %i)...\n", chainActive.Height() - pindexRescan->nHeight, pindexRescan->nHeight); if (walletdb.ReadBestBlock(locator))
nStart = GetTimeMillis(); pindexRescan = chainActive.FindFork(locator);
pwalletMain->ScanForWalletTransactions(pindexRescan, true); else
LogPrintf(" rescan %15"PRId64"ms\n", GetTimeMillis() - nStart); pindexRescan = chainActive.Genesis();
pwalletMain->SetBestChain(chainActive.GetLocator()); }
nWalletDBUpdated++; if (chainActive.Tip() && chainActive.Tip() != pindexRescan)
} {
uiInterface.InitMessage(_("Rescanning..."));
LogPrintf("Rescanning last %i blocks (from block %i)...\n", chainActive.Height() - pindexRescan->nHeight, pindexRescan->nHeight);
nStart = GetTimeMillis();
pwalletMain->ScanForWalletTransactions(pindexRescan, true);
LogPrintf(" rescan %15"PRId64"ms\n", GetTimeMillis() - nStart);
pwalletMain->SetBestChain(chainActive.GetLocator());
nWalletDBUpdated++;
}
} // (!fDisableWallet)
// ********************************************************* Step 9: import blocks // ********************************************************* Step 9: import blocks

19
src/qt/bitcoin.cpp
Unescape View File

@ -313,11 +313,16 @@ int main(int argc, char *argv[])
splash.finish(&window); splash.finish(&window);
ClientModel clientModel(&optionsModel); ClientModel clientModel(&optionsModel);
WalletModel walletModel(pwalletMain, &optionsModel); WalletModel *walletModel = 0;
if(pwalletMain)
walletModel = new WalletModel(pwalletMain, &optionsModel);
window.setClientModel(&clientModel); window.setClientModel(&clientModel);
window.addWallet("~Default", &walletModel); if(walletModel)
window.setCurrentWallet("~Default"); {
window.addWallet("~Default", walletModel);
window.setCurrentWallet("~Default");
}
// If -min option passed, start window minimized. // If -min option passed, start window minimized.
if(GetBoolArg("-min", false)) if(GetBoolArg("-min", false))
@ -335,8 +340,11 @@ int main(int argc, char *argv[])
&window, SLOT(handlePaymentRequest(SendCoinsRecipient))); &window, SLOT(handlePaymentRequest(SendCoinsRecipient)));
QObject::connect(&window, SIGNAL(receivedURI(QString)), QObject::connect(&window, SIGNAL(receivedURI(QString)),
paymentServer, SLOT(handleURIOrFile(QString))); paymentServer, SLOT(handleURIOrFile(QString)));
QObject::connect(&walletModel, SIGNAL(coinsSent(CWallet*,SendCoinsRecipient,QByteArray)), if(walletModel)
paymentServer, SLOT(fetchPaymentACK(CWallet*,const SendCoinsRecipient&,QByteArray))); {
QObject::connect(walletModel, SIGNAL(coinsSent(CWallet*,SendCoinsRecipient,QByteArray)),
paymentServer, SLOT(fetchPaymentACK(CWallet*,const SendCoinsRecipient&,QByteArray)));
}
QObject::connect(paymentServer, SIGNAL(message(QString,QString,unsigned int)), QObject::connect(paymentServer, SIGNAL(message(QString,QString,unsigned int)),
guiref, SLOT(message(QString,QString,unsigned int))); guiref, SLOT(message(QString,QString,unsigned int)));
QTimer::singleShot(100, paymentServer, SLOT(uiReady())); QTimer::singleShot(100, paymentServer, SLOT(uiReady()));
@ -347,6 +355,7 @@ int main(int argc, char *argv[])
window.setClientModel(0); window.setClientModel(0);
window.removeAllWallets(); window.removeAllWallets();
guiref = 0; guiref = 0;
delete walletModel;
} }
// Shutdown the core and its threads, but don't exit Bitcoin-Qt here // Shutdown the core and its threads, but don't exit Bitcoin-Qt here
threadGroup.interrupt_all(); threadGroup.interrupt_all();

21
src/qt/bitcoingui.cpp
Unescape View File

@ -163,6 +163,9 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) :
// Install event filter to be able to catch status tip events (QEvent::StatusTip) // Install event filter to be able to catch status tip events (QEvent::StatusTip)
this->installEventFilter(this); this->installEventFilter(this);
// Initially wallet actions should be disabled
setWalletActionsEnabled(false);
} }
BitcoinGUI::~BitcoinGUI() BitcoinGUI::~BitcoinGUI()
@ -352,6 +355,7 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
bool BitcoinGUI::addWallet(const QString& name, WalletModel *walletModel) bool BitcoinGUI::addWallet(const QString& name, WalletModel *walletModel)
{ {
setWalletActionsEnabled(true);
return walletFrame->addWallet(name, walletModel); return walletFrame->addWallet(name, walletModel);
} }
@ -362,9 +366,26 @@ bool BitcoinGUI::setCurrentWallet(const QString& name)
void BitcoinGUI::removeAllWallets() void BitcoinGUI::removeAllWallets()
{ {
setWalletActionsEnabled(false);
walletFrame->removeAllWallets(); walletFrame->removeAllWallets();
} }
void BitcoinGUI::setWalletActionsEnabled(bool enabled)
{
overviewAction->setEnabled(enabled);
sendCoinsAction->setEnabled(enabled);
receiveCoinsAction->setEnabled(enabled);
historyAction->setEnabled(enabled);
encryptWalletAction->setEnabled(enabled);
backupWalletAction->setEnabled(enabled);
changePassphraseAction->setEnabled(enabled);
signMessageAction->setEnabled(enabled);
verifyMessageAction->setEnabled(enabled);
usedSendingAddressesAction->setEnabled(enabled);
usedReceivingAddressesAction->setEnabled(enabled);
openAction->setEnabled(enabled);
}
void BitcoinGUI::createTrayIcon(bool fIsTestnet) void BitcoinGUI::createTrayIcon(bool fIsTestnet)
{ {
#ifndef Q_OS_MAC #ifndef Q_OS_MAC

3
src/qt/bitcoingui.h
Unescape View File

@ -108,6 +108,9 @@ private:
/** Create system tray menu (or setup the dock menu) */ /** Create system tray menu (or setup the dock menu) */
void createTrayIconMenu(); void createTrayIconMenu();
/** Enable or disable all wallet-related actions */
void setWalletActionsEnabled(bool enabled);
signals: signals:
/** Signal raised when a URI was entered or dragged to the GUI */ /** Signal raised when a URI was entered or dragged to the GUI */
void receivedURI(const QString &uri); void receivedURI(const QString &uri);

29
src/qt/walletframe.cpp
Unescape View File

@ -10,6 +10,7 @@
#include <cstdio> #include <cstdio>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLabel>
WalletFrame::WalletFrame(BitcoinGUI *_gui) : WalletFrame::WalletFrame(BitcoinGUI *_gui) :
QFrame(_gui), QFrame(_gui),
@ -21,6 +22,10 @@ WalletFrame::WalletFrame(BitcoinGUI *_gui) :
walletStack = new QStackedWidget(this); walletStack = new QStackedWidget(this);
walletFrameLayout->setContentsMargins(0,0,0,0); walletFrameLayout->setContentsMargins(0,0,0,0);
walletFrameLayout->addWidget(walletStack); walletFrameLayout->addWidget(walletStack);
QLabel *noWallet = new QLabel(tr("No wallet has been loaded."));
noWallet->setAlignment(Qt::AlignCenter);
walletStack->addWidget(noWallet);
} }
WalletFrame::~WalletFrame() WalletFrame::~WalletFrame()
@ -85,7 +90,7 @@ void WalletFrame::removeAllWallets()
bool WalletFrame::handlePaymentRequest(const SendCoinsRecipient &recipient) bool WalletFrame::handlePaymentRequest(const SendCoinsRecipient &recipient)
{ {
WalletView *walletView = (WalletView*)walletStack->currentWidget(); WalletView *walletView = currentWalletView();
if (!walletView) if (!walletView)
return false; return false;
@ -130,56 +135,62 @@ void WalletFrame::gotoSendCoinsPage(QString addr)
void WalletFrame::gotoSignMessageTab(QString addr) void WalletFrame::gotoSignMessageTab(QString addr)
{ {
WalletView *walletView = (WalletView*)walletStack->currentWidget(); WalletView *walletView = currentWalletView();
if (walletView) if (walletView)
walletView->gotoSignMessageTab(addr); walletView->gotoSignMessageTab(addr);
} }
void WalletFrame::gotoVerifyMessageTab(QString addr) void WalletFrame::gotoVerifyMessageTab(QString addr)
{ {
WalletView *walletView = (WalletView*)walletStack->currentWidget(); WalletView *walletView = currentWalletView();
if (walletView) if (walletView)
walletView->gotoVerifyMessageTab(addr); walletView->gotoVerifyMessageTab(addr);
} }
void WalletFrame::encryptWallet(bool status) void WalletFrame::encryptWallet(bool status)
{ {
WalletView *walletView = (WalletView*)walletStack->currentWidget(); WalletView *walletView = currentWalletView();
if (walletView) if (walletView)
walletView->encryptWallet(status); walletView->encryptWallet(status);
} }
void WalletFrame::backupWallet() void WalletFrame::backupWallet()
{ {
WalletView *walletView = (WalletView*)walletStack->currentWidget(); WalletView *walletView = currentWalletView();
if (walletView) if (walletView)
walletView->backupWallet(); walletView->backupWallet();
} }
void WalletFrame::changePassphrase() void WalletFrame::changePassphrase()
{ {
WalletView *walletView = (WalletView*)walletStack->currentWidget(); WalletView *walletView = currentWalletView();
if (walletView) if (walletView)
walletView->changePassphrase(); walletView->changePassphrase();
} }
void WalletFrame::unlockWallet() void WalletFrame::unlockWallet()
{ {
WalletView *walletView = (WalletView*)walletStack->currentWidget(); WalletView *walletView = currentWalletView();
if (walletView) if (walletView)
walletView->unlockWallet(); walletView->unlockWallet();
} }
void WalletFrame::usedSendingAddresses() void WalletFrame::usedSendingAddresses()
{ {
WalletView *walletView = (WalletView*)walletStack->currentWidget(); WalletView *walletView = currentWalletView();
if (walletView) if (walletView)
walletView->usedSendingAddresses(); walletView->usedSendingAddresses();
} }
void WalletFrame::usedReceivingAddresses() void WalletFrame::usedReceivingAddresses()
{ {
WalletView *walletView = (WalletView*)walletStack->currentWidget(); WalletView *walletView = currentWalletView();
if (walletView) if (walletView)
walletView->usedReceivingAddresses(); walletView->usedReceivingAddresses();
} }
WalletView *WalletFrame::currentWalletView()
{
return qobject_cast<WalletView*>(walletStack->currentWidget());
}

2
src/qt/walletframe.h
Unescape View File

@ -45,6 +45,8 @@ private:
bool bOutOfSync; bool bOutOfSync;
WalletView *currentWalletView();
public slots: public slots:
/** Switch to overview (home) page */ /** Switch to overview (home) page */
void gotoOverviewPage(); void gotoOverviewPage();

Write Preview
Loading…
Cancel
Save