From 1542a88b5f940eb35efd6e32a5a4563f744c1a1c Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Mon, 23 Feb 2015 12:07:06 +0100 Subject: [PATCH] Put back the KeyChainGroup log message and remove an apparently useless wallet creation on the load path in WalletAppKit that was triggering it. --- core/src/main/java/org/bitcoinj/kits/WalletAppKit.java | 1 - core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java b/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java index 58186d242..365f3afd5 100644 --- a/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java +++ b/core/src/main/java/org/bitcoinj/kits/WalletAppKit.java @@ -356,7 +356,6 @@ public class WalletAppKit extends AbstractIdleService { FileInputStream walletStream = new FileInputStream(vWalletFile); try { List extensions = provideWalletExtensions(); - wallet = new Wallet(params); WalletExtension[] extArray = extensions.toArray(new WalletExtension[extensions.size()]); Protos.Wallet proto = WalletProtobufSerializer.parseToProto(walletStream); final WalletProtobufSerializer serializer; diff --git a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java index 70890a07a..801185382 100644 --- a/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java +++ b/core/src/main/java/org/bitcoinj/wallet/KeyChainGroup.java @@ -152,6 +152,7 @@ public class KeyChainGroup implements KeyBag { * Useful for adding a complex pre-configured keychain, such as a married wallet. */ public void addAndActivateHDChain(DeterministicKeyChain chain) { + log.info("Creating and activating a new HD chain: {}", chain); for (ListenerRegistration registration : basic.getListeners()) chain.addEventListener(registration.listener, registration.executor); if (lookaheadSize >= 0)