diff --git a/docs/classmonero_1_1monero__wallet-members.html b/docs/classmonero_1_1monero__wallet-members.html index 5644cda..d087de5 100644 --- a/docs/classmonero_1_1monero__wallet-members.html +++ b/docs/classmonero_1_1monero__wallet-members.html @@ -177,7 +177,7 @@ $(function() { set_tx_notes(const std::vector< std::string > &tx_hashes, const std::vector< std::string > &notes)monero::monero_walletinlinevirtual sign_message(const std::string &msg, monero_message_signature_type signature_type, uint32_t account_idx=0, uint32_t subaddress_idx=0) constmonero::monero_walletinlinevirtual sign_multisig_tx_hex(const std::string &multisig_tx_hex)monero::monero_walletinlinevirtual - sign_txs(const std::string &unsigned_tx_hex)monero::monero_walletinlinevirtual + sign_txs(const std::string &unsigned_tx_hex)monero::monero_walletinlinevirtual start_mining(boost::optional< uint64_t > num_threads, boost::optional< bool > background_mining, boost::optional< bool > ignore_battery)monero::monero_walletinlinevirtual start_syncing(uint64_t sync_period_in_ms=10000)monero::monero_walletinlinevirtual stop_mining()monero::monero_walletinlinevirtual diff --git a/docs/classmonero_1_1monero__wallet.html b/docs/classmonero_1_1monero__wallet.html index 0ee343a..b6529c3 100644 --- a/docs/classmonero_1_1monero__wallet.html +++ b/docs/classmonero_1_1monero__wallet.html @@ -249,8 +249,8 @@ Public Member Functions   virtual monero_tx_set describe_tx_set (const monero_tx_set &tx_set)   -virtual std::string sign_txs (const std::string &unsigned_tx_hex) -  +virtual monero_tx_set sign_txs (const std::string &unsigned_tx_hex) +  virtual std::vector< std::string > submit_txs (const std::string &signed_tx_hex)   virtual std::string sign_message (const std::string &msg, monero_message_signature_type signature_type, uint32_t account_idx=0, uint32_t subaddress_idx=0) const @@ -4318,8 +4318,8 @@ Public Member Functions - -

◆ sign_txs()

+ +

◆ sign_txs()

@@ -4328,7 +4328,7 @@ Public Member Functions - + @@ -4348,9 +4348,9 @@ Public Member Functions
virtual std::string monero::monero_wallet::sign_txs virtual monero_tx_set monero::monero_wallet::sign_txs ( const std::string &  unsigned_tx_hex)
-
Returns
the signed transaction hex
+
Returns
the signed transaction set
-

Reimplemented in monero::monero_wallet_full.

+

Reimplemented in monero::monero_wallet_full.

@@ -4560,7 +4560,7 @@ Public Member Functions

Submit signed transactions from a view-only wallet.

Parameters
- +
signed_tx_hexis signed transaction hex from signTxs()
signed_tx_hexis signed transaction hex from sign_txs()
diff --git a/docs/classmonero_1_1monero__wallet__full-members.html b/docs/classmonero_1_1monero__wallet__full-members.html index 9ea7dbc..a35e42e 100644 --- a/docs/classmonero_1_1monero__wallet__full-members.html +++ b/docs/classmonero_1_1monero__wallet__full-members.html @@ -158,52 +158,53 @@ $(function() { is_output_frozen(const std::string &key_image) overridemonero::monero_wallet_fullvirtual is_synced() const overridemonero::monero_wallet_fullvirtual is_view_only() const overridemonero::monero_wallet_fullinlinevirtual - make_multisig(const std::vector< std::string > &multisig_hexes, int threshold, const std::string &password) overridemonero::monero_wallet_fullvirtual - move_to(const std::string &path, const std::string &password) overridemonero::monero_wallet_fullvirtual - open_wallet(const std::string &path, const std::string &password, const monero_network_type network_type)monero::monero_wallet_fullstatic - 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)monero::monero_wallet_fullstatic - parse_payment_uri(const std::string &uri) const overridemonero::monero_wallet_fullvirtual - prepare_multisig() overridemonero::monero_wallet_fullvirtual - relay_tx(const std::string &tx_metadata)monero::monero_walletinlinevirtual - relay_tx(const monero_tx_wallet &tx)monero::monero_walletinlinevirtual - relay_txs(const std::vector< std::string > &tx_metadatas) overridemonero::monero_wallet_fullvirtual - monero::monero_wallet::relay_txs(const std::vector< std::shared_ptr< monero_tx_wallet > > &txs)monero::monero_walletinlinevirtual - remove_listener(monero_wallet_listener &listener) overridemonero::monero_wallet_fullvirtual - rescan_blockchain() overridemonero::monero_wallet_fullvirtual - rescan_spent() overridemonero::monero_wallet_fullvirtual - save() overridemonero::monero_wallet_fullvirtual - scan_txs(const std::vector< std::string > &tx_hashes) overridemonero::monero_wallet_fullvirtual - set_attribute(const std::string &key, const std::string &val) overridemonero::monero_wallet_fullvirtual - set_daemon_connection(const std::string &uri, const std::string &username="", const std::string &password="") overridemonero::monero_wallet_fullvirtual - set_daemon_connection(const boost::optional< monero_rpc_connection > &connection) overridemonero::monero_wallet_fullvirtual - set_daemon_proxy(const std::string &uri="") overridemonero::monero_wallet_fullvirtual - set_restore_height(uint64_t restore_height) overridemonero::monero_wallet_fullvirtual - set_subaddress_label(uint32_t account_idx, uint32_t subaddress_idx, const std::string &label="") overridemonero::monero_wallet_fullvirtual - set_tx_note(const std::string &tx_hash, const std::string &note) overridemonero::monero_wallet_fullvirtual - set_tx_notes(const std::vector< std::string > &tx_hashes, const std::vector< std::string > &notes) overridemonero::monero_wallet_fullvirtual - sign_message(const std::string &msg, monero_message_signature_type signature_type, uint32_t account_idx=0, uint32_t subaddress_idx=0) const overridemonero::monero_wallet_fullvirtual - sign_multisig_tx_hex(const std::string &multisig_tx_hex) overridemonero::monero_wallet_fullvirtual - sign_txs(const std::string &unsigned_tx_hex) overridemonero::monero_wallet_fullvirtual - start_mining(boost::optional< uint64_t > num_threads, boost::optional< bool > background_mining, boost::optional< bool > ignore_battery) overridemonero::monero_wallet_fullvirtual - start_syncing(uint64_t sync_period_in_ms) overridemonero::monero_wallet_fullvirtual - stop_mining() overridemonero::monero_wallet_fullvirtual - stop_syncing() overridemonero::monero_wallet_fullvirtual - submit_multisig_tx_hex(const std::string &signed_multisig_tx_hex) overridemonero::monero_wallet_fullvirtual - submit_txs(const std::string &signed_tx_hex) overridemonero::monero_wallet_fullvirtual - sweep_dust(bool relay=false) overridemonero::monero_wallet_fullvirtual - sweep_output(const monero_tx_config &config) overridemonero::monero_wallet_fullvirtual - sweep_unlocked(const monero_tx_config &config) overridemonero::monero_wallet_fullvirtual - sync() overridemonero::monero_wallet_fullvirtual - sync(monero_wallet_listener &listener) overridemonero::monero_wallet_fullvirtual - sync(uint64_t start_height) overridemonero::monero_wallet_fullvirtual - sync(uint64_t start_height, monero_wallet_listener &listener) overridemonero::monero_wallet_fullvirtual - thaw_output(const std::string &key_image) overridemonero::monero_wallet_fullvirtual - verify_message(const std::string &msg, const std::string &address, const std::string &signature) const overridemonero::monero_wallet_fullvirtual - wait_for_next_block() overridemonero::monero_wallet_fullvirtual - wallet2_listener (defined in monero::monero_wallet_full)monero::monero_wallet_fullfriend - wallet_exists(const std::string &path)monero::monero_wallet_fullstatic - ~monero_wallet()monero::monero_walletinlinevirtual - ~monero_wallet_full()monero::monero_wallet_full + m_w2 (defined in monero::monero_wallet_full)monero::monero_wallet_fullprotected + make_multisig(const std::vector< std::string > &multisig_hexes, int threshold, const std::string &password) overridemonero::monero_wallet_fullvirtual + move_to(const std::string &path, const std::string &password) overridemonero::monero_wallet_fullvirtual + open_wallet(const std::string &path, const std::string &password, const monero_network_type network_type)monero::monero_wallet_fullstatic + 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)monero::monero_wallet_fullstatic + parse_payment_uri(const std::string &uri) const overridemonero::monero_wallet_fullvirtual + prepare_multisig() overridemonero::monero_wallet_fullvirtual + relay_tx(const std::string &tx_metadata)monero::monero_walletinlinevirtual + relay_tx(const monero_tx_wallet &tx)monero::monero_walletinlinevirtual + relay_txs(const std::vector< std::string > &tx_metadatas) overridemonero::monero_wallet_fullvirtual + monero::monero_wallet::relay_txs(const std::vector< std::shared_ptr< monero_tx_wallet > > &txs)monero::monero_walletinlinevirtual + remove_listener(monero_wallet_listener &listener) overridemonero::monero_wallet_fullvirtual + rescan_blockchain() overridemonero::monero_wallet_fullvirtual + rescan_spent() overridemonero::monero_wallet_fullvirtual + save() overridemonero::monero_wallet_fullvirtual + scan_txs(const std::vector< std::string > &tx_hashes) overridemonero::monero_wallet_fullvirtual + set_attribute(const std::string &key, const std::string &val) overridemonero::monero_wallet_fullvirtual + set_daemon_connection(const std::string &uri, const std::string &username="", const std::string &password="") overridemonero::monero_wallet_fullvirtual + set_daemon_connection(const boost::optional< monero_rpc_connection > &connection) overridemonero::monero_wallet_fullvirtual + set_daemon_proxy(const std::string &uri="") overridemonero::monero_wallet_fullvirtual + set_restore_height(uint64_t restore_height) overridemonero::monero_wallet_fullvirtual + set_subaddress_label(uint32_t account_idx, uint32_t subaddress_idx, const std::string &label="") overridemonero::monero_wallet_fullvirtual + set_tx_note(const std::string &tx_hash, const std::string &note) overridemonero::monero_wallet_fullvirtual + set_tx_notes(const std::vector< std::string > &tx_hashes, const std::vector< std::string > &notes) overridemonero::monero_wallet_fullvirtual + sign_message(const std::string &msg, monero_message_signature_type signature_type, uint32_t account_idx=0, uint32_t subaddress_idx=0) const overridemonero::monero_wallet_fullvirtual + sign_multisig_tx_hex(const std::string &multisig_tx_hex) overridemonero::monero_wallet_fullvirtual + sign_txs(const std::string &unsigned_tx_hex) overridemonero::monero_wallet_fullvirtual + start_mining(boost::optional< uint64_t > num_threads, boost::optional< bool > background_mining, boost::optional< bool > ignore_battery) overridemonero::monero_wallet_fullvirtual + start_syncing(uint64_t sync_period_in_ms) overridemonero::monero_wallet_fullvirtual + stop_mining() overridemonero::monero_wallet_fullvirtual + stop_syncing() overridemonero::monero_wallet_fullvirtual + submit_multisig_tx_hex(const std::string &signed_multisig_tx_hex) overridemonero::monero_wallet_fullvirtual + submit_txs(const std::string &signed_tx_hex) overridemonero::monero_wallet_fullvirtual + sweep_dust(bool relay=false) overridemonero::monero_wallet_fullvirtual + sweep_output(const monero_tx_config &config) overridemonero::monero_wallet_fullvirtual + sweep_unlocked(const monero_tx_config &config) overridemonero::monero_wallet_fullvirtual + sync() overridemonero::monero_wallet_fullvirtual + sync(monero_wallet_listener &listener) overridemonero::monero_wallet_fullvirtual + sync(uint64_t start_height) overridemonero::monero_wallet_fullvirtual + sync(uint64_t start_height, monero_wallet_listener &listener) overridemonero::monero_wallet_fullvirtual + thaw_output(const std::string &key_image) overridemonero::monero_wallet_fullvirtual + verify_message(const std::string &msg, const std::string &address, const std::string &signature) const overridemonero::monero_wallet_fullvirtual + wait_for_next_block() overridemonero::monero_wallet_fullvirtual + wallet2_listener (defined in monero::monero_wallet_full)monero::monero_wallet_fullfriend + wallet_exists(const std::string &path)monero::monero_wallet_fullstatic + ~monero_wallet()monero::monero_walletinlinevirtual + ~monero_wallet_full()monero::monero_wallet_full
diff --git a/docs/classmonero_1_1monero__wallet__full.html b/docs/classmonero_1_1monero__wallet__full.html index 1695b51..c86f914 100644 --- a/docs/classmonero_1_1monero__wallet__full.html +++ b/docs/classmonero_1_1monero__wallet__full.html @@ -69,6 +69,7 @@ $(function() {
Public Member Functions | Static Public Member Functions | +Protected Attributes | Friends | List of all members
monero::monero_wallet_full Class Reference
@@ -228,8 +229,8 @@ Public Member Functions   monero_tx_set describe_tx_set (const monero_tx_set &tx_set) override   -std::string sign_txs (const std::string &unsigned_tx_hex) override -  +monero_tx_set sign_txs (const std::string &unsigned_tx_hex) override +  std::vector< std::string > submit_txs (const std::string &signed_tx_hex) override   std::string sign_message (const std::string &msg, monero_message_signature_type signature_type, uint32_t account_idx=0, uint32_t subaddress_idx=0) const override @@ -478,8 +479,8 @@ std::string get_cache_file   virtual monero_tx_set describe_tx_set (const monero_tx_set &tx_set)   -virtual std::string sign_txs (const std::string &unsigned_tx_hex) -  +virtual monero_tx_set sign_txs (const std::string &unsigned_tx_hex) +  virtual std::vector< std::string > submit_txs (const std::string &signed_tx_hex)   virtual std::string sign_message (const std::string &msg, monero_message_signature_type signature_type, uint32_t account_idx=0, uint32_t subaddress_idx=0) const @@ -576,6 +577,12 @@ Static Public Member Functions static std::vector< std::string > get_seed_languages ()   + + + +

+Protected Attributes

+std::unique_ptr< tools::wallet2 > m_w2
 

Friends

@@ -4383,8 +4390,8 @@ struct wallet2_listener - -

◆ sign_txs()

+ +

◆ sign_txs()

@@ -4393,7 +4400,7 @@ struct 
wallet2_listener - + @@ -4413,9 +4420,9 @@ struct  - + diff --git a/docs/classmonero_1_1monero__wallet__keys.html b/docs/classmonero_1_1monero__wallet__keys.html index 0be763a..8e2f96c 100644 --- a/docs/classmonero_1_1monero__wallet__keys.html +++ b/docs/classmonero_1_1monero__wallet__keys.html @@ -288,8 +288,8 @@ Public Member Functions - - + + diff --git a/docs/functions_func_s.html b/docs/functions_func_s.html index bbddb5b..d04df88 100644 --- a/docs/functions_func_s.html +++ b/docs/functions_func_s.html @@ -77,7 +77,7 @@ $(function() {
  • set_tx_notes() : monero::monero_wallet, monero::monero_wallet_full
  • sign_message() : monero::monero_wallet, monero::monero_wallet_full, monero::monero_wallet_keys
  • sign_multisig_tx_hex() : monero::monero_wallet, monero::monero_wallet_full
    • -
  • sign_txs() : monero::monero_wallet, monero::monero_wallet_full
    • +
  • sign_txs() : monero::monero_wallet, monero::monero_wallet_full
  • start_mining() : monero::monero_wallet, monero::monero_wallet_full
  • start_syncing() : monero::monero_wallet, monero::monero_wallet_full
  • stop_mining() : monero::monero_wallet, monero::monero_wallet_full
    • diff --git a/docs/functions_s.html b/docs/functions_s.html index f11786a..ec267db 100644 --- a/docs/functions_s.html +++ b/docs/functions_s.html @@ -77,7 +77,7 @@ $(function() {
  • set_tx_notes() : monero::monero_wallet, monero::monero_wallet_full
  • sign_message() : monero::monero_wallet, monero::monero_wallet_full, monero::monero_wallet_keys
  • sign_multisig_tx_hex() : monero::monero_wallet, monero::monero_wallet_full
    • -
  • sign_txs() : monero::monero_wallet, monero::monero_wallet_full
    • +
  • sign_txs() : monero::monero_wallet, monero::monero_wallet_full
  • start_mining() : monero::monero_wallet, monero::monero_wallet_full
  • start_syncing() : monero::monero_wallet, monero::monero_wallet_full
  • stop_mining() : monero::monero_wallet, monero::monero_wallet_full
    • diff --git a/docs/gen__utils_8h_source.html b/docs/gen__utils_8h_source.html index ac70daf..ce5c48d 100644 --- a/docs/gen__utils_8h_source.html +++ b/docs/gen__utils_8h_source.html @@ -80,86 +80,87 @@ $(function() {
    59#include <boost/uuid/uuid_generators.hpp>
    60#include <boost/uuid/uuid_io.hpp>
    61#include <chrono>
    -
    62#include "include_base_utils.h"
    -
    63#include "common/util.h"
    -
    64
    -
    68namespace gen_utils
    -
    69{
    -
    70
    -
    76 static std::string get_uuid() {
    -
    77 boost::uuids::random_generator generator;
    -
    78 boost::uuids::uuid uuid = generator();
    -
    79 return boost::uuids::to_string(uuid);
    -
    80 }
    -
    81
    -
    87 static void wait_for(uint64_t duration_ms) {
    -
    88 std::this_thread::sleep_for(std::chrono::milliseconds(duration_ms));
    -
    89 }
    -
    90
    -
    91 // ------------------------- VALUE RECONCILATION ----------------------------
    -
    92
    -
    93 // TODO: refactor common template code
    -
    94 template <class T, typename std::enable_if<std::is_same<T, std::string>::value, T>::type* = nullptr>
    -
    95 boost::optional<T> reconcile(const boost::optional<T>& val1, const boost::optional<T>& val2, boost::optional<bool> resolve_defined, boost::optional<bool> resolve_true, boost::optional<bool> resolve_max, const std::string& err_msg = "") {
    -
    96
    -
    97 // check for equality
    -
    98 if (val1 == val2) return val1;
    -
    99
    -
    100 // resolve one value none
    -
    101 if (val1 == boost::none || val2 == boost::none) {
    -
    102 if (resolve_defined != boost::none && *resolve_defined == false) return boost::none;
    -
    103 else return val1 == boost::none ? val2 : val1;
    -
    104 }
    -
    105
    -
    106 throw std::runtime_error(std::string("Cannot reconcile strings: ") + boost::lexical_cast<std::string>(val1) + std::string(" vs ") + boost::lexical_cast<std::string>(val2) + (!err_msg.empty() ? std::string(". ") + err_msg : std::string("")));
    -
    107 }
    -
    108 template <class T, typename std::enable_if<std::is_same<T, std::string>::value, T>::type* = nullptr>
    -
    109 boost::optional<T> reconcile(const boost::optional<T>& val1, const boost::optional<T>& val2, const std::string& err_msg = "") {
    -
    110 return reconcile(val1, val2, boost::none, boost::none, boost::none, err_msg);
    -
    111 }
    -
    112
    -
    113 template <class T, typename std::enable_if<std::is_integral<T>::value, T>::type* = nullptr>
    -
    114 boost::optional<T> reconcile(const boost::optional<T>& val1, const boost::optional<T>& val2, boost::optional<bool> resolve_defined, boost::optional<bool> resolve_true, boost::optional<bool> resolve_max, const std::string& err_msg = "") {
    -
    115
    -
    116 // check for equality
    -
    117 if (val1 == val2) return val1;
    -
    118
    -
    119 // resolve one value none
    -
    120 if (val1 == boost::none || val2 == boost::none) {
    -
    121 if (resolve_defined != boost::none && *resolve_defined == false) return boost::none;
    -
    122 else return val1 == boost::none ? val2 : val1;
    -
    123 }
    -
    124
    -
    125 // resolve different booleans
    -
    126 if (resolve_true != boost::none) return (bool) val1 == *resolve_true ? val1 : val2; // if resolve true, return true, else return false
    -
    127
    -
    128 // resolve different numbers
    -
    129 if (resolve_max != boost::none) return *resolve_max ? std::max(*val1, *val2) : std::min(*val1, *val2);
    -
    130
    -
    131 // cannot reconcile
    -
    132 throw std::runtime_error(std::string("Cannot reconcile integrals: ") + boost::lexical_cast<std::string>(val1) + std::string(" vs ") + boost::lexical_cast<std::string>(val2) + (!err_msg.empty() ? std::string(". ") + err_msg : std::string("")));
    -
    133 }
    -
    134 template <class T, typename std::enable_if<std::is_integral<T>::value, T>::type* = nullptr>
    -
    135 boost::optional<T> reconcile(const boost::optional<T>& val1, const boost::optional<T>& val2, const std::string& err_msg = "") {
    -
    136 return reconcile(val1, val2, boost::none, boost::none, boost::none, err_msg);
    -
    137 }
    -
    138
    -
    139 template <class T>
    -
    140 std::vector<T> reconcile(const std::vector<T>& v1, const std::vector<T>& v2, const std::string& err_msg = "") {
    -
    141
    -
    142 // check for equality
    -
    143 if (v1 == v2) return v1;
    -
    144
    -
    145 // resolve one vector empty
    -
    146 if (v1.empty()) return v2;
    -
    147 if (v2.empty()) return v1;
    -
    148
    -
    149 // otherwise cannot reconcile
    -
    150 throw std::runtime_error("Cannot reconcile vectors" + (!err_msg.empty() ? std::string(". ") + err_msg : std::string("")));
    -
    151 }
    -
    152}
    -
    153#endif /* gen_utils_h */
    -
    gen_utils
    Definition: gen_utils.h:69
    +
    62#include <thread>
    +
    63#include "include_base_utils.h"
    +
    64#include "common/util.h"
    +
    65
    +
    69namespace gen_utils
    +
    70{
    +
    71
    +
    77 static std::string get_uuid() {
    +
    78 boost::uuids::random_generator generator;
    +
    79 boost::uuids::uuid uuid = generator();
    +
    80 return boost::uuids::to_string(uuid);
    +
    81 }
    +
    82
    +
    88 static void wait_for(uint64_t duration_ms) {
    +
    89 std::this_thread::sleep_for(std::chrono::milliseconds(duration_ms));
    +
    90 }
    +
    91
    +
    92 // ------------------------- VALUE RECONCILATION ----------------------------
    +
    93
    +
    94 // TODO: refactor common template code
    +
    95 template <class T, typename std::enable_if<std::is_same<T, std::string>::value, T>::type* = nullptr>
    +
    96 boost::optional<T> reconcile(const boost::optional<T>& val1, const boost::optional<T>& val2, boost::optional<bool> resolve_defined, boost::optional<bool> resolve_true, boost::optional<bool> resolve_max, const std::string& err_msg = "") {
    +
    97
    +
    98 // check for equality
    +
    99 if (val1 == val2) return val1;
    +
    100
    +
    101 // resolve one value none
    +
    102 if (val1 == boost::none || val2 == boost::none) {
    +
    103 if (resolve_defined != boost::none && *resolve_defined == false) return boost::none;
    +
    104 else return val1 == boost::none ? val2 : val1;
    +
    105 }
    +
    106
    +
    107 throw std::runtime_error(std::string("Cannot reconcile strings: ") + boost::lexical_cast<std::string>(val1) + std::string(" vs ") + boost::lexical_cast<std::string>(val2) + (!err_msg.empty() ? std::string(". ") + err_msg : std::string("")));
    +
    108 }
    +
    109 template <class T, typename std::enable_if<std::is_same<T, std::string>::value, T>::type* = nullptr>
    +
    110 boost::optional<T> reconcile(const boost::optional<T>& val1, const boost::optional<T>& val2, const std::string& err_msg = "") {
    +
    111 return reconcile(val1, val2, boost::none, boost::none, boost::none, err_msg);
    +
    112 }
    +
    113
    +
    114 template <class T, typename std::enable_if<std::is_integral<T>::value, T>::type* = nullptr>
    +
    115 boost::optional<T> reconcile(const boost::optional<T>& val1, const boost::optional<T>& val2, boost::optional<bool> resolve_defined, boost::optional<bool> resolve_true, boost::optional<bool> resolve_max, const std::string& err_msg = "") {
    +
    116
    +
    117 // check for equality
    +
    118 if (val1 == val2) return val1;
    +
    119
    +
    120 // resolve one value none
    +
    121 if (val1 == boost::none || val2 == boost::none) {
    +
    122 if (resolve_defined != boost::none && *resolve_defined == false) return boost::none;
    +
    123 else return val1 == boost::none ? val2 : val1;
    +
    124 }
    +
    125
    +
    126 // resolve different booleans
    +
    127 if (resolve_true != boost::none) return (bool) val1 == *resolve_true ? val1 : val2; // if resolve true, return true, else return false
    +
    128
    +
    129 // resolve different numbers
    +
    130 if (resolve_max != boost::none) return *resolve_max ? std::max(*val1, *val2) : std::min(*val1, *val2);
    +
    131
    +
    132 // cannot reconcile
    +
    133 throw std::runtime_error(std::string("Cannot reconcile integrals: ") + boost::lexical_cast<std::string>(val1) + std::string(" vs ") + boost::lexical_cast<std::string>(val2) + (!err_msg.empty() ? std::string(". ") + err_msg : std::string("")));
    +
    134 }
    +
    135 template <class T, typename std::enable_if<std::is_integral<T>::value, T>::type* = nullptr>
    +
    136 boost::optional<T> reconcile(const boost::optional<T>& val1, const boost::optional<T>& val2, const std::string& err_msg = "") {
    +
    137 return reconcile(val1, val2, boost::none, boost::none, boost::none, err_msg);
    +
    138 }
    +
    139
    +
    140 template <class T>
    +
    141 std::vector<T> reconcile(const std::vector<T>& v1, const std::vector<T>& v2, const std::string& err_msg = "") {
    +
    142
    +
    143 // check for equality
    +
    144 if (v1 == v2) return v1;
    +
    145
    +
    146 // resolve one vector empty
    +
    147 if (v1.empty()) return v2;
    +
    148 if (v2.empty()) return v1;
    +
    149
    +
    150 // otherwise cannot reconcile
    +
    151 throw std::runtime_error("Cannot reconcile vectors" + (!err_msg.empty() ? std::string(". ") + err_msg : std::string("")));
    +
    152 }
    +
    153}
    +
    154#endif /* gen_utils_h */
    +
    gen_utils
    Definition: gen_utils.h:70
    diff --git a/docs/monero__wallet_8h_source.html b/docs/monero__wallet_8h_source.html index 539b30f..290242f 100644 --- a/docs/monero__wallet_8h_source.html +++ b/docs/monero__wallet_8h_source.html @@ -434,7 +434,7 @@ $(function() {
    937 throw std::runtime_error("describe_tx_set() not supported");
    938 }
    939
    -
    946 virtual std::string sign_txs(const std::string& unsigned_tx_hex) {
    +
    946 virtual monero_tx_set sign_txs(const std::string& unsigned_tx_hex) {
    947 throw std::runtime_error("sign_txs() not supported");
    948 }
    949
    @@ -644,6 +644,7 @@ $(function() {
    monero::monero_wallet::freeze_output
    virtual void freeze_output(const std::string &key_image)
    Definition: monero_wallet.h:810
    monero::monero_wallet::sweep_unlocked
    virtual std::vector< std::shared_ptr< monero_tx_wallet > > sweep_unlocked(const monero_tx_config &config)
    Definition: monero_wallet.h:862
    monero::monero_wallet::get_address_book_entries
    virtual std::vector< monero_address_book_entry > get_address_book_entries(const std::vector< uint64_t > &indices) const
    Definition: monero_wallet.h:1135
    +
    monero::monero_wallet::sign_txs
    virtual monero_tx_set sign_txs(const std::string &unsigned_tx_hex)
    Definition: monero_wallet.h:946
    monero::monero_wallet::get_height
    virtual uint64_t get_height() const
    Definition: monero_wallet.h:352
    monero::monero_wallet::exchange_multisig_keys
    virtual monero_multisig_init_result exchange_multisig_keys(const std::vector< std::string > &mutisig_hexes, const std::string &password)
    Definition: monero_wallet.h:1298
    monero::monero_wallet::is_multisig_import_needed
    virtual bool is_multisig_import_needed() const
    Definition: monero_wallet.h:1245
    @@ -667,7 +668,6 @@ $(function() {
    monero::monero_wallet::get_outputs
    virtual std::vector< std::shared_ptr< monero_output_wallet > > get_outputs(const monero_output_query &query) const
    Definition: monero_wallet.h:761
    monero::monero_wallet::add_address_book_entry
    virtual uint64_t add_address_book_entry(const std::string &address, const std::string &description)
    Definition: monero_wallet.h:1146
    monero::monero_wallet::get_balance
    virtual uint64_t get_balance(uint32_t account_idx) const
    Definition: monero_wallet.h:533
    -
    monero::monero_wallet::sign_txs
    virtual std::string sign_txs(const std::string &unsigned_tx_hex)
    Definition: monero_wallet.h:946
    monero::monero_wallet::is_connected_to_daemon
    virtual bool is_connected_to_daemon() const
    Definition: monero_wallet.h:183
    monero::monero_wallet::decode_integrated_address
    virtual monero_integrated_address decode_integrated_address(const std::string &integrated_address) const
    Definition: monero_wallet.h:343
    monero::monero_wallet::sweep_output
    virtual std::shared_ptr< monero_tx_wallet > sweep_output(const monero_tx_config &config)
    Definition: monero_wallet.h:872
    diff --git a/docs/monero__wallet__full_8h_source.html b/docs/monero__wallet__full_8h_source.html index a213c8e..25e77a3 100644 --- a/docs/monero__wallet__full_8h_source.html +++ b/docs/monero__wallet__full_8h_source.html @@ -175,7 +175,7 @@ $(function() {
    204 std::vector<std::shared_ptr<monero_tx_wallet>> sweep_dust(bool relay = false) override;
    205 std::vector<std::string> relay_txs(const std::vector<std::string>& tx_metadatas) override;
    206 monero_tx_set describe_tx_set(const monero_tx_set& tx_set) override;
    -
    207 std::string sign_txs(const std::string& unsigned_tx_hex) override;
    +
    207 monero_tx_set sign_txs(const std::string& unsigned_tx_hex) override;
    208 std::vector<std::string> submit_txs(const std::string& signed_tx_hex) override;
    209 std::string sign_message(const std::string& msg, monero_message_signature_type signature_type, uint32_t account_idx = 0, uint32_t subaddress_idx = 0) const override;
    210 monero_message_signature_result verify_message(const std::string& msg, const std::string& address, const std::string& signature) const override;
    @@ -220,65 +220,69 @@ $(function() {
    252 std::string get_keys_file_buffer(const epee::wipeable_string& password, bool view_only) const;
    253 std::string get_cache_file_buffer() const;
    254
    -
    255 // ---------------------------------- PRIVATE ---------------------------------
    +
    255 // --------------------------------- PROTECTED --------------------------------
    256
    -
    257 private:
    -
    258 friend struct wallet2_listener;
    -
    259 std::unique_ptr<tools::wallet2> m_w2; // internal wallet implementation
    -
    260 std::unique_ptr<wallet2_listener> m_w2_listener; // internal wallet implementation listener
    -
    261 std::set<monero_wallet_listener*> m_listeners; // external wallet listeners
    -
    262
    -
    263 static monero_wallet_full* create_wallet_from_seed(monero_wallet_config& config, std::unique_ptr<epee::net_utils::http::http_client_factory> http_client_factory);
    -
    264 static monero_wallet_full* create_wallet_from_keys(monero_wallet_config& config, std::unique_ptr<epee::net_utils::http::http_client_factory> http_client_factory);
    -
    265 static monero_wallet_full* create_wallet_random(monero_wallet_config& config, std::unique_ptr<epee::net_utils::http::http_client_factory> http_client_factory);
    +
    257 protected:
    +
    258 std::unique_ptr<tools::wallet2> m_w2; // internal wallet implementation
    +
    259
    +
    260 // ---------------------------------- PRIVATE ---------------------------------
    +
    261
    +
    262 private:
    +
    263 friend struct wallet2_listener;
    +
    264 std::unique_ptr<wallet2_listener> m_w2_listener; // internal wallet implementation listener
    +
    265 std::set<monero_wallet_listener*> m_listeners; // external wallet listeners
    266
    -
    267 void init_common();
    -
    268 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;
    -
    269 std::vector<std::shared_ptr<monero_transfer>> get_transfers_aux(const monero_transfer_query& query) const;
    -
    270 std::vector<std::shared_ptr<monero_output_wallet>> get_outputs_aux(const monero_output_query& query) const;
    -
    271 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()
    -
    272
    -
    273 // blockchain sync management
    -
    274 mutable std::atomic<bool> m_is_synced; // whether or not wallet is synced
    -
    275 mutable std::atomic<bool> m_is_connected; // cache connection status to avoid unecessary RPC calls
    -
    276 boost::condition_variable m_sync_cv; // to make sync threads woke
    -
    277 boost::mutex m_sync_mutex; // synchronize sync() and syncAsync() requests
    -
    278 std::atomic<bool> m_rescan_on_sync; // whether or not to rescan on sync
    -
    279 std::atomic<bool> m_syncing_enabled; // whether or not auto sync is enabled
    -
    280 std::atomic<bool> m_sync_loop_running; // whether or not the syncing thread is shut down
    -
    281 std::atomic<int> m_syncing_interval; // auto sync loop interval in milliseconds
    -
    282 boost::thread m_syncing_thread; // thread for auto sync loop
    -
    283 boost::mutex m_syncing_mutex; // synchronize auto sync loop
    -
    284 void run_sync_loop(); // run the sync loop in a thread
    -
    285 monero_sync_result lock_and_sync(boost::optional<uint64_t> start_height = boost::none); // internal function to synchronize request to sync and rescan
    -
    286 monero_sync_result sync_aux(boost::optional<uint64_t> start_height = boost::none); // internal function to immediately block, sync, and report progress
    -
    287 };
    -
    288}
    +
    267 static monero_wallet_full* create_wallet_from_seed(monero_wallet_config& config, std::unique_ptr<epee::net_utils::http::http_client_factory> http_client_factory);
    +
    268 static monero_wallet_full* create_wallet_from_keys(monero_wallet_config& config, std::unique_ptr<epee::net_utils::http::http_client_factory> http_client_factory);
    +
    269 static monero_wallet_full* create_wallet_random(monero_wallet_config& config, std::unique_ptr<epee::net_utils::http::http_client_factory> http_client_factory);
    +
    270
    +
    271 void init_common();
    +
    272 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;
    +
    273 std::vector<std::shared_ptr<monero_transfer>> get_transfers_aux(const monero_transfer_query& query) const;
    +
    274 std::vector<std::shared_ptr<monero_output_wallet>> get_outputs_aux(const monero_output_query& query) const;
    +
    275 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()
    +
    276
    +
    277 // blockchain sync management
    +
    278 mutable std::atomic<bool> m_is_synced; // whether or not wallet is synced
    +
    279 mutable std::atomic<bool> m_is_connected; // cache connection status to avoid unecessary RPC calls
    +
    280 boost::condition_variable m_sync_cv; // to make sync threads woke
    +
    281 boost::mutex m_sync_mutex; // synchronize sync() and syncAsync() requests
    +
    282 std::atomic<bool> m_rescan_on_sync; // whether or not to rescan on sync
    +
    283 std::atomic<bool> m_syncing_enabled; // whether or not auto sync is enabled
    +
    284 std::atomic<bool> m_sync_loop_running; // whether or not the syncing thread is shut down
    +
    285 std::atomic<int> m_syncing_interval; // auto sync loop interval in milliseconds
    +
    286 boost::thread m_syncing_thread; // thread for auto sync loop
    +
    287 boost::mutex m_syncing_mutex; // synchronize auto sync loop
    +
    288 void run_sync_loop(); // run the sync loop in a thread
    +
    289 monero_sync_result lock_and_sync(boost::optional<uint64_t> start_height = boost::none); // internal function to synchronize request to sync and rescan
    +
    290 monero_sync_result sync_aux(boost::optional<uint64_t> start_height = boost::none); // internal function to immediately block, sync, and report progress
    +
    291 };
    +
    292}
    monero::monero_wallet_full
    Definition: monero_wallet_full.h:77
    -
    monero::monero_wallet_full::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_full.cpp:3230
    +
    monero::monero_wallet_full::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_full.cpp:3247
    monero::monero_wallet_full::get_seed
    std::string get_seed() const override
    Definition: monero_wallet_full.cpp:1351
    monero::monero_wallet_full::get_outputs
    std::vector< std::shared_ptr< monero_output_wallet > > get_outputs(const monero_output_query &query) const override
    Definition: monero_wallet_full.cpp:1857
    monero::monero_wallet_full::wallet_exists
    static bool wallet_exists(const std::string &path)
    Definition: monero_wallet_full.cpp:1048
    -
    monero::monero_wallet_full::get_tx_note
    std::string get_tx_note(const std::string &tx_hash) const override
    Definition: monero_wallet_full.cpp:3048
    +
    monero::monero_wallet_full::get_tx_note
    std::string get_tx_note(const std::string &tx_hash) const override
    Definition: monero_wallet_full.cpp:3065
    monero::monero_wallet_full::get_version
    monero_version get_version() const override
    Definition: monero_wallet_full.cpp:1336
    monero::monero_wallet_full::get_restore_height
    uint64_t get_restore_height() const override
    Definition: monero_wallet_full.cpp:1468
    monero::monero_wallet_full::get_private_view_key
    std::string get_private_view_key() const override
    Definition: monero_wallet_full.cpp:1375
    -
    monero::monero_wallet_full::prepare_multisig
    std::string prepare_multisig() override
    Definition: monero_wallet_full.cpp:3312
    +
    monero::monero_wallet_full::prepare_multisig
    std::string prepare_multisig() override
    Definition: monero_wallet_full.cpp:3329
    monero::monero_wallet_full::get_public_view_key
    std::string get_public_view_key() const override
    Definition: monero_wallet_full.cpp:1370
    -
    monero::monero_wallet_full::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_full.cpp:3083
    +
    monero::monero_wallet_full::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_full.cpp:3100
    monero::monero_wallet_full::get_account
    monero_account get_account(const uint32_t account_idx, bool include_subaddresses) const override
    Definition: monero_wallet_full.cpp:1656
    monero::monero_wallet_full::sweep_dust
    std::vector< std::shared_ptr< monero_tx_wallet > > sweep_dust(bool relay=false) override
    Definition: monero_wallet_full.cpp:2465
    monero::monero_wallet_full::set_daemon_proxy
    void set_daemon_proxy(const std::string &uri="") override
    Definition: monero_wallet_full.cpp:1289
    -
    monero::monero_wallet_full::set_attribute
    void set_attribute(const std::string &key, const std::string &val) override
    Definition: monero_wallet_full.cpp:3226
    -
    monero::monero_wallet_full::set_tx_notes
    void set_tx_notes(const std::vector< std::string > &tx_hashes, const std::vector< std::string > &notes) override
    Definition: monero_wallet_full.cpp:3075
    +
    monero::monero_wallet_full::set_attribute
    void set_attribute(const std::string &key, const std::string &val) override
    Definition: monero_wallet_full.cpp:3243
    +
    monero::monero_wallet_full::set_tx_notes
    void set_tx_notes(const std::vector< std::string > &tx_hashes, const std::vector< std::string > &notes) override
    Definition: monero_wallet_full.cpp:3092
    monero::monero_wallet_full::stop_syncing
    void stop_syncing() override
    Definition: monero_wallet_full.cpp:1566
    monero::monero_wallet_full::get_path
    std::string get_path() const override
    Definition: monero_wallet_full.cpp:1343
    monero::monero_wallet_full::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_full.cpp:1688
    -
    monero::monero_wallet_full::set_tx_note
    void set_tx_note(const std::string &tx_hash, const std::string &note) override
    Definition: monero_wallet_full.cpp:3065
    -
    monero::monero_wallet_full::import_multisig_hex
    int import_multisig_hex(const std::vector< std::string > &multisig_hexes) override
    Definition: monero_wallet_full.cpp:3356
    +
    monero::monero_wallet_full::set_tx_note
    void set_tx_note(const std::string &tx_hash, const std::string &note) override
    Definition: monero_wallet_full.cpp:3082
    +
    monero::monero_wallet_full::import_multisig_hex
    int import_multisig_hex(const std::vector< std::string > &multisig_hexes) override
    Definition: monero_wallet_full.cpp:3373
    monero::monero_wallet_full::export_key_images
    std::vector< std::shared_ptr< monero_key_image > > export_key_images(bool all=false) const override
    Definition: monero_wallet_full.cpp:1894
    monero::monero_wallet_full::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_full.cpp:1909
    -
    monero::monero_wallet_full::sign_multisig_tx_hex
    monero_multisig_sign_result sign_multisig_tx_hex(const std::string &multisig_tx_hex) override
    Definition: monero_wallet_full.cpp:3384
    +
    monero::monero_wallet_full::sign_multisig_tx_hex
    monero_multisig_sign_result sign_multisig_tx_hex(const std::string &multisig_tx_hex) override
    Definition: monero_wallet_full.cpp:3401
    monero::monero_wallet_full::freeze_output
    void freeze_output(const std::string &key_image) override
    Definition: monero_wallet_full.cpp:1936
    monero::monero_wallet_full::relay_txs
    std::vector< std::string > relay_txs(const std::vector< std::string > &tx_metadatas) override
    Definition: monero_wallet_full.cpp:2565
    monero::monero_wallet_full::create_subaddress
    monero_subaddress create_subaddress(uint32_t account_idx, const std::string &label="") override
    Definition: monero_wallet_full.cpp:1697
    @@ -287,79 +291,79 @@ $(function() {
    monero::monero_wallet_full::get_seed_languages
    static std::vector< std::string > get_seed_languages()
    Definition: monero_wallet_full.cpp:1255
    monero::monero_wallet_full::rescan_spent
    void rescan_spent() override
    Definition: monero_wallet_full.cpp:1589
    monero::monero_wallet_full::open_wallet_data
    static monero_wallet_full * 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_full.cpp:1066
    -
    monero::monero_wallet_full::sign_message
    std::string sign_message(const std::string &msg, monero_message_signature_type signature_type, uint32_t account_idx=0, uint32_t subaddress_idx=0) const override
    Definition: monero_wallet_full.cpp:2820
    +
    monero::monero_wallet_full::sign_message
    std::string sign_message(const std::string &msg, monero_message_signature_type signature_type, uint32_t account_idx=0, uint32_t subaddress_idx=0) const override
    Definition: monero_wallet_full.cpp:2837
    monero::monero_wallet_full::create_wallet
    static monero_wallet_full * create_wallet(const monero_wallet_config &config, std::unique_ptr< epee::net_utils::http::http_client_factory > http_client_factory=nullptr)
    Definition: monero_wallet_full.cpp:1078
    -
    monero::monero_wallet_full::get_tx_key
    std::string get_tx_key(const std::string &tx_hash) const override
    Definition: monero_wallet_full.cpp:2859
    +
    monero::monero_wallet_full::get_tx_key
    std::string get_tx_key(const std::string &tx_hash) const override
    Definition: monero_wallet_full.cpp:2876
    monero::monero_wallet_full::thaw_output
    void thaw_output(const std::string &key_image) override
    Definition: monero_wallet_full.cpp:1943
    monero::monero_wallet_full::get_unlocked_balance
    uint64_t get_unlocked_balance() const override
    Definition: monero_wallet_full.cpp:1620
    monero::monero_wallet_full::get_address_index
    monero_subaddress get_address_index(const std::string &address) const override
    Definition: monero_wallet_full.cpp:1397
    -
    monero::monero_wallet_full::submit_txs
    std::vector< std::string > submit_txs(const std::string &signed_tx_hex) override
    Definition: monero_wallet_full.cpp:2794
    +
    monero::monero_wallet_full::submit_txs
    std::vector< std::string > submit_txs(const std::string &signed_tx_hex) override
    Definition: monero_wallet_full.cpp:2811
    monero::monero_wallet_full::create_txs
    std::vector< std::shared_ptr< monero_tx_wallet > > create_txs(const monero_tx_config &config) override
    Definition: monero_wallet_full.cpp:1957
    -
    monero::monero_wallet_full::parse_payment_uri
    std::shared_ptr< monero_tx_config > parse_payment_uri(const std::string &uri) const override
    Definition: monero_wallet_full.cpp:3194
    -
    monero::monero_wallet_full::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_full.cpp:3027
    -
    monero::monero_wallet_full::submit_multisig_tx_hex
    std::vector< std::string > submit_multisig_tx_hex(const std::string &signed_multisig_tx_hex) override
    Definition: monero_wallet_full.cpp:3427
    -
    monero::monero_wallet_full::get_spend_proof
    std::string get_spend_proof(const std::string &tx_hash, const std::string &message) const override
    Definition: monero_wallet_full.cpp:2984
    +
    monero::monero_wallet_full::parse_payment_uri
    std::shared_ptr< monero_tx_config > parse_payment_uri(const std::string &uri) const override
    Definition: monero_wallet_full.cpp:3211
    +
    monero::monero_wallet_full::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_full.cpp:3044
    +
    monero::monero_wallet_full::submit_multisig_tx_hex
    std::vector< std::string > submit_multisig_tx_hex(const std::string &signed_multisig_tx_hex) override
    Definition: monero_wallet_full.cpp:3444
    +
    monero::monero_wallet_full::get_spend_proof
    std::string get_spend_proof(const std::string &tx_hash, const std::string &message) const override
    Definition: monero_wallet_full.cpp:3001
    monero::monero_wallet_full::get_daemon_connection
    boost::optional< monero_rpc_connection > get_daemon_connection() const override
    Definition: monero_wallet_full.cpp:1298
    monero::monero_wallet_full::get_height_by_date
    uint64_t get_height_by_date(uint16_t year, uint8_t month, uint8_t day) const override
    Definition: monero_wallet_full.cpp:1493
    monero::monero_wallet_full::export_outputs
    std::string export_outputs(bool all=false) const override
    Definition: monero_wallet_full.cpp:1878
    monero::monero_wallet_full::decode_integrated_address
    monero_integrated_address decode_integrated_address(const std::string &integrated_address) const override
    Definition: monero_wallet_full.cpp:1448
    +
    monero::monero_wallet_full::sign_txs
    monero_tx_set sign_txs(const std::string &unsigned_tx_hex) override
    Definition: monero_wallet_full.cpp:2772
    monero::monero_wallet_full::get_txs
    std::vector< std::shared_ptr< monero_tx_wallet > > get_txs() const override
    Definition: monero_wallet_full.cpp:1723
    monero::monero_wallet_full::sweep_unlocked
    std::vector< std::shared_ptr< monero_tx_wallet > > sweep_unlocked(const monero_tx_config &config) override
    Definition: monero_wallet_full.cpp:2119
    monero::monero_wallet_full::describe_tx_set
    monero_tx_set describe_tx_set(const monero_tx_set &tx_set) override
    Definition: monero_wallet_full.cpp:2613
    monero::monero_wallet_full::import_outputs
    int import_outputs(const std::string &outputs_hex) override
    Definition: monero_wallet_full.cpp:1882
    -
    monero::monero_wallet_full::get_payment_uri
    std::string get_payment_uri(const monero_tx_config &config) const override
    Definition: monero_wallet_full.cpp:3171
    -
    monero::monero_wallet_full::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_full.cpp:2952
    +
    monero::monero_wallet_full::get_payment_uri
    std::string get_payment_uri(const monero_tx_config &config) const override
    Definition: monero_wallet_full.cpp:3188
    +
    monero::monero_wallet_full::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_full.cpp:2969
    monero::monero_wallet_full::start_syncing
    void start_syncing(uint64_t sync_period_in_ms) override
    Definition: monero_wallet_full.cpp:1557
    monero::monero_wallet_full::add_listener
    void add_listener(monero_wallet_listener &listener) override
    Definition: monero_wallet_full.cpp:1497
    -
    monero::monero_wallet_full::save
    void save() override
    Definition: monero_wallet_full.cpp:3481
    +
    monero::monero_wallet_full::save
    void save() override
    Definition: monero_wallet_full.cpp:3498
    monero::monero_wallet_full::is_output_frozen
    bool is_output_frozen(const std::string &key_image) override
    Definition: monero_wallet_full.cpp:1950
    -
    monero::monero_wallet_full::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_full.cpp:3326
    +
    monero::monero_wallet_full::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_full.cpp:3343
    monero::monero_wallet_full::is_daemon_synced
    bool is_daemon_synced() const override
    Definition: monero_wallet_full.cpp:1321
    -
    monero::monero_wallet_full::sign_txs
    std::string sign_txs(const std::string &unsigned_tx_hex) override
    Definition: monero_wallet_full.cpp:2772
    -
    monero::monero_wallet_full::is_multisig_import_needed
    bool is_multisig_import_needed() const override
    Definition: monero_wallet_full.cpp:3302
    -
    monero::monero_wallet_full::get_reserve_proof_wallet
    std::string get_reserve_proof_wallet(const std::string &message) const override
    Definition: monero_wallet_full.cpp:3013
    -
    monero::monero_wallet_full::verify_message
    monero_message_signature_result verify_message(const std::string &msg, const std::string &address, const std::string &signature) const override
    Definition: monero_wallet_full.cpp:2826
    +
    monero::monero_wallet_full::is_multisig_import_needed
    bool is_multisig_import_needed() const override
    Definition: monero_wallet_full.cpp:3319
    +
    monero::monero_wallet_full::get_reserve_proof_wallet
    std::string get_reserve_proof_wallet(const std::string &message) const override
    Definition: monero_wallet_full.cpp:3030
    +
    monero::monero_wallet_full::verify_message
    monero_message_signature_result verify_message(const std::string &msg, const std::string &address, const std::string &signature) const override
    Definition: monero_wallet_full.cpp:2843
    monero::monero_wallet_full::sweep_output
    std::shared_ptr< monero_tx_wallet > sweep_output(const monero_tx_config &config) override
    Definition: monero_wallet_full.cpp:2321
    -
    monero::monero_wallet_full::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_full.cpp:2934
    -
    monero::monero_wallet_full::stop_mining
    void stop_mining() override
    Definition: monero_wallet_full.cpp:3260
    -
    monero::monero_wallet_full::get_attribute
    bool get_attribute(const std::string &key, std::string &value) const override
    Definition: monero_wallet_full.cpp:3222
    +
    monero::monero_wallet_full::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_full.cpp:2951
    +
    monero::monero_wallet_full::stop_mining
    void stop_mining() override
    Definition: monero_wallet_full.cpp:3277
    +
    monero::monero_wallet_full::get_attribute
    bool get_attribute(const std::string &key, std::string &value) const override
    Definition: monero_wallet_full.cpp:3239
    monero::monero_wallet_full::~monero_wallet_full
    ~monero_wallet_full()
    Definition: monero_wallet_full.cpp:1263
    monero::monero_wallet_full::is_daemon_trusted
    bool is_daemon_trusted() const override
    Definition: monero_wallet_full.cpp:1327
    -
    monero::monero_wallet_full::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_full.cpp:2884
    +
    monero::monero_wallet_full::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_full.cpp:2901
    monero::monero_wallet_full::scan_txs
    void scan_txs(const std::vector< std::string > &tx_hashes) override
    Definition: monero_wallet_full.cpp:1571
    monero::monero_wallet_full::get_address
    std::string get_address(const uint32_t account_idx, const uint32_t subaddress_idx) const override
    Definition: monero_wallet_full.cpp:1393
    monero::monero_wallet_full::get_listeners
    std::set< monero_wallet_listener * > get_listeners() override
    Definition: monero_wallet_full.cpp:1507
    -
    monero::monero_wallet_full::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_full.cpp:2997
    -
    monero::monero_wallet_full::delete_address_book_entry
    void delete_address_book_entry(uint64_t index) override
    Definition: monero_wallet_full.cpp:3165
    -
    monero::monero_wallet_full::add_address_book_entry
    uint64_t add_address_book_entry(const std::string &address, const std::string &description) override
    Definition: monero_wallet_full.cpp:3115
    -
    monero::monero_wallet_full::get_keys_file_buffer
    std::string get_keys_file_buffer(const epee::wipeable_string &password, bool view_only) const
    Definition: monero_wallet_full.cpp:3486
    +
    monero::monero_wallet_full::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_full.cpp:3014
    +
    monero::monero_wallet_full::delete_address_book_entry
    void delete_address_book_entry(uint64_t index) override
    Definition: monero_wallet_full.cpp:3182
    +
    monero::monero_wallet_full::add_address_book_entry
    uint64_t add_address_book_entry(const std::string &address, const std::string &description) override
    Definition: monero_wallet_full.cpp:3132
    +
    monero::monero_wallet_full::get_keys_file_buffer
    std::string get_keys_file_buffer(const epee::wipeable_string &password, bool view_only) const
    Definition: monero_wallet_full.cpp:3503
    monero::monero_wallet_full::is_connected_to_daemon
    bool is_connected_to_daemon() const override
    Definition: monero_wallet_full.cpp:1313
    -
    monero::monero_wallet_full::change_password
    void change_password(const std::string &old_password, const std::string &new_password) override
    Definition: monero_wallet_full.cpp:3468
    +
    monero::monero_wallet_full::change_password
    void change_password(const std::string &old_password, const std::string &new_password) override
    Definition: monero_wallet_full.cpp:3485
    monero::monero_wallet_full::open_wallet
    static monero_wallet_full * open_wallet(const std::string &path, const std::string &password, const monero_network_type network_type)
    Definition: monero_wallet_full.cpp:1056
    -
    monero::monero_wallet_full::wait_for_next_block
    uint64_t wait_for_next_block() override
    Definition: monero_wallet_full.cpp:3270
    -
    monero::monero_wallet_full::get_multisig_info
    monero_multisig_info get_multisig_info() const override
    Definition: monero_wallet_full.cpp:3306
    +
    monero::monero_wallet_full::wait_for_next_block
    uint64_t wait_for_next_block() override
    Definition: monero_wallet_full.cpp:3287
    +
    monero::monero_wallet_full::get_multisig_info
    monero_multisig_info get_multisig_info() const override
    Definition: monero_wallet_full.cpp:3323
    monero::monero_wallet_full::get_balance
    uint64_t get_balance() const override
    Definition: monero_wallet_full.cpp:1606
    monero::monero_wallet_full::get_integrated_address
    monero_integrated_address get_integrated_address(const std::string &standard_address="", const std::string &payment_id="") const override
    Definition: monero_wallet_full.cpp:1418
    -
    monero::monero_wallet_full::move_to
    void move_to(const std::string &path, const std::string &password) override
    Definition: monero_wallet_full.cpp:3476
    +
    monero::monero_wallet_full::move_to
    void move_to(const std::string &path, const std::string &password) override
    Definition: monero_wallet_full.cpp:3493
    monero::monero_wallet_full::get_seed_language
    std::string get_seed_language() const override
    Definition: monero_wallet_full.cpp:1365
    -
    monero::monero_wallet_full::make_multisig
    std::string make_multisig(const std::vector< std::string > &multisig_hexes, int threshold, const std::string &password) override
    Definition: monero_wallet_full.cpp:3319
    +
    monero::monero_wallet_full::make_multisig
    std::string make_multisig(const std::vector< std::string > &multisig_hexes, int threshold, const std::string &password) override
    Definition: monero_wallet_full.cpp:3336
    monero::monero_wallet_full::get_network_type
    monero_network_type get_network_type() const override
    Definition: monero_wallet_full.cpp:1347
    monero::monero_wallet_full::create_account
    monero_account create_account(const std::string &label="") override
    Definition: monero_wallet_full.cpp:1673
    monero::monero_wallet_full::sync
    monero_sync_result sync() override
    Definition: monero_wallet_full.cpp:1511
    -
    monero::monero_wallet_full::export_multisig_hex
    std::string export_multisig_hex() override
    Definition: monero_wallet_full.cpp:3349
    +
    monero::monero_wallet_full::export_multisig_hex
    std::string export_multisig_hex() override
    Definition: monero_wallet_full.cpp:3366
    monero::monero_wallet_full::remove_listener
    void remove_listener(monero_wallet_listener &listener) override
    Definition: monero_wallet_full.cpp:1502
    monero::monero_wallet_full::get_height
    uint64_t get_height() const override
    Definition: monero_wallet_full.cpp:1464
    -
    monero::monero_wallet_full::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_full.cpp:3132
    +
    monero::monero_wallet_full::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_full.cpp:3149
    monero::monero_wallet_full::get_private_spend_key
    std::string get_private_spend_key() const override
    Definition: monero_wallet_full.cpp:1385
    -
    monero::monero_wallet_full::close
    void close(bool save=false) override
    Definition: monero_wallet_full.cpp:3500
    +
    monero::monero_wallet_full::close
    void close(bool save=false) override
    Definition: monero_wallet_full.cpp:3517
    monero::monero_wallet_full::get_daemon_max_peer_height
    uint64_t get_daemon_max_peer_height() const override
    Definition: monero_wallet_full.cpp:1484
    monero::monero_wallet_full::set_subaddress_label
    void set_subaddress_label(uint32_t account_idx, uint32_t subaddress_idx, const std::string &label="") override
    Definition: monero_wallet_full.cpp:1717
    monero::monero_wallet_full::get_daemon_height
    uint64_t get_daemon_height() const override
    Definition: monero_wallet_full.cpp:1476
    monero::monero_wallet_full::get_public_spend_key
    std::string get_public_spend_key() const override
    Definition: monero_wallet_full.cpp:1380
    monero::monero_wallet_full::get_transfers
    std::vector< std::shared_ptr< monero_transfer > > get_transfers(const monero_transfer_query &query) const override
    Definition: monero_wallet_full.cpp:1836
    -
    monero::monero_wallet_full::get_tx_notes
    std::vector< std::string > get_tx_notes(const std::vector< std::string > &tx_hashes) const override
    Definition: monero_wallet_full.cpp:3058
    +
    monero::monero_wallet_full::get_tx_notes
    std::vector< std::string > get_tx_notes(const std::vector< std::string > &tx_hashes) const override
    Definition: monero_wallet_full.cpp:3075
    monero::monero_wallet_full::is_synced
    bool is_synced() const override
    Definition: monero_wallet_full.cpp:1332
    -
    monero::monero_wallet_full::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_full.cpp:3019
    +
    monero::monero_wallet_full::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_full.cpp:3036
    monero::monero_wallet_full::set_restore_height
    void set_restore_height(uint64_t restore_height) override
    Definition: monero_wallet_full.cpp:1472
    monero::monero_wallet_full::set_daemon_connection
    void set_daemon_connection(const std::string &uri, const std::string &username="", const std::string &password="") override
    Definition: monero_wallet_full.cpp:1268
    monero::monero_wallet_listener
    Definition: monero_wallet.h:71
    diff --git a/docs/search/all_c.js b/docs/search/all_c.js index 804f3ef..420a9fe 100644 --- a/docs/search/all_c.js +++ b/docs/search/all_c.js @@ -13,7 +13,7 @@ var searchData= ['set_5ftx_5fnotes_10',['set_tx_notes',['../classmonero_1_1monero__wallet.html#a50e02feb23e27bfd5caa43198d3a3d99',1,'monero::monero_wallet::set_tx_notes()'],['../classmonero_1_1monero__wallet__full.html#a150ce9691173962e022bb75c4ee965f1',1,'monero::monero_wallet_full::set_tx_notes()']]], ['sign_5fmessage_11',['sign_message',['../classmonero_1_1monero__wallet.html#af65667677cd03973ab87389c1dc0c545',1,'monero::monero_wallet::sign_message()'],['../classmonero_1_1monero__wallet__full.html#a400f9ac04199ad8956d4f0e6e3f85b54',1,'monero::monero_wallet_full::sign_message()'],['../classmonero_1_1monero__wallet__keys.html#a817780c43761f5471bea5153e705f1d5',1,'monero::monero_wallet_keys::sign_message()']]], ['sign_5fmultisig_5ftx_5fhex_12',['sign_multisig_tx_hex',['../classmonero_1_1monero__wallet.html#a9dc726f96c121b28499e795a2c864134',1,'monero::monero_wallet::sign_multisig_tx_hex()'],['../classmonero_1_1monero__wallet__full.html#a27d5d11e04fc6add0dc5dc0d412f4520',1,'monero::monero_wallet_full::sign_multisig_tx_hex()']]], - ['sign_5ftxs_13',['sign_txs',['../classmonero_1_1monero__wallet.html#a7610e05a65fa72df26b6890dbe2c630a',1,'monero::monero_wallet::sign_txs()'],['../classmonero_1_1monero__wallet__full.html#a858c1dae560dea7d336912b1eaf806e5',1,'monero::monero_wallet_full::sign_txs()']]], + ['sign_5ftxs_13',['sign_txs',['../classmonero_1_1monero__wallet.html#a479f9c37761ecb34126df8125a6db941',1,'monero::monero_wallet::sign_txs()'],['../classmonero_1_1monero__wallet__full.html#a5eccfcdd50c3d43367a8d2f32451c1bf',1,'monero::monero_wallet_full::sign_txs()']]], ['start_5fmining_14',['start_mining',['../classmonero_1_1monero__wallet.html#a8d73894b5f7fd6e86abb512abee5b31a',1,'monero::monero_wallet::start_mining()'],['../classmonero_1_1monero__wallet__full.html#a00d6363b33ba2d711d5d4afcfc8d58b1',1,'monero::monero_wallet_full::start_mining()']]], ['start_5fsyncing_15',['start_syncing',['../classmonero_1_1monero__wallet.html#ad742d34231b98e9f17bd24180b835815',1,'monero::monero_wallet::start_syncing()'],['../classmonero_1_1monero__wallet__full.html#a75ba267ea4c2bff0b6eb4c7456eb115e',1,'monero::monero_wallet_full::start_syncing()']]], ['stop_5fmining_16',['stop_mining',['../classmonero_1_1monero__wallet.html#a339a4897c8379e0f018b3179fa16c8c2',1,'monero::monero_wallet::stop_mining()'],['../classmonero_1_1monero__wallet__full.html#a96aa765519134c6b971223e1f7e9610c',1,'monero::monero_wallet_full::stop_mining()']]], diff --git a/docs/search/functions_b.js b/docs/search/functions_b.js index 8213436..d66fff3 100644 --- a/docs/search/functions_b.js +++ b/docs/search/functions_b.js @@ -12,7 +12,7 @@ var searchData= ['set_5ftx_5fnotes_9',['set_tx_notes',['../classmonero_1_1monero__wallet.html#a50e02feb23e27bfd5caa43198d3a3d99',1,'monero::monero_wallet::set_tx_notes()'],['../classmonero_1_1monero__wallet__full.html#a150ce9691173962e022bb75c4ee965f1',1,'monero::monero_wallet_full::set_tx_notes()']]], ['sign_5fmessage_10',['sign_message',['../classmonero_1_1monero__wallet.html#af65667677cd03973ab87389c1dc0c545',1,'monero::monero_wallet::sign_message()'],['../classmonero_1_1monero__wallet__full.html#a400f9ac04199ad8956d4f0e6e3f85b54',1,'monero::monero_wallet_full::sign_message()'],['../classmonero_1_1monero__wallet__keys.html#a817780c43761f5471bea5153e705f1d5',1,'monero::monero_wallet_keys::sign_message()']]], ['sign_5fmultisig_5ftx_5fhex_11',['sign_multisig_tx_hex',['../classmonero_1_1monero__wallet.html#a9dc726f96c121b28499e795a2c864134',1,'monero::monero_wallet::sign_multisig_tx_hex()'],['../classmonero_1_1monero__wallet__full.html#a27d5d11e04fc6add0dc5dc0d412f4520',1,'monero::monero_wallet_full::sign_multisig_tx_hex()']]], - ['sign_5ftxs_12',['sign_txs',['../classmonero_1_1monero__wallet.html#a7610e05a65fa72df26b6890dbe2c630a',1,'monero::monero_wallet::sign_txs()'],['../classmonero_1_1monero__wallet__full.html#a858c1dae560dea7d336912b1eaf806e5',1,'monero::monero_wallet_full::sign_txs()']]], + ['sign_5ftxs_12',['sign_txs',['../classmonero_1_1monero__wallet.html#a479f9c37761ecb34126df8125a6db941',1,'monero::monero_wallet::sign_txs()'],['../classmonero_1_1monero__wallet__full.html#a5eccfcdd50c3d43367a8d2f32451c1bf',1,'monero::monero_wallet_full::sign_txs()']]], ['start_5fmining_13',['start_mining',['../classmonero_1_1monero__wallet.html#a8d73894b5f7fd6e86abb512abee5b31a',1,'monero::monero_wallet::start_mining()'],['../classmonero_1_1monero__wallet__full.html#a00d6363b33ba2d711d5d4afcfc8d58b1',1,'monero::monero_wallet_full::start_mining()']]], ['start_5fsyncing_14',['start_syncing',['../classmonero_1_1monero__wallet.html#ad742d34231b98e9f17bd24180b835815',1,'monero::monero_wallet::start_syncing()'],['../classmonero_1_1monero__wallet__full.html#a75ba267ea4c2bff0b6eb4c7456eb115e',1,'monero::monero_wallet_full::start_syncing()']]], ['stop_5fmining_15',['stop_mining',['../classmonero_1_1monero__wallet.html#a339a4897c8379e0f018b3179fa16c8c2',1,'monero::monero_wallet::stop_mining()'],['../classmonero_1_1monero__wallet__full.html#a96aa765519134c6b971223e1f7e9610c',1,'monero::monero_wallet_full::stop_mining()']]],
    std::string monero::monero_wallet_full::sign_txs monero_tx_set monero::monero_wallet_full::sign_txs ( const std::string &  unsigned_tx_hex)wallet2_listener -
    Returns
    the signed transaction hex
    +
    Returns
    the signed transaction set
    -

    Reimplemented from monero::monero_wallet.

    +

    Reimplemented from monero::monero_wallet.

    @@ -4625,7 +4632,7 @@ struct     		wallet2_listenerSubmit signed transactions from a view-only wallet.

    Parameters
    - +
    signed_tx_hexis signed transaction hex from signTxs()
    signed_tx_hexis signed transaction hex from sign_txs()
    diff --git a/docs/classmonero_1_1monero__wallet__keys-members.html b/docs/classmonero_1_1monero__wallet__keys-members.html index dab2355..e08c4c3 100644 --- a/docs/classmonero_1_1monero__wallet__keys-members.html +++ b/docs/classmonero_1_1monero__wallet__keys-members.html @@ -181,7 +181,7 @@ $(function() {
    set_tx_notes(const std::vector< std::string > &tx_hashes, const std::vector< std::string > &notes)monero::monero_walletinlinevirtual
    sign_message(const std::string &msg, monero_message_signature_type signature_type, uint32_t account_idx=0, uint32_t subaddress_idx=0) const overridemonero::monero_wallet_keysvirtual
    sign_multisig_tx_hex(const std::string &multisig_tx_hex)monero::monero_walletinlinevirtual
    sign_txs(const std::string &unsigned_tx_hex)monero::monero_walletinlinevirtual
    sign_txs(const std::string &unsigned_tx_hex)monero::monero_walletinlinevirtual
    start_mining(boost::optional< uint64_t > num_threads, boost::optional< bool > background_mining, boost::optional< bool > ignore_battery)monero::monero_walletinlinevirtual
    start_syncing(uint64_t sync_period_in_ms=10000)monero::monero_walletinlinevirtual
    stop_mining()monero::monero_walletinlinevirtual
     
    virtual monero_tx_set describe_tx_set (const monero_tx_set &tx_set)
     
    virtual std::string sign_txs (const std::string &unsigned_tx_hex)
     
    virtual monero_tx_set sign_txs (const std::string &unsigned_tx_hex)
     
    virtual std::vector< std::string > submit_txs (const std::string &signed_tx_hex)
     
    virtual std::string sign_message (const std::string &msg, monero_message_signature_type signature_type, uint32_t account_idx=0, uint32_t subaddress_idx=0) const