DeterministicKeyChain: Allow encrypting DeterministicKeyChain with ar…

…bitrary path
nogang · Mar 12, 2018 · e0d9683 · e0d9683
1 parent 4bbb7be
commit e0d9683
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java b/core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java
@@ -433,6 +433,7 @@ protected DeterministicKeyChain(KeyCrypter crypter, KeyParameter aesKey, Determi
         checkNotNull(chain.seed);
 
         checkArgument(!chain.rootKey.isEncrypted(), "Chain already encrypted");
+        setAccountPath(chain.getAccountPath());
 
         this.issuedExternalKeys = chain.issuedExternalKeys;
         this.issuedInternalKeys = chain.issuedInternalKeys;

diff --git a/core/src/test/java/org/bitcoinj/wallet/WalletTest.java b/core/src/test/java/org/bitcoinj/wallet/WalletTest.java
@@ -165,6 +165,16 @@ public void basicSpendingWithEncryptedWallet() throws Exception {
         basicSpendingCommon(encryptedWallet, myEncryptedAddress, OTHER_ADDRESS, encryptedWallet);
     }
 
+    @Test
+    public void encryptWalletWithArbitraryPath() throws Exception {
+        final byte[] ENTROPY = Sha256Hash.hash("don't use a string seed like this in real life".getBytes());
+        KeyChainGroup keyChainGroup = new KeyChainGroup(UNITTEST,
+                new DeterministicSeed(ENTROPY, "", 1389353062L),
+                        DeterministicKeyChain.BIP44_ACCOUNT_ZERO_PATH);
+        Wallet encryptedWallet = new Wallet(UNITTEST, keyChainGroup);
+        encryptedWallet.encrypt(PASSWORD1);
+    }
+
     @Test
     public void basicSpendingFromP2SH() throws Exception {
         createMarriedWallet(2, 2);