laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-08-09 08:14:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix various refresh history issues when updating node sets

Browse Source
This commit is contained in:
Craig Raw
2022-03-04 10:36:47 +02:00
parent 001e368775
commit 7b3ff2a6d3
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drongo
+1 -1
Submodule drongo updated: 0734757a17...04631be8c1
src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
+5 -1
View File
@@ -1303,6 +1303,11 @@ public class ElectrumServer {
return false;
}
Set<WalletNode> nodes = (filterToNodes == null ? null : filterToNodes.stream().filter(node -> node.getWallet().equals(wallet)).collect(Collectors.toSet()));
if(filterToNodes != null && nodes.isEmpty()) {
return false;
}
boolean initial = (walletSynchronizeLocks.putIfAbsent(wallet, new Object()) == null);
synchronized(walletSynchronizeLocks.get(wallet)) {
if(initial) {
@@ -1311,7 +1316,6 @@ public class ElectrumServer {
if(isConnected()) {
ElectrumServer electrumServer = new ElectrumServer();
Set<WalletNode> nodes = (filterToNodes == null ? null : filterToNodes.stream().filter(node -> node.getWallet().equals(wallet)).collect(Collectors.toSet()));
Map<String, String> previousScriptHashes = getCalculatedScriptHashes(wallet);
Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = (nodes == null ? electrumServer.getHistory(wallet) : electrumServer.getHistory(wallet, nodes));
src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java
+4 -4
View File
@@ -259,12 +259,12 @@ public class WalletForm {
}
private List<WalletNode> getHistoryChangedNodes(Set<WalletNode> previousNodes, Set<WalletNode> currentNodes) {
Map<WalletNode, WalletNode> previousNodeMap = new HashMap<>(previousNodes.size());
previousNodes.forEach(walletNode -> previousNodeMap.put(walletNode, walletNode));
Map<String, WalletNode> previousNodeMap = new HashMap<>(previousNodes.size());
previousNodes.forEach(walletNode -> previousNodeMap.put(walletNode.getDerivationPath(), walletNode));
List<WalletNode> changedNodes = new ArrayList<>();
for(WalletNode currentNode : currentNodes) {
WalletNode previousNode = previousNodeMap.get(currentNode);
WalletNode previousNode = previousNodeMap.get(currentNode.getDerivationPath());
if(previousNode != null) {
if(!currentNode.getTransactionOutputs().equals(previousNode.getTransactionOutputs())) {
changedNodes.add(currentNode);
@@ -286,7 +286,7 @@ public class WalletForm {
return null;
}
Set<WalletNode> allNodes = new LinkedHashSet<>();
Set<WalletNode> allNodes = new LinkedHashSet<>(walletNodes);
for(WalletNode walletNode : walletNodes) {
for(Set<WalletNode> nodes : walletTransactionNodes) {
if(nodes.contains(walletNode)) {