KeyChainGroup: Fix currentKey() and currentAddress() still vends old …

…key/address after new chain was activated.
bitcoinj · Feb 18, 2019 · 497f716 · 497f716
1 parent 9f4f74c
commit 497f716
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java
@@ -272,6 +272,8 @@ public void addAndActivateHDChain(DeterministicKeyChain chain) {
         if (lookaheadThreshold >= 0)
             chain.setLookaheadThreshold(lookaheadThreshold);
         chains.add(chain);
+        currentKeys.clear();
+        currentAddresses.clear();
     }
 
     /**

diff --git a/core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java b/core/src/test/java/org/bitcoinj/wallet/KeyChainGroupTest.java
@@ -518,6 +518,27 @@ public void constructFromSeed() throws Exception {
         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)
     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.