mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-10 17:26:28 +01:00
Code Issues Projects Releases Packages Wiki Activity

HDPath: Use Splitter in parsePath().

Browse source
This commit is contained in:
Andreas Schildbach 2020-06-30 15:49:35 +02:00
parent 8b502dffa2
commit 7a1ad0fac0
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,11 +16,14 @@
package org.bitcoinj.crypto;
import com.google.common.base.Splitter;
import javax.annotation.Nonnull;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
/**
@ -42,6 +45,7 @@ public class HDPath extends AbstractList<ChildNumber> {
private static final char PREFIX_PRIVATE = 'm';
private static final char PREFIX_PUBLIC = 'M';
private static final char SEPARATOR = '/';
private static final Splitter SEPARATOR_SPLITTER = Splitter.on(SEPARATOR).trimResults();
protected final boolean hasPrivateKey;
protected final List<ChildNumber> unmodifiableList;
@ -151,14 +155,15 @@ public class HDPath extends AbstractList<ChildNumber> {
* Where a letter "H" means hardened key. Spaces are ignored.
*/
public static HDPath parsePath(@Nonnull String path) {
String[] parsedNodes = path.replace("M", "").split("/");
List<ChildNumber> nodes = new ArrayList<>();
List<String> parsedNodes = new LinkedList<>(SEPARATOR_SPLITTER.splitToList(path));
if (!parsedNodes.isEmpty() && parsedNodes.get(0).equals(Character.toString(PREFIX_PUBLIC)))
parsedNodes.remove(0);
List<ChildNumber> nodes = new ArrayList<>(parsedNodes.size());
for (String n : parsedNodes) {
n = n.replaceAll(" ", "");
if (n.length() == 0) continue;
if (n.isEmpty()) continue;
boolean isHard = n.endsWith("H");
if (isHard) n = n.substring(0, n.length() - 1);
if (isHard) n = n.substring(0, n.length() - 1).trim();
int nodeNumber = Integer.parseInt(n);
nodes.add(new ChildNumber(nodeNumber, isHard));
}