From 2f5a9b6bb387f50d0ad7914d323cde33f704434e Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Mon, 15 Jan 2018 12:48:25 +0000 Subject: wallet2: split estimate_backlog to allow for raw fee levels --- src/wallet/wallet2.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/wallet/wallet2.h') diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index e68531cbf..57ede86c2 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -956,6 +956,7 @@ namespace tools bool is_synced() const; + std::vector> estimate_backlog(const std::vector> &fee_levels); std::vector> estimate_backlog(uint64_t min_blob_size, uint64_t max_blob_size, const std::vector &fees); uint64_t get_fee_multiplier(uint32_t priority, int fee_algorithm = -1) const; -- cgit v1.2.3 From 30c44bce0627260134d3606a9a6d0b453aad763d Mon Sep 17 00:00:00 2001 From: stoffu Date: Mon, 15 Jan 2018 12:05:16 +0900 Subject: wallet: automatically use low priority if safe (no backlog & recent blocks not full) --- src/wallet/wallet2.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/wallet/wallet2.h') diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 57ede86c2..f768581b2 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -838,6 +838,8 @@ namespace tools uint32_t get_confirm_backlog_threshold() const { return m_confirm_backlog_threshold; }; bool confirm_export_overwrite() const { return m_confirm_export_overwrite; } void confirm_export_overwrite(bool always) { m_confirm_export_overwrite = always; } + bool auto_low_priority() const { return m_auto_low_priority; } + void auto_low_priority(bool value) { m_auto_low_priority = value; } bool get_tx_key(const crypto::hash &txid, crypto::secret_key &tx_key, std::vector &additional_tx_keys) const; void check_tx_key(const crypto::hash &txid, const crypto::secret_key &tx_key, const std::vector &additional_tx_keys, const cryptonote::account_public_address &address, uint64_t &received, bool &in_pool, uint64_t &confirmations); @@ -962,6 +964,7 @@ namespace tools uint64_t get_fee_multiplier(uint32_t priority, int fee_algorithm = -1) const; uint64_t get_per_kb_fee() const; uint64_t adjust_mixin(uint64_t mixin) const; + uint32_t adjust_priority(uint32_t priority); // Light wallet specific functions // fetch unspent outs from lw node and store in m_transfers @@ -1122,6 +1125,7 @@ namespace tools bool m_confirm_backlog; uint32_t m_confirm_backlog_threshold; bool m_confirm_export_overwrite; + bool m_auto_low_priority; bool m_is_initialized; NodeRPCProxy m_node_rpc_proxy; std::unordered_set m_scanned_pool_txs[2]; -- cgit v1.2.3