github-wownero/wownero-cpp
1
0
Fork 0
mirror of https://github.com/wownero/wownero-cpp.git synced 2026-10-18 23:58:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

getDaemonConnection() returns shared_ptr

Browse Source
This commit is contained in:
woodser
2019-07-01 22:14:45 -04:00
parent de1072efef
commit 42dc9cda4a
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/MoneroWallet.cpp
+8 -6
View File
@@ -492,14 +492,15 @@ namespace monero {
wallet2->set_daemon(uri, login, isTrusted);
}
MoneroRpcConnection MoneroWallet::getDaemonConnection() const {
MoneroRpcConnection connection;
if (!wallet2->get_daemon_address().empty()) connection.uri = wallet2->get_daemon_address();
shared_ptr<MoneroRpcConnection> MoneroWallet::getDaemonConnection() const {
if (wallet2->get_daemon_address().empty()) return nullptr;
shared_ptr<MoneroRpcConnection> connection = shared_ptr<MoneroRpcConnection>(new MoneroRpcConnection());
if (!wallet2->get_daemon_address().empty()) connection->uri = wallet2->get_daemon_address();
if (wallet2->get_daemon_login()) {
if (!wallet2->get_daemon_login()->username.empty()) connection.username = wallet2->get_daemon_login()->username;
if (!wallet2->get_daemon_login()->username.empty()) connection->username = wallet2->get_daemon_login()->username;
epee::wipeable_string wipeablePassword = wallet2->get_daemon_login()->password;
string password = string(wipeablePassword.data(), wipeablePassword.size());
if (!password.empty()) connection.password = password;
if (!password.empty()) connection->password = password;
}
return connection;
}
@@ -640,8 +641,9 @@ namespace monero {
uint64_t MoneroWallet::getChainHeight() const {
string err;
if (getDaemonConnection() == nullptr) throw runtime_error("No connection to daemon");
uint64_t chainHeight = wallet2->get_daemon_blockchain_height(err);
if (!err.empty()) throw runtime_error(err); // TODO: proper monero error
if (!err.empty()) throw runtime_error(err);
return chainHeight;
}
src/wallet/MoneroWallet.h
+1 -1
View File
@@ -168,7 +168,7 @@ namespace monero {
/**
* TODO
*/
MoneroRpcConnection getDaemonConnection() const;
shared_ptr<MoneroRpcConnection> getDaemonConnection() const;
/**
* TODO
todo.txt
+1
View File
@@ -1,3 +1,4 @@
throw MoneroErrors instead of runtime_errors
toPropertyTree() should take node as parameter; optimize memory elsewhere
cannot reconcile integrals on getTransfers() test, need to add reconcile debug info including vals and pass error message
re-usable debug trace statements