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

handle server errors on retreiving wallet history

Browse source
This commit is contained in:
Craig Raw 2020-06-14 11:25:25 +02:00
parent b1b4734094
commit 09c4a01ca4
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/com/sparrowwallet/sparrow/io/ElectrumServer.java
View file

@ -155,7 +155,14 @@ public class ElectrumServer {
for(WalletNode node : nodes) { for(WalletNode node : nodes) {
batchRequest.add(node.getDerivationPath(), method, getScriptHash(wallet, node)); batchRequest.add(node.getDerivationPath(), method, getScriptHash(wallet, node));
} }
Map<String, ScriptHashTx[]> result = batchRequest.execute();
Map<String, ScriptHashTx[]> result;
try {
result = batchRequest.execute();
} catch (JsonRpcBatchException e) {
//Even if we have some successes, failure to retrieve all references will result in an incomplete wallet history. Don't proceed.
throw new IllegalStateException("Failed to retrieve references for paths: " + e.getErrors().keySet());
}
for(String path : result.keySet()) { for(String path : result.keySet()) {
ScriptHashTx[] txes = result.get(path); ScriptHashTx[] txes = result.get(path);
@ -373,7 +380,7 @@ public class ElectrumServer {
Set<BlockTransactionHash> history = nodeTransactionMap.get(node); Set<BlockTransactionHash> history = nodeTransactionMap.get(node);
for(BlockTransactionHash reference : history) { for(BlockTransactionHash reference : history) {
BlockTransaction blockTransaction = wallet.getTransactions().get(reference.getHash()); BlockTransaction blockTransaction = wallet.getTransactions().get(reference.getHash());
if (blockTransaction == null) { if (blockTransaction == null || blockTransaction.equals(UNFETCHABLE_BLOCK_TRANSACTION)) {
throw new IllegalStateException("Could not retrieve transaction for hash " + reference.getHashAsString()); throw new IllegalStateException("Could not retrieve transaction for hash " + reference.getHashAsString());
} }
Transaction transaction = blockTransaction.getTransaction(); Transaction transaction = blockTransaction.getTransaction();
@ -389,7 +396,7 @@ public class ElectrumServer {
for(BlockTransactionHash reference : history) { for(BlockTransactionHash reference : history) {
BlockTransaction blockTransaction = wallet.getTransactions().get(reference.getHash()); BlockTransaction blockTransaction = wallet.getTransactions().get(reference.getHash());
if (blockTransaction == null) { if (blockTransaction == null || blockTransaction.equals(UNFETCHABLE_BLOCK_TRANSACTION)) {
throw new IllegalStateException("Could not retrieve transaction for hash " + reference.getHashAsString()); throw new IllegalStateException("Could not retrieve transaction for hash " + reference.getHashAsString());
} }
Transaction transaction = blockTransaction.getTransaction(); Transaction transaction = blockTransaction.getTransaction();
@ -398,7 +405,10 @@ public class ElectrumServer {
TransactionInput input = transaction.getInputs().get(inputIndex); TransactionInput input = transaction.getInputs().get(inputIndex);
Sha256Hash previousHash = input.getOutpoint().getHash(); Sha256Hash previousHash = input.getOutpoint().getHash();
BlockTransaction previousTransaction = wallet.getTransactions().get(previousHash); BlockTransaction previousTransaction = wallet.getTransactions().get(previousHash);
if(previousTransaction == null) {
if(previousTransaction.equals(UNFETCHABLE_BLOCK_TRANSACTION)) {
throw new IllegalStateException("Could not retrieve transaction for hash " + reference.getHashAsString());
} else if(previousTransaction == null) {
//No referenced transaction found, cannot check if spends from wallet //No referenced transaction found, cannot check if spends from wallet
//This is fine so long as all referenced transactions have been returned, in which case this refers to a transaction that does not affect this wallet //This is fine so long as all referenced transactions have been returned, in which case this refers to a transaction that does not affect this wallet
continue; continue;