diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-04-05 23:56:09 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-04-05 23:56:09 -0400 |
| commit | d054def63f9b8950fe20b2d8e841f5a9ae09418f (patch) | |
| tree | eae611a614dd11fb7e2a1e63bae3e9b31cbfa267 /src/wallet/wallet2.h | |
| parent | Merge pull request #7153 (diff) | |
| parent | bulletproofs+: some minor cleanup from vtnerd's review (diff) | |
| download | monero-d054def63f9b8950fe20b2d8e841f5a9ae09418f.tar.xz | |
Merge pull request #7170
bd27deb Bulletproofs+ (SarangNoether)
b7713cc Precompute initial transcript hash (SarangNoether)
b535d66 Updates from security audit (SarangNoether)
a0d80b1 plug bulletproofs plus into consensus (moneromooo-monero)
75bd004 ringct: a few minor optimizations from review (moneromooo-monero)
a345060 ringct: port some of vtnerd's review changes from BP+ to BP (moneromooo-monero)
4c94cfe store outPk/8 in the tx for speed (moneromooo-monero)
5acdd0e bulletproofs+: some minor cleanup from vtnerd's review (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 51ca6e038..ccf9a96a3 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -1388,7 +1388,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, uint64_t base_fee, uint64_t fee_multiplier, uint64_t fee_quantization_mask) const; + 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, uint64_t base_fee, uint64_t fee_multiplier, uint64_t fee_quantization_mask) const; uint64_t get_fee_multiplier(uint32_t priority, int fee_algorithm = -1); uint64_t get_base_fee(); uint64_t get_fee_quantization_mask(); |