Skip to content

Commit

Permalink
Obtain minimumFee from mempool api in place of hardcoded value
Browse files Browse the repository at this point in the history
  • Loading branch information
jmacxx committed Feb 25, 2021
1 parent 0feb107 commit c33ac1b
Show file tree
Hide file tree
Showing 9 changed files with 53 additions and 25 deletions.
4 changes: 4 additions & 0 deletions core/src/main/java/bisq/core/provider/fee/FeeProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import bisq.network.http.HttpClient;

import bisq.common.app.Version;
import bisq.common.config.Config;
import bisq.common.util.Tuple2;

import com.google.gson.Gson;
Expand Down Expand Up @@ -58,8 +59,11 @@ public Tuple2<Map<String, Long>, Map<String, Long>> getFees() throws IOException
try {
LinkedTreeMap<?, ?> dataMap = (LinkedTreeMap<?, ?>) linkedTreeMap.get("dataMap");
Long btcTxFee = ((Double) dataMap.get("btcTxFee")).longValue();
Long btcMinTxFee = dataMap.get("btcMinTxFee") != null ?
((Double) dataMap.get("btcMinTxFee")).longValue() : Config.baseCurrencyNetwork().getDefaultMinFeePerVbyte();

map.put("BTC", btcTxFee);
map.put("btcMinTxFee", btcMinTxFee);
} catch (Throwable t) {
log.error(t.toString());
t.printStackTrace();
Expand Down
6 changes: 4 additions & 2 deletions core/src/main/java/bisq/core/provider/fee/FeeService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public static Coin getMinTakerFee(boolean currencyForFeeIsBtc) {
private Map<String, Long> timeStampMap;
@Getter
private long lastRequest;
@Getter
private long minFeePerVByte;
private long epochInSecondAtLastRequest;

Expand Down Expand Up @@ -157,14 +158,15 @@ public void onSuccess(@Nullable Tuple2<Map<String, Long>, Map<String, Long>> res
epochInSecondAtLastRequest = timeStampMap.get("bitcoinFeesTs");
final Map<String, Long> map = result.second;
txFeePerVbyte = map.get("BTC");
minFeePerVByte = map.get("btcMinTxFee");

if (txFeePerVbyte < minFeePerVByte) {
log.warn("The delivered fee per vbyte is smaller than the min. default fee of 5 sat/vbyte");
log.warn("The delivered fee of {} sat/vbyte is smaller than the min. default fee of {} sat/vbyte", txFeePerVbyte, minFeePerVByte);
txFeePerVbyte = minFeePerVByte;
}

feeUpdateCounter.set(feeUpdateCounter.get() + 1);
log.info("BTC tx fee: txFeePerVbyte={}", txFeePerVbyte);
log.info("BTC tx fee: txFeePerVbyte={} minFeePerVbyte={}", txFeePerVbyte, minFeePerVByte);
if (resultHandler != null)
resultHandler.run();
});
Expand Down
6 changes: 5 additions & 1 deletion core/src/main/java/bisq/core/user/Preferences.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PaymentAccountUtil;
import bisq.core.provider.fee.FeeService;
import bisq.core.setup.CoreNetworkCapabilities;

import bisq.network.p2p.network.BridgeAddressProvider;
Expand Down Expand Up @@ -165,6 +166,7 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid

private final PersistenceManager<PreferencesPayload> persistenceManager;
private final Config config;
private final FeeService feeService;
private final LocalBitcoinNode localBitcoinNode;
private final String btcNodesFromOptions, referralIdFromOptions,
rpcUserFromOptions, rpcPwFromOptions;
Expand All @@ -181,6 +183,7 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
@Inject
public Preferences(PersistenceManager<PreferencesPayload> persistenceManager,
Config config,
FeeService feeService,
LocalBitcoinNode localBitcoinNode,
@Named(Config.BTC_NODES) String btcNodesFromOptions,
@Named(Config.REFERRAL_ID) String referralId,
Expand All @@ -191,6 +194,7 @@ public Preferences(PersistenceManager<PreferencesPayload> persistenceManager,

this.persistenceManager = persistenceManager;
this.config = config;
this.feeService = feeService;
this.localBitcoinNode = localBitcoinNode;
this.btcNodesFromOptions = btcNodesFromOptions;
this.referralIdFromOptions = referralId;
Expand Down Expand Up @@ -907,7 +911,7 @@ public List<String> getBridgeAddresses() {

public long getWithdrawalTxFeeInVbytes() {
return Math.max(prefPayload.getWithdrawalTxFeeInVbytes(),
Config.baseCurrencyNetwork().getDefaultMinFeePerVbyte());
feeService.getMinFeePerVByte());
}

public boolean isDaoFullNode() {
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ private void initializeGeneralOptions() {
String estimatedFee = String.valueOf(feeService.getTxFeePerVbyte().value);
try {
int withdrawalTxFeePerVbyte = Integer.parseInt(transactionFeeInputTextField.getText());
final long minFeePerVbyte = Config.baseCurrencyNetwork().getDefaultMinFeePerVbyte();
final long minFeePerVbyte = feeService.getMinFeePerVByte();
if (withdrawalTxFeePerVbyte < minFeePerVbyte) {
new Popup().warning(Res.get("setting.preferences.txFeeMin", minFeePerVbyte)).show();
transactionFeeInputTextField.setText(estimatedFee);
Expand Down
8 changes: 7 additions & 1 deletion pricenode/src/main/java/bisq/price/mining/FeeRate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ public class FeeRate {

private final String currency;
private final long price;
private final long minimumFee;
private final long timestamp;

public FeeRate(String currency, long price, long timestamp) {
public FeeRate(String currency, long price, long minimumFee, long timestamp) {
this.currency = currency;
this.price = price;
this.minimumFee = minimumFee;
this.timestamp = timestamp;
}

Expand All @@ -40,6 +42,10 @@ public long getPrice() {
return price;
}

public long getMinimumFee() {
return minimumFee;
}

public long getTimestamp() {
return timestamp;
}
Expand Down
8 changes: 8 additions & 0 deletions pricenode/src/main/java/bisq/price/mining/FeeRateService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public Map<String, Object> getFees() {
Map<String, Long> allFeeRates = new HashMap<>();

AtomicLong sumOfAllFeeRates = new AtomicLong();
AtomicLong sumOfAllMinFeeRates = new AtomicLong();
AtomicInteger amountOfFeeRates = new AtomicInteger();

// Process each provider, retrieve and store their fee rate
Expand All @@ -67,6 +68,7 @@ public Map<String, Object> getFees() {
String currency = feeRate.getCurrency();
if ("BTC".equals(currency)) {
sumOfAllFeeRates.getAndAdd(feeRate.getPrice());
sumOfAllMinFeeRates.getAndAdd(feeRate.getMinimumFee());
amountOfFeeRates.getAndAdd(1);
}
});
Expand All @@ -75,10 +77,15 @@ public Map<String, Object> getFees() {
long averageFeeRate = (amountOfFeeRates.intValue() > 0)
? sumOfAllFeeRates.longValue() / amountOfFeeRates.intValue()
: FeeRateProvider.MIN_FEE_RATE;
long averageMinFeeRate = (amountOfFeeRates.intValue() > 0)
? sumOfAllMinFeeRates.longValue() / amountOfFeeRates.intValue()
: FeeRateProvider.MIN_FEE_RATE;

// Make sure the returned value is within the min-max range
averageFeeRate = Math.max(averageFeeRate, FeeRateProvider.MIN_FEE_RATE);
averageFeeRate = Math.min(averageFeeRate, FeeRateProvider.MAX_FEE_RATE);
averageMinFeeRate = Math.max(averageMinFeeRate, FeeRateProvider.MIN_FEE_RATE);
averageMinFeeRate = Math.min(averageMinFeeRate, FeeRateProvider.MAX_FEE_RATE);

// Prepare response: Add timestamp of now
// Since this is an average, the timestamp is associated with when the moment in
Expand All @@ -87,6 +94,7 @@ public Map<String, Object> getFees() {

// Prepare response: Add the fee average
allFeeRates.put("btcTxFee", averageFeeRate);
allFeeRates.put("btcMinTxFee", averageMinFeeRate);

// Build response
return new HashMap<>() {{
Expand Down
40 changes: 22 additions & 18 deletions pricenode/src/main/java/bisq/price/mining/providers/MempoolFeeRateProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

import java.util.Map;
import java.util.Optional;
import java.util.stream.Stream;
import java.util.Set;

/**
* {@link FeeRateProvider} that interprets the Mempool API format to retrieve a mining
Expand Down Expand Up @@ -77,33 +77,37 @@ public MempoolFeeRateProvider(Environment env) {
protected FeeRate doGet() {
// Default value is the minimum rate. If the connection to the fee estimate
// provider fails, we fall back to this value.
long estimatedFeeRate = MIN_FEE_RATE;
try {
estimatedFeeRate = getEstimatedFeeRate();
return getEstimatedFeeRate();
}
catch (Exception e) {
// Something happened with the connection
log.error("Error retrieving bitcoin mining fee estimation: " + e.getMessage());
}

return new FeeRate("BTC", estimatedFeeRate, Instant.now().getEpochSecond());
return new FeeRate("BTC", MIN_FEE_RATE, MIN_FEE_RATE, Instant.now().getEpochSecond());
}

private long getEstimatedFeeRate() {
return getFeeRatePredictions()
.filter(p -> p.getKey().equalsIgnoreCase("halfHourFee"))
.map(Map.Entry::getValue)
.findFirst()
.map(r -> {
log.info("Retrieved estimated mining fee of {} sat/vbyte from {}", r, getMempoolApiHostname());
return r;
})
.map(r -> Math.max(r, MIN_FEE_RATE))
.map(r -> Math.min(r, MAX_FEE_RATE))
.orElse(MIN_FEE_RATE);
private FeeRate getEstimatedFeeRate() {
Set<Map.Entry<String, Long>> feeRatePredictions = getFeeRatePredictions();
long estimatedFeeRate = feeRatePredictions.stream()
.filter(p -> p.getKey().equalsIgnoreCase("halfHourFee"))
.map(Map.Entry::getValue)
.findFirst()
.map(r -> Math.max(r, MIN_FEE_RATE))
.map(r -> Math.min(r, MAX_FEE_RATE))
.orElse(MIN_FEE_RATE);
long minimumFee = feeRatePredictions.stream()
.filter(p -> p.getKey().equalsIgnoreCase("minimumFee"))
.map(Map.Entry::getValue)
.findFirst()
.map(r -> Math.multiplyExact(r, 2)) // multiply the minimumFee by 2 (per wiz)
.orElse(MIN_FEE_RATE);
log.info("Retrieved estimated mining fee of {} sat/vB and minimumFee of {} sat/vB from {}", estimatedFeeRate, minimumFee, getMempoolApiHostname());
return new FeeRate("BTC", estimatedFeeRate, minimumFee, Instant.now().getEpochSecond());
}

private Stream<Map.Entry<String, Long>> getFeeRatePredictions() {
private Set<Map.Entry<String, Long>> getFeeRatePredictions() {
return restTemplate.exchange(
RequestEntity
.get(UriComponentsBuilder
Expand All @@ -112,7 +116,7 @@ private Stream<Map.Entry<String, Long>> getFeeRatePredictions() {
.build().toUri())
.build(),
new ParameterizedTypeReference<Map<String, Long>>() { }
).getBody().entrySet().stream();
).getBody().entrySet();
}

/**
Expand Down
2 changes: 1 addition & 1 deletion pricenode/src/test/java/bisq/price/mining/FeeRateServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ private void doSanityChecksForRetrievedData(Map<String, Object> retrievedData, l
assertNotEquals(0L, retrievedData.get("bitcoinFeesTs"));

Map<String, String> retrievedDataMap = (Map<String, String>) retrievedData.get("dataMap");
assertEquals(1, retrievedDataMap.size());
assertEquals(2, retrievedDataMap.size());
assertEquals(expectedFeeRate, retrievedDataMap.get("btcTxFee"));
}
}
2 changes: 1 addition & 1 deletion pricenode/src/test/java/bisq/price/mining/providers/MempoolFeeRateProviderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static FeeRateProvider buildDummyReachableMempoolFeeRateProvider(long fee
MempoolFeeRateProvider dummyProvider = new MempoolFeeRateProvider.First(env) {
@Override
protected FeeRate doGet() {
return new FeeRate("BTC", feeRate, Instant.now().getEpochSecond());
return new FeeRate("BTC", feeRate, MIN_FEE_RATE, Instant.now().getEpochSecond());
}
};

Expand Down

0 comments on commit c33ac1b

Please sign in to comment.