sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-04 21:36:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix removing added txes

Browse source
This commit is contained in:
Craig Raw 2020-06-25 15:22:21 +02:00
parent 0f89327f35
commit 829be40243
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/sparrowwallet/sparrow/control/TransactionsTreeTable.java
View file

@ -70,6 +70,7 @@ public class TransactionsTreeTable extends TreeTableView<Entry> {
} }
public void updateHistory(List<WalletNode> updatedNodes) { public void updateHistory(List<WalletNode> updatedNodes) {
//Recalculate from scratch and update according - any changes may affect the balance of other transactions
WalletTransactionsEntry rootEntry = (WalletTransactionsEntry)getRoot().getValue(); WalletTransactionsEntry rootEntry = (WalletTransactionsEntry)getRoot().getValue();
rootEntry.updateTransactions(); rootEntry.updateTransactions();
sort(); sort();

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

@ -142,15 +142,20 @@ public class ElectrumServer {
getHistory(wallet, purposeNode.getChildren(), nodeTransactionMap, 0); getHistory(wallet, purposeNode.getChildren(), nodeTransactionMap, 0);
int historySize = purposeNode.getChildren().size(); int historySize = purposeNode.getChildren().size();
int gapLimitSize = nodeTransactionMap.size() + Wallet.DEFAULT_LOOKAHEAD; int gapLimitSize = getGapLimitSize(nodeTransactionMap);
while(historySize < gapLimitSize) { while(historySize < gapLimitSize) {
purposeNode.fillToIndex(gapLimitSize - 1); purposeNode.fillToIndex(gapLimitSize - 1);
getHistory(wallet, purposeNode.getChildren(), nodeTransactionMap, historySize); getHistory(wallet, purposeNode.getChildren(), nodeTransactionMap, historySize);
historySize = purposeNode.getChildren().size(); historySize = purposeNode.getChildren().size();
gapLimitSize = nodeTransactionMap.size() + Wallet.DEFAULT_LOOKAHEAD; gapLimitSize = getGapLimitSize(nodeTransactionMap);
} }
} }
private int getGapLimitSize(Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap) {
int highestIndex = nodeTransactionMap.entrySet().stream().filter(entry -> !entry.getValue().isEmpty()).map(entry -> entry.getKey().getIndex()).max(Comparator.comparing(Integer::valueOf)).orElse(-1);
return highestIndex + Wallet.DEFAULT_LOOKAHEAD + 1;
}
public void getHistory(Wallet wallet, Collection<WalletNode> nodes, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap, int startIndex) throws ServerException { public void getHistory(Wallet wallet, Collection<WalletNode> nodes, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap, int startIndex) throws ServerException {
getReferences(wallet, "blockchain.scripthash.get_history", nodes, nodeTransactionMap, startIndex); getReferences(wallet, "blockchain.scripthash.get_history", nodes, nodeTransactionMap, startIndex);
} }
@ -188,7 +193,7 @@ public class ElectrumServer {
Set<BlockTransactionHash> references = Arrays.stream(txes).map(ScriptHashTx::getBlockchainTransactionHash).collect(Collectors.toCollection(TreeSet::new)); Set<BlockTransactionHash> references = Arrays.stream(txes).map(ScriptHashTx::getBlockchainTransactionHash).collect(Collectors.toCollection(TreeSet::new));
Set<BlockTransactionHash> existingReferences = nodeTransactionMap.get(node); Set<BlockTransactionHash> existingReferences = nodeTransactionMap.get(node);
if(existingReferences == null && !references.isEmpty()) { if(existingReferences == null) {
nodeTransactionMap.put(node, references); nodeTransactionMap.put(node, references);
} else { } else {
for(BlockTransactionHash reference : references) { for(BlockTransactionHash reference : references) {