diff --git a/README.md b/README.md index f01ef6b..be8cbfe 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ## Overview -This project is a C++ library for using Monero wallets with native bindings to [Monero Core v0.15.0.5 Carbon Chameleon](https://web.getmonero.org/downloads/). +This project is a C++ library for using Monero wallets with native bindings to [Monero Core v0.16.0.0 'Nitrogen Nebula'](https://web.getmonero.org/downloads/). In addition, this project conforms to an [API specification](http://moneroecosystem.org/monero-java/monero-spec.pdf) intended to be intuitive, robust, and for long-term use in the Monero project. diff --git a/docs/monero__wallet_8h_source.html b/docs/monero__wallet_8h_source.html index f368d8f..3c26df9 100644 --- a/docs/monero__wallet_8h_source.html +++ b/docs/monero__wallet_8h_source.html @@ -205,7 +205,7 @@ $(function() {
monero::monero_wallet::get_listeners
virtual std::set< monero_wallet_listener * > get_listeners()
Definition: monero_wallet.h:398
monero::monero_tx_config
Definition: monero_wallet_model.h:343
monero::monero_wallet::create_txs
virtual std::vector< std::shared_ptr< monero_tx_wallet > > create_txs(const monero_tx_config &config)
Definition: monero_wallet.h:785
-
monero::wallet2_listener
Definition: monero_wallet_core.cpp:688
+
monero::wallet2_listener
Definition: monero_wallet_core.cpp:679
monero::monero_wallet::verify_message
virtual bool verify_message(const std::string &msg, const std::string &address, const std::string &signature) const
Definition: monero_wallet.h:911
monero::monero_wallet::get_account
virtual monero_account get_account(uint32_t account_idx) const
Definition: monero_wallet.h:586
diff --git a/docs/monero__wallet__core_8h_source.html b/docs/monero__wallet__core_8h_source.html index b269ea9..b9eb5b8 100644 --- a/docs/monero__wallet__core_8h_source.html +++ b/docs/monero__wallet__core_8h_source.html @@ -71,126 +71,126 @@ $(function() {
1 
53 #pragma once
54 
55 #include "monero_wallet.h"
56 #include "wallet/wallet2.h"
57 
58 #include <boost/thread/mutex.hpp>
59 #include <boost/thread/thread.hpp>
60 #include <boost/thread/condition_variable.hpp>
61 
65 namespace monero {
66 
67  // -------------------------------- LISTENERS -------------------------------
68 
69  // forward declaration of internal wallet2 listener
70  struct wallet2_listener;
71 
72  // --------------------------- STATIC WALLET UTILS --------------------------
73 
77  class monero_wallet_core : public monero_wallet {
78 
79  public:
80 
87  static bool wallet_exists(const std::string& path);
88 
97  static monero_wallet_core* open_wallet(const std::string& path, const std::string& password, const monero_network_type network_type);
98 
110  static monero_wallet_core* open_wallet_data(const std::string& password, const monero_network_type, const std::string& keys_data, const std::string& cache_data, const monero_rpc_connection& daemon_connection = monero_rpc_connection(), std::unique_ptr<epee::net_utils::http::http_client_factory> http_client_factory = nullptr);
111 
123  static monero_wallet_core* create_wallet_random(const std::string& path, const std::string& password, const monero_network_type network_type, const monero_rpc_connection& daemon_connection = monero_rpc_connection(), const std::string& language = "English", std::unique_ptr<epee::net_utils::http::http_client_factory> http_client_factory = nullptr);
124 
137  static monero_wallet_core* create_wallet_from_mnemonic(const std::string& path, const std::string& password, const monero_network_type network_type, const std::string& mnemonic, const monero_rpc_connection& daemon_connection = monero_rpc_connection(), uint64_t restore_height = 0, const std::string& seed_offset = "", std::unique_ptr<epee::net_utils::http::http_client_factory> http_client_factory = nullptr);
138 
154  static monero_wallet_core* create_wallet_from_keys(const std::string& path, const std::string& password, const monero_network_type network_type, const std::string& address, const std::string& view_key, const std::string& spend_key, const monero_rpc_connection& daemon_connection = monero_rpc_connection(), uint64_t restore_height = 0, const std::string& language = "English", std::unique_ptr<epee::net_utils::http::http_client_factory> http_client_factory = nullptr);
155 
161  static std::vector<std::string> get_mnemonic_languages();
162 
163  // ----------------------------- WALLET METHODS -----------------------------
164 
168  ~monero_wallet_core();
169 
173  bool is_view_only() const override { return m_w2->watch_only(); }
174  void set_daemon_connection(const std::string& uri, const std::string& username = "", const std::string& password = "") override;
175  void set_daemon_connection(const boost::optional<monero_rpc_connection>& connection) override;
176  boost::optional<monero_rpc_connection> get_daemon_connection() const override;
177  bool is_connected() const override;
178  bool is_daemon_synced() const override;
179  bool is_daemon_trusted() const override;
180  bool is_synced() const override;
181  monero_version get_version() const override;
182  std::string get_path() const override;
183  monero_network_type get_network_type() const override;
184  std::string get_mnemonic() const override;
185  std::string get_mnemonic_language() const override;
186  std::string get_public_view_key() const override;
187  std::string get_private_view_key() const override;
188  std::string get_public_spend_key() const override;
189  std::string get_private_spend_key() const override;
190  std::string get_address(const uint32_t account_idx, const uint32_t subaddress_idx) const override;
191  monero_subaddress get_address_index(const std::string& address) const override;
192  monero_integrated_address get_integrated_address(const std::string& standard_address = "", const std::string& payment_id = "") const override;
193  monero_integrated_address decode_integrated_address(const std::string& integrated_address) const override;
194  uint64_t get_height() const override;
195  uint64_t get_sync_height() const override;
196  void set_sync_height(uint64_t sync_height) override;
197  uint64_t get_daemon_height() const override;
198  uint64_t get_daemon_max_peer_height() const override;
199  void add_listener(monero_wallet_listener& listener) override;
200  void remove_listener(monero_wallet_listener& listener) override;
201  std::set<monero_wallet_listener*> get_listeners() override;
202  monero_sync_result sync() override;
203  monero_sync_result sync(monero_wallet_listener& listener) override;
204  monero_sync_result sync(uint64_t start_height) override;
205  monero_sync_result sync(uint64_t start_height, monero_wallet_listener& listener) override;
206  void start_syncing() override;
207  void stop_syncing() override;
208  void rescan_spent() override;
209  void rescan_blockchain() override;
210  uint64_t get_balance() const override;
211  uint64_t get_balance(uint32_t account_idx) const override;
212  uint64_t get_balance(uint32_t account_idx, uint32_t subaddress_idx) const override;
213  uint64_t get_unlocked_balance() const override;
214  uint64_t get_unlocked_balance(uint32_t account_idx) const override;
215  uint64_t get_unlocked_balance(uint32_t account_idx, uint32_t subaddress_idx) const override;
216  std::vector<monero_account> get_accounts(bool include_subaddresses, const std::string& tag) const override;
217  monero_account get_account(const uint32_t account_idx, bool include_subaddresses) const override;
218  monero_account create_account(const std::string& label = "") override;
219  std::vector<monero_subaddress> get_subaddresses(const uint32_t account_idx, const std::vector<uint32_t>& subaddress_indices) const override;
220  monero_subaddress create_subaddress(uint32_t account_idx, const std::string& label = "") override;
221  std::vector<std::shared_ptr<monero_tx_wallet>> get_txs() const override;
222  std::vector<std::shared_ptr<monero_tx_wallet>> get_txs(const monero_tx_query& query) const override;
223  std::vector<std::shared_ptr<monero_tx_wallet>> get_txs(const monero_tx_query& query, std::vector<std::string>& missing_tx_hashes) const override;
224  std::vector<std::shared_ptr<monero_transfer>> get_transfers(const monero_transfer_query& query) const override;
225  std::vector<std::shared_ptr<monero_output_wallet>> get_outputs(const monero_output_query& query) const override;
226  std::string get_outputs_hex() const override;
227  int import_outputs_hex(const std::string& outputs_hex) override;
228  std::vector<std::shared_ptr<monero_key_image>> get_key_images() const override;
229  std::shared_ptr<monero_key_image_import_result> import_key_images(const std::vector<std::shared_ptr<monero_key_image>>& key_images) override;
230  std::vector<std::shared_ptr<monero_tx_wallet>> create_txs(const monero_tx_config& config) override;
231  std::vector<std::shared_ptr<monero_tx_wallet>> sweep_unlocked(const monero_tx_config& config) override;
232  std::shared_ptr<monero_tx_wallet> sweep_output(const monero_tx_config& config) override;
233  std::vector<std::shared_ptr<monero_tx_wallet>> sweep_dust(bool relay = false) override;
234  std::vector<std::string> relay_txs(const std::vector<std::string>& tx_metadatas) override;
235  monero_tx_set parse_tx_set(const monero_tx_set& tx_set) override;
236  std::string sign_txs(const std::string& unsigned_tx_hex) override;
237  std::vector<std::string> submit_txs(const std::string& signed_tx_hex) override;
238  std::string sign_message(const std::string& msg) const override;
239  bool verify_message(const std::string& msg, const std::string& address, const std::string& signature) const override;
240  std::string get_tx_key(const std::string& tx_hash) const override;
241  std::shared_ptr<monero_check_tx> check_tx_key(const std::string& tx_hash, const std::string& txKey, const std::string& address) const override;
242  std::string get_tx_proof(const std::string& tx_hash, const std::string& address, const std::string& message) const override;
243  std::shared_ptr<monero_check_tx> check_tx_proof(const std::string& tx_hash, const std::string& address, const std::string& message, const std::string& signature) const override;
244  std::string get_spend_proof(const std::string& tx_hash, const std::string& message) const override;
245  bool check_spend_proof(const std::string& tx_hash, const std::string& message, const std::string& signature) const override;
246  std::string get_reserve_proof_wallet(const std::string& message) const override;
247  std::string get_reserve_proof_account(uint32_t account_idx, uint64_t amount, const std::string& message) const override;
248  std::shared_ptr<monero_check_reserve> check_reserve_proof(const std::string& address, const std::string& message, const std::string& signature) const override;
249  std::string get_tx_note(const std::string& tx_hash) const override;
250  std::vector<std::string> get_tx_notes(const std::vector<std::string>& tx_hashes) const override;
251  void set_tx_note(const std::string& tx_hash, const std::string& note) override;
252  void set_tx_notes(const std::vector<std::string>& tx_hashes, const std::vector<std::string>& notes) override;
253  std::vector<monero_address_book_entry> get_address_book_entries(const std::vector<uint64_t>& indices) const override;
254  uint64_t add_address_book_entry(const std::string& address, const std::string& description) override;
255  void edit_address_book_entry(uint64_t index, bool set_address, const std::string& address, bool set_description, const std::string& description) override;
256  void delete_address_book_entry(uint64_t index) override;
257  std::string create_payment_uri(const monero_tx_config& config) const override;
258  std::shared_ptr<monero_tx_config> parse_payment_uri(const std::string& uri) const override;
259  bool get_attribute(const std::string& key, std::string& value) const override;
260  void set_attribute(const std::string& key, const std::string& val) override;
261  void start_mining(boost::optional<uint64_t> num_threads, boost::optional<bool> background_mining, boost::optional<bool> ignore_battery) override;
262  void stop_mining() override;
263  uint64_t wait_for_next_block() override;
264  bool is_multisig_import_needed() const override;
265  monero_multisig_info get_multisig_info() override;
266  std::string prepare_multisig() override;
267  monero_multisig_init_result make_multisig(const std::vector<std::string>& multisig_hexes, int threshold, const std::string& password) override;
268  monero_multisig_init_result exchange_multisig_keys(const std::vector<std::string>& mutisig_hexes, const std::string& password) override;
269  std::string get_multisig_hex() override;
270  int import_multisig_hex(const std::vector<std::string>& multisig_hexes) override;
271  monero_multisig_sign_result sign_multisig_tx_hex(const std::string& multisig_tx_hex) override;
272  std::vector<std::string> submit_multisig_tx_hex(const std::string& signed_multisig_tx_hex) override;
273  void save() override;
274  void move_to(std::string path, std::string password) override;
275  void close(bool save = false) override;
276 
280  std::string get_keys_file_buffer(const epee::wipeable_string& password, bool view_only) const;
281  std::string get_cache_file_buffer(const epee::wipeable_string& password) const;
282 
283  // --------------------------------- PRIVATE --------------------------------
284 
285  private:
286  friend struct wallet2_listener;
287  std::unique_ptr<tools::wallet2> m_w2; // internal wallet implementation
288  std::unique_ptr<wallet2_listener> m_w2_listener; // internal wallet implementation listener
289  std::set<monero_wallet_listener*> m_listeners; // external wallet listeners
290 
291  void init_common();
292  std::vector<monero_subaddress> get_subaddresses_aux(uint32_t account_idx, const std::vector<uint32_t>& subaddress_indices, const std::vector<tools::wallet2::transfer_details>& transfers) const;
293  std::vector<std::shared_ptr<monero_transfer>> get_transfers_aux(const monero_transfer_query& query) const;
294  std::vector<std::shared_ptr<monero_output_wallet>> get_outputs_aux(const monero_output_query& query) const;
295  std::vector<std::shared_ptr<monero_tx_wallet>> sweep_account(const monero_tx_config& config); // sweeps unlocked funds within an account; private helper to sweep_unlocked()
296 
297  // blockchain sync management
298  mutable std::atomic<bool> m_is_synced; // whether or not wallet is synced
299  mutable std::atomic<bool> m_is_connected; // cache connection status to avoid unecessary RPC calls
300  boost::condition_variable m_sync_cv; // to make sync threads woke
301  boost::mutex m_sync_mutex; // synchronize sync() and syncAsync() requests
302  std::atomic<bool> m_rescan_on_sync; // whether or not to rescan on sync
303  std::atomic<bool> m_syncing_enabled; // whether or not auto sync is enabled
304  std::atomic<bool> m_sync_loop_running; // whether or not the syncing thread is shut down
305  std::atomic<int> m_syncing_interval; // auto sync loop interval in milliseconds
306  boost::thread m_syncing_thread; // thread for auto sync loop
307  boost::mutex m_syncing_mutex; // synchronize auto sync loop
308  void run_sync_loop(); // run the sync loop in a thread
309  monero_sync_result lock_and_sync(boost::optional<uint64_t> start_height = boost::none); // internal function to synchronize request to sync and rescan
310  monero_sync_result sync_aux(boost::optional<uint64_t> start_height = boost::none); // internal function to immediately block, sync, and report progress
311  };
312 }
monero::monero_multisig_info
Definition: monero_wallet_model.h:414
monero
Definition: monero_daemon.cpp:58
-
monero::monero_wallet_core::is_synced
bool is_synced() const override
Definition: monero_wallet_core.cpp:1046
-
monero::monero_wallet_core::set_sync_height
void set_sync_height(uint64_t sync_height) override
Definition: monero_wallet_core.cpp:1178
-
monero::monero_wallet_core::get_public_view_key
std::string get_public_view_key() const override
Definition: monero_wallet_core.cpp:1077
+
monero::monero_wallet_core::is_synced
bool is_synced() const override
Definition: monero_wallet_core.cpp:1025
+
monero::monero_wallet_core::set_sync_height
void set_sync_height(uint64_t sync_height) override
Definition: monero_wallet_core.cpp:1157
+
monero::monero_wallet_core::get_public_view_key
std::string get_public_view_key() const override
Definition: monero_wallet_core.cpp:1056
monero::monero_wallet
Definition: monero_wallet.h:115
-
monero::monero_wallet_core::get_tx_notes
std::vector< std::string > get_tx_notes(const std::vector< std::string > &tx_hashes) const override
Definition: monero_wallet_core.cpp:2589
-
monero::monero_wallet_core::~monero_wallet_core
~monero_wallet_core()
Definition: monero_wallet_core.cpp:981
-
monero::monero_wallet_core::add_listener
void add_listener(monero_wallet_listener &listener) override
Definition: monero_wallet_core.cpp:1199
-
monero::monero_wallet_core::check_reserve_proof
std::shared_ptr< monero_check_reserve > check_reserve_proof(const std::string &address, const std::string &message, const std::string &signature) const override
Definition: monero_wallet_core.cpp:2559
+
monero::monero_wallet_core::get_tx_notes
std::vector< std::string > get_tx_notes(const std::vector< std::string > &tx_hashes) const override
Definition: monero_wallet_core.cpp:2580
+
monero::monero_wallet_core::~monero_wallet_core
~monero_wallet_core()
Definition: monero_wallet_core.cpp:960
+
monero::monero_wallet_core::add_listener
void add_listener(monero_wallet_listener &listener) override
Definition: monero_wallet_core.cpp:1178
+
monero::monero_wallet_core::check_reserve_proof
std::shared_ptr< monero_check_reserve > check_reserve_proof(const std::string &address, const std::string &message, const std::string &signature) const override
Definition: monero_wallet_core.cpp:2550
monero::monero_integrated_address
Definition: monero_wallet_model.h:322
-
monero::monero_wallet_core::get_keys_file_buffer
std::string get_keys_file_buffer(const epee::wipeable_string &password, bool view_only) const
Definition: monero_wallet_core.cpp:3004
-
monero::monero_wallet_core::set_daemon_connection
void set_daemon_connection(const std::string &uri, const std::string &username="", const std::string &password="") override
Definition: monero_wallet_core.cpp:986
-
monero::monero_wallet_core::get_tx_note
std::string get_tx_note(const std::string &tx_hash) const override
Definition: monero_wallet_core.cpp:2579
-
monero::monero_wallet_core::check_tx_proof
std::shared_ptr< monero_check_tx > check_tx_proof(const std::string &tx_hash, const std::string &address, const std::string &message, const std::string &signature) const override
Definition: monero_wallet_core.cpp:2490
-
monero::monero_wallet_core::create_wallet_random
static monero_wallet_core * create_wallet_random(const std::string &path, const std::string &password, const monero_network_type network_type, const monero_rpc_connection &daemon_connection=monero_rpc_connection(), const std::string &language="English", std::unique_ptr< epee::net_utils::http::http_client_factory > http_client_factory=nullptr)
Definition: monero_wallet_core.cpp:875
+
monero::monero_wallet_core::get_keys_file_buffer
std::string get_keys_file_buffer(const epee::wipeable_string &password, bool view_only) const
Definition: monero_wallet_core.cpp:3001
+
monero::monero_wallet_core::set_daemon_connection
void set_daemon_connection(const std::string &uri, const std::string &username="", const std::string &password="") override
Definition: monero_wallet_core.cpp:965
+
monero::monero_wallet_core::get_tx_note
std::string get_tx_note(const std::string &tx_hash) const override
Definition: monero_wallet_core.cpp:2570
+
monero::monero_wallet_core::check_tx_proof
std::shared_ptr< monero_check_tx > check_tx_proof(const std::string &tx_hash, const std::string &address, const std::string &message, const std::string &signature) const override
Definition: monero_wallet_core.cpp:2481
+
monero::monero_wallet_core::create_wallet_random
static monero_wallet_core * create_wallet_random(const std::string &path, const std::string &password, const monero_network_type network_type, const monero_rpc_connection &daemon_connection=monero_rpc_connection(), const std::string &language="English", std::unique_ptr< epee::net_utils::http::http_client_factory > http_client_factory=nullptr)
Definition: monero_wallet_core.cpp:854
monero::monero_wallet_listener
Definition: monero_wallet.h:71
-
monero::monero_wallet_core::create_wallet_from_keys
static monero_wallet_core * create_wallet_from_keys(const std::string &path, const std::string &password, const monero_network_type network_type, const std::string &address, const std::string &view_key, const std::string &spend_key, const monero_rpc_connection &daemon_connection=monero_rpc_connection(), uint64_t restore_height=0, const std::string &language="English", std::unique_ptr< epee::net_utils::http::http_client_factory > http_client_factory=nullptr)
Definition: monero_wallet_core.cpp:914
-
monero::monero_wallet_core::sign_txs
std::string sign_txs(const std::string &unsigned_tx_hex) override
Definition: monero_wallet_core.cpp:2321
-
monero::monero_wallet_core::close
void close(bool save=false) override
Definition: monero_wallet_core.cpp:3018
-
monero::monero_wallet_core::set_tx_note
void set_tx_note(const std::string &tx_hash, const std::string &note) override
Definition: monero_wallet_core.cpp:2596
-
monero::monero_wallet_core::get_version
monero_version get_version() const override
Definition: monero_wallet_core.cpp:1050
-
monero::monero_wallet_core::get_account
monero_account get_account(const uint32_t account_idx, bool include_subaddresses) const override
Definition: monero_wallet_core.cpp:1347
-
monero::monero_wallet_core::submit_multisig_tx_hex
std::vector< std::string > submit_multisig_tx_hex(const std::string &signed_multisig_tx_hex) override
Definition: monero_wallet_core.cpp:2953
-
monero::monero_wallet_core::get_address
std::string get_address(const uint32_t account_idx, const uint32_t subaddress_idx) const override
Definition: monero_wallet_core.cpp:1099
-
monero::monero_wallet_core::create_payment_uri
std::string create_payment_uri(const monero_tx_config &config) const override
Definition: monero_wallet_core.cpp:2696
-
monero::monero_wallet_core::start_mining
void start_mining(boost::optional< uint64_t > num_threads, boost::optional< bool > background_mining, boost::optional< bool > ignore_battery) override
Definition: monero_wallet_core.cpp:2755
-
monero::monero_wallet_core::import_outputs_hex
int import_outputs_hex(const std::string &outputs_hex) override
Definition: monero_wallet_core.cpp:1561
-
monero::monero_wallet_core::get_daemon_height
uint64_t get_daemon_height() const override
Definition: monero_wallet_core.cpp:1182
+
monero::monero_wallet_core::create_wallet_from_keys
static monero_wallet_core * create_wallet_from_keys(const std::string &path, const std::string &password, const monero_network_type network_type, const std::string &address, const std::string &view_key, const std::string &spend_key, const monero_rpc_connection &daemon_connection=monero_rpc_connection(), uint64_t restore_height=0, const std::string &language="English", std::unique_ptr< epee::net_utils::http::http_client_factory > http_client_factory=nullptr)
Definition: monero_wallet_core.cpp:893
+
monero::monero_wallet_core::sign_txs
std::string sign_txs(const std::string &unsigned_tx_hex) override
Definition: monero_wallet_core.cpp:2312
+
monero::monero_wallet_core::close
void close(bool save=false) override
Definition: monero_wallet_core.cpp:3015
+
monero::monero_wallet_core::set_tx_note
void set_tx_note(const std::string &tx_hash, const std::string &note) override
Definition: monero_wallet_core.cpp:2587
+
monero::monero_wallet_core::get_version
monero_version get_version() const override
Definition: monero_wallet_core.cpp:1029
+
monero::monero_wallet_core::get_account
monero_account get_account(const uint32_t account_idx, bool include_subaddresses) const override
Definition: monero_wallet_core.cpp:1326
+
monero::monero_wallet_core::submit_multisig_tx_hex
std::vector< std::string > submit_multisig_tx_hex(const std::string &signed_multisig_tx_hex) override
Definition: monero_wallet_core.cpp:2950
+
monero::monero_wallet_core::get_address
std::string get_address(const uint32_t account_idx, const uint32_t subaddress_idx) const override
Definition: monero_wallet_core.cpp:1078
+
monero::monero_wallet_core::create_payment_uri
std::string create_payment_uri(const monero_tx_config &config) const override
Definition: monero_wallet_core.cpp:2693
+
monero::monero_wallet_core::start_mining
void start_mining(boost::optional< uint64_t > num_threads, boost::optional< bool > background_mining, boost::optional< bool > ignore_battery) override
Definition: monero_wallet_core.cpp:2752
+
monero::monero_wallet_core::import_outputs_hex
int import_outputs_hex(const std::string &outputs_hex) override
Definition: monero_wallet_core.cpp:1540
+
monero::monero_wallet_core::get_daemon_height
uint64_t get_daemon_height() const override
Definition: monero_wallet_core.cpp:1161
monero::monero_wallet::get_accounts
virtual std::vector< monero_account > get_accounts() const
Definition: monero_wallet.h:545
monero::monero_multisig_init_result
Definition: monero_wallet_model.h:428
-
monero::monero_wallet_core::get_private_spend_key
std::string get_private_spend_key() const override
Definition: monero_wallet_core.cpp:1092
-
monero::monero_wallet_core::create_txs
std::vector< std::shared_ptr< monero_tx_wallet > > create_txs(const monero_tx_config &config) override
Definition: monero_wallet_core.cpp:1615
-
monero::monero_wallet_core::get_sync_height
uint64_t get_sync_height() const override
Definition: monero_wallet_core.cpp:1174
-
monero::monero_wallet_core::is_connected
bool is_connected() const override
Definition: monero_wallet_core.cpp:1027
+
monero::monero_wallet_core::get_private_spend_key
std::string get_private_spend_key() const override
Definition: monero_wallet_core.cpp:1071
+
monero::monero_wallet_core::create_txs
std::vector< std::shared_ptr< monero_tx_wallet > > create_txs(const monero_tx_config &config) override
Definition: monero_wallet_core.cpp:1594
+
monero::monero_wallet_core::get_sync_height
uint64_t get_sync_height() const override
Definition: monero_wallet_core.cpp:1153
+
monero::monero_wallet_core::is_connected
bool is_connected() const override
Definition: monero_wallet_core.cpp:1006
monero::monero_tx_query
Definition: monero_wallet_model.h:278
-
monero::monero_wallet_core::edit_address_book_entry
void edit_address_book_entry(uint64_t index, bool set_address, const std::string &address, bool set_description, const std::string &description) override
Definition: monero_wallet_core.cpp:2657
-
monero::monero_wallet_core::get_tx_key
std::string get_tx_key(const std::string &tx_hash) const override
Definition: monero_wallet_core.cpp:2397
-
monero::monero_wallet_core::get_path
std::string get_path() const override
Definition: monero_wallet_core.cpp:1057
-
monero::monero_wallet_core::get_daemon_max_peer_height
uint64_t get_daemon_max_peer_height() const override
Definition: monero_wallet_core.cpp:1190
+
monero::monero_wallet_core::edit_address_book_entry
void edit_address_book_entry(uint64_t index, bool set_address, const std::string &address, bool set_description, const std::string &description) override
Definition: monero_wallet_core.cpp:2654
+
monero::monero_wallet_core::get_tx_key
std::string get_tx_key(const std::string &tx_hash) const override
Definition: monero_wallet_core.cpp:2388
+
monero::monero_wallet_core::get_path
std::string get_path() const override
Definition: monero_wallet_core.cpp:1036
+
monero::monero_wallet_core::get_daemon_max_peer_height
uint64_t get_daemon_max_peer_height() const override
Definition: monero_wallet_core.cpp:1169
monero::monero_multisig_sign_result
Definition: monero_wallet_model.h:438
-
monero::monero_wallet_core::create_account
monero_account create_account(const std::string &label="") override
Definition: monero_wallet_core.cpp:1364
+
monero::monero_wallet_core::create_account
monero_account create_account(const std::string &label="") override
Definition: monero_wallet_core.cpp:1343
monero::monero_wallet_core::is_view_only
bool is_view_only() const override
Definition: monero_wallet_core.h:173
-
monero::monero_wallet_core::get_integrated_address
monero_integrated_address get_integrated_address(const std::string &standard_address="", const std::string &payment_id="") const override
Definition: monero_wallet_core.cpp:1124
-
monero::monero_wallet_core::open_wallet
static monero_wallet_core * open_wallet(const std::string &path, const std::string &password, const monero_network_type network_type)
Definition: monero_wallet_core.cpp:853
-
monero::monero_wallet_core::is_daemon_synced
bool is_daemon_synced() const override
Definition: monero_wallet_core.cpp:1035
+
monero::monero_wallet_core::get_integrated_address
monero_integrated_address get_integrated_address(const std::string &standard_address="", const std::string &payment_id="") const override
Definition: monero_wallet_core.cpp:1103
+
monero::monero_wallet_core::open_wallet
static monero_wallet_core * open_wallet(const std::string &path, const std::string &password, const monero_network_type network_type)
Definition: monero_wallet_core.cpp:832
+
monero::monero_wallet_core::is_daemon_synced
bool is_daemon_synced() const override
Definition: monero_wallet_core.cpp:1014
monero::monero_version
Definition: monero_daemon_model.h:99
-
monero::monero_wallet_core::sweep_unlocked
std::vector< std::shared_ptr< monero_tx_wallet > > sweep_unlocked(const monero_tx_config &config) override
Definition: monero_wallet_core.cpp:1735
-
monero::monero_wallet_core::get_network_type
monero_network_type get_network_type() const override
Definition: monero_wallet_core.cpp:1061
-
monero::monero_wallet_core::open_wallet_data
static monero_wallet_core * open_wallet_data(const std::string &password, const monero_network_type, const std::string &keys_data, const std::string &cache_data, const monero_rpc_connection &daemon_connection=monero_rpc_connection(), std::unique_ptr< epee::net_utils::http::http_client_factory > http_client_factory=nullptr)
Definition: monero_wallet_core.cpp:863
-
monero::monero_wallet_core::import_key_images
std::shared_ptr< monero_key_image_import_result > import_key_images(const std::vector< std::shared_ptr< monero_key_image >> &key_images) override
Definition: monero_wallet_core.cpp:1588
-
monero::monero_wallet_core::create_subaddress
monero_subaddress create_subaddress(uint32_t account_idx, const std::string &label="") override
Definition: monero_wallet_core.cpp:1388
-
monero::monero_wallet_core::move_to
void move_to(std::string path, std::string password) override
Definition: monero_wallet_core.cpp:2999
-
monero::monero_wallet_core::get_multisig_hex
std::string get_multisig_hex() override
Definition: monero_wallet_core.cpp:2875
-
monero::monero_wallet_core::get_unlocked_balance
uint64_t get_unlocked_balance() const override
Definition: monero_wallet_core.cpp:1311
-
monero::monero_wallet_core::verify_message
bool verify_message(const std::string &msg, const std::string &address, const std::string &signature) const override
Definition: monero_wallet_core.cpp:2372
-
monero::monero_wallet_core::check_tx_key
std::shared_ptr< monero_check_tx > check_tx_key(const std::string &tx_hash, const std::string &txKey, const std::string &address) const override
Definition: monero_wallet_core.cpp:2422
-
monero::monero_wallet_core::get_address_book_entries
std::vector< monero_address_book_entry > get_address_book_entries(const std::vector< uint64_t > &indices) const override
Definition: monero_wallet_core.cpp:2614
-
monero::monero_wallet_core::get_key_images
std::vector< std::shared_ptr< monero_key_image > > get_key_images() const override
Definition: monero_wallet_core.cpp:1573
-
monero::monero_wallet_core::get_listeners
std::set< monero_wallet_listener * > get_listeners() override
Definition: monero_wallet_core.cpp:1211
-
monero::monero_wallet_core::get_transfers
std::vector< std::shared_ptr< monero_transfer > > get_transfers(const monero_transfer_query &query) const override
Definition: monero_wallet_core.cpp:1515
-
monero::monero_wallet_core::import_multisig_hex
int import_multisig_hex(const std::vector< std::string > &multisig_hexes) override
Definition: monero_wallet_core.cpp:2882
-
monero::monero_wallet_core::get_attribute
bool get_attribute(const std::string &key, std::string &value) const override
Definition: monero_wallet_core.cpp:2747
-
monero::monero_wallet_core::get_private_view_key
std::string get_private_view_key() const override
Definition: monero_wallet_core.cpp:1082
+
monero::monero_wallet_core::sweep_unlocked
std::vector< std::shared_ptr< monero_tx_wallet > > sweep_unlocked(const monero_tx_config &config) override
Definition: monero_wallet_core.cpp:1717
+
monero::monero_wallet_core::get_network_type
monero_network_type get_network_type() const override
Definition: monero_wallet_core.cpp:1040
+
monero::monero_wallet_core::open_wallet_data
static monero_wallet_core * open_wallet_data(const std::string &password, const monero_network_type, const std::string &keys_data, const std::string &cache_data, const monero_rpc_connection &daemon_connection=monero_rpc_connection(), std::unique_ptr< epee::net_utils::http::http_client_factory > http_client_factory=nullptr)
Definition: monero_wallet_core.cpp:842
+
monero::monero_wallet_core::import_key_images
std::shared_ptr< monero_key_image_import_result > import_key_images(const std::vector< std::shared_ptr< monero_key_image >> &key_images) override
Definition: monero_wallet_core.cpp:1567
+
monero::monero_wallet_core::create_subaddress
monero_subaddress create_subaddress(uint32_t account_idx, const std::string &label="") override
Definition: monero_wallet_core.cpp:1367
+
monero::monero_wallet_core::move_to
void move_to(std::string path, std::string password) override
Definition: monero_wallet_core.cpp:2996
+
monero::monero_wallet_core::get_multisig_hex
std::string get_multisig_hex() override
Definition: monero_wallet_core.cpp:2872
+
monero::monero_wallet_core::get_unlocked_balance
uint64_t get_unlocked_balance() const override
Definition: monero_wallet_core.cpp:1290
+
monero::monero_wallet_core::verify_message
bool verify_message(const std::string &msg, const std::string &address, const std::string &signature) const override
Definition: monero_wallet_core.cpp:2363
+
monero::monero_wallet_core::check_tx_key
std::shared_ptr< monero_check_tx > check_tx_key(const std::string &tx_hash, const std::string &txKey, const std::string &address) const override
Definition: monero_wallet_core.cpp:2413
+
monero::monero_wallet_core::get_address_book_entries
std::vector< monero_address_book_entry > get_address_book_entries(const std::vector< uint64_t > &indices) const override
Definition: monero_wallet_core.cpp:2605
+
monero::monero_wallet_core::get_key_images
std::vector< std::shared_ptr< monero_key_image > > get_key_images() const override
Definition: monero_wallet_core.cpp:1552
+
monero::monero_wallet_core::get_listeners
std::set< monero_wallet_listener * > get_listeners() override
Definition: monero_wallet_core.cpp:1190
+
monero::monero_wallet_core::get_transfers
std::vector< std::shared_ptr< monero_transfer > > get_transfers(const monero_transfer_query &query) const override
Definition: monero_wallet_core.cpp:1494
+
monero::monero_wallet_core::import_multisig_hex
int import_multisig_hex(const std::vector< std::string > &multisig_hexes) override
Definition: monero_wallet_core.cpp:2879
+
monero::monero_wallet_core::get_attribute
bool get_attribute(const std::string &key, std::string &value) const override
Definition: monero_wallet_core.cpp:2744
+
monero::monero_wallet_core::get_private_view_key
std::string get_private_view_key() const override
Definition: monero_wallet_core.cpp:1061
monero::monero_sync_result
Definition: monero_wallet_model.h:67
-
monero::monero_wallet_core::sweep_dust
std::vector< std::shared_ptr< monero_tx_wallet > > sweep_dust(bool relay=false) override
Definition: monero_wallet_core.cpp:2041
+
monero::monero_wallet_core::sweep_dust
std::vector< std::shared_ptr< monero_tx_wallet > > sweep_dust(bool relay=false) override
Definition: monero_wallet_core.cpp:2029
monero::monero_tx_set
Definition: monero_wallet_model.h:308
-
monero::monero_wallet_core::delete_address_book_entry
void delete_address_book_entry(uint64_t index) override
Definition: monero_wallet_core.cpp:2690
-
monero::monero_wallet_core::decode_integrated_address
monero_integrated_address decode_integrated_address(const std::string &integrated_address) const override
Definition: monero_wallet_core.cpp:1154
-
monero::monero_wallet_core::get_mnemonic
std::string get_mnemonic() const override
Definition: monero_wallet_core.cpp:1065
-
monero::monero_wallet_core::check_spend_proof
bool check_spend_proof(const std::string &tx_hash, const std::string &message, const std::string &signature) const override
Definition: monero_wallet_core.cpp:2532
-
monero::monero_wallet_core::prepare_multisig
std::string prepare_multisig() override
Definition: monero_wallet_core.cpp:2837
-
monero::monero_wallet_core::get_address_index
monero_subaddress get_address_index(const std::string &address) const override
Definition: monero_wallet_core.cpp:1103
-
monero::monero_wallet_core::is_multisig_import_needed
bool is_multisig_import_needed() const override
Definition: monero_wallet_core.cpp:2827
-
monero::monero_wallet_core::sync
monero_sync_result sync() override
Definition: monero_wallet_core.cpp:1216
-
monero::monero_wallet_core::make_multisig
monero_multisig_init_result make_multisig(const std::vector< std::string > &multisig_hexes, int threshold, const std::string &password) override
Definition: monero_wallet_core.cpp:2843
-
monero::monero_wallet_core::parse_payment_uri
std::shared_ptr< monero_tx_config > parse_payment_uri(const std::string &uri) const override
Definition: monero_wallet_core.cpp:2719
-
monero::monero_wallet_core::get_outputs_hex
std::string get_outputs_hex() const override
Definition: monero_wallet_core.cpp:1557
-
monero::monero_wallet_core::wait_for_next_block
uint64_t wait_for_next_block() override
Definition: monero_wallet_core.cpp:2795
-
monero::monero_wallet_core::relay_txs
std::vector< std::string > relay_txs(const std::vector< std::string > &tx_metadatas) override
Definition: monero_wallet_core.cpp:2124
-
monero::monero_wallet_core::get_multisig_info
monero_multisig_info get_multisig_info() override
Definition: monero_wallet_core.cpp:2831
+
monero::monero_wallet_core::delete_address_book_entry
void delete_address_book_entry(uint64_t index) override
Definition: monero_wallet_core.cpp:2687
+
monero::monero_wallet_core::decode_integrated_address
monero_integrated_address decode_integrated_address(const std::string &integrated_address) const override
Definition: monero_wallet_core.cpp:1133
+
monero::monero_wallet_core::get_mnemonic
std::string get_mnemonic() const override
Definition: monero_wallet_core.cpp:1044
+
monero::monero_wallet_core::check_spend_proof
bool check_spend_proof(const std::string &tx_hash, const std::string &message, const std::string &signature) const override
Definition: monero_wallet_core.cpp:2523
+
monero::monero_wallet_core::prepare_multisig
std::string prepare_multisig() override
Definition: monero_wallet_core.cpp:2834
+
monero::monero_wallet_core::get_address_index
monero_subaddress get_address_index(const std::string &address) const override
Definition: monero_wallet_core.cpp:1082
+
monero::monero_wallet_core::is_multisig_import_needed
bool is_multisig_import_needed() const override
Definition: monero_wallet_core.cpp:2824
+
monero::monero_wallet_core::sync
monero_sync_result sync() override
Definition: monero_wallet_core.cpp:1195
+
monero::monero_wallet_core::make_multisig
monero_multisig_init_result make_multisig(const std::vector< std::string > &multisig_hexes, int threshold, const std::string &password) override
Definition: monero_wallet_core.cpp:2840
+
monero::monero_wallet_core::parse_payment_uri
std::shared_ptr< monero_tx_config > parse_payment_uri(const std::string &uri) const override
Definition: monero_wallet_core.cpp:2716
+
monero::monero_wallet_core::get_outputs_hex
std::string get_outputs_hex() const override
Definition: monero_wallet_core.cpp:1536
+
monero::monero_wallet_core::wait_for_next_block
uint64_t wait_for_next_block() override
Definition: monero_wallet_core.cpp:2792
+
monero::monero_wallet_core::relay_txs
std::vector< std::string > relay_txs(const std::vector< std::string > &tx_metadatas) override
Definition: monero_wallet_core.cpp:2115
+
monero::monero_wallet_core::get_multisig_info
monero_multisig_info get_multisig_info() override
Definition: monero_wallet_core.cpp:2828
monero::monero_output_query
Definition: monero_wallet_model.h:225
-
monero::monero_wallet_core::get_reserve_proof_account
std::string get_reserve_proof_account(uint32_t account_idx, uint64_t amount, const std::string &message) const override
Definition: monero_wallet_core.cpp:2551
+
monero::monero_wallet_core::get_reserve_proof_account
std::string get_reserve_proof_account(uint32_t account_idx, uint64_t amount, const std::string &message) const override
Definition: monero_wallet_core.cpp:2542
monero::monero_account
Definition: monero_wallet_model.h:96
-
monero::monero_wallet_core::rescan_blockchain
void rescan_blockchain() override
Definition: monero_wallet_core.cpp:1288
+
monero::monero_wallet_core::rescan_blockchain
void rescan_blockchain() override
Definition: monero_wallet_core.cpp:1267
monero::monero_rpc_connection
Definition: monero_daemon_model.h:109
-
monero::monero_wallet_core::wallet_exists
static bool wallet_exists(const std::string &path)
Definition: monero_wallet_core.cpp:845
+
monero::monero_wallet_core::wallet_exists
static bool wallet_exists(const std::string &path)
Definition: monero_wallet_core.cpp:824
monero::monero_subaddress
Definition: monero_wallet_model.h:79
-
monero::monero_wallet_core::get_height
uint64_t get_height() const override
Definition: monero_wallet_core.cpp:1170
-
monero::monero_wallet_core::get_txs
std::vector< std::shared_ptr< monero_tx_wallet > > get_txs() const override
Definition: monero_wallet_core.cpp:1408
-
monero::monero_wallet_core::get_mnemonic_languages
static std::vector< std::string > get_mnemonic_languages()
Definition: monero_wallet_core.cpp:973
-
monero::monero_wallet_core::stop_mining
void stop_mining() override
Definition: monero_wallet_core.cpp:2785
-
monero::monero_wallet_core::set_attribute
void set_attribute(const std::string &key, const std::string &val) override
Definition: monero_wallet_core.cpp:2751
-
monero::monero_wallet_core::sweep_output
std::shared_ptr< monero_tx_wallet > sweep_output(const monero_tx_config &config) override
Definition: monero_wallet_core.cpp:1918
-
monero::monero_wallet_core::create_wallet_from_mnemonic
static monero_wallet_core * create_wallet_from_mnemonic(const std::string &path, const std::string &password, const monero_network_type network_type, const std::string &mnemonic, const monero_rpc_connection &daemon_connection=monero_rpc_connection(), uint64_t restore_height=0, const std::string &seed_offset="", std::unique_ptr< epee::net_utils::http::http_client_factory > http_client_factory=nullptr)
Definition: monero_wallet_core.cpp:889
-
monero::monero_wallet_core::sign_message
std::string sign_message(const std::string &msg) const override
Definition: monero_wallet_core.cpp:2368
-
monero::monero_wallet_core::stop_syncing
void stop_syncing() override
Definition: monero_wallet_core.cpp:1276
-
monero::monero_wallet_core::get_public_spend_key
std::string get_public_spend_key() const override
Definition: monero_wallet_core.cpp:1087
-
monero::monero_wallet_core::set_tx_notes
void set_tx_notes(const std::vector< std::string > &tx_hashes, const std::vector< std::string > &notes) override
Definition: monero_wallet_core.cpp:2606
-
monero::monero_wallet_core::get_balance
uint64_t get_balance() const override
Definition: monero_wallet_core.cpp:1297
-
monero::monero_wallet_core::get_daemon_connection
boost::optional< monero_rpc_connection > get_daemon_connection() const override
Definition: monero_wallet_core.cpp:1012
+
monero::monero_wallet_core::get_height
uint64_t get_height() const override
Definition: monero_wallet_core.cpp:1149
+
monero::monero_wallet_core::get_txs
std::vector< std::shared_ptr< monero_tx_wallet > > get_txs() const override
Definition: monero_wallet_core.cpp:1387
+
monero::monero_wallet_core::get_mnemonic_languages
static std::vector< std::string > get_mnemonic_languages()
Definition: monero_wallet_core.cpp:952
+
monero::monero_wallet_core::stop_mining
void stop_mining() override
Definition: monero_wallet_core.cpp:2782
+
monero::monero_wallet_core::set_attribute
void set_attribute(const std::string &key, const std::string &val) override
Definition: monero_wallet_core.cpp:2748
+
monero::monero_wallet_core::sweep_output
std::shared_ptr< monero_tx_wallet > sweep_output(const monero_tx_config &config) override
Definition: monero_wallet_core.cpp:1903
+
monero::monero_wallet_core::create_wallet_from_mnemonic
static monero_wallet_core * create_wallet_from_mnemonic(const std::string &path, const std::string &password, const monero_network_type network_type, const std::string &mnemonic, const monero_rpc_connection &daemon_connection=monero_rpc_connection(), uint64_t restore_height=0, const std::string &seed_offset="", std::unique_ptr< epee::net_utils::http::http_client_factory > http_client_factory=nullptr)
Definition: monero_wallet_core.cpp:868
+
monero::monero_wallet_core::sign_message
std::string sign_message(const std::string &msg) const override
Definition: monero_wallet_core.cpp:2359
+
monero::monero_wallet_core::stop_syncing
void stop_syncing() override
Definition: monero_wallet_core.cpp:1255
+
monero::monero_wallet_core::get_public_spend_key
std::string get_public_spend_key() const override
Definition: monero_wallet_core.cpp:1066
+
monero::monero_wallet_core::set_tx_notes
void set_tx_notes(const std::vector< std::string > &tx_hashes, const std::vector< std::string > &notes) override
Definition: monero_wallet_core.cpp:2597
+
monero::monero_wallet_core::get_balance
uint64_t get_balance() const override
Definition: monero_wallet_core.cpp:1276
+
monero::monero_wallet_core::get_daemon_connection
boost::optional< monero_rpc_connection > get_daemon_connection() const override
Definition: monero_wallet_core.cpp:991
monero::monero_transfer_query
Definition: monero_wallet_model.h:183
monero::monero_network_type
monero_network_type
Definition: monero_daemon_model.h:90
-
monero::monero_wallet_core::get_outputs
std::vector< std::shared_ptr< monero_output_wallet > > get_outputs(const monero_output_query &query) const override
Definition: monero_wallet_core.cpp:1536
-
monero::monero_wallet_core::get_reserve_proof_wallet
std::string get_reserve_proof_wallet(const std::string &message) const override
Definition: monero_wallet_core.cpp:2545
-
monero::monero_wallet_core::get_mnemonic_language
std::string get_mnemonic_language() const override
Definition: monero_wallet_core.cpp:1072
-
monero::monero_wallet_core::save
void save() override
Definition: monero_wallet_core.cpp:2994
+
monero::monero_wallet_core::get_outputs
std::vector< std::shared_ptr< monero_output_wallet > > get_outputs(const monero_output_query &query) const override
Definition: monero_wallet_core.cpp:1515
+
monero::monero_wallet_core::get_reserve_proof_wallet
std::string get_reserve_proof_wallet(const std::string &message) const override
Definition: monero_wallet_core.cpp:2536
+
monero::monero_wallet_core::get_mnemonic_language
std::string get_mnemonic_language() const override
Definition: monero_wallet_core.cpp:1051
+
monero::monero_wallet_core::save
void save() override
Definition: monero_wallet_core.cpp:2991
monero::monero_wallet_core
Definition: monero_wallet_core.h:77
-
monero::monero_wallet_core::parse_tx_set
monero_tx_set parse_tx_set(const monero_tx_set &tx_set) override
Definition: monero_wallet_core.cpp:2162
-
monero::monero_wallet_core::sign_multisig_tx_hex
monero_multisig_sign_result sign_multisig_tx_hex(const std::string &multisig_tx_hex) override
Definition: monero_wallet_core.cpp:2910
-
monero::monero_wallet_core::get_tx_proof
std::string get_tx_proof(const std::string &tx_hash, const std::string &address, const std::string &message) const override
Definition: monero_wallet_core.cpp:2472
-
monero::monero_wallet_core::submit_txs
std::vector< std::string > submit_txs(const std::string &signed_tx_hex) override
Definition: monero_wallet_core.cpp:2343
-
monero::monero_wallet_core::get_spend_proof
std::string get_spend_proof(const std::string &tx_hash, const std::string &message) const override
Definition: monero_wallet_core.cpp:2519
-
monero::monero_wallet_core::exchange_multisig_keys
monero_multisig_init_result exchange_multisig_keys(const std::vector< std::string > &mutisig_hexes, const std::string &password) override
Definition: monero_wallet_core.cpp:2853
-
monero::monero_wallet_core::rescan_spent
void rescan_spent() override
Definition: monero_wallet_core.cpp:1280
-
monero::monero_wallet_core::remove_listener
void remove_listener(monero_wallet_listener &listener) override
Definition: monero_wallet_core.cpp:1205
-
monero::monero_wallet_core::start_syncing
void start_syncing() override
Definition: monero_wallet_core.cpp:1265
+
monero::monero_wallet_core::parse_tx_set
monero_tx_set parse_tx_set(const monero_tx_set &tx_set) override
Definition: monero_wallet_core.cpp:2153
+
monero::monero_wallet_core::sign_multisig_tx_hex
monero_multisig_sign_result sign_multisig_tx_hex(const std::string &multisig_tx_hex) override
Definition: monero_wallet_core.cpp:2907
+
monero::monero_wallet_core::get_tx_proof
std::string get_tx_proof(const std::string &tx_hash, const std::string &address, const std::string &message) const override
Definition: monero_wallet_core.cpp:2463
+
monero::monero_wallet_core::submit_txs
std::vector< std::string > submit_txs(const std::string &signed_tx_hex) override
Definition: monero_wallet_core.cpp:2334
+
monero::monero_wallet_core::get_spend_proof
std::string get_spend_proof(const std::string &tx_hash, const std::string &message) const override
Definition: monero_wallet_core.cpp:2510
+
monero::monero_wallet_core::exchange_multisig_keys
monero_multisig_init_result exchange_multisig_keys(const std::vector< std::string > &mutisig_hexes, const std::string &password) override
Definition: monero_wallet_core.cpp:2850
+
monero::monero_wallet_core::rescan_spent
void rescan_spent() override
Definition: monero_wallet_core.cpp:1259
+
monero::monero_wallet_core::remove_listener
void remove_listener(monero_wallet_listener &listener) override
Definition: monero_wallet_core.cpp:1184
+
monero::monero_wallet_core::start_syncing
void start_syncing() override
Definition: monero_wallet_core.cpp:1244
monero::monero_tx_config
Definition: monero_wallet_model.h:343
-
monero::monero_wallet_core::add_address_book_entry
uint64_t add_address_book_entry(const std::string &address, const std::string &description) override
Definition: monero_wallet_core.cpp:2640
-
monero::monero_wallet_core::is_daemon_trusted
bool is_daemon_trusted() const override
Definition: monero_wallet_core.cpp:1041
-
monero::wallet2_listener
Definition: monero_wallet_core.cpp:688
-
monero::monero_wallet_core::get_subaddresses
std::vector< monero_subaddress > get_subaddresses(const uint32_t account_idx, const std::vector< uint32_t > &subaddress_indices) const override
Definition: monero_wallet_core.cpp:1379
+
monero::monero_wallet_core::add_address_book_entry
uint64_t add_address_book_entry(const std::string &address, const std::string &description) override
Definition: monero_wallet_core.cpp:2637
+
monero::monero_wallet_core::is_daemon_trusted
bool is_daemon_trusted() const override
Definition: monero_wallet_core.cpp:1020
+
monero::wallet2_listener
Definition: monero_wallet_core.cpp:679
+
monero::monero_wallet_core::get_subaddresses
std::vector< monero_subaddress > get_subaddresses(const uint32_t account_idx, const std::vector< uint32_t > &subaddress_indices) const override
Definition: monero_wallet_core.cpp:1358
diff --git a/docs/monero__wallet__model_8h_source.html b/docs/monero__wallet__model_8h_source.html index 45fe333..e143df9 100644 --- a/docs/monero__wallet__model_8h_source.html +++ b/docs/monero__wallet__model_8h_source.html @@ -69,55 +69,55 @@ $(function() {
monero_wallet_model.h
-
1 
53 #pragma once
54 
55 #include "daemon/monero_daemon_model.h"
56 
57 using namespace monero;
58 
62 namespace monero {
63 
67  struct monero_sync_result : public serializable_struct {
68  uint64_t m_num_blocks_fetched;
69  bool m_received_money;
70  monero_sync_result() {}
71  monero_sync_result(const uint64_t num_blocks_fetched, const bool received_money) : m_num_blocks_fetched(num_blocks_fetched), m_received_money(received_money) {}
72 
73  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
74  };
75 
79  struct monero_subaddress : public serializable_struct {
80  boost::optional<uint32_t> m_account_index;
81  boost::optional<uint32_t> m_index;
82  boost::optional<std::string> m_address;
83  boost::optional<std::string> m_label;
84  boost::optional<uint64_t> m_balance;
85  boost::optional<uint64_t> m_unlocked_balance;
86  boost::optional<uint64_t> m_num_unspent_outputs;
87  boost::optional<bool> m_is_used;
88  boost::optional<uint64_t> m_num_blocks_to_unlock;
89 
90  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
91  };
92 
96  struct monero_account : public serializable_struct {
97  boost::optional<uint32_t> m_index;
98  boost::optional<std::string> m_primary_address;
99  boost::optional<uint64_t> m_balance;
100  boost::optional<uint64_t> m_unlocked_balance;
101  boost::optional<std::string> m_tag;
102  std::vector<monero_subaddress> m_subaddresses;
103 
104  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
105  };
106 
110  struct monero_destination {
111  boost::optional<std::string> m_address;
112  boost::optional<uint64_t> m_amount;
113 
114  monero_destination(boost::optional<std::string> address = boost::none, boost::optional<uint64_t> amount = boost::none) : m_address(address), m_amount(amount) {}
115  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
116  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_destination>& destination);
117  std::shared_ptr<monero_destination> copy(const std::shared_ptr<monero_destination>& src, const std::shared_ptr<monero_destination>& tgt) const;
118  };
119 
120  // forward declarations
121  struct monero_tx_wallet;
122  struct monero_tx_query;
123  struct monero_tx_set;
124 
130  struct monero_transfer : serializable_struct {
131  std::shared_ptr<monero_tx_wallet> m_tx;
132  boost::optional<uint64_t> m_amount;
133  boost::optional<uint32_t> m_account_index;
134  boost::optional<uint64_t> m_num_suggested_confirmations;
135 
136  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
137  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_transfer>& transfer);
138  virtual boost::optional<bool> is_incoming() const = 0; // derived class must implement
139  std::shared_ptr<monero_transfer> copy(const std::shared_ptr<monero_transfer>& src, const std::shared_ptr<monero_transfer>& tgt) const;
140  boost::optional<bool> is_outgoing() const {
141  if (is_incoming() == boost::none) return boost::none;
142  return !(*is_incoming());
143  }
144  void merge(const std::shared_ptr<monero_transfer>& self, const std::shared_ptr<monero_transfer>& other);
145  };
146 
150  struct monero_incoming_transfer : public monero_transfer {
151  boost::optional<uint32_t> m_subaddress_index;
152  boost::optional<std::string> m_address;
153 
154  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
155  std::shared_ptr<monero_incoming_transfer> copy(const std::shared_ptr<monero_transfer>& src, const std::shared_ptr<monero_transfer>& tgt) const;
156  std::shared_ptr<monero_incoming_transfer> copy(const std::shared_ptr<monero_incoming_transfer>& src, const std::shared_ptr<monero_incoming_transfer>& tgt) const;
157  boost::optional<bool> is_incoming() const;
158  void merge(const std::shared_ptr<monero_transfer>& self, const std::shared_ptr<monero_transfer>& other);
159  void merge(const std::shared_ptr<monero_incoming_transfer>& self, const std::shared_ptr<monero_incoming_transfer>& other);
160  };
161 
165  struct monero_outgoing_transfer : public monero_transfer {
166  std::vector<uint32_t> m_subaddress_indices;
167  std::vector<std::string> m_addresses;
168  std::vector<std::shared_ptr<monero_destination>> m_destinations;
169 
170  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
171  std::shared_ptr<monero_outgoing_transfer> copy(const std::shared_ptr<monero_transfer>& src, const std::shared_ptr<monero_transfer>& tgt) const;
172  std::shared_ptr<monero_outgoing_transfer> copy(const std::shared_ptr<monero_outgoing_transfer>& src, const std::shared_ptr<monero_outgoing_transfer>& tgt) const;
173  boost::optional<bool> is_incoming() const;
174  void merge(const std::shared_ptr<monero_transfer>& self, const std::shared_ptr<monero_transfer>& other);
175  void merge(const std::shared_ptr<monero_outgoing_transfer>& self, const std::shared_ptr<monero_outgoing_transfer>& other);
176  };
177 
183  struct monero_transfer_query : public monero_transfer {
184  boost::optional<bool> m_is_incoming;
185  boost::optional<std::string> m_address;
186  std::vector<std::string> m_addresses;
187  boost::optional<uint32_t> m_subaddress_index;
188  std::vector<uint32_t> m_subaddress_indices;
189  std::vector<std::shared_ptr<monero_destination>> m_destinations;
190  boost::optional<bool> m_has_destinations;
191  boost::optional<std::shared_ptr<monero_tx_query>> m_tx_query;
192 
193  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
194  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_transfer_query>& transfer_query);
195  static std::shared_ptr<monero_transfer_query> deserialize_from_block(const std::string& transfer_query_json);
196  std::shared_ptr<monero_transfer_query> copy(const std::shared_ptr<monero_transfer>& src, const std::shared_ptr<monero_transfer>& tgt) const;
197  std::shared_ptr<monero_transfer_query> copy(const std::shared_ptr<monero_transfer_query>& src, const std::shared_ptr<monero_transfer_query>& tgt) const;
198  boost::optional<bool> is_incoming() const;
199  bool meets_criteria(monero_transfer* transfer, bool query_parent = true) const;
200  };
201 
205  struct monero_output_wallet : public monero_output {
206  boost::optional<uint32_t> m_account_index;
207  boost::optional<uint32_t> m_subaddress_index;
208  boost::optional<bool> m_is_spent;
209  boost::optional<bool> m_is_frozen;
210 
211  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
212  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_output_wallet>& output_wallet);
213  std::shared_ptr<monero_output_wallet> copy(const std::shared_ptr<monero_output>& src, const std::shared_ptr<monero_output>& tgt) const;
214  std::shared_ptr<monero_output_wallet> copy(const std::shared_ptr<monero_output_wallet>& src, const std::shared_ptr<monero_output_wallet>& tgt) const;
215  void merge(const std::shared_ptr<monero_output>& self, const std::shared_ptr<monero_output>& other);
216  void merge(const std::shared_ptr<monero_output_wallet>& self, const std::shared_ptr<monero_output_wallet>& other);
217  };
218 
225  struct monero_output_query : public monero_output_wallet {
226  std::vector<uint32_t> m_subaddress_indices;
227  boost::optional<uint64_t> m_min_amount;
228  boost::optional<uint64_t> m_max_amount;
229  boost::optional<std::shared_ptr<monero_tx_query>> m_tx_query;
230 
231  //boost::property_tree::ptree to_property_tree() const;
232  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
233  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_output_query>& output_query);
234  static std::shared_ptr<monero_output_query> deserialize_from_block(const std::string& output_query_json);
235  std::shared_ptr<monero_output_query> copy(const std::shared_ptr<monero_output>& src, const std::shared_ptr<monero_output>& tgt) const;
236  std::shared_ptr<monero_output_query> copy(const std::shared_ptr<monero_output_wallet>& src, const std::shared_ptr<monero_output_wallet>& tgt) const; // TODO: necessary to override all super classes?
237  std::shared_ptr<monero_output_query> copy(const std::shared_ptr<monero_output_query>& src, const std::shared_ptr<monero_output_query>& tgt) const;
238  bool meets_criteria(monero_output_wallet* output, bool query_parent = true) const;
239  };
240 
244  struct monero_tx_wallet : public monero_tx {
245  boost::optional<std::shared_ptr<monero_tx_set>> m_tx_set;
246  boost::optional<bool> m_is_incoming;
247  boost::optional<bool> m_is_outgoing;
248  std::vector<std::shared_ptr<monero_incoming_transfer>> m_incoming_transfers;
249  boost::optional<std::shared_ptr<monero_outgoing_transfer>> m_outgoing_transfer;
250  boost::optional<std::string> m_note;
251  boost::optional<bool> m_is_locked;
252  boost::optional<uint64_t> m_input_sum;
253  boost::optional<uint64_t> m_output_sum;
254  boost::optional<std::string> m_change_address;
255  boost::optional<uint64_t> m_change_amount;
256  boost::optional<uint32_t> m_num_dummy_outputs;
257  boost::optional<std::string> m_extra_hex;
258 
259  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
260  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_tx_wallet>& tx_wallet);
261  std::shared_ptr<monero_tx_wallet> copy(const std::shared_ptr<monero_tx>& src, const std::shared_ptr<monero_tx>& tgt) const;
262  std::shared_ptr<monero_tx_wallet> copy(const std::shared_ptr<monero_tx_wallet>& src, const std::shared_ptr<monero_tx_wallet>& tgt) const;
263  void merge(const std::shared_ptr<monero_tx>& self, const std::shared_ptr<monero_tx>& other);
264  void merge(const std::shared_ptr<monero_tx_wallet>& self, const std::shared_ptr<monero_tx_wallet>& other);
265  std::vector<std::shared_ptr<monero_transfer>> get_transfers() const;
266  std::vector<std::shared_ptr<monero_transfer>> get_transfers(const monero_transfer_query& query) const;
267  std::vector<std::shared_ptr<monero_transfer>> filter_transfers(const monero_transfer_query& query);
268  std::vector<std::shared_ptr<monero_output_wallet>> get_outputs_wallet() const;
269  std::vector<std::shared_ptr<monero_output_wallet>> get_outputs_wallet(const monero_output_query& query) const;
270  std::vector<std::shared_ptr<monero_output_wallet>> filter_outputs_wallet(const monero_output_query& query);
271  };
272 
278  struct monero_tx_query : public monero_tx_wallet {
279  boost::optional<bool> m_is_outgoing;
280  boost::optional<bool> m_is_incoming;
281  std::vector<std::string> m_hashes;
282  boost::optional<bool> m_has_payment_id;
283  std::vector<std::string> m_payment_ids;
284  boost::optional<uint64_t> m_height;
285  boost::optional<uint64_t> m_min_height;
286  boost::optional<uint64_t> m_max_height;
287  boost::optional<uint64_t> m_include_outputs;
288  boost::optional<std::shared_ptr<monero_transfer_query>> m_transfer_query;
289  boost::optional<std::shared_ptr<monero_output_query>> m_output_query;
290 
291  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
292  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_tx_query>& tx_query);
293  static std::shared_ptr<monero_tx_query> deserialize_from_block(const std::string& tx_query_json);
294  std::shared_ptr<monero_tx_query> copy(const std::shared_ptr<monero_tx>& src, const std::shared_ptr<monero_tx>& tgt) const;
295  std::shared_ptr<monero_tx_query> copy(const std::shared_ptr<monero_tx_wallet>& src, const std::shared_ptr<monero_tx_wallet>& tgt) const; // TODO: necessary to override all super classes?
296  std::shared_ptr<monero_tx_query> copy(const std::shared_ptr<monero_tx_query>& src, const std::shared_ptr<monero_tx_query>& tgt) const;
297  bool meets_criteria(monero_tx_wallet* tx, bool query_children = true) const;
298  };
299 
308  struct monero_tx_set : public serializable_struct {
309  std::vector<std::shared_ptr<monero_tx_wallet>> m_txs;
310  boost::optional<std::string> m_signed_tx_hex;
311  boost::optional<std::string> m_unsigned_tx_hex;
312  boost::optional<std::string> m_multisig_tx_hex;
313 
314  //boost::property_tree::ptree to_property_tree() const;
315  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
316  static monero_tx_set deserialize(const std::string& tx_set_json);
317  };
318 
322  struct monero_integrated_address : public serializable_struct {
323  std::string m_standard_address;
324  std::string m_payment_id;
325  std::string m_integrated_address;
326 
327  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
328  };
329 
333  enum monero_tx_priority : uint8_t {
334  DEFAULT = 0,
335  UNIMPORTANT,
336  NORMAL,
337  ELEVATED
338  };
339 
343  struct monero_tx_config : public serializable_struct {
344  boost::optional<std::string> m_address;
345  boost::optional<uint64_t> m_amount;
346  std::vector<std::shared_ptr<monero_destination>> m_destinations;
347  boost::optional<std::string> m_payment_id;
348  boost::optional<monero_tx_priority> m_priority;
349  boost::optional<uint32_t> m_ring_size;
350  boost::optional<uint64_t> m_fee;
351  boost::optional<uint32_t> m_account_index;
352  std::vector<uint32_t> m_subaddress_indices;
353  boost::optional<uint64_t> m_unlock_time;
354  boost::optional<bool> m_can_split;
355  boost::optional<bool> m_relay;
356  boost::optional<std::string> m_note;
357  boost::optional<std::string> m_recipient_name;
358  boost::optional<uint64_t> m_below_amount;
359  boost::optional<bool> m_sweep_each_subaddress;
360  boost::optional<std::string> m_key_image;
361 
362  monero_tx_config() {}
363  monero_tx_config(const monero_tx_config& config);
364  monero_tx_config copy() const;
365  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
366  static std::shared_ptr<monero_tx_config> deserialize(const std::string& config_json);
367  std::vector<std::shared_ptr<monero_destination>> get_normalized_destinations() const;
368  };
369 
373  struct monero_key_image_import_result : public serializable_struct {
374  boost::optional<uint64_t> m_height;
375  boost::optional<uint64_t> m_spent_amount;
376  boost::optional<uint64_t> m_unspent_amount;
377 
378  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
379  };
380 
384  struct monero_check : public serializable_struct {
385  bool m_is_good;
386 
387  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
388  };
389 
393  struct monero_check_tx : public monero_check {
394  boost::optional<bool> m_in_tx_pool;
395  boost::optional<uint64_t> m_num_confirmations;
396  boost::optional<uint64_t> m_received_amount;
397 
398  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
399  };
400 
404  struct monero_check_reserve : public monero_check {
405  boost::optional<uint64_t> m_total_amount;
406  boost::optional<uint64_t> m_unconfirmed_spent_amount;
407 
408  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
409  };
410 
414  struct monero_multisig_info : serializable_struct {
415  bool m_is_multisig;
416  bool m_is_ready;
417  uint32_t m_threshold;
418  uint32_t m_num_participants;
419 
420  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
421  };
422 
428  struct monero_multisig_init_result : serializable_struct {
429  boost::optional<std::string> m_address;
430  boost::optional<std::string> m_multisig_hex;
431 
432  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
433  };
434 
438  struct monero_multisig_sign_result : serializable_struct {
439  boost::optional<std::string> m_signed_multisig_tx_hex;
440  std::vector<std::string> m_tx_hashes;
441 
442  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
443  };
444 
448  struct monero_address_book_entry : serializable_struct {
449  boost::optional<uint64_t> m_index; // TODO: not boost::optional
450  boost::optional<std::string> m_address;
451  boost::optional<std::string> m_description;
452  boost::optional<std::string> m_payment_id;
453 
454  monero_address_book_entry() {}
455  monero_address_book_entry(uint64_t index, const std::string& address, const std::string& description, const std::string& payment_id) : m_index(index), m_address(address), m_description(description), m_payment_id(payment_id) {}
456  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
457  };
458 }
monero::monero_multisig_info
Definition: monero_wallet_model.h:414
+
1 
53 #pragma once
54 
55 #include "daemon/monero_daemon_model.h"
56 
57 using namespace monero;
58 
62 namespace monero {
63 
67  struct monero_sync_result : public serializable_struct {
68  uint64_t m_num_blocks_fetched;
69  bool m_received_money;
70  monero_sync_result() {}
71  monero_sync_result(const uint64_t num_blocks_fetched, const bool received_money) : m_num_blocks_fetched(num_blocks_fetched), m_received_money(received_money) {}
72 
73  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
74  };
75 
79  struct monero_subaddress : public serializable_struct {
80  boost::optional<uint32_t> m_account_index;
81  boost::optional<uint32_t> m_index;
82  boost::optional<std::string> m_address;
83  boost::optional<std::string> m_label;
84  boost::optional<uint64_t> m_balance;
85  boost::optional<uint64_t> m_unlocked_balance;
86  boost::optional<uint64_t> m_num_unspent_outputs;
87  boost::optional<bool> m_is_used;
88  boost::optional<uint64_t> m_num_blocks_to_unlock;
89 
90  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
91  };
92 
96  struct monero_account : public serializable_struct {
97  boost::optional<uint32_t> m_index;
98  boost::optional<std::string> m_primary_address;
99  boost::optional<uint64_t> m_balance;
100  boost::optional<uint64_t> m_unlocked_balance;
101  boost::optional<std::string> m_tag;
102  std::vector<monero_subaddress> m_subaddresses;
103 
104  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
105  };
106 
110  struct monero_destination {
111  boost::optional<std::string> m_address;
112  boost::optional<uint64_t> m_amount;
113 
114  monero_destination(boost::optional<std::string> address = boost::none, boost::optional<uint64_t> amount = boost::none) : m_address(address), m_amount(amount) {}
115  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
116  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_destination>& destination);
117  std::shared_ptr<monero_destination> copy(const std::shared_ptr<monero_destination>& src, const std::shared_ptr<monero_destination>& tgt) const;
118  };
119 
120  // forward declarations
121  struct monero_tx_wallet;
122  struct monero_tx_query;
123  struct monero_tx_set;
124 
130  struct monero_transfer : serializable_struct {
131  std::shared_ptr<monero_tx_wallet> m_tx;
132  boost::optional<uint64_t> m_amount;
133  boost::optional<uint32_t> m_account_index;
134 
135  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
136  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_transfer>& transfer);
137  virtual boost::optional<bool> is_incoming() const = 0; // derived class must implement
138  std::shared_ptr<monero_transfer> copy(const std::shared_ptr<monero_transfer>& src, const std::shared_ptr<monero_transfer>& tgt) const;
139  boost::optional<bool> is_outgoing() const {
140  if (is_incoming() == boost::none) return boost::none;
141  return !(*is_incoming());
142  }
143  void merge(const std::shared_ptr<monero_transfer>& self, const std::shared_ptr<monero_transfer>& other);
144  };
145 
149  struct monero_incoming_transfer : public monero_transfer {
150  boost::optional<uint32_t> m_subaddress_index;
151  boost::optional<std::string> m_address;
152  boost::optional<uint64_t> m_num_suggested_confirmations;
153 
154  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
155  std::shared_ptr<monero_incoming_transfer> copy(const std::shared_ptr<monero_transfer>& src, const std::shared_ptr<monero_transfer>& tgt) const;
156  std::shared_ptr<monero_incoming_transfer> copy(const std::shared_ptr<monero_incoming_transfer>& src, const std::shared_ptr<monero_incoming_transfer>& tgt) const;
157  boost::optional<bool> is_incoming() const;
158  void merge(const std::shared_ptr<monero_transfer>& self, const std::shared_ptr<monero_transfer>& other);
159  void merge(const std::shared_ptr<monero_incoming_transfer>& self, const std::shared_ptr<monero_incoming_transfer>& other);
160  };
161 
165  struct monero_outgoing_transfer : public monero_transfer {
166  std::vector<uint32_t> m_subaddress_indices;
167  std::vector<std::string> m_addresses;
168  std::vector<std::shared_ptr<monero_destination>> m_destinations;
169 
170  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
171  std::shared_ptr<monero_outgoing_transfer> copy(const std::shared_ptr<monero_transfer>& src, const std::shared_ptr<monero_transfer>& tgt) const;
172  std::shared_ptr<monero_outgoing_transfer> copy(const std::shared_ptr<monero_outgoing_transfer>& src, const std::shared_ptr<monero_outgoing_transfer>& tgt) const;
173  boost::optional<bool> is_incoming() const;
174  void merge(const std::shared_ptr<monero_transfer>& self, const std::shared_ptr<monero_transfer>& other);
175  void merge(const std::shared_ptr<monero_outgoing_transfer>& self, const std::shared_ptr<monero_outgoing_transfer>& other);
176  };
177 
183  struct monero_transfer_query : public monero_transfer {
184  boost::optional<bool> m_is_incoming;
185  boost::optional<std::string> m_address;
186  std::vector<std::string> m_addresses;
187  boost::optional<uint32_t> m_subaddress_index;
188  std::vector<uint32_t> m_subaddress_indices;
189  std::vector<std::shared_ptr<monero_destination>> m_destinations;
190  boost::optional<bool> m_has_destinations;
191  boost::optional<std::shared_ptr<monero_tx_query>> m_tx_query;
192 
193  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
194  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_transfer_query>& transfer_query);
195  static std::shared_ptr<monero_transfer_query> deserialize_from_block(const std::string& transfer_query_json);
196  std::shared_ptr<monero_transfer_query> copy(const std::shared_ptr<monero_transfer>& src, const std::shared_ptr<monero_transfer>& tgt) const;
197  std::shared_ptr<monero_transfer_query> copy(const std::shared_ptr<monero_transfer_query>& src, const std::shared_ptr<monero_transfer_query>& tgt) const;
198  boost::optional<bool> is_incoming() const;
199  bool meets_criteria(monero_transfer* transfer, bool query_parent = true) const;
200  };
201 
205  struct monero_output_wallet : public monero_output {
206  boost::optional<uint32_t> m_account_index;
207  boost::optional<uint32_t> m_subaddress_index;
208  boost::optional<bool> m_is_spent;
209  boost::optional<bool> m_is_frozen;
210 
211  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
212  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_output_wallet>& output_wallet);
213  std::shared_ptr<monero_output_wallet> copy(const std::shared_ptr<monero_output>& src, const std::shared_ptr<monero_output>& tgt) const;
214  std::shared_ptr<monero_output_wallet> copy(const std::shared_ptr<monero_output_wallet>& src, const std::shared_ptr<monero_output_wallet>& tgt) const;
215  void merge(const std::shared_ptr<monero_output>& self, const std::shared_ptr<monero_output>& other);
216  void merge(const std::shared_ptr<monero_output_wallet>& self, const std::shared_ptr<monero_output_wallet>& other);
217  };
218 
225  struct monero_output_query : public monero_output_wallet {
226  std::vector<uint32_t> m_subaddress_indices;
227  boost::optional<uint64_t> m_min_amount;
228  boost::optional<uint64_t> m_max_amount;
229  boost::optional<std::shared_ptr<monero_tx_query>> m_tx_query;
230 
231  //boost::property_tree::ptree to_property_tree() const;
232  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
233  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_output_query>& output_query);
234  static std::shared_ptr<monero_output_query> deserialize_from_block(const std::string& output_query_json);
235  std::shared_ptr<monero_output_query> copy(const std::shared_ptr<monero_output>& src, const std::shared_ptr<monero_output>& tgt) const;
236  std::shared_ptr<monero_output_query> copy(const std::shared_ptr<monero_output_wallet>& src, const std::shared_ptr<monero_output_wallet>& tgt) const; // TODO: necessary to override all super classes?
237  std::shared_ptr<monero_output_query> copy(const std::shared_ptr<monero_output_query>& src, const std::shared_ptr<monero_output_query>& tgt) const;
238  bool meets_criteria(monero_output_wallet* output, bool query_parent = true) const;
239  };
240 
244  struct monero_tx_wallet : public monero_tx {
245  boost::optional<std::shared_ptr<monero_tx_set>> m_tx_set;
246  boost::optional<bool> m_is_incoming;
247  boost::optional<bool> m_is_outgoing;
248  std::vector<std::shared_ptr<monero_incoming_transfer>> m_incoming_transfers;
249  boost::optional<std::shared_ptr<monero_outgoing_transfer>> m_outgoing_transfer;
250  boost::optional<std::string> m_note;
251  boost::optional<bool> m_is_locked;
252  boost::optional<uint64_t> m_input_sum;
253  boost::optional<uint64_t> m_output_sum;
254  boost::optional<std::string> m_change_address;
255  boost::optional<uint64_t> m_change_amount;
256  boost::optional<uint32_t> m_num_dummy_outputs;
257  boost::optional<std::string> m_extra_hex;
258 
259  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
260  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_tx_wallet>& tx_wallet);
261  std::shared_ptr<monero_tx_wallet> copy(const std::shared_ptr<monero_tx>& src, const std::shared_ptr<monero_tx>& tgt) const;
262  std::shared_ptr<monero_tx_wallet> copy(const std::shared_ptr<monero_tx_wallet>& src, const std::shared_ptr<monero_tx_wallet>& tgt) const;
263  void merge(const std::shared_ptr<monero_tx>& self, const std::shared_ptr<monero_tx>& other);
264  void merge(const std::shared_ptr<monero_tx_wallet>& self, const std::shared_ptr<monero_tx_wallet>& other);
265  std::vector<std::shared_ptr<monero_transfer>> get_transfers() const;
266  std::vector<std::shared_ptr<monero_transfer>> get_transfers(const monero_transfer_query& query) const;
267  std::vector<std::shared_ptr<monero_transfer>> filter_transfers(const monero_transfer_query& query);
268  std::vector<std::shared_ptr<monero_output_wallet>> get_outputs_wallet() const;
269  std::vector<std::shared_ptr<monero_output_wallet>> get_outputs_wallet(const monero_output_query& query) const;
270  std::vector<std::shared_ptr<monero_output_wallet>> filter_outputs_wallet(const monero_output_query& query);
271  };
272 
278  struct monero_tx_query : public monero_tx_wallet {
279  boost::optional<bool> m_is_outgoing;
280  boost::optional<bool> m_is_incoming;
281  std::vector<std::string> m_hashes;
282  boost::optional<bool> m_has_payment_id;
283  std::vector<std::string> m_payment_ids;
284  boost::optional<uint64_t> m_height;
285  boost::optional<uint64_t> m_min_height;
286  boost::optional<uint64_t> m_max_height;
287  boost::optional<uint64_t> m_include_outputs;
288  boost::optional<std::shared_ptr<monero_transfer_query>> m_transfer_query;
289  boost::optional<std::shared_ptr<monero_output_query>> m_output_query;
290 
291  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
292  static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr<monero_tx_query>& tx_query);
293  static std::shared_ptr<monero_tx_query> deserialize_from_block(const std::string& tx_query_json);
294  std::shared_ptr<monero_tx_query> copy(const std::shared_ptr<monero_tx>& src, const std::shared_ptr<monero_tx>& tgt) const;
295  std::shared_ptr<monero_tx_query> copy(const std::shared_ptr<monero_tx_wallet>& src, const std::shared_ptr<monero_tx_wallet>& tgt) const; // TODO: necessary to override all super classes?
296  std::shared_ptr<monero_tx_query> copy(const std::shared_ptr<monero_tx_query>& src, const std::shared_ptr<monero_tx_query>& tgt) const;
297  bool meets_criteria(monero_tx_wallet* tx, bool query_children = true) const;
298  };
299 
308  struct monero_tx_set : public serializable_struct {
309  std::vector<std::shared_ptr<monero_tx_wallet>> m_txs;
310  boost::optional<std::string> m_signed_tx_hex;
311  boost::optional<std::string> m_unsigned_tx_hex;
312  boost::optional<std::string> m_multisig_tx_hex;
313 
314  //boost::property_tree::ptree to_property_tree() const;
315  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
316  static monero_tx_set deserialize(const std::string& tx_set_json);
317  };
318 
322  struct monero_integrated_address : public serializable_struct {
323  std::string m_standard_address;
324  std::string m_payment_id;
325  std::string m_integrated_address;
326 
327  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
328  };
329 
333  enum monero_tx_priority : uint8_t {
334  DEFAULT = 0,
335  UNIMPORTANT,
336  NORMAL,
337  ELEVATED
338  };
339 
343  struct monero_tx_config : public serializable_struct {
344  boost::optional<std::string> m_address;
345  boost::optional<uint64_t> m_amount;
346  std::vector<std::shared_ptr<monero_destination>> m_destinations;
347  boost::optional<std::string> m_payment_id;
348  boost::optional<monero_tx_priority> m_priority;
349  boost::optional<uint32_t> m_ring_size;
350  boost::optional<uint64_t> m_fee;
351  boost::optional<uint32_t> m_account_index;
352  std::vector<uint32_t> m_subaddress_indices;
353  boost::optional<uint64_t> m_unlock_time;
354  boost::optional<bool> m_can_split;
355  boost::optional<bool> m_relay;
356  boost::optional<std::string> m_note;
357  boost::optional<std::string> m_recipient_name;
358  boost::optional<uint64_t> m_below_amount;
359  boost::optional<bool> m_sweep_each_subaddress;
360  boost::optional<std::string> m_key_image;
361 
362  monero_tx_config() {}
363  monero_tx_config(const monero_tx_config& config);
364  monero_tx_config copy() const;
365  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
366  static std::shared_ptr<monero_tx_config> deserialize(const std::string& config_json);
367  std::vector<std::shared_ptr<monero_destination>> get_normalized_destinations() const;
368  };
369 
373  struct monero_key_image_import_result : public serializable_struct {
374  boost::optional<uint64_t> m_height;
375  boost::optional<uint64_t> m_spent_amount;
376  boost::optional<uint64_t> m_unspent_amount;
377 
378  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
379  };
380 
384  struct monero_check : public serializable_struct {
385  bool m_is_good;
386 
387  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
388  };
389 
393  struct monero_check_tx : public monero_check {
394  boost::optional<bool> m_in_tx_pool;
395  boost::optional<uint64_t> m_num_confirmations;
396  boost::optional<uint64_t> m_received_amount;
397 
398  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
399  };
400 
404  struct monero_check_reserve : public monero_check {
405  boost::optional<uint64_t> m_total_amount;
406  boost::optional<uint64_t> m_unconfirmed_spent_amount;
407 
408  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
409  };
410 
414  struct monero_multisig_info : serializable_struct {
415  bool m_is_multisig;
416  bool m_is_ready;
417  uint32_t m_threshold;
418  uint32_t m_num_participants;
419 
420  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
421  };
422 
428  struct monero_multisig_init_result : serializable_struct {
429  boost::optional<std::string> m_address;
430  boost::optional<std::string> m_multisig_hex;
431 
432  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
433  };
434 
438  struct monero_multisig_sign_result : serializable_struct {
439  boost::optional<std::string> m_signed_multisig_tx_hex;
440  std::vector<std::string> m_tx_hashes;
441 
442  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
443  };
444 
448  struct monero_address_book_entry : serializable_struct {
449  boost::optional<uint64_t> m_index; // TODO: not boost::optional
450  boost::optional<std::string> m_address;
451  boost::optional<std::string> m_description;
452  boost::optional<std::string> m_payment_id;
453 
454  monero_address_book_entry() {}
455  monero_address_book_entry(uint64_t index, const std::string& address, const std::string& description) : m_index(index), m_address(address), m_description(description) {}
456  monero_address_book_entry(uint64_t index, const std::string& address, const std::string& description, const std::string& payment_id) : m_index(index), m_address(address), m_description(description), m_payment_id(payment_id) {}
457  rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
458  };
459 }
monero::monero_multisig_info
Definition: monero_wallet_model.h:414
monero
Definition: monero_daemon.cpp:58
monero::monero_tx_query::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:353
monero::monero_tx_set::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:568
monero::monero_destination
Definition: monero_wallet_model.h:110
monero::monero_integrated_address
Definition: monero_wallet_model.h:322
monero::monero_sync_result::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:95
-
monero::monero_multisig_sign_result::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1345
-
monero::monero_output_wallet::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:929
+
monero::monero_multisig_sign_result::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1342
+
monero::monero_output_wallet::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:926
monero::monero_multisig_init_result
Definition: monero_wallet_model.h:428
monero::monero_tx_priority
monero_tx_priority
Definition: monero_wallet_model.h:333
-
monero::monero_incoming_transfer
Definition: monero_wallet_model.h:150
+
monero::monero_incoming_transfer
Definition: monero_wallet_model.h:149
monero::monero_tx_query
Definition: monero_wallet_model.h:278
monero::serializable_struct
Definition: monero_daemon_model.h:69
-
monero::monero_tx_config::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1136
+
monero::monero_tx_config::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1133
monero::monero_multisig_sign_result
Definition: monero_wallet_model.h:438
monero::monero_output
Definition: monero_daemon_model.h:233
-
monero::monero_multisig_info::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1313
-
monero::monero_key_image_import_result::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1247
+
monero::monero_multisig_info::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1310
+
monero::monero_key_image_import_result::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1244
monero::monero_tx
Definition: monero_daemon_model.h:168
monero::monero_tx_wallet
Definition: monero_wallet_model.h:244
-
monero::monero_outgoing_transfer::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:715
+
monero::monero_outgoing_transfer::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:712
monero::monero_transfer::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:615
-
monero::monero_multisig_init_result::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1331
+
monero::monero_multisig_init_result::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1328
monero::monero_check_reserve
Definition: monero_wallet_model.h:404
monero::monero_outgoing_transfer
Definition: monero_wallet_model.h:165
monero::monero_sync_result
Definition: monero_wallet_model.h:67
monero::monero_tx_set
Definition: monero_wallet_model.h:308
-
monero::monero_integrated_address::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1230
+
monero::monero_integrated_address::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1227
monero::monero_address_book_entry
Definition: monero_wallet_model.h:448
-
monero::monero_check_reserve::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1297
-
monero::monero_transfer_query::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:754
+
monero::monero_check_reserve::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1294
+
monero::monero_transfer_query::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:751
monero::monero_check_tx
Definition: monero_wallet_model.h:393
monero::monero_output_query
Definition: monero_wallet_model.h:225
monero::monero_account
Definition: monero_wallet_model.h:96
monero::monero_tx_wallet::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:166
-
monero::monero_address_book_entry::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1362
+
monero::monero_address_book_entry::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1359
monero::monero_subaddress
Definition: monero_wallet_model.h:79
-
monero::monero_output_query::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:999
+
monero::monero_output_query::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:996
monero::monero_output_wallet
Definition: monero_wallet_model.h:205
monero::monero_transfer_query
Definition: monero_wallet_model.h:183
monero::monero_subaddress::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:138
monero::monero_key_image_import_result
Definition: monero_wallet_model.h:373
monero::monero_check
Definition: monero_wallet_model.h:384
monero::monero_transfer
Definition: monero_wallet_model.h:130
-
monero::monero_incoming_transfer::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:674
+
monero::monero_incoming_transfer::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:669
monero::monero_tx_config
Definition: monero_wallet_model.h:343
-
monero::monero_check_tx::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1278
-
monero::monero_check::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1264
+
monero::monero_check_tx::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1275
+
monero::monero_check::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:1261
monero::monero_account::to_rapidjson_val
rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) const
Definition: monero_wallet_model.cpp:113
diff --git a/docs/namespacemonero.html b/docs/namespacemonero.html index 9f11471..0d6368a 100644 --- a/docs/namespacemonero.html +++ b/docs/namespacemonero.html @@ -203,10 +203,10 @@ std::string get_default_ri   bool validate_transfer (wallet2 *m_w2, const std::list< wallet_rpc::transfer_destination > &destinations, const std::string &payment_id, std::vector< cryptonote::tx_destination_entry > &dsts, std::vector< uint8_t > &extra, bool at_least_one_destination, epee::json_rpc::error &er)   - + template<typename Ts , typename Tu > -bool fill_response (wallet2 *m_w2, std::vector< tools::wallet2::pending_tx > &ptx_vector, bool get_tx_key, Ts &tx_key, Tu &amount, Tu &fee, std::string &multisig_txset, std::string &unsigned_txset, bool do_not_relay, Ts &tx_hash, bool get_tx_hex, Ts &tx_blob, bool get_tx_metadata, Ts &tx_metadata, epee::json_rpc::error &er) -  +bool fill_response (wallet2 *m_w2, std::vector< tools::wallet2::pending_tx > &ptx_vector, bool get_tx_key, Ts &tx_key, Tu &amount, Tu &fee, Tu &weight, std::string &multisig_txset, std::string &unsigned_txset, bool do_not_relay, Ts &tx_hash, bool get_tx_hex, Ts &tx_blob, bool get_tx_metadata, Ts &tx_metadata, epee::json_rpc::error &er) +  void merge_incoming_transfer (std::vector< std::shared_ptr< monero_incoming_transfer >> &transfers, const std::shared_ptr< monero_incoming_transfer > &transfer)   diff --git a/docs/structmonero_1_1monero__address__book__entry-members.html b/docs/structmonero_1_1monero__address__book__entry-members.html index 3df9ff9..f113bdb 100644 --- a/docs/structmonero_1_1monero__address__book__entry-members.html +++ b/docs/structmonero_1_1monero__address__book__entry-members.html @@ -77,9 +77,10 @@ $(function() { m_index (defined in monero::monero_address_book_entry)monero::monero_address_book_entry m_payment_id (defined in monero::monero_address_book_entry)monero::monero_address_book_entry monero_address_book_entry() (defined in monero::monero_address_book_entry)monero::monero_address_book_entryinline - monero_address_book_entry(uint64_t index, const std::string &address, const std::string &description, const std::string &payment_id) (defined in monero::monero_address_book_entry)monero::monero_address_book_entryinline - serialize() constmonero::serializable_struct - to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) constmonero::monero_address_book_entryvirtual + monero_address_book_entry(uint64_t index, const std::string &address, const std::string &description) (defined in monero::monero_address_book_entry)monero::monero_address_book_entryinline + monero_address_book_entry(uint64_t index, const std::string &address, const std::string &description, const std::string &payment_id) (defined in monero::monero_address_book_entry)monero::monero_address_book_entryinline + serialize() constmonero::serializable_struct + to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) constmonero::monero_address_book_entryvirtual
diff --git a/docs/structmonero_1_1monero__address__book__entry.html b/docs/structmonero_1_1monero__address__book__entry.html index 9958a53..c8a0661 100644 --- a/docs/structmonero_1_1monero__address__book__entry.html +++ b/docs/structmonero_1_1monero__address__book__entry.html @@ -87,6 +87,9 @@ Inheritance diagram for monero::monero_address_book_entry: + + diff --git a/docs/structmonero_1_1monero__incoming__transfer-members.html b/docs/structmonero_1_1monero__incoming__transfer-members.html index 0307837..dd159ca 100644 --- a/docs/structmonero_1_1monero__incoming__transfer-members.html +++ b/docs/structmonero_1_1monero__incoming__transfer-members.html @@ -80,7 +80,7 @@ $(function() { - + diff --git a/docs/structmonero_1_1monero__incoming__transfer.html b/docs/structmonero_1_1monero__incoming__transfer.html index ffb00ed..321875c 100644 --- a/docs/structmonero_1_1monero__incoming__transfer.html +++ b/docs/structmonero_1_1monero__incoming__transfer.html @@ -127,6 +127,9 @@ boost::optional< uint32_t >  + + @@ -137,9 +140,6 @@ boost::optional< uint64_t >  - -

Public Member Functions

+ monero_address_book_entry (uint64_t index, const std::string &address, const std::string &description)
 
 monero_address_book_entry (uint64_t index, const std::string &address, const std::string &description, const std::string &payment_id)
 
m_account_index (defined in monero::monero_transfer)monero::monero_transfer
m_address (defined in monero::monero_incoming_transfer)monero::monero_incoming_transfer
m_amount (defined in monero::monero_transfer)monero::monero_transfer
m_num_suggested_confirmations (defined in monero::monero_transfer)monero::monero_transfer
m_num_suggested_confirmations (defined in monero::monero_incoming_transfer)monero::monero_incoming_transfer
m_subaddress_index (defined in monero::monero_incoming_transfer)monero::monero_incoming_transfer
m_tx (defined in monero::monero_transfer)monero::monero_transfer
merge(const std::shared_ptr< monero_transfer > &self, const std::shared_ptr< monero_transfer > &other) (defined in monero::monero_incoming_transfer)monero::monero_incoming_transfer
boost::optional< std::string > m_address
 
+boost::optional< uint64_t > m_num_suggested_confirmations
 
- Public Attributes inherited from monero::monero_transfer
std::shared_ptr< monero_tx_wallet > m_tx
boost::optional< uint32_t > m_account_index
 
-boost::optional< uint64_t > m_num_suggested_confirmations
 
diff --git a/docs/structmonero_1_1monero__outgoing__transfer-members.html b/docs/structmonero_1_1monero__outgoing__transfer-members.html index e73d03f..b0870d7 100644 --- a/docs/structmonero_1_1monero__outgoing__transfer-members.html +++ b/docs/structmonero_1_1monero__outgoing__transfer-members.html @@ -81,13 +81,12 @@ $(function() { - - - - - - - + + + + + +

Additional Inherited Members

m_addresses (defined in monero::monero_outgoing_transfer)monero::monero_outgoing_transfer
m_amount (defined in monero::monero_transfer)monero::monero_transfer
m_destinations (defined in monero::monero_outgoing_transfer)monero::monero_outgoing_transfer
m_num_suggested_confirmations (defined in monero::monero_transfer)monero::monero_transfer
m_subaddress_indices (defined in monero::monero_outgoing_transfer)monero::monero_outgoing_transfer
m_tx (defined in monero::monero_transfer)monero::monero_transfer
merge(const std::shared_ptr< monero_transfer > &self, const std::shared_ptr< monero_transfer > &other) (defined in monero::monero_outgoing_transfer)monero::monero_outgoing_transfer
merge(const std::shared_ptr< monero_outgoing_transfer > &self, const std::shared_ptr< monero_outgoing_transfer > &other) (defined in monero::monero_outgoing_transfer)monero::monero_outgoing_transfer
serialize() constmonero::serializable_struct
to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) constmonero::monero_outgoing_transfervirtual
m_subaddress_indices (defined in monero::monero_outgoing_transfer)monero::monero_outgoing_transfer
m_tx (defined in monero::monero_transfer)monero::monero_transfer
merge(const std::shared_ptr< monero_transfer > &self, const std::shared_ptr< monero_transfer > &other) (defined in monero::monero_outgoing_transfer)monero::monero_outgoing_transfer
merge(const std::shared_ptr< monero_outgoing_transfer > &self, const std::shared_ptr< monero_outgoing_transfer > &other) (defined in monero::monero_outgoing_transfer)monero::monero_outgoing_transfer
serialize() constmonero::serializable_struct
to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) constmonero::monero_outgoing_transfervirtual
diff --git a/docs/structmonero_1_1monero__outgoing__transfer.html b/docs/structmonero_1_1monero__outgoing__transfer.html index 9172acd..8ec7160 100644 --- a/docs/structmonero_1_1monero__outgoing__transfer.html +++ b/docs/structmonero_1_1monero__outgoing__transfer.html @@ -140,9 +140,6 @@ boost::optional< uint64_t >  boost::optional< uint32_t > m_account_index   - -boost::optional< uint64_t > m_num_suggested_confirmations -  diff --git a/docs/structmonero_1_1monero__transfer-members.html b/docs/structmonero_1_1monero__transfer-members.html index 9c6a792..d55d8b3 100644 --- a/docs/structmonero_1_1monero__transfer-members.html +++ b/docs/structmonero_1_1monero__transfer-members.html @@ -78,11 +78,10 @@ $(function() { - - - - - + + + +

Additional Inherited Members

is_outgoing() const (defined in monero::monero_transfer)monero::monero_transferinline
m_account_index (defined in monero::monero_transfer)monero::monero_transfer
m_amount (defined in monero::monero_transfer)monero::monero_transfer
m_num_suggested_confirmations (defined in monero::monero_transfer)monero::monero_transfer
m_tx (defined in monero::monero_transfer)monero::monero_transfer
merge(const std::shared_ptr< monero_transfer > &self, const std::shared_ptr< monero_transfer > &other) (defined in monero::monero_transfer)monero::monero_transfer
serialize() constmonero::serializable_struct
to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) constmonero::monero_transfervirtual
m_tx (defined in monero::monero_transfer)monero::monero_transfer
merge(const std::shared_ptr< monero_transfer > &self, const std::shared_ptr< monero_transfer > &other) (defined in monero::monero_transfer)monero::monero_transfer
serialize() constmonero::serializable_struct
to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) constmonero::monero_transfervirtual
diff --git a/docs/structmonero_1_1monero__transfer.html b/docs/structmonero_1_1monero__transfer.html index 2ef08f5..4ba7f9b 100644 --- a/docs/structmonero_1_1monero__transfer.html +++ b/docs/structmonero_1_1monero__transfer.html @@ -126,9 +126,6 @@ boost::optional< uint64_t >  boost::optional< uint32_t > m_account_index   - -boost::optional< uint64_t > m_num_suggested_confirmations - 

Detailed Description

Models a base transfer of funds to or from the wallet.

diff --git a/docs/structmonero_1_1monero__transfer__query-members.html b/docs/structmonero_1_1monero__transfer__query-members.html index ce7e84c..f8830c1 100644 --- a/docs/structmonero_1_1monero__transfer__query-members.html +++ b/docs/structmonero_1_1monero__transfer__query-members.html @@ -86,15 +86,14 @@ $(function() { m_destinations (defined in monero::monero_transfer_query)monero::monero_transfer_query m_has_destinations (defined in monero::monero_transfer_query)monero::monero_transfer_query m_is_incoming (defined in monero::monero_transfer_query)monero::monero_transfer_query - m_num_suggested_confirmations (defined in monero::monero_transfer)monero::monero_transfer - m_subaddress_index (defined in monero::monero_transfer_query)monero::monero_transfer_query - m_subaddress_indices (defined in monero::monero_transfer_query)monero::monero_transfer_query - m_tx (defined in monero::monero_transfer)monero::monero_transfer - m_tx_query (defined in monero::monero_transfer_query)monero::monero_transfer_query - meets_criteria(monero_transfer *transfer, bool query_parent=true) const (defined in monero::monero_transfer_query)monero::monero_transfer_query - merge(const std::shared_ptr< monero_transfer > &self, const std::shared_ptr< monero_transfer > &other) (defined in monero::monero_transfer)monero::monero_transfer - serialize() constmonero::serializable_struct - to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) constmonero::monero_transfer_queryvirtual + m_subaddress_index (defined in monero::monero_transfer_query)monero::monero_transfer_query + m_subaddress_indices (defined in monero::monero_transfer_query)monero::monero_transfer_query + m_tx (defined in monero::monero_transfer)monero::monero_transfer + m_tx_query (defined in monero::monero_transfer_query)monero::monero_transfer_query + meets_criteria(monero_transfer *transfer, bool query_parent=true) const (defined in monero::monero_transfer_query)monero::monero_transfer_query + merge(const std::shared_ptr< monero_transfer > &self, const std::shared_ptr< monero_transfer > &other) (defined in monero::monero_transfer)monero::monero_transfer + serialize() constmonero::serializable_struct + to_rapidjson_val(rapidjson::Document::AllocatorType &allocator) constmonero::monero_transfer_queryvirtual
diff --git a/docs/structmonero_1_1monero__transfer__query.html b/docs/structmonero_1_1monero__transfer__query.html index 3abaff0..73e3080 100644 --- a/docs/structmonero_1_1monero__transfer__query.html +++ b/docs/structmonero_1_1monero__transfer__query.html @@ -166,9 +166,6 @@ boost::optional< uint64_t >  boost::optional< uint32_t > m_account_index   - -boost::optional< uint64_t > m_num_suggested_confirmations - 

Detailed Description

Configures a query to retrieve transfers.

diff --git a/docs/structmonero_1_1wallet2__listener-members.html b/docs/structmonero_1_1wallet2__listener-members.html index 6905df4..d1cc81e 100644 --- a/docs/structmonero_1_1wallet2__listener-members.html +++ b/docs/structmonero_1_1wallet2__listener-members.html @@ -72,12 +72,12 @@ $(function() {

This is the complete list of members for monero::wallet2_listener, including all inherited members.

- - - + + + - + diff --git a/docs/structmonero_1_1wallet2__listener.html b/docs/structmonero_1_1wallet2__listener.html index 8ebe7bf..e9dcb32 100644 --- a/docs/structmonero_1_1wallet2__listener.html +++ b/docs/structmonero_1_1wallet2__listener.html @@ -92,18 +92,18 @@ void  - - - - - - - - + + + + + + + +
on_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx, uint64_t amount, const cryptonote::subaddress_index &subaddr_index, uint64_t unlock_time) (defined in monero::wallet2_listener)monero::wallet2_listenerinline
on_money_spent(uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx_in, uint64_t amount, const cryptonote::transaction &cn_tx_out, const cryptonote::subaddress_index &subaddr_index) (defined in monero::wallet2_listener)monero::wallet2_listenerinline
on_new_block(uint64_t height, const cryptonote::block &cn_block) (defined in monero::wallet2_listener)monero::wallet2_listenerinline
on_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx, uint64_t amount, const cryptonote::subaddress_index &subaddr_index, bool is_change, uint64_t unlock_time) override (defined in monero::wallet2_listener)monero::wallet2_listenerinline
on_money_spent(uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx_in, uint64_t amount, const cryptonote::transaction &cn_tx_out, const cryptonote::subaddress_index &subaddr_index) override (defined in monero::wallet2_listener)monero::wallet2_listenerinline
on_new_block(uint64_t height, const cryptonote::block &cn_block) override (defined in monero::wallet2_listener)monero::wallet2_listenerinline
on_sync_end() (defined in monero::wallet2_listener)monero::wallet2_listenerinline
on_sync_start(uint64_t start_height) (defined in monero::wallet2_listener)monero::wallet2_listenerinline
on_unconfirmed_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx, uint64_t amount, const cryptonote::subaddress_index &subaddr_index) (defined in monero::wallet2_listener)monero::wallet2_listenerinline
on_unconfirmed_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx, uint64_t amount, const cryptonote::subaddress_index &subaddr_index) override (defined in monero::wallet2_listener)monero::wallet2_listenerinline
update_listening() (defined in monero::wallet2_listener)monero::wallet2_listenerinline
wallet2_listener(monero_wallet_core &wallet, tools::wallet2 &m_w2)monero::wallet2_listenerinline
~wallet2_listener() (defined in monero::wallet2_listener)monero::wallet2_listenerinline
on_sync_start (ui
void on_sync_end ()
 
-void on_new_block (uint64_t height, const cryptonote::block &cn_block)
 
-void on_unconfirmed_money_received (uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx, uint64_t amount, const cryptonote::subaddress_index &subaddr_index)
 
-void on_money_received (uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx, uint64_t amount, const cryptonote::subaddress_index &subaddr_index, uint64_t unlock_time)
 
-void on_money_spent (uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx_in, uint64_t amount, const cryptonote::transaction &cn_tx_out, const cryptonote::subaddress_index &subaddr_index)
 
+void on_new_block (uint64_t height, const cryptonote::block &cn_block) override
 
+void on_unconfirmed_money_received (uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx, uint64_t amount, const cryptonote::subaddress_index &subaddr_index) override
 
+void on_money_received (uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx, uint64_t amount, const cryptonote::subaddress_index &subaddr_index, bool is_change, uint64_t unlock_time) override
 
+void on_money_spent (uint64_t height, const crypto::hash &txid, const cryptonote::transaction &cn_tx_in, uint64_t amount, const cryptonote::transaction &cn_tx_out, const cryptonote::subaddress_index &subaddr_index) override
 

Detailed Description

Listens to wallet2 notifications in order to notify external wallet listeners.

diff --git a/src/daemon/monero_daemon_model.cpp b/src/daemon/monero_daemon_model.cpp index 131622b..0a5861d 100644 --- a/src/daemon/monero_daemon_model.cpp +++ b/src/daemon/monero_daemon_model.cpp @@ -319,8 +319,8 @@ namespace monero { else if (key == std::string("prunedHex")) tx->m_pruned_hex = it->second.data(); else if (key == std::string("prunableHex")) tx->m_prunable_hex = it->second.data(); else if (key == std::string("prunableHash")) tx->m_prunable_hash = it->second.data(); - else if (key == std::string("size")) throw std::runtime_error("size deserialization not implemented"); - else if (key == std::string("weight")) throw std::runtime_error("weight deserialization not implemented"); + else if (key == std::string("size")) tx->m_size = it->second.get_value(); + else if (key == std::string("weight")) tx->m_weight = it->second.get_value(); else if (key == std::string("inputs")) throw std::runtime_error("inputs deserializationn not implemented"); else if (key == std::string("outputs")) throw std::runtime_error("outputs deserializationn not implemented"); else if (key == std::string("outputIndices")) throw std::runtime_error("m_output_indices deserialization not implemented"); diff --git a/src/wallet/monero_wallet_core.cpp b/src/wallet/monero_wallet_core.cpp index d79846b..1b6083a 100644 --- a/src/wallet/monero_wallet_core.cpp +++ b/src/wallet/monero_wallet_core.cpp @@ -234,11 +234,6 @@ namespace monero { outgoing_transfer->m_amount = amount; } - // compute m_num_suggested_confirmations TODO monero core: this logic is based on wallet_rpc_server.cpp:87 but it should be encapsulated in wallet2 - uint64_t block_reward = m_w2.get_last_block_reward(); - if (block_reward == 0) outgoing_transfer->m_num_suggested_confirmations = 0; - else outgoing_transfer->m_num_suggested_confirmations = (*outgoing_transfer->m_amount + block_reward - 1) / block_reward; - // return pointer to new tx return tx; } @@ -339,11 +334,6 @@ namespace monero { outgoing_transfer->m_amount = amount; } - // compute num_suggested_confirmations TODO monero core: this logic is based on wallet_rpc_server.cpp:87 but it should be encapsulated in wallet2 - uint64_t block_reward = m_w2.get_last_block_reward(); - if (block_reward == 0) outgoing_transfer->m_num_suggested_confirmations = 0; - else outgoing_transfer->m_num_suggested_confirmations = (*outgoing_transfer->m_amount + block_reward - 1) / block_reward; - // return pointer to new tx return tx; } @@ -622,7 +612,7 @@ namespace monero { //------------------------------------------------------------------------------------------------------------------------------ template bool fill_response(wallet2* m_w2, std::vector &ptx_vector, - bool get_tx_key, Ts& tx_key, Tu &amount, Tu &fee, std::string &multisig_txset, std::string &unsigned_txset, bool do_not_relay, + bool get_tx_key, Ts& tx_key, Tu &amount, Tu &fee, Tu &weight, std::string &multisig_txset, std::string &unsigned_txset, bool do_not_relay, Ts &tx_hash, bool get_tx_hex, Ts &tx_blob, bool get_tx_metadata, Ts &tx_metadata, epee::json_rpc::error &er) { for (const auto & ptx : ptx_vector) @@ -637,6 +627,7 @@ namespace monero { // Compute amount leaving wallet in tx. By convention dests does not include change outputs fill(amount, total_amount(ptx)); fill(fee, ptx.fee); + fill(weight, cryptonote::get_transaction_weight(ptx.tx)); } if (m_w2->multisig()) @@ -720,7 +711,7 @@ namespace monero { m_sync_end_height = boost::none; } - void on_new_block(uint64_t height, const cryptonote::block& cn_block) { + void on_new_block(uint64_t height, const cryptonote::block& cn_block) override { if (m_wallet.get_listeners().empty()) return; // ignore notifications before sync start height, irrelevant to clients @@ -740,7 +731,7 @@ namespace monero { } } - void on_unconfirmed_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& cn_tx, uint64_t amount, const cryptonote::subaddress_index& subaddr_index) { + void on_unconfirmed_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& cn_tx, uint64_t amount, const cryptonote::subaddress_index& subaddr_index) override { if (m_wallet.get_listeners().empty()) return; // create library tx @@ -763,7 +754,7 @@ namespace monero { tx.reset(); } - void on_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& cn_tx, uint64_t amount, const cryptonote::subaddress_index& subaddr_index, uint64_t unlock_time) { + void on_money_received(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& cn_tx, uint64_t amount, const cryptonote::subaddress_index& subaddr_index, bool is_change, uint64_t unlock_time) override { if (m_wallet.get_listeners().empty()) return; // create native library tx @@ -792,7 +783,7 @@ namespace monero { tx.reset(); } - void on_money_spent(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& cn_tx_in, uint64_t amount, const cryptonote::transaction& cn_tx_out, const cryptonote::subaddress_index& subaddr_index) { + void on_money_spent(uint64_t height, const crypto::hash &txid, const cryptonote::transaction& cn_tx_in, uint64_t amount, const cryptonote::transaction& cn_tx_out, const cryptonote::subaddress_index& subaddr_index) override { if (m_wallet.get_listeners().empty()) return; if (&cn_tx_in != &cn_tx_out) throw std::runtime_error("on_money_spent() in tx is different than out tx"); @@ -819,23 +810,11 @@ namespace monero { monero_utils::free(block); output.reset(); tx.reset(); - - // TODO **: to notify or not to notify? -// std::string tx_hash = epee::string_tools::pod_to_hex(txid); -// LOG_PRINT_L3(__FUNCTION__ << ": money spent. height: " << height -// << ", tx: " << tx_hash -// << ", amount: " << print_money(amount) -// << ", idx: " << subaddr_index); -// // do not signal on sent tx if wallet is not syncronized completely -// if (m_listener && m_wallet->synchronized()) { -// m_listener->moneySpent(tx_hash, amount); -// m_listener->updated(); -// } } private: - monero_wallet_core& m_wallet; // wallet to provide context for notifications - tools::wallet2& m_w2; // internal wallet implementation to listen to + monero_wallet_core& m_wallet; // wallet to provide context for notifications + tools::wallet2& m_w2; // internal wallet implementation to listen to boost::optional m_sync_start_height; boost::optional m_sync_end_height; }; @@ -1664,12 +1643,13 @@ namespace monero { std::list tx_keys; std::list tx_amounts; std::list tx_fees; + std::list tx_weights; std::string multisig_tx_hex; std::string unsigned_tx_hex; std::list tx_hashes; std::list tx_blobs; std::list tx_metadatas; - if (!fill_response(m_w2.get(), ptx_vector, get_tx_keys, tx_keys, tx_amounts, tx_fees, multisig_tx_hex, unsigned_tx_hex, !relay, tx_hashes, get_tx_hex, tx_blobs, get_tx_metadata, tx_metadatas, err)) { + if (!fill_response(m_w2.get(), ptx_vector, get_tx_keys, tx_keys, tx_amounts, tx_fees, tx_weights, multisig_tx_hex, unsigned_tx_hex, !relay, tx_hashes, get_tx_hex, tx_blobs, get_tx_metadata, tx_metadatas, err)) { throw std::runtime_error("need to handle error filling response!"); // TODO } @@ -1679,6 +1659,7 @@ namespace monero { auto tx_keys_iter = tx_keys.begin(); auto tx_amounts_iter = tx_amounts.begin(); auto tx_fees_iter = tx_fees.begin(); + auto tx_weights_iter = tx_weights.begin(); auto tx_blobs_iter = tx_blobs.begin(); auto tx_metadatas_iter = tx_metadatas.begin(); while (tx_fees_iter != tx_fees.end()) { @@ -1689,6 +1670,7 @@ namespace monero { tx->m_hash = *tx_hashes_iter; tx->m_key = *tx_keys_iter; tx->m_fee = *tx_fees_iter; + tx->m_weight = *tx_weights_iter; tx->m_full_hex = *tx_blobs_iter; tx->m_metadata = *tx_metadatas_iter; std::shared_ptr out_transfer = std::make_shared(); @@ -1846,12 +1828,13 @@ namespace monero { std::list tx_keys; std::list tx_amounts; std::list tx_fees; + std::list tx_weights; std::string multisig_tx_hex; std::string unsigned_tx_hex; std::list tx_hashes; std::list tx_blobs; std::list tx_metadatas; - if (!fill_response(m_w2.get(), ptx_vector, get_tx_keys, tx_keys, tx_amounts, tx_fees, multisig_tx_hex, unsigned_tx_hex, !relay, tx_hashes, get_tx_hex, tx_blobs, get_tx_metadata, tx_metadatas, err)) { + if (!fill_response(m_w2.get(), ptx_vector, get_tx_keys, tx_keys, tx_amounts, tx_fees, tx_weights, multisig_tx_hex, unsigned_tx_hex, !relay, tx_hashes, get_tx_hex, tx_blobs, get_tx_metadata, tx_metadatas, err)) { throw std::runtime_error("need to handle error filling response!"); // TODO } @@ -1861,6 +1844,7 @@ namespace monero { auto tx_keys_iter = tx_keys.begin(); auto tx_amounts_iter = tx_amounts.begin(); auto tx_fees_iter = tx_fees.begin(); + auto tx_weights_iter = tx_weights.begin(); auto tx_blobs_iter = tx_blobs.begin(); auto tx_metadatas_iter = tx_metadatas.begin(); while (tx_fees_iter != tx_fees.end()) { @@ -1873,6 +1857,7 @@ namespace monero { tx->m_is_outgoing = true; tx->m_key = *tx_keys_iter; tx->m_fee = *tx_fees_iter; + tx->m_weight = *tx_weights_iter; tx->m_full_hex = *tx_blobs_iter; tx->m_metadata = *tx_metadatas_iter; std::shared_ptr out_transfer = std::make_shared(); @@ -1966,12 +1951,13 @@ namespace monero { std::list tx_keys; std::list tx_amounts; std::list tx_fees; + std::list tx_weights; std::string multisig_tx_hex; std::string unsigned_tx_hex; std::list tx_hashes; std::list tx_blobs; std::list tx_metadatas; - if (!fill_response(m_w2.get(), ptx_vector, get_tx_keys, tx_keys, tx_amounts, tx_fees, multisig_tx_hex, unsigned_tx_hex, !relay, tx_hashes, get_tx_hex, tx_blobs, get_tx_metadata, tx_metadatas, err)) { + if (!fill_response(m_w2.get(), ptx_vector, get_tx_keys, tx_keys, tx_amounts, tx_fees, tx_weights, multisig_tx_hex, unsigned_tx_hex, !relay, tx_hashes, get_tx_hex, tx_blobs, get_tx_metadata, tx_metadatas, err)) { throw std::runtime_error("need to handle error filling response!"); // TODO: return err message } @@ -1981,6 +1967,7 @@ namespace monero { auto tx_keys_iter = tx_keys.begin(); auto tx_amounts_iter = tx_amounts.begin(); auto tx_fees_iter = tx_fees.begin(); + auto tx_weights_iter = tx_weights.begin(); auto tx_blobs_iter = tx_blobs.begin(); auto tx_metadatas_iter = tx_metadatas.begin(); while (tx_fees_iter != tx_fees.end()) { @@ -1992,6 +1979,7 @@ namespace monero { tx->m_is_outgoing = true; tx->m_key = *tx_keys_iter; tx->m_fee = *tx_fees_iter; + tx->m_weight = *tx_weights_iter; tx->m_full_hex = *tx_blobs_iter; tx->m_metadata = *tx_metadatas_iter; std::shared_ptr out_transfer = std::make_shared(); @@ -2053,13 +2041,14 @@ namespace monero { std::list tx_keys; std::list tx_amounts; std::list tx_fees; + std::list tx_weights; std::string multisig_tx_hex; std::string unsigned_tx_hex; std::list tx_hashes; std::list tx_blobs; std::list tx_metadatas; epee::json_rpc::error er; - if (!fill_response(m_w2.get(), ptx_vector, get_tx_keys, tx_keys, tx_amounts, tx_fees, multisig_tx_hex, unsigned_tx_hex, !relay, tx_hashes, get_tx_hex, tx_blobs, get_tx_metadata, tx_metadatas, er)) { + if (!fill_response(m_w2.get(), ptx_vector, get_tx_keys, tx_keys, tx_amounts, tx_fees, tx_weights, multisig_tx_hex, unsigned_tx_hex, !relay, tx_hashes, get_tx_hex, tx_blobs, get_tx_metadata, tx_metadatas, er)) { throw std::runtime_error("need to handle error filling response!"); // TODO: return err message } @@ -2069,6 +2058,7 @@ namespace monero { auto tx_keys_iter = tx_keys.begin(); auto tx_amounts_iter = tx_amounts.begin(); auto tx_fees_iter = tx_fees.begin(); + auto tx_weights_iter = tx_weights.begin(); auto tx_blobs_iter = tx_blobs.begin(); auto tx_metadatas_iter = tx_metadatas.begin(); while (tx_fees_iter != tx_fees.end()) { @@ -2080,6 +2070,7 @@ namespace monero { tx->m_is_outgoing = true; tx->m_key = *tx_keys_iter; tx->m_fee = *tx_fees_iter; + tx->m_weight = *tx_weights_iter; tx->m_full_hex = *tx_blobs_iter; tx->m_metadata = *tx_metadatas_iter; std::shared_ptr out_transfer = std::make_shared(); @@ -2622,14 +2613,20 @@ namespace monero { if (indices.empty()) { uint64_t idx = 0; for (const auto &w2_entry: w2_entries) { - monero_address_book_entry entry(idx++, cryptonote::get_account_address_as_str(m_w2->nettype(), w2_entry.m_is_subaddress, w2_entry.m_address), w2_entry.m_description, epee::string_tools::pod_to_hex(w2_entry.m_payment_id)); + std::string address; + if (w2_entry.m_has_payment_id) address = cryptonote::get_account_integrated_address_as_str(m_w2->nettype(), w2_entry.m_address, w2_entry.m_payment_id); + else address = get_account_address_as_str(m_w2->nettype(), w2_entry.m_is_subaddress, w2_entry.m_address); + monero_address_book_entry entry(idx++, address, w2_entry.m_description); entries.push_back(entry); } } else { for (uint64_t idx : indices) { if (idx >= w2_entries.size()) throw std::runtime_error("Index out of range: " + std::to_string(idx)); const auto &w2_entry = w2_entries[idx]; - monero_address_book_entry entry(idx++, cryptonote::get_account_address_as_str(m_w2->nettype(), w2_entry.m_is_subaddress, w2_entry.m_address), w2_entry.m_description, epee::string_tools::pod_to_hex(w2_entry.m_payment_id)); + std::string address; + if (w2_entry.m_has_payment_id) address = cryptonote::get_account_integrated_address_as_str(m_w2->nettype(), w2_entry.m_address, w2_entry.m_payment_id); + else address = get_account_address_as_str(m_w2->nettype(), w2_entry.m_is_subaddress, w2_entry.m_address); + monero_address_book_entry entry(idx++, address, w2_entry.m_description); entries.push_back(entry); } } diff --git a/src/wallet/monero_wallet_model.cpp b/src/wallet/monero_wallet_model.cpp index 6d8d179..64bf422 100644 --- a/src/wallet/monero_wallet_model.cpp +++ b/src/wallet/monero_wallet_model.cpp @@ -621,7 +621,6 @@ namespace monero { rapidjson::Value value_num(rapidjson::kNumberType); if (m_amount != boost::none) monero_utils::addJsonMember("amount", m_amount.get(), allocator, root, value_num); if (m_account_index != boost::none) monero_utils::addJsonMember("accountIndex", m_account_index.get(), allocator, root, value_num); - if (m_num_suggested_confirmations != boost::none) monero_utils::addJsonMember("numSuggestedConfirmations", m_num_suggested_confirmations.get(), allocator, root, value_num); // return root return root; @@ -641,7 +640,6 @@ namespace monero { tgt->m_tx = src->m_tx; // reference parent tx by default tgt->m_amount = src->m_amount; tgt->m_account_index = src->m_account_index; - tgt->m_num_suggested_confirmations = src->m_num_suggested_confirmations; return tgt; } @@ -658,14 +656,11 @@ namespace monero { // otherwise merge transfer fields m_account_index = gen_utils::reconcile(m_account_index, other->m_account_index, "acountIndex"); - // TODO monero core: failed m_tx in pool (after testUpdateLockedDifferentAccounts()) causes non-originating saved wallets to return duplicate incoming transfers but one has amount/m_num_suggested_confirmations of 0 + // TODO monero core: failed m_tx in pool (after testUpdateLockedDifferentAccounts()) causes non-originating saved wallets to return duplicate incoming transfers but one has amount of 0 if (m_amount != boost::none && other->m_amount != boost::none && *m_amount != *other->m_amount && (*m_amount == 0 || *other->m_amount == 0)) { - m_account_index = gen_utils::reconcile(m_account_index, other->m_account_index, boost::none, boost::none, true, "acountIndex"); - m_num_suggested_confirmations = gen_utils::reconcile(m_num_suggested_confirmations, other->m_num_suggested_confirmations, boost::none, boost::none, true, "m_num_suggested_confirmations"); - MWARNING("WARNING: failed tx in pool causes non-originating wallets to return duplicate incoming transfers but with one amount/m_num_suggested_confirmations of 0"); + throw std::runtime_error("failed tx in pool causes non-originating wallets to return duplicate incoming transfers but with one amount/m_num_suggested_confirmations of 0"); } else { m_amount = gen_utils::reconcile(m_amount, other->m_amount, "transfer amount"); - m_num_suggested_confirmations = gen_utils::reconcile(m_num_suggested_confirmations, other->m_num_suggested_confirmations, boost::none, boost::none, false, "m_num_suggested_confirmations"); } } @@ -679,6 +674,7 @@ namespace monero { // set num values rapidjson::Value value_num(rapidjson::kNumberType); if (m_subaddress_index != boost::none) monero_utils::addJsonMember("subaddressIndex", m_subaddress_index.get(), allocator, root, value_num); + if (m_num_suggested_confirmations != boost::none) monero_utils::addJsonMember("numSuggestedConfirmations", m_num_suggested_confirmations.get(), allocator, root, value_num); // set std::string values rapidjson::Value value_str(rapidjson::kStringType); @@ -708,6 +704,7 @@ namespace monero { monero_transfer::merge(self, other); m_subaddress_index = gen_utils::reconcile(m_subaddress_index, other->m_subaddress_index, "incoming transfer m_subaddress_index"); m_address = gen_utils::reconcile(m_address, other->m_address); + m_num_suggested_confirmations = gen_utils::reconcile(m_num_suggested_confirmations, other->m_num_suggested_confirmations, boost::none, boost::none, false, "m_num_suggested_confirmations"); } // ----------------------- MONERO OUTGOING TRANSFER ------------------------- diff --git a/src/wallet/monero_wallet_model.h b/src/wallet/monero_wallet_model.h index 7a76c5c..0b2af44 100644 --- a/src/wallet/monero_wallet_model.h +++ b/src/wallet/monero_wallet_model.h @@ -131,7 +131,6 @@ namespace monero { std::shared_ptr m_tx; boost::optional m_amount; boost::optional m_account_index; - boost::optional m_num_suggested_confirmations; rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const; static void from_property_tree(const boost::property_tree::ptree& node, const std::shared_ptr& transfer); @@ -150,6 +149,7 @@ namespace monero { struct monero_incoming_transfer : public monero_transfer { boost::optional m_subaddress_index; boost::optional m_address; + boost::optional m_num_suggested_confirmations; rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const; std::shared_ptr copy(const std::shared_ptr& src, const std::shared_ptr& tgt) const; @@ -452,6 +452,7 @@ namespace monero { boost::optional m_payment_id; monero_address_book_entry() {} + monero_address_book_entry(uint64_t index, const std::string& address, const std::string& description) : m_index(index), m_address(address), m_description(description) {} monero_address_book_entry(uint64_t index, const std::string& address, const std::string& description, const std::string& payment_id) : m_index(index), m_address(address), m_description(description), m_payment_id(payment_id) {} rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const; };