diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-03-14 19:28:38 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2017-03-15 08:32:51 +0000 |
| commit | 3396a9f2aff1b4e3c12a663e0458934c8d42b32f (patch) | |
| tree | aaa35be649ba8203f65ebe5c9309af3e64555e40 /src/wallet/wallet2.h | |
| parent | Merge pull request #1857 (diff) | |
| download | monero-3396a9f2aff1b4e3c12a663e0458934c8d42b32f.tar.xz | |
Add intervening v5 fork for increased min block size
Minimum mixin 4 and enforced ringct is moved from v5 to v6.
v5 is now used for an increased minimum block size (from 60000
to 300000) to cater for larger typical/minimum transaction size.
The fee algorithm is also changed to decrease the base per kB
fee, and add a cheap tier for those transactions which we do
not care if they get delayed (or even included in a block).
Diffstat (limited to '')
| -rw-r--r-- | src/wallet/wallet2.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index ddc237f1b..5c8d0ae86 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -537,6 +537,7 @@ namespace tools void get_hard_fork_info(uint8_t version, uint64_t &earliest_height); bool use_fork_rules(uint8_t version, int64_t early_blocks = 0); + int get_fee_algorithm(); std::string get_wallet_file() const; std::string get_keys_file() const; @@ -622,7 +623,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_tranaction_size_limit(); std::vector<uint64_t> get_unspent_amounts_vector(); - uint64_t get_fee_multiplier(uint32_t priority, bool use_new_fee) const; + 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; |