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

KeyChainGroup: Fix currentKey() and currentAddress() still vends old key/address after new chain was activated.

Browse Source
This commit is contained in:
Andreas Schildbach
2019-02-18 09:57:10 +01:00
parent d7b2beac97
commit e68a24e6bc
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
View File

@@ -272,6 +272,8 @@ public class KeyChainGroup implements KeyBag {
if (lookaheadThreshold >= 0) if (lookaheadThreshold >= 0)
chain.setLookaheadThreshold(lookaheadThreshold); chain.setLookaheadThreshold(lookaheadThreshold);
chains.add(chain); chains.add(chain);
currentKeys.clear();
currentAddresses.clear();
} }
/** /**

21
core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java
View File

@@ -518,6 +518,27 @@ public class KeyChainGroupTest {
assertEquals(key1, key2); assertEquals(key1, key2);
} }
@Test
public void addAndActivateHDChain_freshCurrentAddress() {
DeterministicSeed seed = new DeterministicSeed(ENTROPY, "", 0);
DeterministicKeyChain chain1 = DeterministicKeyChain.builder().seed(seed)
.accountPath(DeterministicKeyChain.ACCOUNT_ZERO_PATH).outputScriptType(Script.ScriptType.P2PKH).build();
group = KeyChainGroup.builder(MAINNET).addChain(chain1).build();
assertEquals("1M5T5k9yKtGWRtWYMjQtGx3K2sshrABzCT", group.currentAddress(KeyPurpose.RECEIVE_FUNDS).toString());
final DeterministicKeyChain chain2 = DeterministicKeyChain.builder().seed(seed)
.accountPath(DeterministicKeyChain.ACCOUNT_ONE_PATH).outputScriptType(Script.ScriptType.P2PKH).build();
group.addAndActivateHDChain(chain2);
assertEquals("1JLnjJEXcyByAaW6sqSxNvGiiSEWRhdvPb", group.currentAddress(KeyPurpose.RECEIVE_FUNDS).toString());
final DeterministicKeyChain chain3 = DeterministicKeyChain.builder().seed(seed)
.accountPath(DeterministicKeyChain.BIP44_ACCOUNT_ZERO_PATH).outputScriptType(Script.ScriptType.P2WPKH)
.build();
group.addAndActivateHDChain(chain3);
assertEquals("bc1q5fa84aghxd6uzk5g2ywkppmzlut5d77vg8cd20",
group.currentAddress(KeyPurpose.RECEIVE_FUNDS).toString());
}
@Test(expected = DeterministicUpgradeRequiredException.class) @Test(expected = DeterministicUpgradeRequiredException.class)
public void deterministicUpgradeRequired() throws Exception { public void deterministicUpgradeRequired() throws Exception {
// Check that if we try to use HD features in a KCG that only has random keys, we get an exception. // Check that if we try to use HD features in a KCG that only has random keys, we get an exception.