Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-01 21:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix off by one in DKC.getKeys(false). Resolves #253

Browse Source
This commit is contained in:
Mike Hearn
2014-10-22 22:00:31 +02:00
parent cd25e673f1
commit afb05867a9
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java
View File

@@ -1186,8 +1186,8 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
DeterministicKey parent = detkey.getParent(); DeterministicKey parent = detkey.getParent();
if (parent == null) continue; if (parent == null) continue;
if (detkey.getPath().size() <= treeSize) continue; if (detkey.getPath().size() <= treeSize) continue;
if (parent.equals(internalKey) && detkey.getChildNumber().i() > issuedInternalKeys) continue; if (parent.equals(internalKey) && detkey.getChildNumber().i() >= issuedInternalKeys) continue;
if (parent.equals(externalKey) && detkey.getChildNumber().i() > issuedExternalKeys) continue; if (parent.equals(externalKey) && detkey.getChildNumber().i() >= issuedExternalKeys) continue;
issuedKeys.add(detkey); issuedKeys.add(detkey);
} }
return issuedKeys; return issuedKeys;

8
core/src/test/java/org/bitcoinj/wallet/DeterministicKeyChainTest.java
View File

@@ -72,6 +72,14 @@ public class DeterministicKeyChainTest {
key3.sign(Sha256Hash.ZERO_HASH); key3.sign(Sha256Hash.ZERO_HASH);
} }
@Test
public void getKeys() throws Exception {
chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);
chain.getKey(KeyChain.KeyPurpose.CHANGE);
chain.maybeLookAhead();
assertEquals(2, chain.getKeys(false).size());
}
@Test @Test
public void signMessage() throws Exception { public void signMessage() throws Exception {
ECKey key = chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS); ECKey key = chain.getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);