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

allow external unconfirmed utxos to be spent

Browse source
This commit is contained in:
Craig Raw 2021-04-20 11:08:44 +02:00
parent e9d0491b42
commit e62b44bbbe
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drongo

@ -1 +1 @@
Subproject commit 85e8b97a8c8d21bfbb76096285eec95d28384090 Subproject commit a25dfa5c7671023b60d1773cf603b4d46885a546

2
src/main/java/com/sparrowwallet/sparrow/control/UtxosChart.java
View file

@ -72,7 +72,7 @@ public class UtxosChart extends BarChart<String, Number> {
private String getCategoryName(Entry entry) { private String getCategoryName(Entry entry) {
if(entry.getLabel() != null && !entry.getLabel().isEmpty()) { if(entry.getLabel() != null && !entry.getLabel().isEmpty()) {
return entry.getLabel().length() > 15 ? entry.getLabel().substring(0, 15) + "..." : entry.getLabel(); return entry.getLabel().length() > 15 ? entry.getLabel().substring(0, 15) + "..." : entry.getLabel() + "\n" + ((UtxoEntry)entry).getDescription();
} }
return ((UtxoEntry)entry).getDescription(); return ((UtxoEntry)entry).getDescription();

3
src/main/java/com/sparrowwallet/sparrow/wallet/HashIndexEntry.java
View file

@ -8,6 +8,7 @@ import com.sparrowwallet.drongo.wallet.Wallet;
import com.sparrowwallet.sparrow.EventManager; import com.sparrowwallet.sparrow.EventManager;
import com.sparrowwallet.sparrow.control.DateLabel; import com.sparrowwallet.sparrow.control.DateLabel;
import com.sparrowwallet.sparrow.event.WalletEntryLabelChangedEvent; import com.sparrowwallet.sparrow.event.WalletEntryLabelChangedEvent;
import com.sparrowwallet.sparrow.io.Config;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -58,7 +59,7 @@ public class HashIndexEntry extends Entry implements Comparable<HashIndexEntry>
} }
public boolean isSpendable() { public boolean isSpendable() {
return !isSpent() && (hashIndex.getHeight() > 0 || getWallet().allInputsFromWallet(hashIndex.getHash())) && (hashIndex.getStatus() == null || hashIndex.getStatus() != Status.FROZEN); return !isSpent() && (hashIndex.getHeight() > 0 || Config.get().isIncludeMempoolChange()) && (hashIndex.getStatus() == null || hashIndex.getStatus() != Status.FROZEN);
} }
@Override @Override

4
src/main/resources/com/sparrowwallet/sparrow/preferences/general.fxml
View file

@ -86,9 +86,9 @@
<UnlabeledToggleSwitch fx:id="groupByAddress" /> <UnlabeledToggleSwitch fx:id="groupByAddress" />
<HelpLabel helpText="Group UTXOs by address when sending to improve privacy by only sending from an address once."/> <HelpLabel helpText="Group UTXOs by address when sending to improve privacy by only sending from an address once."/>
</Field> </Field>
<Field text="Use mempool change:"> <Field text="Allow unconfirmed:">
<UnlabeledToggleSwitch fx:id="includeMempoolChange" /> <UnlabeledToggleSwitch fx:id="includeMempoolChange" />
<HelpLabel helpText="Allow a wallet to spend UTXOs that are still in the mempool where all their inputs are from that wallet."/> <HelpLabel helpText="Allow a wallet to spend UTXOs that are still in the mempool."/>
</Field> </Field>
</Fieldset> </Fieldset>
<Fieldset inputGrow="SOMETIMES" text="Notifications" styleClass="wideLabelFieldSet"> <Fieldset inputGrow="SOMETIMES" text="Notifications" styleClass="wideLabelFieldSet">