github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-20 16:48:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

implement getIsConnected(), getDaemonHeight(), getDaemonTargetHeight(),

Browse Source 
getIsDaemonSynced(), getIsSynced()
This commit is contained in:
woodser
2019-07-18 10:58:08 -04:00
parent 3b6e5e8eb0
commit dc1e8b0a86
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/MoneroWallet.cpp
+21 -8
View File
@@ -866,26 +866,39 @@ namespace monero {
// TODO: could return Wallet::ConnectionStatus_Disconnected, Wallet::ConnectionStatus_WrongVersion, Wallet::ConnectionStatus_Connected like wallet.cpp::connected()
bool MoneroWallet::getIsConnected() {
uint32_t version = 0;
bool isConnected = wallet2->check_connection(&version, NULL, DEFAULT_CONNECTION_TIMEOUT_MILLIS);
isConnected = wallet2->check_connection(&version, NULL, DEFAULT_CONNECTION_TIMEOUT_MILLIS); // TODO: should this be updated elsewhere?
if (!isConnected) return false;
if (!wallet2->light_wallet() && (version >> 16) != CORE_RPC_VERSION_MAJOR) return false;
return true;
if (!wallet2->light_wallet() && (version >> 16) != CORE_RPC_VERSION_MAJOR) isConnected = false;
return isConnected;
}
long MoneroWallet::getDaemonHeight() {
uint64_t MoneroWallet::getDaemonHeight() {
if (!isConnected) throw runtime_error("Wallet is not connected to daemon");
std::string err;
uint64_t result = wallet2->get_daemon_blockchain_height(err);
if (!err.empty()) throw runtime_error(err);
return result;
throw runtime_error("getDaemonHeight() not implemented");
}
long MoneroWallet::getDaemonTargetHeight() {
throw runtime_error("getDaemonTargetHeight() not implemented");
uint64_t MoneroWallet::getDaemonTargetHeight() {
if (!isConnected) throw runtime_error("Wallet is not connected to daemon");
std::string err;
uint64_t result = wallet2->get_daemon_blockchain_target_height(err);
if (!err.empty()) throw runtime_error(err);
if (result == 0) result = getDaemonHeight(); // TODO monero core: target height can be 0 when daemon is synced. Use blockchain height instead
return result;
}
bool MoneroWallet::getIsDaemonSynced() {
throw runtime_error("getIsDaemonSynced() not implemented");
if (!isConnected) return false;
uint64_t daemonHeight = getDaemonHeight();
return daemonHeight >= getDaemonTargetHeight() && daemonHeight > 1;
}
bool MoneroWallet::getIsSynced() {
throw runtime_error("getIsSynced() not implemented");
return isSynced;
}
string MoneroWallet::getPath() const {
src/wallet/MoneroWallet.h
+4 -2
View File
@@ -227,9 +227,9 @@ namespace monero {
bool getIsConnected();
long getDaemonHeight();
uint64_t getDaemonHeight();
long getDaemonTargetHeight();
uint64_t getDaemonTargetHeight();
bool getIsDaemonSynced();
@@ -1163,6 +1163,8 @@ namespace monero {
vector<MoneroSubaddress> getSubaddressesAux(uint32_t accountIdx, vector<uint32_t> subaddressIndices, const vector<tools::wallet2::transfer_details>& transfers) const;
// sync thread management
mutable std::atomic<bool> isSynced; // whether or not wallet is synced
mutable std::atomic<bool> isConnected; // cache connection status to avoid unecessary RPC calls
boost::condition_variable syncCV; // to awaken sync threads
std::mutex syncMutex; // synchronize sync() and syncAsync() requests
std::atomic<bool> rescanOnSync; // whether or not to rescan on sync