diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-03-20 23:29:43 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-03-20 23:29:43 +0200 |
| commit | 37eebd9dcf0bedbc87a7abcba96cd59db63c3ad3 (patch) | |
| tree | 72a26b0ad1038a45bd348d5513da0951c5be4c79 /src/wallet | |
| parent | 73e8510717fbf30935ed2a55276e9c7af8f4b43c (diff) | |
| parent | 7c03349869cdf2f3512a6182ed5bd67e6e7f8085 (diff) | |
| download | monzero-core-37eebd9dcf0bedbc87a7abcba96cd59db63c3ad3.tar.gz monzero-core-37eebd9dcf0bedbc87a7abcba96cd59db63c3ad3.tar.xz monzero-core-37eebd9dcf0bedbc87a7abcba96cd59db63c3ad3.zip | |
Merge pull request #1902
7c033498 blockchain: lower the relay fee by 2% (moneromooo-monero)
266492e9 tx_pool: use new filling algorithm from v5 only (moneromooo-monero)
5b7c6ced wallet2: start using new fee priorities at v5, not 14 days laer (moneromooo-monero)
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index dff848a92..e81b946cb 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -3379,7 +3379,7 @@ uint64_t wallet2::get_per_kb_fee() int wallet2::get_fee_algorithm() { // changes at v3 and v5 - if (use_fork_rules(5, -720 * 14)) + if (use_fork_rules(5, 0)) return 2; if (use_fork_rules(3, -720 * 14)) return 1; |