diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2024-08-13 12:29:10 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2024-08-13 12:29:10 -0400 |
| commit | 2676e5ae85a64986a10d5912032da271935e4640 (patch) | |
| tree | e7756e46a7166b303130f32a8e871fb0c2901ae6 | |
| parent | bedfa83ea02718b65b236cbb222496903a148b92 (diff) | |
| parent | 1f733fb868bcdc9c3b037096824ae5e2d763e0f2 (diff) | |
| download | monzero-core-2676e5ae85a64986a10d5912032da271935e4640.tar.gz monzero-core-2676e5ae85a64986a10d5912032da271935e4640.tar.xz monzero-core-2676e5ae85a64986a10d5912032da271935e4640.zip | |
Merge pull request #9426
1f733fb Make wallet2::estimate_fee static (Lee Clagett)
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet2.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 64f486e71..ad8c36190 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -8007,7 +8007,7 @@ bool wallet2::sign_multisig_tx_from_file(const std::string &filename, std::vecto return sign_multisig_tx_to_file(exported_txs, filename, txids); } //---------------------------------------------------------------------------------------------------- -uint64_t wallet2::estimate_fee(bool use_per_byte_fee, bool use_rct, int n_inputs, int mixin, int n_outputs, size_t extra_size, bool bulletproof, bool clsag, bool bulletproof_plus, bool use_view_tags, uint64_t base_fee, uint64_t fee_quantization_mask) const +uint64_t wallet2::estimate_fee(bool use_per_byte_fee, bool use_rct, int n_inputs, int mixin, int n_outputs, size_t extra_size, bool bulletproof, bool clsag, bool bulletproof_plus, bool use_view_tags, uint64_t base_fee, uint64_t fee_quantization_mask) { if (use_per_byte_fee) { diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index c38d77675..24366f630 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -1565,7 +1565,7 @@ private: std::vector<std::pair<uint64_t, uint64_t>> estimate_backlog(const std::vector<std::pair<double, double>> &fee_levels); std::vector<std::pair<uint64_t, uint64_t>> estimate_backlog(uint64_t min_tx_weight, uint64_t max_tx_weight, const std::vector<uint64_t> &fees); - uint64_t estimate_fee(bool use_per_byte_fee, bool use_rct, int n_inputs, int mixin, int n_outputs, size_t extra_size, bool bulletproof, bool clsag, bool bulletproof_plus, bool use_view_tags, uint64_t base_fee, uint64_t fee_quantization_mask) const; + static uint64_t estimate_fee(bool use_per_byte_fee, bool use_rct, int n_inputs, int mixin, int n_outputs, size_t extra_size, bool bulletproof, bool clsag, bool bulletproof_plus, bool use_view_tags, uint64_t base_fee, uint64_t fee_quantization_mask); uint64_t get_fee_multiplier(uint32_t priority, int fee_algorithm = -1); uint64_t get_base_fee(uint32_t priority); uint64_t get_base_fee(); |