From ff0f0574a767d4a65092846451b8879b63baa079 Mon Sep 17 00:00:00 2001 From: woodser Date: Sat, 23 Nov 2019 13:13:19 -0500 Subject: [PATCH] add monero_version daemon model and wallet get_version() w/o impl --- src/daemon/monero_daemon_model.cpp | 9 +++++++++ src/daemon/monero_daemon_model.h | 9 +++++++++ src/wallet/monero_wallet.cpp | 4 ++++ src/wallet/monero_wallet.h | 7 +++++++ 4 files changed, 29 insertions(+) diff --git a/src/daemon/monero_daemon_model.cpp b/src/daemon/monero_daemon_model.cpp index 5ccc271..cf5ca15 100644 --- a/src/daemon/monero_daemon_model.cpp +++ b/src/daemon/monero_daemon_model.cpp @@ -84,6 +84,15 @@ namespace monero { return monero_utils::serialize(to_property_tree()); } + // ----------------------------- MONERO VERSION ----------------------------- + + boost::property_tree::ptree monero_version::to_property_tree() const { + boost::property_tree::ptree node; + if (m_version_number != boost::none) node.put("versionNumber", *m_version_number); + if (m_is_release != boost::none) node.put("isRelease", *m_is_release); + return node; + } + // ------------------------- MONERO BLOCK HEADER ---------------------------- boost::property_tree::ptree monero_block_header::to_property_tree() const { diff --git a/src/daemon/monero_daemon_model.h b/src/daemon/monero_daemon_model.h index 21f793c..60a2ad0 100644 --- a/src/daemon/monero_daemon_model.h +++ b/src/daemon/monero_daemon_model.h @@ -91,6 +91,15 @@ namespace monero { STAGENET }; + /** + * Models a Monero version. + */ + struct monero_version : public serializable_struct { + boost::optional m_version_number; + boost::optional m_is_release; + boost::property_tree::ptree to_property_tree() const; + }; + /** * Models a connection to a daemon. * diff --git a/src/wallet/monero_wallet.cpp b/src/wallet/monero_wallet.cpp index a1dd6b6..50f2ddf 100644 --- a/src/wallet/monero_wallet.cpp +++ b/src/wallet/monero_wallet.cpp @@ -981,6 +981,10 @@ namespace monero { return m_is_synced; } + monero_version monero_wallet::get_version() const { + throw runtime_error("Not implemented"); + } + string monero_wallet::get_path() const { return m_w2->path(); } diff --git a/src/wallet/monero_wallet.h b/src/wallet/monero_wallet.h index 2dd6928..1a47835 100644 --- a/src/wallet/monero_wallet.h +++ b/src/wallet/monero_wallet.h @@ -245,6 +245,13 @@ namespace monero { */ bool is_synced() const; + /** + * Get the wallet's version. + * + * @return the wallet's version + */ + monero_version get_version() const; + /** * Get the path of this wallet's file on disk. *