From f554aac4cfbf8139347df040416a55a5296b568b Mon Sep 17 00:00:00 2001
From: Jon Layton <jon@seequ.com>
Date: Mon, 4 Jun 2018 15:27:51 -0500
Subject: [PATCH] [wallet] JSONRPCRequest for signrawtransaction and
 sendrawtransaction

---
 src/wallet/asyncrpcoperation_mergetoaddress.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/wallet/asyncrpcoperation_mergetoaddress.cpp b/src/wallet/asyncrpcoperation_mergetoaddress.cpp
index 88e88763d..8500c548b 100644
--- a/src/wallet/asyncrpcoperation_mergetoaddress.cpp
+++ b/src/wallet/asyncrpcoperation_mergetoaddress.cpp
@@ -15,6 +15,7 @@
 #include <paymentdisclosuredb.h>
 #include <rpc/protocol.h>
 #include <rpc/server.h>
+#include <rpc/rawtransaction.cpp>
 #include <script/interpreter.h>
 #include <sodium.h>
 #include <timedata.h>
@@ -637,7 +638,9 @@ void AsyncRPCOperation_mergetoaddress::sign_send_raw_transaction(UniValue obj)
 
     UniValue params = UniValue(UniValue::VARR);
     params.push_back(rawtxn);
-    UniValue signResultValue = signrawtransaction(params, false);
+    JSONRPCRequest jsonRequest;
+    jsonRequest.params = params;
+    UniValue signResultValue = signrawtransaction(jsonRequest);
     UniValue signResultObject = signResultValue.get_obj();
     UniValue completeValue = find_value(signResultObject, "complete");
     bool complete = completeValue.get_bool();
@@ -657,7 +660,9 @@ void AsyncRPCOperation_mergetoaddress::sign_send_raw_transaction(UniValue obj)
         params.clear();
         params.setArray();
         params.push_back(signedtxn);
-        UniValue sendResultValue = sendrawtransaction(params, false);
+        JSONRPCRequest jsonRequest;
+        jsonRequest.params = params;
+        UniValue sendResultValue = sendrawtransaction(jsonRequest);
         if (sendResultValue.isNull()) {
             throw JSONRPCError(RPC_WALLET_ERROR, "Send raw transaction did not return an error or a txid.");
         }