laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-07-30 19:46:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix sp self-spend output discovery by always scanning all batch txs

Browse Source
This commit is contained in:
Craig Raw
2026-05-06 15:05:52 +02:00
parent e64069f02f
commit ab6416f30a
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
+11 -8
View File
@@ -1501,21 +1501,24 @@ public class ElectrumServer {
return Collections.emptySet();
}
Map<BlockTransactionHash, Transaction> references = new TreeMap<>();
Map<BlockTransactionHash, Transaction> referencesToFetch = new TreeMap<>();
Map<Sha256Hash, BlockTransaction> transactionMap = new HashMap<>();
Map<Sha256Hash, byte[]> tweakMap = new HashMap<>();
for(SilentPaymentsTx entry : entries) {
Sha256Hash txid = Sha256Hash.wrap(entry.tx_hash);
tweakMap.putIfAbsent(txid, Utils.hexToBytes(entry.tweak_key));
if(wallet.getWalletTransaction(txid) == null) {
references.put(new BlockTransaction(txid, entry.height, null, null, null), null);
BlockTransaction existing = wallet.getWalletTransaction(txid);
if(existing != null) {
transactionMap.put(txid, existing);
} else {
referencesToFetch.put(new BlockTransaction(txid, entry.height, null, null, null), null);
}
}
if(references.isEmpty()) {
return Collections.emptySet();
}
Map<Integer, BlockHeader> blockHeaderMap = getBlockHeaders(wallet, references.keySet());
Map<Sha256Hash, BlockTransaction> transactionMap = getTransactions(wallet, references, blockHeaderMap);
if(!referencesToFetch.isEmpty()) {
Map<Integer, BlockHeader> blockHeaderMap = getBlockHeaders(wallet, referencesToFetch.keySet());
transactionMap.putAll(getTransactions(wallet, referencesToFetch, blockHeaderMap));
}
ECKey scanPriv = wallet.getSilentPaymentScanAddress().getScanKey();
ECKey spendPub = wallet.getSilentPaymentScanAddress().getSpendKey();