Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-07-31 20:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

DeterministicKeyChain: Allow encrypting DeterministicKeyChain with arbitrary path

Browse Source
This commit is contained in:
HashEngineering
2018-03-11 22:09:26 -07:00
committed by Andreas Schildbach
parent 4bbb7be059
commit e0d9683bd5
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -433,6 +433,7 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
checkNotNull(chain.seed); checkNotNull(chain.seed);
checkArgument(!chain.rootKey.isEncrypted(), "Chain already encrypted"); checkArgument(!chain.rootKey.isEncrypted(), "Chain already encrypted");
setAccountPath(chain.getAccountPath());
this.issuedExternalKeys = chain.issuedExternalKeys; this.issuedExternalKeys = chain.issuedExternalKeys;
this.issuedInternalKeys = chain.issuedInternalKeys; this.issuedInternalKeys = chain.issuedInternalKeys;

10
core/src/test/java/org/bitcoinj/wallet/WalletTest.java
View File

@@ -165,6 +165,16 @@ public class WalletTest extends TestWithWallet {
basicSpendingCommon(encryptedWallet, myEncryptedAddress, OTHER_ADDRESS, encryptedWallet); 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 @Test
public void basicSpendingFromP2SH() throws Exception { public void basicSpendingFromP2SH() throws Exception {
createMarriedWallet(2, 2); createMarriedWallet(2, 2);