DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

async wallet upstream chnages

Browse Source
This commit is contained in:
Duke Leto
2019-12-12 19:16:06 -05:00
parent 73997b39fc
commit b3d3a3cff9
3 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wallet/asyncrpcoperation_mergetoaddress.cpp
View File

@@ -50,7 +50,7 @@ int32_t komodo_blockheight(uint256 hash);
using namespace libzcash;
extern UniValue sendrawtransaction(const UniValue& params, bool fHelp);
extern UniValue sendrawtransaction(const UniValue& params, bool fHelp, const CPubKey& mypk);
int mta_find_output(UniValue obj, int n)
{
@@ -403,7 +403,7 @@ bool AsyncRPCOperation_mergetoaddress::main_impl()
if (!testmode) {
UniValue params = UniValue(UniValue::VARR);
params.push_back(signedtxn);
UniValue sendResultValue = sendrawtransaction(params, false);
UniValue sendResultValue = sendrawtransaction(params, false, CPubKey());
if (sendResultValue.isNull()) {
throw JSONRPCError(RPC_WALLET_ERROR, "sendrawtransaction did not return an error or a txid.");
}
@@ -780,7 +780,7 @@ bool AsyncRPCOperation_mergetoaddress::main_impl()
}
extern UniValue signrawtransaction(const UniValue& params, bool fHelp);
extern UniValue signrawtransaction(const UniValue& params, bool fHelp, const CPubKey& mypk);
/**
* Sign and send a raw transaction.
@@ -797,7 +797,7 @@ void AsyncRPCOperation_mergetoaddress::sign_send_raw_transaction(UniValue obj)
UniValue params = UniValue(UniValue::VARR);
params.push_back(rawtxn);
UniValue signResultValue = signrawtransaction(params, false);
UniValue signResultValue = signrawtransaction(params, false, CPubKey());
UniValue signResultObject = signResultValue.get_obj();
UniValue completeValue = find_value(signResultObject, "complete");
bool complete = completeValue.get_bool();
@@ -817,7 +817,7 @@ void AsyncRPCOperation_mergetoaddress::sign_send_raw_transaction(UniValue obj)
params.clear();
params.setArray();
params.push_back(signedtxn);
UniValue sendResultValue = sendrawtransaction(params, false);
UniValue sendResultValue = sendrawtransaction(params, false, CPubKey());
if (sendResultValue.isNull()) {
throw JSONRPCError(RPC_WALLET_ERROR, "Send raw transaction did not return an error or a txid.");
}