Fix crash that can occur when editing projects that have a P2SH targe…

…t address
vinumeris · Dec 8, 2014 · 04bc28f · 04bc28f
1 parent c9607a8
commit 04bc28f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/client/src/main/java/lighthouse/model/ProjectModel.java b/client/src/main/java/lighthouse/model/ProjectModel.java
@@ -6,10 +6,7 @@
 import lighthouse.protocol.LHUtils;
 import lighthouse.protocol.Project;
 import lighthouse.wallet.PledgingWallet;
-import org.bitcoinj.core.Address;
-import org.bitcoinj.core.AddressFormatException;
-import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.*;
 import org.bitcoinj.script.Script;
 import org.bitcoinj.script.ScriptBuilder;
 
@@ -76,9 +73,12 @@ public ProjectModel(LHProtos.ProjectDetails.Builder liveProto) {
                 proto.setPaymentUrl(LHUtils.makeServerPath(name, LHUtils.titleToUrlString(title.get())));
         });
 
-        Address addr = project.getOutputs().get(0).getAddressFromP2PKHScript(project.getParams());
+        TransactionOutput output = project.getOutputs().get(0);
+        Address addr = output.getAddressFromP2PKHScript(project.getParams());
         if (addr == null)
-            throw new IllegalArgumentException("Output type is not a pay to address: " + project.getOutputs().get(0));
+            addr = output.getAddressFromP2SH(project.getParams());
+        if (addr == null)
+            throw new IllegalArgumentException("Output type is not pay to address/p2sh: " + output);
         address.set(addr.toString());
         address.addListener(o -> {
             try {