Merge pull request #2362

adce8ae4 simplewallet: new "fee" command to display fee information (moneromooo-monero)

1 files changed, 4 insertions, 3 deletions

diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 3d5033535..adf03abcc 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -609,7 +609,10 @@ namespace tools
 
     bool is_synced() const;
 
-    uint64_t estimate_backlog(uint64_t blob_size, uint64_t fee);
+    std::vector<std::pair<uint64_t, uint64_t>> estimate_backlog(uint64_t min_blob_size, uint64_t max_blob_size, const std::vector<uint64_t> &fees);
+
+    uint64_t get_fee_multiplier(uint32_t priority, int fee_algorithm = -1);
+    uint64_t get_per_kb_fee();
 
   private:
     /*!
@@ -651,9 +654,7 @@ namespace tools
     void parse_block_round(const cryptonote::blobdata &blob, cryptonote::block &bl, crypto::hash &bl_id, bool &error) const;
     uint64_t get_upper_transaction_size_limit();
     std::vector<uint64_t> get_unspent_amounts_vector();
-    uint64_t get_fee_multiplier(uint32_t priority, int fee_algorithm) const;
     uint64_t get_dynamic_per_kb_fee_estimate();
-    uint64_t get_per_kb_fee();
     float get_output_relatedness(const transfer_details &td0, const transfer_details &td1) const;
     std::vector<size_t> pick_preferred_rct_inputs(uint64_t needed_money) const;
     void set_spent(size_t idx, uint64_t height);