sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2024-11-05 03:26:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

support configurable wallet gap limit

Browse source
This commit is contained in:
Craig Raw 2020-09-09 14:56:28 +02:00
parent 488752c142
commit 9faacb055c
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/sparrowwallet/drongo/wallet/Wallet.java
View file

@ -2,7 +2,6 @@ package com.sparrowwallet.drongo.wallet;
import com.sparrowwallet.drongo.BitcoinUnit; import com.sparrowwallet.drongo.BitcoinUnit;
import com.sparrowwallet.drongo.KeyPurpose; import com.sparrowwallet.drongo.KeyPurpose;
import com.sparrowwallet.drongo.Utils;
import com.sparrowwallet.drongo.address.Address; import com.sparrowwallet.drongo.address.Address;
import com.sparrowwallet.drongo.crypto.ECKey; import com.sparrowwallet.drongo.crypto.ECKey;
import com.sparrowwallet.drongo.crypto.Key; import com.sparrowwallet.drongo.crypto.Key;
@ -29,6 +28,7 @@ public class Wallet {
private final TreeSet<WalletNode> purposeNodes = new TreeSet<>(); private final TreeSet<WalletNode> purposeNodes = new TreeSet<>();
private final Map<Sha256Hash, BlockTransaction> transactions = new HashMap<>(); private final Map<Sha256Hash, BlockTransaction> transactions = new HashMap<>();
private Integer storedBlockHeight; private Integer storedBlockHeight;
private Integer gapLimit;
public Wallet() { public Wallet() {
} }
@ -103,6 +103,14 @@ public class Wallet {
this.storedBlockHeight = storedBlockHeight; this.storedBlockHeight = storedBlockHeight;
} }
public int getGapLimit() {
return gapLimit == null ? DEFAULT_LOOKAHEAD : gapLimit;
}
public void setGapLimit(int gapLimit) {
this.gapLimit = gapLimit;
}
public synchronized WalletNode getNode(KeyPurpose keyPurpose) { public synchronized WalletNode getNode(KeyPurpose keyPurpose) {
WalletNode purposeNode; WalletNode purposeNode;
Optional<WalletNode> optionalPurposeNode = purposeNodes.stream().filter(node -> node.getKeyPurpose().equals(keyPurpose)).findFirst(); Optional<WalletNode> optionalPurposeNode = purposeNodes.stream().filter(node -> node.getKeyPurpose().equals(keyPurpose)).findFirst();
@ -118,10 +126,10 @@ public class Wallet {
} }
public int getLookAheadIndex(WalletNode node) { public int getLookAheadIndex(WalletNode node) {
int lookAheadIndex = DEFAULT_LOOKAHEAD - 1; int lookAheadIndex = getGapLimit() - 1;
Integer highestUsed = node.getHighestUsedIndex(); Integer highestUsed = node.getHighestUsedIndex();
if(highestUsed != null) { if(highestUsed != null) {
lookAheadIndex = highestUsed + DEFAULT_LOOKAHEAD; lookAheadIndex = highestUsed + getGapLimit();
} }
return lookAheadIndex; return lookAheadIndex;
@ -863,6 +871,7 @@ public class Wallet {
copy.transactions.put(hash, transactions.get(hash)); copy.transactions.put(hash, transactions.get(hash));
} }
copy.setStoredBlockHeight(getStoredBlockHeight()); copy.setStoredBlockHeight(getStoredBlockHeight());
copy.gapLimit = gapLimit;
return copy; return copy;
} }