From a3899da08dce937c86ffa73b18dc92d2e28f1952 Mon Sep 17 00:00:00 2001
From: Gregory Sanders <gsanders87@gmail.com>
Date: Fri, 10 Mar 2017 14:21:59 -0500
Subject: [PATCH] Allow FillOutputs to continue on failure to deblind output

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

diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 125667b66e..165285e501 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -581,7 +581,6 @@ UniValue createrawtransaction(const JSONRPCRequest& request)
 }
 
 // Rewind the outputs to unblinded, and push placeholders for blinding info
-// Failure if any are unable to be unblinded
 void FillOutputBlinds(CMutableTransaction& tx, bool fUseWallet, std::vector<uint256>& output_value_blinds, std::vector<uint256>& output_asset_blinds, std::vector<CPubKey>& output_pubkeys) {
     for (size_t nOut = 0; nOut < tx.vout.size(); nOut++) {
         if (!tx.vout[nOut].nValue.IsExplicit()) {
@@ -603,12 +602,13 @@ void FillOutputBlinds(CMutableTransaction& tx, bool fUseWallet, std::vector<uint
                 output_pubkeys.push_back(pubkey);
                 output_value_blinds.push_back(uint256());
                 output_asset_blinds.push_back(uint256());
-
-            } else if (fUseWallet)
-                throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter: transaction outputs must be unblinded or to wallet"));
+                continue;
+            }
 #endif
-            if (!fUseWallet)
-                throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter: transaction outputs must be unblinded"));
+            // If no wallet, or unable to unblind, leave it alone in next blinding step
+            output_pubkeys.push_back(CPubKey());
+            output_value_blinds.push_back(uint256());
+            output_asset_blinds.push_back(uint256());
         } else if (tx.vout[nOut].nNonce.vchCommitment.size() == 0) {
             output_pubkeys.push_back(CPubKey());
             output_value_blinds.push_back(uint256());