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

use fallback fee rate estimates if the connected server returns an error estimating fee rates

Browse source
This commit is contained in:
Craig Raw 2023-11-20 10:29:14 +02:00
parent 170e7c0abf
commit 74c3370277
2 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,7 +228,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
try { try {
return batchRequest.execute(); return batchRequest.execute();
} catch(JsonRpcBatchException e) { } catch(JsonRpcBatchException e) {
throw new ElectrumServerRpcException("Error getting fee estimates: " + e.getErrors(), e); throw new ElectrumServerRpcException("Error getting fee estimates from connected server: " + e.getErrors(), e);
} catch(Exception e) { } catch(Exception e) {
throw new ElectrumServerRpcException("Error getting fee estimates for target blocks: " + targetBlocks, e); throw new ElectrumServerRpcException("Error getting fee estimates for target blocks: " + targetBlocks, e);
} }

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

@ -813,6 +813,18 @@ public class ElectrumServer {
} }
public Map<Integer, Double> getFeeEstimates(List<Integer> targetBlocks) throws ServerException { public Map<Integer, Double> getFeeEstimates(List<Integer> targetBlocks) throws ServerException {
Map<Integer, Double> targetBlocksFeeRatesSats = getDefaultFeeEstimates(targetBlocks);
FeeRatesSource feeRatesSource = Config.get().getFeeRatesSource();
feeRatesSource = (feeRatesSource == null ? FeeRatesSource.MEMPOOL_SPACE : feeRatesSource);
if(Network.get().equals(Network.MAINNET)) {
targetBlocksFeeRatesSats.putAll(feeRatesSource.getBlockTargetFeeRates(targetBlocksFeeRatesSats));
}
return targetBlocksFeeRatesSats;
}
public Map<Integer, Double> getDefaultFeeEstimates(List<Integer> targetBlocks) throws ServerException {
try { try {
Map<Integer, Double> targetBlocksFeeRatesBtcKb = electrumServerRpc.getFeeEstimates(getTransport(), targetBlocks); Map<Integer, Double> targetBlocksFeeRatesBtcKb = electrumServerRpc.getFeeEstimates(getTransport(), targetBlocks);
@ -825,15 +837,12 @@ public class ElectrumServer {
targetBlocksFeeRatesSats.put(target, minFeeRateSatsKb / 1000d); targetBlocksFeeRatesSats.put(target, minFeeRateSatsKb / 1000d);
} }
FeeRatesSource feeRatesSource = Config.get().getFeeRatesSource();
feeRatesSource = (feeRatesSource == null ? FeeRatesSource.MEMPOOL_SPACE : feeRatesSource);
if(Network.get().equals(Network.MAINNET)) {
targetBlocksFeeRatesSats.putAll(feeRatesSource.getBlockTargetFeeRates(targetBlocksFeeRatesSats));
}
return targetBlocksFeeRatesSats; return targetBlocksFeeRatesSats;
} catch(ElectrumServerRpcException e) { } catch(ElectrumServerRpcException e) {
throw new ServerException(e.getMessage(), e); log.warn(e.getMessage());
return targetBlocks.stream().collect(Collectors.toMap(java.util.function.Function.identity(), v -> AppServices.getFallbackFeeRate(),
(u, v) -> { throw new IllegalStateException("Duplicate target blocks"); },
LinkedHashMap::new));
} }
} }