asymptotically
/
openmonero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update_current_blockchain_height uses rpc

Browse Source 
This will "ping" the Monero deamon
that our backend is still using it
so that rpc connection does not
timeout.

https://github.com/moneroexamples/openmonero/issues/118
new_rpc
moneroexamples 5 years ago
parent 26bb36e3c8
commit 5ac844cd65
3 changed files with 65 additions and 101 deletions
Show Stats Download Patch File Download Diff File

16
src/CurrentBlockchainStatus.cpp
Unescape View File

@ -66,7 +66,21 @@ CurrentBlockchainStatus::get_current_blockchain_height()
void
CurrentBlockchainStatus::update_current_blockchain_height()
{
current_height = mcore->get_current_blockchain_height() - 1;
//current_height = mcore->get_current_blockchain_height() - 1;
uint64_t tmp {0};
// This rpc call not only gets the blockchain height
// but it also serves as a "ping" into the Monero
// deamon to keep the connection between the
// openmonero backend and the deamon alive
if (rpc->get_current_height(tmp))
{
current_height = tmp - 1;
return;
}
OMERROR << "rpc->get_current_height() failed!";
}
bool

134
src/RPCCalls.cpp
Unescape View File

@ -19,76 +19,6 @@ RPCCalls::RPCCalls(string _deamon_url, chrono::seconds _timeout)
boost::optional<epee::net_utils::http::login>{});
}
//RPCCalls::RPCCalls(RPCCalls&& a)
//{
//std::lock_guard<std::mutex> guard(a.m_daemon_rpc_mutex);
//deamon_url = std::move(a.deamon_url);
//timeout_time = a.timeout_time;
//timeout_time_ms = a.timeout_time_ms;
//url = std::move(a.url);
//port = std::move(port);
//// we can't move or copy m_http_client,
//// so we just initialize it from zero
//m_http_client.set_server(
//deamon_url,
//boost::optional<epee::net_utils::http::login>{});
//// after the move, disconned the a object
//a.m_http_client.disconnect();
//cout << "\n RPCCalls(RPCCalls&& a) " << endl;
//}
//RPCCalls&
//RPCCalls::operator=(RPCCalls&& a)
//{
//if (*this == a)
//return *this;
//std::unique_lock<std::mutex> lhs_lk(m_daemon_rpc_mutex, std::defer_lock);
//std::unique_lock<std::mutex> rhs_lk(a.m_daemon_rpc_mutex, std::defer_lock);
//std::lock(lhs_lk, rhs_lk);
//deamon_url = std::move(a.deamon_url);
//timeout_time = a.timeout_time;
//timeout_time_ms = a.timeout_time_ms;
//url = std::move(a.url);
//port = std::move(port);
//// we can't move or copy m_http_client,
//// so we just initialize it from zero
//m_http_client.set_server(
//deamon_url,
//boost::optional<epee::net_utils::http::login>{});
//// after the move, disconned the a object
//a.m_http_client.disconnect();
//cout << "\n RPCCalls& operator=(RPCCalls&& a) " << endl;
//return *this;
//}
//bool
//RPCCalls::operator==(RPCCalls const& a)
//{
//return deamon_url == a.deamon_url;
//}
//bool
//RPCCalls::operator!=(RPCCalls const& a)
//{
//return !(*this == a);
//}
bool
RPCCalls::connect_to_monero_deamon()
{
@ -100,8 +30,6 @@ RPCCalls::connect_to_monero_deamon()
return m_http_client.connect(rpc_timeout);
}
bool
RPCCalls::commit_tx(
const string& tx_blob,
@ -112,25 +40,19 @@ RPCCalls::commit_tx(
COMMAND_RPC_SEND_RAW_TX::response res;
req.tx_as_hex = tx_blob;
req.do_not_relay = do_not_relay;
req.do_not_relay = do_not_relay;
bool r {false};
std::lock_guard<std::mutex> guard(m_daemon_rpc_mutex);
if (!connect_to_monero_deamon())
{
cerr << "commit_tx: not connected to deamon" << endl;
error_msg = "Can't connect to Monero daemon";
std::lock_guard<std::mutex> guard(m_daemon_rpc_mutex);
return false;
r = epee::net_utils::invoke_http_json(
"/sendrawtransaction", req, res,
m_http_client, rpc_timeout);
}
bool r = epee::net_utils::invoke_http_json(
"/sendrawtransaction", req, res,
m_http_client, rpc_timeout);
if (!r || res.status == "Failed")
if (!r)
{
error_msg = res.reason;
@ -139,11 +61,12 @@ RPCCalls::commit_tx(
error_msg = "Reason not given by daemon.";
}
cerr << "Error sending tx: " << res.reason << endl;
cerr << "Error sending tx: " << error_msg << endl;
return false;
}
else if (res.status == "BUSY")
if (res.status == CORE_RPC_STATUS_BUSY)
{
error_msg = "Deamon is BUSY. Cant sent now " + res.reason;
@ -152,6 +75,15 @@ RPCCalls::commit_tx(
return false;
}
if (res.status != CORE_RPC_STATUS_OK)
{
error_msg = "Tx rejected: " + res.reason;
cerr << "Error sending tx: " << error_msg << endl;
return false;
}
if (do_not_relay)
{
cout << "Tx accepted by deamon but not relayed (useful for testing of constructing txs)" << endl;
@ -174,4 +106,32 @@ RPCCalls::commit_tx(
}
bool
RPCCalls::get_current_height(uint64_t& current_height)
{
COMMAND_RPC_GET_HEIGHT::request req;
COMMAND_RPC_GET_HEIGHT::response res;
bool r {false};
{
std::lock_guard<std::mutex> guard(m_daemon_rpc_mutex);
r = epee::net_utils::invoke_http_json(
"/getheight",
req, res, m_http_client, rpc_timeout);
}
if (!r)
{
cerr << "Error connecting to Monero deamon at "
<< deamon_url << endl;
return false;
}
current_height = res.height;
return true;
}
}

16
src/RPCCalls.h
Unescape View File

@ -25,7 +25,6 @@ class RPCCalls
string deamon_url;
uint64_t timeout_time;
//std::chrono::milliseconds timeout_time_ms;
chrono::seconds rpc_timeout;
epee::net_utils::http::url_content url;
@ -39,18 +38,7 @@ class RPCCalls
public:
RPCCalls(string _deamon_url = "http:://127.0.0.1:18081",
chrono::seconds _timeout = 3min + 30s);
//RPCCalls(RPCCalls&& a);
//RPCCalls&
//operator=(RPCCalls&& a);
//virtual bool
//operator==(RPCCalls const& a);
//virtual bool
//operator!=(RPCCalls const& a);
chrono::seconds _timeout = 3min + 30s);
virtual bool
connect_to_monero_deamon();
@ -64,6 +52,8 @@ public:
commit_tx(tools::wallet2::pending_tx& ptx,
string& error_msg);
virtual bool
get_current_height(uint64_t& current_height);
virtual ~RPCCalls() = default;
};

Write Preview
Loading…
Cancel
Save