mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-23 14:40:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

DeterministicKeyChain: improve HDPath deserialization

Browse source
This commit is contained in:
Sean Gilligan 2022-04-13 17:45:17 -07:00 • committed by Andreas Schildbach
parent 2b82c27456
commit 309c0e2448
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/org/bitcoinj/crypto/HDPath.java
View file

@ -84,6 +84,17 @@ public class HDPath extends AbstractList<ChildNumber> {
return new HDPath(hasPrivateKey, list);
}
/**
* Deserialize a list of integers into an HDPath (internal use only)
* @param integerList A list of integers (what we use in ProtoBuf for an HDPath)
* @return a deserialized HDPath (hasPrivateKey is false/unknown)
*/
public static HDPath deserialize(List<Integer> integerList) {
return integerList.stream()
.map(ChildNumber::new)
.collect(Collectors.collectingAndThen(Collectors.toList(), HDPath::M));
}
/**
* Returns a path for a public key.
*

17
core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java
View file

@ -42,6 +42,7 @@ import java.security.SecureRandom;
import java.util.*;
import java.util.concurrent.Executor;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.*;
@ -805,19 +806,14 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
int lookaheadSize = -1;
int sigsRequiredToSpend = 1;
List<ChildNumber> accountPath = new ArrayList<>();
HDPath accountPath = HDPath.M();
Script.ScriptType outputScriptType = Script.ScriptType.P2PKH;
PeekingIterator<Protos.Key> iter = Iterators.peekingIterator(keys.iterator());
while (iter.hasNext()) {
Protos.Key key = iter.next();
final Protos.Key.Type t = key.getType();
if (t == Protos.Key.Type.DETERMINISTIC_MNEMONIC) {
accountPath = new ArrayList<>();
for (int i : key.getAccountPathList()) {
accountPath.add(new ChildNumber(i));
}
if (accountPath.isEmpty())
accountPath = ACCOUNT_ZERO_PATH;
accountPath = deserializeAccountPath(key.getAccountPathList());
if (chain != null) {
checkState(lookaheadSize >= 0);
chain.setLookaheadSize(lookaheadSize);
@ -901,7 +897,7 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
isWatchingAccountKey = true;
} else {
chain = factory.makeKeyChain(seed, crypter, isMarried,
outputScriptType, HDPath.M(accountPath));
outputScriptType, accountPath);
chain.lookaheadSize = LAZY_CALCULATE_LOOKAHEAD;
// If the seed is encrypted, then the chain is incomplete at this point. However, we will load
// it up below as we parse in the keys. We just need to check at the end that we've loaded
@ -980,6 +976,11 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
return chains;
}
private static HDPath deserializeAccountPath(List<Integer> integerList) {
HDPath path = HDPath.deserialize(integerList);
return path.isEmpty() ? ACCOUNT_ZERO_PATH : path;
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Encryption support