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

avoid triggering all history changed event on unconfident script hash status calculations

Browse source
This commit is contained in:
Craig Raw 2022-12-12 10:49:29 +02:00
parent 00f5001385
commit 6f4fc4f2ca
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,6 +61,8 @@ public class ElectrumServer {
private static Map<Sha256Hash, BlockTransaction> retrievedTransactions = Collections.synchronizedMap(new HashMap<>()); private static Map<Sha256Hash, BlockTransaction> retrievedTransactions = Collections.synchronizedMap(new HashMap<>());
private static Set<String> sameHeightTxioScriptHashes = Collections.synchronizedSet(new HashSet<>());
private static ElectrumServerRpc electrumServerRpc = new SimpleElectrumServerRpc(); private static ElectrumServerRpc electrumServerRpc = new SimpleElectrumServerRpc();
private static Cormorant cormorant; private static Cormorant cormorant;
@ -208,11 +210,11 @@ public class ElectrumServer {
private static void addScriptHashStatus(Map<String, String> calculatedScriptHashes, WalletNode walletNode) { private static void addScriptHashStatus(Map<String, String> calculatedScriptHashes, WalletNode walletNode) {
String scriptHash = getScriptHash(walletNode); String scriptHash = getScriptHash(walletNode);
String scriptHashStatus = getScriptHashStatus(walletNode); String scriptHashStatus = getScriptHashStatus(scriptHash, walletNode);
calculatedScriptHashes.put(scriptHash, scriptHashStatus); calculatedScriptHashes.put(scriptHash, scriptHashStatus);
} }
private static String getScriptHashStatus(WalletNode walletNode) { private static String getScriptHashStatus(String scriptHash, WalletNode walletNode) {
List<BlockTransactionHashIndex> txos = new ArrayList<>(walletNode.getTransactionOutputs()); List<BlockTransactionHashIndex> txos = new ArrayList<>(walletNode.getTransactionOutputs());
txos.addAll(walletNode.getTransactionOutputs().stream().filter(BlockTransactionHashIndex::isSpent).map(BlockTransactionHashIndex::getSpentBy).collect(Collectors.toList())); txos.addAll(walletNode.getTransactionOutputs().stream().filter(BlockTransactionHashIndex::isSpent).map(BlockTransactionHashIndex::getSpentBy).collect(Collectors.toList()));
Set<Sha256Hash> unique = new HashSet<>(txos.size()); Set<Sha256Hash> unique = new HashSet<>(txos.size());
@ -231,6 +233,8 @@ public class ElectrumServer {
} }
//We cannot further sort by order within a block, so sometimes multiple txos to an address will mean an incorrect status //We cannot further sort by order within a block, so sometimes multiple txos to an address will mean an incorrect status
//Save a record of these to avoid triggering an AllHistoryChangedEvent based on potentially incorrect calculated statuses
sameHeightTxioScriptHashes.add(scriptHash);
return 0; return 0;
}); });
if(!txos.isEmpty()) { if(!txos.isEmpty()) {
@ -246,8 +250,13 @@ public class ElectrumServer {
} }
public static void clearRetrievedScriptHashes(Wallet wallet) { public static void clearRetrievedScriptHashes(Wallet wallet) {
wallet.getNode(KeyPurpose.RECEIVE).getChildren().stream().map(ElectrumServer::getScriptHash).forEach(scriptHash -> retrievedScriptHashes.remove(scriptHash)); wallet.getNode(KeyPurpose.RECEIVE).getChildren().stream().map(ElectrumServer::getScriptHash).forEach(ElectrumServer::clearRetrievedScriptHash);
wallet.getNode(KeyPurpose.CHANGE).getChildren().stream().map(ElectrumServer::getScriptHash).forEach(scriptHash -> retrievedScriptHashes.remove(scriptHash)); wallet.getNode(KeyPurpose.CHANGE).getChildren().stream().map(ElectrumServer::getScriptHash).forEach(ElectrumServer::clearRetrievedScriptHash);
}
private static void clearRetrievedScriptHash(String scriptHash) {
retrievedScriptHashes.remove(scriptHash);
sameHeightTxioScriptHashes.remove(scriptHash);
} }
public Map<WalletNode, Set<BlockTransactionHash>> getHistory(Wallet wallet) throws ServerException { public Map<WalletNode, Set<BlockTransactionHash>> getHistory(Wallet wallet) throws ServerException {
@ -449,7 +458,7 @@ public class ElectrumServer {
String subscribedStatus = getSubscribedScriptHashStatus(scriptHash); String subscribedStatus = getSubscribedScriptHashStatus(scriptHash);
if(subscribedStatus != null) { if(subscribedStatus != null) {
//Already subscribed, but still need to fetch history from a used node if not previously fetched or present //Already subscribed, but still need to fetch history from a used node if not previously fetched or present
if(!subscribedStatus.equals(retrievedScriptHashes.get(scriptHash)) || !subscribedStatus.equals(getScriptHashStatus(node))) { if(!subscribedStatus.equals(retrievedScriptHashes.get(scriptHash)) || !subscribedStatus.equals(getScriptHashStatus(scriptHash, node))) {
nodeTransactionMap.put(node, new TreeSet<>()); nodeTransactionMap.put(node, new TreeSet<>());
} }
} else if(!subscribedScriptHashes.containsKey(scriptHash) && scriptHashes.add(scriptHash)) { } else if(!subscribedScriptHashes.containsKey(scriptHash) && scriptHashes.add(scriptHash)) {
@ -1404,7 +1413,9 @@ public class ElectrumServer {
//If wallet was not empty, check if all used updated nodes have changed history //If wallet was not empty, check if all used updated nodes have changed history
if(nodes == null && previousScriptHashes.values().stream().anyMatch(Objects::nonNull)) { if(nodes == null && previousScriptHashes.values().stream().anyMatch(Objects::nonNull)) {
if(!updatedNodes.isEmpty() && updatedNodes.equals(walletNodes.entrySet().stream().filter(entry -> !entry.getValue().isEmpty()).map(Map.Entry::getKey).collect(Collectors.toSet()))) { if(!updatedNodes.isEmpty()
&& updatedNodes.equals(walletNodes.entrySet().stream().filter(entry -> !entry.getValue().isEmpty()).map(Map.Entry::getKey).collect(Collectors.toSet()))
&& !sameHeightTxioScriptHashes.containsAll(updatedNodes.stream().map(ElectrumServer::getScriptHash).collect(Collectors.toSet()))) {
//All used nodes on a non-empty wallet have changed history. Abort and trigger a full refresh. //All used nodes on a non-empty wallet have changed history. Abort and trigger a full refresh.
log.info("All used nodes on a non-empty wallet have changed history. Triggering a full wallet refresh."); log.info("All used nodes on a non-empty wallet have changed history. Triggering a full wallet refresh.");
throw new AllHistoryChangedException(); throw new AllHistoryChangedException();