mirror of
https://github.com/sparrowwallet/drongo.git
synced 2024-11-02 18:26:43 +00:00
add support for searching for the required gap limit to sign a psbt where global xpubs match
This commit is contained in:
parent
12db57c8d7
commit
75730f00ac
1 changed files with 36 additions and 0 deletions
|
@ -24,6 +24,7 @@ import static com.sparrowwallet.drongo.protocol.Transaction.WITNESS_SCALE_FACTOR
|
||||||
|
|
||||||
public class Wallet extends Persistable implements Comparable<Wallet> {
|
public class Wallet extends Persistable implements Comparable<Wallet> {
|
||||||
public static final int DEFAULT_LOOKAHEAD = 20;
|
public static final int DEFAULT_LOOKAHEAD = 20;
|
||||||
|
public static final int SEARCH_LOOKAHEAD = 4000;
|
||||||
public static final String ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY = "com.sparrowwallet.allowDerivationsMatchingOtherScriptTypes";
|
public static final String ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY = "com.sparrowwallet.allowDerivationsMatchingOtherScriptTypes";
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
|
@ -1484,6 +1485,41 @@ public class Wallet extends Persistable implements Comparable<Wallet> {
|
||||||
return signingNodes;
|
return signingNodes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<Keystore> getSigningKeystores(PSBT psbt) {
|
||||||
|
List<Keystore> signingKeystores = new ArrayList<>();
|
||||||
|
|
||||||
|
for(Map.Entry<ExtendedKey, KeyDerivation> entry : psbt.getExtendedPublicKeys().entrySet()) {
|
||||||
|
for(Keystore keystore : getKeystores()) {
|
||||||
|
if(entry.getKey().equals(keystore.getExtendedPublicKey()) && entry.getValue().equals(keystore.getKeyDerivation())) {
|
||||||
|
signingKeystores.add(keystore);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return signingKeystores;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Integer getRequiredGapLimit(PSBT psbt) {
|
||||||
|
Wallet copy = this.copy();
|
||||||
|
for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
|
||||||
|
WalletNode purposeNode = copy.getNode(keyPurpose);
|
||||||
|
purposeNode.fillToIndex(purposeNode.getChildren().size() + SEARCH_LOOKAHEAD);
|
||||||
|
}
|
||||||
|
Map<PSBTInput, WalletNode> copySigningNodes = copy.getSigningNodes(psbt);
|
||||||
|
boolean found = false;
|
||||||
|
int gapLimit = getGapLimit();
|
||||||
|
for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
|
||||||
|
OptionalInt optHighestIndex = copySigningNodes.values().stream().filter(node -> node.getKeyPurpose() == keyPurpose).mapToInt(WalletNode::getIndex).max();
|
||||||
|
if(optHighestIndex.isPresent()) {
|
||||||
|
found = true;
|
||||||
|
Integer highestUsedIndex = getNode(keyPurpose).getHighestUsedIndex();
|
||||||
|
gapLimit = Math.max(gapLimit, optHighestIndex.getAsInt() - (highestUsedIndex == null ? -1 : highestUsedIndex));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return found ? gapLimit : null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determines which keystores have signed a PSBT
|
* Determines which keystores have signed a PSBT
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue