diff options
| -rw-r--r-- | contrib/README.md | 2 | ||||
| -rw-r--r-- | src/rpcrawtransaction.cpp | 4 | ||||
| -rw-r--r-- | src/rpcwallet.cpp | 10 |
3 files changed, 5 insertions, 11 deletions
diff --git a/contrib/README.md b/contrib/README.md index 167b5df4e1..cd0dd3b023 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -52,7 +52,7 @@ tests each pull and when master is tested using jenkins. ### [Verify SF Binaries](/contrib/verifysfbinaries) ### This script attempts to download and verify the signature file SHA256SUMS.asc from SourceForge. -### [Developer tools](/control/devtools) ### +### [Developer tools](/contrib/devtools) ### Specific tools for developers working on this repository. Contains the script `github-merge.sh` for merging github pull requests securely and signing them using GPG. diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp index e2bdc80aef..837aee7eaa 100644 --- a/src/rpcrawtransaction.cpp +++ b/src/rpcrawtransaction.cpp @@ -522,7 +522,7 @@ Value signrawtransaction(const Array& params, bool fHelp) "\nArguments:\n" "1. \"hexstring\" (string, required) The transaction hex string\n" "2. \"prevtxs\" (string, optional) An json array of previous dependent transaction outputs\n" - " [ (json array of json objects)\n" + " [ (json array of json objects, or 'null' if none provided)\n" " {\n" " \"txid\":\"id\", (string, required) The transaction id\n" " \"vout\":n, (numeric, required) The output number\n" @@ -532,7 +532,7 @@ Value signrawtransaction(const Array& params, bool fHelp) " ,...\n" " ]\n" "3. \"privatekeys\" (string, optional) A json array of base58-encoded private keys for signing\n" - " [ (json array of strings)\n" + " [ (json array of strings, or 'null' if none provided)\n" " \"privatekey\" (string) private key in base58-encoding\n" " ,...\n" " ]\n" diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp index 3b0c84e49e..7b605af589 100644 --- a/src/rpcwallet.cpp +++ b/src/rpcwallet.cpp @@ -1114,10 +1114,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe Object entry; entry.push_back(Pair("account", strSentAccount)); MaybePushAddress(entry, s.first); - if (wtx.GetDepthInMainChain() < 0) - entry.push_back(Pair("category", "conflicted")); - else - entry.push_back(Pair("category", "send")); + entry.push_back(Pair("category", "send")); entry.push_back(Pair("amount", ValueFromAmount(-s.second))); entry.push_back(Pair("fee", ValueFromAmount(-nFee))); if (fLong) @@ -1150,10 +1147,7 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe } else { - if (wtx.GetDepthInMainChain() < 0) - entry.push_back(Pair("category", "conflicted")); - else - entry.push_back(Pair("category", "receive")); + entry.push_back(Pair("category", "receive")); } entry.push_back(Pair("amount", ValueFromAmount(r.second))); if (fLong) |