sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2025-11-05 11:56:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix npe on null fee returned from server

Browse source
This commit is contained in:
Craig Raw 2025-05-21 10:12:38 +02:00
parent b3c92617c9
commit 276f8b4148
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -261,7 +261,7 @@ public class ElectrumServer {
return 0; return 0;
}); });
return txos.stream().map(txo -> new ScriptHashTx(txo.getHeight(), txo.getHashAsString(), txo.getFee())).toList(); return txos.stream().map(txo -> new ScriptHashTx(txo.getHeight(), txo.getHashAsString(), txo.getFee() == null ? 0 : txo.getFee())).toList();
} }
private static String getScriptHashStatus(List<ScriptHashTx> scriptHashTxes) { private static String getScriptHashStatus(List<ScriptHashTx> scriptHashTxes) {
@ -439,7 +439,7 @@ public class ElectrumServer {
blkTx.getTransaction().getInputs().stream().map(txInput -> getPrevOutput(wallet, txInput)) blkTx.getTransaction().getInputs().stream().map(txInput -> getPrevOutput(wallet, txInput))
.filter(Objects::nonNull).map(ElectrumServer::getScriptHash).anyMatch(scriptHash::equals)) { .filter(Objects::nonNull).map(ElectrumServer::getScriptHash).anyMatch(scriptHash::equals)) {
List<ScriptHashTx> scriptHashTxes = new ArrayList<>(getScriptHashes(scriptHash, node)); List<ScriptHashTx> scriptHashTxes = new ArrayList<>(getScriptHashes(scriptHash, node));
scriptHashTxes.add(new ScriptHashTx(0, txid.toString(), blkTx.getFee())); scriptHashTxes.add(new ScriptHashTx(0, txid.toString(), blkTx.getFee() == null ? 0 : blkTx.getFee()));
String status = getScriptHashStatus(scriptHashTxes); String status = getScriptHashStatus(scriptHashTxes);
if(Objects.equals(status, statuses.getLast())) { if(Objects.equals(status, statuses.getLast())) {