laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-10-06 03:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve randomization for utxo selection, input and output shuffling, and anti-fee-sniping

Browse Source
This commit is contained in:
Craig Raw
2026-08-21 10:06:28 +02:00
parent fdd1875a0c
commit bf0daae6cd
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drongo
+1 -1
Submodule drongo updated: 097420f6ea...23e092f556
src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java
+4 -2
View File
@@ -29,6 +29,7 @@ import org.controlsfx.glyphfont.Glyph;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.security.SecureRandom;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -38,6 +39,7 @@ import java.util.stream.Collectors;
public class EntryCell extends TreeTableCell<Entry, Entry> implements ConfirmationsListener {
private static final Logger log = LoggerFactory.getLogger(EntryCell.class);
private static final SecureRandom SECURE_RANDOM = new SecureRandom();
public static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm");
public static final Pattern REPLACED_BY_FEE_SUFFIX = Pattern.compile("(.*?)( \\(Replaced By Fee( #)?(\\d+)?\\)).*?");
@@ -258,7 +260,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
double feeRate = blockTransaction.getFeeRate() == null ? AppServices.getMinimumRelayFeeRate() : blockTransaction.getFeeRate();
List<OutputGroup> outputGroups = transactionEntry.getWallet().getGroupedUtxos(txoFilters, feeRate, AppServices.getMinimumRelayFeeRate(), Config.get().isGroupByAddress())
.stream().filter(outputGroup -> outputGroup.getEffectiveValue() >= 0).collect(Collectors.toList());
Collections.shuffle(outputGroups);
Collections.shuffle(outputGroups, SECURE_RANDOM);
while((double)changeTotal / vSize < getMaxFeeRate() && !outputGroups.isEmpty() && !cancelTransaction && !consolidationTransaction && safeToAddInputsOrOutputs) {
//If there is insufficient change output, include another random output group so the fee can be increased
OutputGroup outputGroup = outputGroups.remove(0);
@@ -382,7 +384,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
double feeRate = blockTransaction.getFeeRate() == null ? AppServices.getMinimumRelayFeeRate() : blockTransaction.getFeeRate();
List<OutputGroup> outputGroups = transactionEntry.getWallet().getGroupedUtxos(txoFilters, feeRate, AppServices.getMinimumRelayFeeRate(), Config.get().isGroupByAddress())
.stream().filter(outputGroup -> outputGroup.getEffectiveValue() >= 0).collect(Collectors.toList());
Collections.shuffle(outputGroups);
Collections.shuffle(outputGroups, SECURE_RANDOM);
List<BlockTransactionHashIndex> utxos = new ArrayList<>();
utxos.add(cpfpUtxo);
src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java
+3 -1
View File
@@ -54,6 +54,7 @@ import tornadofx.control.Field;
import java.io.IOException;
import java.net.URL;
import java.security.SecureRandom;
import java.text.DecimalFormat;
import java.util.*;
import java.util.regex.Pattern;
@@ -63,6 +64,7 @@ import static com.sparrowwallet.sparrow.AppServices.*;
public class SendController extends WalletFormController implements Initializable {
private static final Logger log = LoggerFactory.getLogger(SendController.class);
private static final SecureRandom SECURE_RANDOM = new SecureRandom();
@FXML
private TabPane paymentTabs;
@@ -710,7 +712,7 @@ public class SendController extends WalletFormController implements Initializabl
filters.add(presetUtxoSelector.asExcludeTxoFilter());
List<OutputGroup> outputGroups = wallet.getGroupedUtxos(filters, params.feeRate(), AppServices.getMinimumRelayFeeRate(), Config.get().isGroupByAddress())
.stream().filter(outputGroup -> outputGroup.getEffectiveValue() >= 0).collect(Collectors.toList());
Collections.shuffle(outputGroups);
Collections.shuffle(outputGroups, SECURE_RANDOM);
while(!outputGroups.isEmpty() && presetUtxoSelector.getPresetUtxos().stream().mapToLong(BlockTransactionHashIndex::getValue).sum() < e.getTargetValue()) {
OutputGroup outputGroup = outputGroups.removeFirst();