From 5f605e172baee35421eb20736601befdd8cad796 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Tue, 13 Feb 2018 13:04:48 -0800
Subject: Make signrawtransaction accept P2SH-P2WSH redeemscripts

---
 src/rpc/rawtransaction.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/rpc/rawtransaction.cpp')

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 24f2431efc..bbc0459a7c 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -848,6 +848,8 @@ UniValue signrawtransaction(const JSONRPCRequest& request)
                     std::vector<unsigned char> rsData(ParseHexV(v, "redeemScript"));
                     CScript redeemScript(rsData.begin(), rsData.end());
                     tempKeystore.AddCScript(redeemScript);
+                    // Automatically also add the P2WSH wrapped version of the script (to deal with P2SH-P2WSH).
+                    tempKeystore.AddCScript(GetScriptForWitness(redeemScript));
                 }
             }
         }
-- 
cgit v1.2.3