From 1d8c78f327b893b71725cf2566b10df6a48c9977 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas.schildbach@bloq.com>
Date: Thu, 7 Mar 2019 15:45:13 +0100
Subject: [PATCH] Wallet: Fix crash when isAddressMine() is called with a P2SH
 or a P2WSH address.

---
 core/src/main/java/org/bitcoinj/wallet/Wallet.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/main/java/org/bitcoinj/wallet/Wallet.java b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
index 8327483d..d817cf78 100644
--- a/core/src/main/java/org/bitcoinj/wallet/Wallet.java
+++ b/core/src/main/java/org/bitcoinj/wallet/Wallet.java
@@ -1173,6 +1173,10 @@ public class Wallet extends BaseTaggableObject
         final ScriptType scriptType = address.getOutputScriptType();
         if (scriptType == ScriptType.P2PKH || scriptType == ScriptType.P2WPKH)
             return isPubKeyHashMine(address.getHash(), scriptType);
+        else if (scriptType == ScriptType.P2SH)
+            return isPayToScriptHashMine(address.getHash());
+        else if (scriptType == ScriptType.P2WSH)
+            return false;
         else
             throw new IllegalArgumentException(address.toString());
     }