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

Wallet: In maybeRotateKeys(), fix logic to find out the preferred scriptType.

Browse Source
This commit is contained in:
Andreas Schildbach
2019-02-15 00:00:57 +01:00
parent 08bb331cc3
commit 3dbc7ecd62
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/org/bitcoinj/wallet/Wallet.java
View File

@@ -5313,16 +5313,18 @@ public class Wallet extends BaseTaggableObject
Script.ScriptType preferredScriptType = Script.ScriptType.P2PKH;
if (keyChainGroup.isSupportsDeterministicChains()) {
for (DeterministicKeyChain chain : keyChainGroup.getDeterministicKeyChains()) {
if (chain.getEarliestKeyCreationTime() >= keyRotationTimestamp) {
if (chain.getEarliestKeyCreationTime() >= keyRotationTimestamp)
allChainsRotating = false;
else
preferredScriptType = chain.getOutputScriptType();
}
}
}
if (allChainsRotating) {
try {
if (keyChainGroup.getImportedKeys().isEmpty()) {
log.info("All HD chains are currently rotating and we have no random keys, creating fresh HD chain ...");
log.info(
"All deterministic chains are currently rotating and we have no random keys, creating fresh {} chain: backup required after this.",
preferredScriptType);
KeyChainGroup newChains = KeyChainGroup.builder(params, structure).fromRandom(preferredScriptType)
.build();
if (keyChainGroup.isEncrypted()) {
@@ -5336,12 +5338,16 @@ public class Wallet extends BaseTaggableObject
keyChainGroup.mergeActiveKeyChains(newChains, keyRotationTimestamp);
}
} else {
log.info("All HD chains are currently rotating, attempting to create a new one from the next oldest non-rotating key material ...");
log.info(
"All deterministic chains are currently rotating, creating a new {} one from the next oldest non-rotating key material...",
preferredScriptType);
keyChainGroup.upgradeToDeterministic(preferredScriptType, structure, keyRotationTimestamp, aesKey);
log.info(" ... upgraded to HD again, based on next best oldest key.");
log.info("...upgraded to HD again, based on next best oldest key.");
}
} catch (AllRandomKeysRotating rotating) {
log.info(" ... no non-rotating random keys available, generating entirely new HD tree: backup required after this.");
log.info(
"No non-rotating random keys available, generating entirely new {} tree: backup required after this.",
preferredScriptType);
KeyChainGroup newChains = KeyChainGroup.builder(params, structure).fromRandom(preferredScriptType)
.build();
if (keyChainGroup.isEncrypted()) {