From c3b6e0d7b9dab7231650545c8e97e5f41f4cd902 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Tue, 19 Mar 2019 17:54:45 +0100 Subject: [PATCH] Wallet: Fix handling of wallet without deterministic chains in checkForFilterExhaustion(). --- core/src/main/java/org/bitcoinj/wallet/Wallet.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java index 9f75fa3b..cfb57ce5 100644 --- a/core/src/main/java/org/bitcoinj/wallet/Wallet.java +++ b/core/src/main/java/org/bitcoinj/wallet/Wallet.java @@ -4880,6 +4880,8 @@ public class Wallet extends BaseTaggableObject public boolean checkForFilterExhaustion(FilteredBlock block) { keyChainGroupLock.lock(); try { + if (!keyChainGroup.isSupportsDeterministicChains()) + return false; int epoch = keyChainGroup.getCombinedKeyLookaheadEpochs(); for (Transaction tx : block.getAssociatedTransactions().values()) { markKeysAsUsed(tx);