aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/wallet/api/utils.cpp28
-rw-r--r--src/wallet/api/wallet.cpp42
-rw-r--r--src/wallet/api/wallet.h7
3 files changed, 53 insertions, 24 deletions
diff --git a/src/wallet/api/utils.cpp b/src/wallet/api/utils.cpp
index aa85323f0..1bf35197c 100644
--- a/src/wallet/api/utils.cpp
+++ b/src/wallet/api/utils.cpp
@@ -56,18 +56,22 @@ bool isAddressLocal(const std::string &address)
LOG_PRINT_L1("Failed to determine whether daemon is local, assuming not");
return false;
}
-
- // resolve to IP
- boost::asio::io_service io_service;
- boost::asio::ip::tcp::resolver resolver(io_service);
- boost::asio::ip::tcp::resolver::query query(u_c.host, "");
- boost::asio::ip::tcp::resolver::iterator i = resolver.resolve(query);
- while (i != boost::asio::ip::tcp::resolver::iterator())
- {
- const boost::asio::ip::tcp::endpoint &ep = *i;
- if (ep.address().is_loopback())
- return true;
- ++i;
+ // resolver::resolve can throw an exception
+ try {
+ // resolve to IP
+ boost::asio::io_service io_service;
+ boost::asio::ip::tcp::resolver resolver(io_service);
+ boost::asio::ip::tcp::resolver::query query(u_c.host, "");
+ boost::asio::ip::tcp::resolver::iterator i = resolver.resolve(query);
+ while (i != boost::asio::ip::tcp::resolver::iterator())
+ {
+ const boost::asio::ip::tcp::endpoint &ep = *i;
+ if (ep.address().is_loopback())
+ return true;
+ ++i;
+ }
+ } catch (const boost::system::system_error &e) {
+ LOG_ERROR("Failed to resolve " << address << ", :" << e.what());
}
return false;
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index eefb49e95..16321a5a2 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -167,7 +167,7 @@ uint64_t Wallet::maximumAllowedAmount()
///////////////////////// WalletImpl implementation ////////////////////////
WalletImpl::WalletImpl(bool testnet)
:m_wallet(nullptr), m_status(Wallet::Status_Ok), m_trustedDaemon(false),
- m_wallet2Callback(nullptr)
+ m_wallet2Callback(nullptr), m_recoveringFromSeed(false)
{
m_wallet = new tools::wallet2(testnet);
m_history = new TransactionHistoryImpl(this);
@@ -176,6 +176,7 @@ WalletImpl::WalletImpl(bool testnet)
m_refreshThreadDone = false;
m_refreshEnabled = false;
+
m_refreshIntervalMillis = DEFAULT_REFRESH_INTERVAL_MILLIS;
m_refreshThread = boost::thread([this] () {
@@ -196,7 +197,7 @@ bool WalletImpl::create(const std::string &path, const std::string &password, co
{
clearStatus();
-
+ m_recoveringFromSeed = false;
bool keys_file_exists;
bool wallet_file_exists;
tools::wallet2::wallet_exists(path, keys_file_exists, wallet_file_exists);
@@ -233,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)
{
clearStatus();
+ m_recoveringFromSeed = false;
try {
// TODO: handle "deprecated"
m_wallet->load(path, password);
@@ -257,6 +259,7 @@ bool WalletImpl::recover(const std::string &path, const std::string &seed)
return false;
}
+ m_recoveringFromSeed = true;
crypto::secret_key recovery_key;
std::string old_language;
if (!crypto::ElectrumWords::words_to_bytes(seed, recovery_key, old_language)) {
@@ -269,6 +272,7 @@ bool WalletImpl::recover(const std::string &path, const std::string &seed)
m_wallet->set_seed_language(old_language);
m_wallet->generate(path, "", recovery_key, true, false);
// TODO: wallet->init(daemon_address);
+
} catch (const std::exception &e) {
m_status = Status_Error;
m_errorString = e.what();
@@ -385,11 +389,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 +400,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 +745,27 @@ void WalletImpl::pauseRefresh()
}
+bool WalletImpl::isNewWallet() const
+{
+ // in case wallet created without daemon connection, closed and opened again,
+ // it's the same case as if it created from scratch, i.e. we need "fast sync"
+ // with the daemon (pull hashes instead of pull blocks)
+ return !(blockChainHeight() > 1 || m_recoveringFromSeed);
+}
+
+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
diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index d97a8f3b3..5706b2bf5 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -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,7 +128,10 @@ private:
boost::mutex m_refreshMutex2;
boost::condition_variable m_refreshCV;
boost::thread m_refreshThread;
-
+ // flag indicating wallet is recovering from seed
+ // so it shouldn't be considered as new and pull blocks (slow-refresh)
+ // instead of pulling hashes (fast-refresh)
+ bool m_recoveringFromSeed;
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 18:34:12 +0000