Browse Source

Merge pull request #7010

10953a7 Better error message for fundrawtransaction w/ empty vout (Peter Todd)
61e1eb2 Actually use includeWatching value in fundrawtransaction (Peter Todd)
0.13
Gregory Maxwell 9 years ago
parent
commit
e0a5ef8427
No known key found for this signature in database
GPG Key ID: EAB5AF94D9E9ABE7
  1. 5
      src/wallet/rpcwallet.cpp

5
src/wallet/rpcwallet.cpp

@ -2418,9 +2418,12 @@ UniValue fundrawtransaction(const UniValue& params, bool fHelp)
if (!DecodeHexTx(origTx, params[0].get_str())) if (!DecodeHexTx(origTx, params[0].get_str()))
throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed"); throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "TX decode failed");
if (origTx.vout.size() == 0)
throw JSONRPCError(RPC_INVALID_PARAMETER, "TX must have at least one output");
bool includeWatching = false; bool includeWatching = false;
if (params.size() > 1) if (params.size() > 1)
includeWatching = true; includeWatching = params[1].get_bool();
CMutableTransaction tx(origTx); CMutableTransaction tx(origTx);
CAmount nFee; CAmount nFee;

Loading…
Cancel
Save