ensure fees decrease as target blocks increase, show priority on target blocks slider track

This commit is contained in:
Craig Raw
2021-03-19 13:35:59 +02:00
parent 8d9e253f93
commit 1274d56fce
2 changed files with 13 additions and 0 deletions
@@ -63,6 +63,7 @@ public enum FeeRatesSource {
try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream()); Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
Gson gson = new Gson();
ThreeTierRates threeTierRates = gson.fromJson(reader, ThreeTierRates.class);
Double lastRate = null;
for(Integer blockTarget : defaultblockTargetFeeRates.keySet()) {
if(blockTarget < BLOCKS_IN_HALF_HOUR) {
blockTargetFeeRates.put(blockTarget, threeTierRates.fastestFee);
@@ -75,6 +76,11 @@ public enum FeeRatesSource {
} else {
blockTargetFeeRates.put(blockTarget, defaultblockTargetFeeRates.get(blockTarget));
}
if(lastRate != null) {
blockTargetFeeRates.put(blockTarget, Math.min(lastRate, blockTargetFeeRates.get(blockTarget)));
}
lastRate = blockTargetFeeRates.get(blockTarget);
}
if(threeTierRates.minimumFee != null) {