Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-13 18:55:52 +00:00
Code Issues Projects Releases Wiki Activity

Don't derive private keys just to check if they exist

Browse Source
This commit is contained in:
Devrandom 2015-07-19 11:02:08 -07:00 committed by Andreas Schildbach
parent a293b09ef5
commit 4411eb8702
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/bitcoinj/crypto/DeterministicKey.java
View File

@ -320,7 +320,7 @@ public class DeterministicKey extends ECKey {
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public boolean hasPrivKey() { public boolean hasPrivKey() {
return findOrDerivePrivateKey() != null; return findParentWithPrivKey() != null;
} }
@Nullable @Nullable
@ -407,13 +407,18 @@ public class DeterministicKey extends ECKey {
return derivePrivateKeyDownwards(cursor, parentalPrivateKeyBytes); return derivePrivateKeyDownwards(cursor, parentalPrivateKeyBytes);
} }
@Nullable private DeterministicKey findParentWithPrivKey() {
private BigInteger findOrDerivePrivateKey() {
DeterministicKey cursor = this; DeterministicKey cursor = this;
while (cursor != null) { while (cursor != null) {
if (cursor.priv != null) break; if (cursor.priv != null) break;
cursor = cursor.parent; cursor = cursor.parent;
} }
return cursor;
}
@Nullable
private BigInteger findOrDerivePrivateKey() {
DeterministicKey cursor = findParentWithPrivKey();
if (cursor == null) if (cursor == null)
return null; return null;
return derivePrivateKeyDownwards(cursor, cursor.priv.toByteArray()); return derivePrivateKeyDownwards(cursor, cursor.priv.toByteArray());