Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ A Python library for creating Monero applications using RPC and Python bindings
* Supports client-side wallets using Python bindings.
* Supports multisig, view-only, and offline wallets.
* Wallet types are interchangeable by conforming to a [common interface](https://woodser.github.io/monero-java/javadocs/monero/wallet/MoneroWallet.html).
* Uses a clearly defined [data model and API specification](https://github.com/everoddandeven/monero-python/monero-spec.pdf) intended to be intuitive and robust.
* Uses a clearly defined [data model and API specification](https://github.com/everoddandeven/monero-python/blob/main/docs/monero-spec.pdf) intended to be intuitive and robust.
* Query wallet transactions, transfers, and outputs by their properties.
* Fetch and process binary data from the daemon (e.g. raw blocks).
* Receive notifications when blocks are added to the chain or when wallets sync, send, or receive.
Expand Down
30 changes: 15 additions & 15 deletions src/cpp/common/py_monero_common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ boost::property_tree::ptree PyGenUtils::pyobject_to_ptree(const py::object& obj)
py::object val = py::reinterpret_borrow<py::object>(item);
tree.push_back(std::make_pair("", pyobject_to_ptree(val)));
}
}
}
else if (py::isinstance<py::bool_>(obj)) {
tree.put_value(obj.cast<bool>() ? "true" : "false");
}
}
else if (py::isinstance<py::int_>(obj)) {
tree.put_value(std::to_string(obj.cast<int>()));
}
}
else if (py::isinstance<py::float_>(obj)) {
tree.put_value(std::to_string(obj.cast<double>()));
}
}
else {
tree.put_value(obj.cast<std::string>());
}
Expand Down Expand Up @@ -159,7 +159,7 @@ std::shared_ptr<PyMoneroJsonResponse> PyMoneroJsonResponse::deserialize(const st
response->m_id = it->second.data();
}
else if (key == std::string("result")) {
response->m_result = it->second;
response->m_result = it->second;
}
else std::cout << std::string("WARNING MoneroJsonResponse::deserialize() unrecognized key: ") << key << std::endl;
}
Expand Down Expand Up @@ -195,13 +195,13 @@ boost::optional<py::object> PyMoneroBinaryResponse::get_response() const {
return res;
}

rapidjson::Value PyMoneroPathRequest::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
rapidjson::Value PyMoneroPathRequest::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
if (m_params != boost::none) return m_params.get()->to_rapidjson_val(allocator);
throw std::runtime_error("No params provided");
}

rapidjson::Value PyMoneroJsonRequest::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
rapidjson::Value root(rapidjson::kObjectType);
rapidjson::Value PyMoneroJsonRequest::to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const {
rapidjson::Value root(rapidjson::kObjectType);
rapidjson::Value value_str(rapidjson::kStringType);

if (m_version != boost::none) monero_utils::add_json_member("version", m_version.get(), allocator, root, value_str);
Expand All @@ -216,7 +216,7 @@ int PyMoneroRpcConnection::compare(std::shared_ptr<PyMoneroRpcConnection> c1, st
// current connection is first
if (c1 == current_connection) return -1;
if (c2 == current_connection) return 1;

// order by availability then priority then by name
if (c1->is_online() == c2->is_online()) {
if (c1->m_priority == c2->m_priority) {
Expand Down Expand Up @@ -336,10 +336,10 @@ bool PyMoneroRpcConnection::check_connection(int timeout_ms) {

credentials->username = *m_username;
credentials->password = *m_password;

m_credentials = *credentials;
}

if (!m_http_client->set_server(m_uri.get(), m_credentials)) {
throw std::runtime_error("Could not set rpc connection: " + m_uri.get());
}
Expand Down Expand Up @@ -434,7 +434,7 @@ void PyMoneroConnectionManager::remove_connection(const std::string &uri) {
std::shared_ptr<PyMoneroRpcConnection> connection = get_connection_by_uri(uri);

if (connection == nullptr) throw std::runtime_error("Connection not found");

m_connections.erase(std::remove_if(m_connections.begin(), m_connections.end(), [&connection](std::shared_ptr<PyMoneroRpcConnection> iter){ return iter == connection; }), m_connections.end());

if (connection == m_current_connection) {
Expand Down Expand Up @@ -599,8 +599,8 @@ void PyMoneroConnectionManager::check_connections() {
check_connections(get_connections());
}

void PyMoneroConnectionManager::disconnect() {
set_connection(std::shared_ptr<PyMoneroRpcConnection>(nullptr));
void PyMoneroConnectionManager::disconnect() {
set_connection(std::shared_ptr<PyMoneroRpcConnection>(nullptr));
}

void PyMoneroConnectionManager::clear() {
Expand Down Expand Up @@ -736,7 +736,7 @@ bool PyMoneroConnectionManager::check_connections(const std::vector<std::shared_

process_responses(connections);
return has_connection;
}
}
catch (const std::exception& e) {
throw std::runtime_error(std::string("check_connections failed: ") + e.what());
}
Expand Down
10 changes: 5 additions & 5 deletions src/cpp/daemon/py_monero_daemon_default.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ void PyMoneroDaemonDefault::remove_listeners() {
refresh_listening();
}

boost::optional<std::shared_ptr<monero::monero_tx>> PyMoneroDaemonDefault::get_tx(const std::string& tx_hash, bool prune) {
boost::optional<std::shared_ptr<monero::monero_tx>> PyMoneroDaemonDefault::get_tx(const std::string& tx_hash, bool prune) {
std::vector<std::string> hashes;
hashes.push_back(tx_hash);
auto txs = get_txs(hashes, prune);
Expand All @@ -32,21 +32,21 @@ boost::optional<std::shared_ptr<monero::monero_tx>> PyMoneroDaemonDefault::get_t
return tx;
}

void PyMoneroDaemonDefault::relay_tx_by_hash(std::string& tx_hash) {
void PyMoneroDaemonDefault::relay_tx_by_hash(std::string& tx_hash) {
std::vector<std::string> tx_hashes;
tx_hashes.push_back(tx_hash);
relay_txs_by_hash(tx_hashes);
}

PyMoneroKeyImageSpentStatus PyMoneroDaemonDefault::get_key_image_spent_status(std::string& key_image) {
PyMoneroKeyImageSpentStatus PyMoneroDaemonDefault::get_key_image_spent_status(std::string& key_image) {
std::vector<std::string> key_images;
key_images.push_back(key_image);
auto statuses = get_key_image_spent_statuses(key_images);
if (statuses.empty()) throw std::runtime_error("Could not get key image spent status");
return statuses[0];
}

boost::optional<std::string> PyMoneroDaemonDefault::get_tx_hex(const std::string& tx_hash, bool prune) {
boost::optional<std::string> PyMoneroDaemonDefault::get_tx_hex(const std::string& tx_hash, bool prune) {
std::vector<std::string> hashes;
hashes.push_back(tx_hash);
auto hexes = get_tx_hexes(hashes, prune);
Expand All @@ -58,7 +58,7 @@ boost::optional<std::string> PyMoneroDaemonDefault::get_tx_hex(const std::string
return hex;
}

void PyMoneroDaemonDefault::submit_block(const std::string& block_blob) {
void PyMoneroDaemonDefault::submit_block(const std::string& block_blob) {
std::vector<std::string> block_blobs;
block_blobs.push_back(block_blob);
return submit_blocks(block_blobs);
Expand Down
Loading
Loading