entry.push_back(Pair("confirmations", confirms));
if (wtx.IsCoinBase())
entry.push_back(Pair("generated", true));
- if (confirms)
+ if (confirms > 0)
{
entry.push_back(Pair("blockhash", wtx.hashBlock.GetHex()));
entry.push_back(Pair("blockindex", wtx.nIndex));
Object entry;
entry.push_back(Pair("account", strSentAccount));
MaybePushAddress(entry, s.first);
- entry.push_back(Pair("category", "send"));
+ if (wtx.GetDepthInMainChain() < 0)
+ entry.push_back(Pair("category", "conflicted"));
+ else
+ entry.push_back(Pair("category", "send"));
entry.push_back(Pair("amount", ValueFromAmount(-s.second)));
entry.push_back(Pair("fee", ValueFromAmount(-nFee)));
if (fLong)
entry.push_back(Pair("category", "generate"));
}
else
- entry.push_back(Pair("category", "receive"));
+ {
+ if (wtx.GetDepthInMainChain() < 0)
+ entry.push_back(Pair("category", "conflicted"));
+ else
+ entry.push_back(Pair("category", "receive"));
+ }
entry.push_back(Pair("amount", ValueFromAmount(r.second)));
if (fLong)
WalletTxToJSON(wtx, entry);
"Stores the wallet decryption key in memory for <timeout> seconds.");
if (fHelp)
return true;
+ if (!fServer)
+ throw JSONRPCError(RPC_SERVER_NOT_STARTED, "Error: RPC server was not started, use server=1 to change this.");
if (!pwalletMain->IsCrypted())
throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an unencrypted wallet, but walletpassphrase was called.");