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

Add maybeDoMaintenance back as a deprecated alias.

Browse Source
This commit is contained in:
Mike Hearn
2014-10-22 19:43:16 +02:00
parent ea02436f96
commit 1a55f8d2d5
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/org/bitcoinj/core/Wallet.java
View File

@@ -4297,6 +4297,12 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
return time != 0 && key.getCreationTimeSeconds() < time; return time != 0 && key.getCreationTimeSeconds() < time;
} }
/** @deprecated Renamed to doMaintenance */
@Deprecated
public ListenableFuture<List<Transaction>> maybeDoMaintenance(@Nullable KeyParameter aesKey, boolean andSend) throws DeterministicUpgradeRequiresPassword {
return doMaintenance(aesKey, andSend);
}
/** /**
* A wallet app should call this from time to time in order to let the wallet craft and send transactions needed * A wallet app should call this from time to time in order to let the wallet craft and send transactions needed
* to re-organise coins internally. A good time to call this would be after receiving coins for an unencrypted * to re-organise coins internally. A good time to call this would be after receiving coins for an unencrypted
@@ -4363,10 +4369,15 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
} }
} }
if (allChainsRotating) { if (allChainsRotating) {
log.info("All HD chains are currently rotating, attempting to create a new one from the next oldest non-rotating key material ...");
try { try {
keychain.upgradeToDeterministic(keyRotationTimestamp, aesKey); if (keychain.getImportedKeys().isEmpty()) {
log.info(" ... upgraded to HD again, based on next best oldest key."); log.info("All HD chains are currently rotating and we have no random keys, creating fresh HD chain ...");
keychain.createAndActivateNewHDChain();
} else {
log.info("All HD chains are currently rotating, attempting to create a new one from the next oldest non-rotating key material ...");
keychain.upgradeToDeterministic(keyRotationTimestamp, aesKey);
log.info(" ... upgraded to HD again, based on next best oldest key.");
}
} catch (AllRandomKeysRotating rotating) { } 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 HD tree: backup required after this.");
keychain.createAndActivateNewHDChain(); keychain.createAndActivateNewHDChain();