sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-02 12:26:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

retrieve fee rates from configured source on non-mainnet networks where available

Browse source
This commit is contained in:
Craig Raw 2024-10-07 12:13:24 +02:00
parent e50fe4c68c
commit 7e68ecffd3
3 changed files with 34 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/sparrowwallet/sparrow/AppServices.java
View file

@ -293,7 +293,7 @@ public class AppServices {
FeeRatesSource feeRatesSource = Config.get().getFeeRatesSource();
feeRatesSource = (feeRatesSource == null ? FeeRatesSource.MEMPOOL_SPACE : feeRatesSource);
if(event instanceof ConnectionEvent && Network.get().equals(Network.MAINNET) && feeRatesSource.isExternal()) {
if(event instanceof ConnectionEvent && feeRatesSource.supportsNetwork(Network.get()) && feeRatesSource.isExternal()) {
EventManager.get().post(new FeeRatesSourceChangedEvent(feeRatesSource));
}
});

2
src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
View file

@ -823,7 +823,7 @@ public class ElectrumServer {
if(AppServices.getTargetBlockFeeRates() != null) {
targetBlocksFeeRatesSats.putAll(AppServices.getTargetBlockFeeRates());
}
} else if(Network.get().equals(Network.MAINNET)) {
} else if(feeRatesSource.supportsNetwork(Network.get())) {
targetBlocksFeeRatesSats.putAll(feeRatesSource.getBlockTargetFeeRates(targetBlocksFeeRatesSats));
}

33
src/main/java/com/sparrowwallet/sparrow/net/FeeRatesSource.java
View file

@ -1,5 +1,6 @@
package com.sparrowwallet.sparrow.net;
import com.sparrowwallet.drongo.Network;
import com.sparrowwallet.sparrow.AppServices;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -14,13 +15,26 @@ public enum FeeRatesSource {
public Map<Integer, Double> getBlockTargetFeeRates(Map<Integer, Double> defaultblockTargetFeeRates) {
return Collections.emptyMap();
}
@Override
public boolean supportsNetwork(Network network) {
return true;
}
},
MEMPOOL_SPACE("mempool.space", true) {
@Override
public Map<Integer, Double> getBlockTargetFeeRates(Map<Integer, Double> defaultblockTargetFeeRates) {
String url = AppServices.isUsingProxy() ? "http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion/api/v1/fees/recommended" : "https://mempool.space/api/v1/fees/recommended";
if(Network.get() != Network.MAINNET && supportsNetwork(Network.get())) {
url = url.replace("/api/", "/" + Network.get().getName() + "/api/");
}
return getThreeTierFeeRates(this, defaultblockTargetFeeRates, url);
}
@Override
public boolean supportsNetwork(Network network) {
return network == Network.MAINNET || network == Network.TESTNET || network == Network.TESTNET4 || network == Network.SIGNET;
}
},
BITCOINFEES_EARN_COM("bitcoinfees.earn.com", true) {
@Override
@ -28,6 +42,11 @@ public enum FeeRatesSource {
String url = "https://bitcoinfees.earn.com/api/v1/fees/recommended";
return getThreeTierFeeRates(this, defaultblockTargetFeeRates, url);
}
@Override
public boolean supportsNetwork(Network network) {
return network == Network.MAINNET;
}
},
MINIMUM("Minimum (1 sat/vB)", false) {
@Override
@ -39,6 +58,11 @@ public enum FeeRatesSource {
return blockTargetFeeRates;
}
@Override
public boolean supportsNetwork(Network network) {
return true;
}
},
OXT_ME("oxt.me", true) {
@Override
@ -47,6 +71,11 @@ public enum FeeRatesSource {
return getThreeTierFeeRates(this, defaultblockTargetFeeRates, url);
}
@Override
public boolean supportsNetwork(Network network) {
return network == Network.MAINNET;
}
@Override
protected ThreeTierRates getThreeTierRates(String url, HttpClientService httpClientService) throws Exception {
OxtRates oxtRates = httpClientService.requestJson(url, OxtRates.class, null);
@ -72,6 +101,8 @@ public enum FeeRatesSource {
public abstract Map<Integer, Double> getBlockTargetFeeRates(Map<Integer, Double> defaultblockTargetFeeRates);
public abstract boolean supportsNetwork(Network network);
public String getName() {
return name;
}
@ -132,7 +163,7 @@ public enum FeeRatesSource {
return name;
}
private record ThreeTierRates(Double fastestFee, Double halfHourFee, Double hourFee, Double minimumFee) {}
protected record ThreeTierRates(Double fastestFee, Double halfHourFee, Double hourFee, Double minimumFee) {}
private record OxtRates(OxtRatesData[] data) {}