Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-02 05:56:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

libwallet_api: fast-refresh for new wallet

Browse source
This commit is contained in:
Ilya Kitaev 2016-09-30 02:11:28 +03:00
parent 4789347b27
commit 1f73f80c94
3 changed files with 56 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/wallet/api/wallet.cpp
View file

@ -175,6 +175,7 @@ WalletImpl::WalletImpl(bool testnet)
m_wallet->callback(m_wallet2Callback);
m_refreshThreadDone = false;
m_refreshEnabled = false;
m_newWallet = true;
m_refreshIntervalMillis = DEFAULT_REFRESH_INTERVAL_MILLIS;
@ -195,6 +196,7 @@ WalletImpl::~WalletImpl()
bool WalletImpl::create(const std::string &path, const std::string &password, const std::string &language)
{
m_newWallet = true;
clearStatus();
bool keys_file_exists;
@ -232,6 +234,7 @@ bool WalletImpl::create(const std::string &path, const std::string &password, co
bool WalletImpl::open(const std::string &path, const std::string &password)
{
m_newWallet = false;
clearStatus();
try {
// TODO: handle "deprecated"
@ -385,11 +388,7 @@ string WalletImpl::keysFilename() const
bool WalletImpl::init(const std::string &daemon_address, uint64_t upper_transaction_size_limit)
{
clearStatus();
m_wallet->init(daemon_address, upper_transaction_size_limit);
if (Utils::isAddressLocal(daemon_address)) {
this->setTrustedDaemon(true);
}
doInit(daemon_address, upper_transaction_size_limit);
bool result = this->refresh();
// enabling background refresh thread
startRefresh();
@ -400,10 +399,7 @@ bool WalletImpl::init(const std::string &daemon_address, uint64_t upper_transact
void WalletImpl::initAsync(const string &daemon_address, uint64_t upper_transaction_size_limit)
{
clearStatus();
m_wallet->init(daemon_address, upper_transaction_size_limit);
if (Utils::isAddressLocal(daemon_address)) {
this->setTrustedDaemon(true);
}
doInit(daemon_address, upper_transaction_size_limit);
startRefresh();
}
@ -748,4 +744,24 @@ void WalletImpl::pauseRefresh()
}
bool WalletImpl::isNewWallet() const
{
return m_newWallet;
}
void WalletImpl::doInit(const string &daemon_address, uint64_t upper_transaction_size_limit)
{
m_wallet->init(daemon_address, upper_transaction_size_limit);
// in case new wallet, this will force fast-refresh (pulling hashes instead of blocks)
if (isNewWallet()) {
m_wallet->set_refresh_from_block_height(daemonBlockChainHeight());
}
if (Utils::isAddressLocal(daemon_address)) {
this->setTrustedDaemon(true);
}
}
} // namespace

3
src/wallet/api/wallet.h
View file

@ -101,6 +101,8 @@ private:
void startRefresh();
void stopRefresh();
void pauseRefresh();
bool isNewWallet() const;
void doInit(const std::string &daemon_address, uint64_t upper_transaction_size_limit);
private:
friend class PendingTransactionImpl;
@ -126,6 +128,7 @@ private:
boost::mutex m_refreshMutex2;
boost::condition_variable m_refreshCV;
boost::thread m_refreshThread;
bool m_newWallet;
};